prerelease 1.9R1

CSV: key,type,encoding,value label_space,namespace,, L_LABEL,data,string,"standard_touch.csv. " L_COMMENT,data,string,This is the standard configuration with the touch screen added. gpio_space,namespace,, .... __________________________ sys.conf ##CONFIG# #LABEL: standard_touch.csv. #COMMENT: This is the standard configuration with the touch screen added. And new: Double click for time/main as before , but choice is now permanent. Bugs removed. More reactive display.
karawin · Feb 19, 2019 · 294a1ad · 294a1ad
1 parent 26c0a9f
commit 294a1ad
Show file tree

Hide file tree

Showing 35 changed files with 328 additions and 209 deletions.
diff --git a/boards/build/lolin32pro.bin b/boards/build/lolin32pro.bin
diff --git a/boards/build/new_psram.bin b/boards/build/new_psram.bin
diff --git a/boards/build/odroid-go.bin b/boards/build/odroid-go.bin
diff --git a/boards/build/pattern.bin b/boards/build/pattern.bin
diff --git a/boards/build/standard_adb.bin b/boards/build/standard_adb.bin
diff --git a/boards/build/standard_psram.bin b/boards/build/standard_psram.bin
diff --git a/boards/build/standard_touch.bin b/boards/build/standard_touch.bin
diff --git a/boards/build/test.bin b/boards/build/test.bin
diff --git a/boards/build/ttgot8.bin b/boards/build/ttgot8.bin
diff --git a/boards/build/ttgotm.bin b/boards/build/ttgotm.bin
diff --git a/boards/lolin32pro.csv b/boards/lolin32pro.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,lolin32pro.csv
+L_COMMENT,data,string,This is the configuration for a lolin pro with wrover cpu.
+
 gpio_space,namespace,,
 K_SPI,data,u8,1
 P_MISO,data,u8,12

diff --git a/boards/new_psram.csv b/boards/new_psram.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,new_psram.csv
+L_COMMENT,data,string,This is the standard simple configuration for a wrover .
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19
@@ -46,7 +51,7 @@ O_DDMM_FLAG,data,u8,255
 custom_ir_space,namespace,,
 K_UP,data,string,
 K_LEFT,data,string,
-K_OK,data,string,0
+K_OK,data,string,
 K_RIGHT,data,string,
 K_DOWN,data,string,
 K_0,data,string,

diff --git a/boards/odroid-go.csv b/boards/odroid-go.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,odroid-go.csv
+L_COMMENT,data,string,This is the standard configuration for an odroid-go board.
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19

diff --git a/boards/pattern.csv b/boards/pattern.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,pattern.csv
+L_COMMENT,data,string,pattern for all csv files
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19
@@ -32,6 +37,17 @@ P_I2S_BCLK,data,u8,26
 P_I2S_DATA,data,u8,22
 P_ADC,data,u8,255
 P_BACKLIGHT,data,u8,255
+P_TOUCH_CS,data,u8,16
+P_JOY_0,data,u8,255
+P_JOY_1,data,u8,255
+P_LED_GPIO,data,u8,4
+
+option_space,namespace,,
+O_LCD_TYPE,data,u8,255
+O_LCD_ROTA,data,u8,0
+O_LCD_OUT,data,u32,0
+O_DDMM_FLAG,data,u8,1
+
 custom_ir_space,namespace,,
 K_UP,data,string,
 K_LEFT,data,string,

diff --git a/boards/standard_adb.csv b/boards/standard_adb.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,standard_adb.csv
+L_COMMENT,data,string,This is the standard default configuration as in the builtin conf.
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19
@@ -39,9 +44,9 @@ P_BACKLIGHT,data,u8,255
 
 option_space,namespace,,
 O_LCD_TYPE,data,u8,255
-O_LCD_ROTA,data,u8,255
-O_LCD_OUT,data,u32,255
-O_DDMM_FLAG,data,u8,255
+O_LCD_ROTA,data,u8,0
+O_LCD_OUT,data,u32,0
+O_DDMM_FLAG,data,u8,0
 
 custom_ir_space,namespace,,
 K_UP,data,string,

diff --git a/boards/standard_psram.csv b/boards/standard_psram.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,standard_psram.csv
+L_COMMENT,data,string,This is the standard configuration for a wrover.
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19

diff --git a/boards/standard_touch.csv b/boards/standard_touch.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,"standard_touch.csv. "
+L_COMMENT,data,string,This is the standard configuration with the touch screen added.
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19

diff --git a/boards/test.csv b/boards/test.csv
diff --git a/boards/ttgot8.csv b/boards/ttgot8.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,ttgot8.csv
+L_COMMENT,data,string,LilyGo/TTGO-T8 board .
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19

diff --git a/boards/ttgotm.csv b/boards/ttgotm.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,ttgotm.csv
+L_COMMENT,data,string,LilyGO/TTGO-TM-ESP32 board .
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19

diff --git a/boards/ttgov4.csv b/boards/ttgov4.csv
@@ -1,4 +1,9 @@
 key,type,encoding,value
+
+label_space,namespace,,
+L_LABEL,data,string,4csv
+L_COMMENT,data,string,LilyGO/TTGO-T4 board .
+
 gpio_space,namespace,,
 K_SPI,data,u8,2
 P_MISO,data,u8,19

diff --git a/main/ClickButtons.c b/main/ClickButtons.c
@@ -39,7 +39,7 @@ Button_t* ClickButtonsInit(int8_t A, int8_t B, int8_t C)
 		enc->button[i] = Open;
 		enc->keyDownTicks[i] = 0;
 		enc->doubleClickTicks[i] = 0;
-		enc->lastButtonCheck[i] = 0;
+//		enc->lastButtonCheck[i] = 0;
 	}
 	enc->doubleClickEnabled = true; enc->buttonHeldEnabled = true;
 
@@ -76,15 +76,15 @@ IRAM_ATTR void serviceBtn(Button_t *enc)
 {
   // handle enc->button
   //
-  unsigned long currentMillis = xTaskGetTickCount()* portTICK_PERIOD_MS;
+//  unsigned long currentMillis = xTaskGetTickCount()* portTICK_PERIOD_MS;
 
   for(uint8_t i = 0; i < 3; i++) 
   {
-	if (currentMillis < enc->lastButtonCheck[i]) enc->lastButtonCheck[i] = 0;        // Handle case when millis() wraps back around to zero
-	if ((enc->pinBTN[i] > 0 )        // check enc->button only, if a pin has been provided
-		&& ((currentMillis - enc->lastButtonCheck[i]) >= ENC_BUTTONINTERVAL))            // checking enc->button is sufficient every 10-30ms
+//	if (currentMillis < enc->lastButtonCheck[i]) enc->lastButtonCheck[i] = 0;        // Handle case when millis() wraps back around to zero
+	if ((enc->pinBTN[i] > 0 ))        // check enc->button only, if a pin has been provided
+//		&& ((currentMillis - enc->lastButtonCheck[i]) >= ENC_BUTTONINTERVAL))            // checking enc->button is sufficient every 10-30ms
 	{ 
-		enc->lastButtonCheck[i] = currentMillis;
+//		enc->lastButtonCheck[i] = currentMillis;
 
 		bool pinRead = getPinStates(enc,i);
 

diff --git a/main/ClickEncoder.c b/main/ClickEncoder.c
@@ -129,40 +129,61 @@ bool getHalfStep(Encoder_t *enc)
 //void (*serviceEncoder)() = NULL;
 IRAM_ATTR void service(Encoder_t *enc)
 {
-  bool moved = false;
+  volatile bool moved = false;
 
-  if (enc->pinA >= 0 && enc->pinB >= 0) {
-  if (enc->accelerationEnabled) { // decelerate every tick
-    enc->acceleration -= ENC_ACCEL_DEC;
-    if (enc->acceleration & 0x8000) { // handle overflow of MSB is set
-      enc->acceleration = 0;
-    }
-  }
+//  if (enc->pinA >= 0 && enc->pinB >= 0) 
+  {
+//	if (enc->accelerationEnabled) 
+	{ // decelerate every tick
+		enc->acceleration -= ENC_ACCEL_DEC;
+		if (enc->acceleration & 0x8000) 
+		{ // handle overflow of MSB is set
+			enc->acceleration = 0;
+//enc->dcount++;
+		}
+	}
 
-	int8_t curr = 0; 
-	if (digitalRead(enc->pinA) == enc->pinsActive) {
+	volatile int8_t curr = 0; 
+	volatile int va,vb;
+	va = digitalRead(enc->pinA);
+	vb = digitalRead(enc->pinB);
+
+//	if (digitalRead(enc->pinA) == enc->pinsActive) {
+//	if (digitalRead(enc->pinA) == 0) {
+	if (va == 0) {
 		curr = 3;
 	}
 
-	if (digitalRead(enc->pinB) == enc->pinsActive) {
+//	if (digitalRead(enc->pinB) == enc->pinsActive) {
+//	if (digitalRead(enc->pinB) == 0) {
+	if (vb == 0) {
 		curr ^= 1;
 	}
 
-	int8_t diff = enc->last - curr;
+	volatile int8_t diff = enc->last - curr;
 
 	if (diff & 1) {            // bit 0 = step
+//printf("diff: %d  cur: %d  last: %d  delta: %d\n",diff,curr,enc->last,enc->delta);
+/*
+enc->pcurr = curr;
+enc->plast = enc->last;
+enc->pdiff = diff;
+enc->count++;
+*/	
 		enc->last = curr;
 		enc->delta += (diff & 2) - 1; // bit 1 = direction (+/-)
 		moved = true;    
+//enc->pdelta	=	enc->delta;
 	}
 
-  if (enc->accelerationEnabled && moved) {
+	if (/*enc->accelerationEnabled &&*/ moved) {
     // increment accelerator if encoder has been moved
-    if (enc->acceleration <= (ENC_ACCEL_TOP - enc->accel_inc)) {
-      enc->acceleration += enc->accel_inc ;
-    }
+		if (enc->acceleration <= (ENC_ACCEL_TOP - enc->accel_inc)) {
+			enc->acceleration += enc->accel_inc ;
+//enc->icount++;
+		}
+	}
   }
-}
   // handle enc->button
   //
   unsigned long currentMillis = xTaskGetTickCount()* portTICK_PERIOD_MS;
@@ -239,7 +260,18 @@ int16_t getValue(Encoder_t *enc)
   else if (val > 0) {
     r += 1 + accel;
   }
-//  if (r != 0) printf("Acceleration: %d  accel: %d   val:%d,, R:%d\n",enc->acceleration,accel,val,r);
+
+/*  
+  if (r != 0)
+  {	  
+	printf("count: %d pdiff: %d  pcur: %d  plast: %d  pdelta: %d\n",enc->count,enc->pdiff,enc->pcurr,enc->plast,enc->pdelta);
+	printf(" increment: %d  decrement: %d\n",enc->icount,enc->dcount);
+	enc->count = 0;
+	enc->icount= 0;
+	enc->dcount=0;
+	printf("Acceleration: %d  step: %d  last: %d   val:%d,, R:%d\n",enc->acceleration,enc->steps,enc->last,val,r);
+  }
+*/
   interrupts();
 
   return r;

diff --git a/main/ClickJoystick.c b/main/ClickJoystick.c
@@ -46,7 +46,7 @@ Joystick_t* ClickJoystickInit(int8_t A)
 		enc->button[i] = Open;
 		enc->keyDownTicks[i] = 0;
 		enc->doubleClickTicks[i] = 0;
-		enc->lastButtonCheck[i] = 0;
+//		enc->lastButtonCheck[i] = 0;
 	}
 	enc->doubleClickEnabled = true; enc->buttonHeldEnabled = true;
 
@@ -61,18 +61,16 @@ IRAM_ATTR void serviceJoystick(Joystick_t *enc)
 {
   // handle enc->button
   //
-  unsigned long currentMillis = xTaskGetTickCount()* portTICK_PERIOD_MS;
+//  unsigned long currentMillis = xTaskGetTickCount()* portTICK_PERIOD_MS;
   bool pinRead[NBBUTTONS];
   getJoyStates(enc, pinRead);
   for(uint8_t i = 0; i < NBBUTTONS; i++) 
   {
-	if (currentMillis < enc->lastButtonCheck[i]) enc->lastButtonCheck[i] = 0;        // Handle case when millis() wraps back around to zero
-	if (((currentMillis - enc->lastButtonCheck[i]) >= ENC_BUTTONINTERVAL))            // checking enc->button is sufficient every 10-30ms
+//	if (currentMillis < enc->lastButtonCheck[i]) enc->lastButtonCheck[i] = 0;        // Handle case when millis() wraps back around to zero
+//	if (((currentMillis - enc->lastButtonCheck[i]) >= ENC_BUTTONINTERVAL))            // checking enc->button is sufficient every 10-30ms
 	{ 
-		enc->lastButtonCheck[i] = currentMillis;
-
-
-
+//		enc->lastButtonCheck[i] = currentMillis;
+
 		if (pinRead[i] == true) { // key is down
 			enc->keyDownTicks[i]++;
 			if ((enc->keyDownTicks[i] > (BTN_HOLDTIME / ENC_BUTTONINTERVAL)) && (enc->buttonHeldEnabled)) 
@@ -98,17 +96,16 @@ IRAM_ATTR void serviceJoystick(Joystick_t *enc)
 				else {
 					enc->doubleClickTicks[i] = (enc->doubleClickEnabled) ? (BTN_DOUBLECLICKTIME / ENC_BUTTONINTERVAL) : ENC_SINGLECLICKONLY;
 				}
+				}
 			}
-		}
-
-		enc->keyDownTicks[i] = 0;
+			enc->keyDownTicks[i] = 0;
 		}
 
 		if (enc->doubleClickTicks[i] > 0) {
-		enc->doubleClickTicks[i]--;
-		if (enc->doubleClickTicks[i] == 0) {
-			enc->button[i] = Clicked;
-		}
+			enc->doubleClickTicks[i]--;
+			if (enc->doubleClickTicks[i] == 0) {
+				enc->button[i] = Clicked;
+			}
 		}
 	}
   }