NV14 compile fix

radio/src/targets/nv14/battery_driver.cpp

@@ -108,26 +108,26 @@ void drawChargingInfo(uint16_t chargeState){
         }
         text = STR_BATTERYCHARGING;
         h = ((BATTERY_H_INNER * progress) / 100);
-        color = ROUND|BATTERY_CHARGE_COLOR;
+        color = BATTERY_CHARGE_COLOR;
     }
     else if(CHARGE_FINISHED == chargeState)
     {
         text = STR_BATTERYFULL;
         h = BATTERY_H_INNER;
-        color = ROUND|BATTERY_CHARGE_COLOR;
+        color = BATTERY_CHARGE_COLOR;
     }
     else
     {
         text = STR_BATTERYNONE;
         h = BATTERY_H_INNER;
-        color = ROUND|TRIM_SHADOW_COLOR;
+        color = TRIM_SHADOW_COLOR;
     }
 
     BACKLIGHT_ENABLE();
     lcd->drawSizedText(LCD_W/2, LCD_H-50, text, strlen(text), CENTERED|MAINVIEW_PANES_COLOR);
 
-    lcd->drawFilledRect((LCD_W - BATTERY_W)/2, BATTERY_TOP, BATTERY_W, BATTERY_H, SOLID, ROUND|MAINVIEW_PANES_COLOR);
+    lcd->drawFilledRect((LCD_W - BATTERY_W)/2, BATTERY_TOP, BATTERY_W, BATTERY_H, SOLID, MAINVIEW_PANES_COLOR);
-    lcd->drawFilledRect((LCD_W - BATTERY_W_INNER)/2, BATTERY_TOP_INNER, BATTERY_W_INNER, BATTERY_H_INNER, SOLID, ROUND|TRIM_SHADOW_COLOR);
+    lcd->drawFilledRect((LCD_W - BATTERY_W_INNER)/2, BATTERY_TOP_INNER, BATTERY_W_INNER, BATTERY_H_INNER, SOLID, TRIM_SHADOW_COLOR);
 
     lcd->drawFilledRect((LCD_W - BATTERY_W_INNER)/2, BATTERY_TOP_INNER + BATTERY_H_INNER - h , BATTERY_W_INNER, h, SOLID, color);
     lcd->drawFilledRect((LCD_W - BATTERY_CONNECTOR_W)/2, BATTERY_TOP-BATTERY_CONNECTOR_H , BATTERY_CONNECTOR_W, BATTERY_CONNECTOR_H, SOLID, MAINVIEW_PANES_COLOR);

radio/src/targets/nv14/board.cpp

@@ -108,7 +108,6 @@ extern "C" void INTERRUPT_xMS_IRQHandler()
 extern "C" void initialise_monitor_handles();
 #endif
 
-
 void delay_self(int count)
 {
    for (int i = 50000; i > 0; i--)
@@ -171,14 +170,14 @@ void boardInit()
   RCC_APB1PeriphClockCmd(RCC_APB1PeriphMinimum | RCC_APB1PeriphOther, ENABLE);
   RCC_APB2PeriphClockCmd(RCC_APB2PeriphMinimum | RCC_APB2PeriphOther, ENABLE);
 
+  // enable interrupts
   __enable_irq();
 #endif
+
 #if defined(DEBUG)
    auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
 #endif
 
-  __enable_irq();
-
   TRACE("\nNV14 board started :)");
   delay_ms(10);
   TRACE("RCC->CSR = %08x", RCC->CSR);
@@ -189,29 +188,29 @@ void boardInit()
   init2MhzTimer();
   init1msTimer();
   TouchInit();
+
   uint32_t press_start = 0;
   uint32_t press_end = 0;
-  if(UNEXPECTED_SHUTDOWN()) pwrOn();
+
+  if (UNEXPECTED_SHUTDOWN()) {
+    pwrOn();
+  }
   
-  while (boardState == BOARD_POWER_OFF)
+  while (boardState == BOARD_POWER_OFF) {
-  {
     uint32_t now = get_tmr10ms();
-    if (pwrPressed())
+    if (pwrPressed()) {
-    {
       press_end = now;
       if (press_start == 0) press_start = now;
-      if ((now - press_start) > POWER_ON_DELAY)
+      if ((now - press_start) > POWER_ON_DELAY) {
-      {
           pwrOn();
           break;
       }
     }
     else {
       uint32_t press_end_touch = press_end;
-      if(touchState.event == TE_UP)
+      if (touchPanelEventOccured()) {
-      {
+        touchPanelRead();
-        touchState.event = TE_NONE;
+        press_end_touch = get_tmr10ms();
-        press_end_touch = touchState.time;
       }
       press_start = 0;
       handle_battery_charge(press_end_touch);
@@ -256,8 +255,7 @@ void boardOff()
   haptic.event(AU_ERROR);
   delay_ms(50);
 #endif
-  while(1)
+  while(1) {
-  {
     NVIC_SystemReset();
   }
 #endif

radio/src/targets/nv14/board.h

@@ -533,6 +533,8 @@ typedef Fifo<uint8_t, 32> AuxSerialRxFifo;
 extern AuxSerialRxFifo auxSerialRxFifo;
 #endif
 
-uint8_t touchPressed(uint32_t x, uint32_t y, uint32_t w, uint32_t h);
+// Touch panel driver
+bool touchPanelEventOccured();
+void touchPanelRead();
 
 #endif // _BOARD_H_

radio/src/targets/nv14/touch_driver.cpp

@@ -21,21 +21,7 @@
 #include "opentx.h"
 #include "touch_driver.h"
 
-enum ENUM_TOUCH_STATE
+static bool touchEventOccured;
-{
-  TOUCH_NONE,
-  TOUCH_SLIDE,
-  TOUCH_CLICK
-};
-
-int x;
-int y;
-uint32_t TouchEvent;
-unsigned short Tx;
-unsigned short Ty;
-static unsigned char TouchState = TOUCH_NONE;
-static unsigned short Txold;
-static unsigned short Tyold;
 
 #define FT6x06_MAX_INSTANCE  1
 
@@ -436,12 +422,6 @@ static void ft6x06_TS_GetXY(uint16_t DeviceAddr, uint16_t * X, uint16_t * Y, uin
   }
 }
 
-
-static void ft6x06_TS_GetGestureID(uint16_t DeviceAddr, uint32_t * pGestureId)
-{
-  *pGestureId = TS_IO_Read(DeviceAddr, FT6206_GEST_ID_REG);
-}
-
 void TouchReset()
 {
   GPIO_ResetBits(I2C_TOUCH_RESET_GPIO, I2C_TOUCH_RESET_GPIO_PIN);
@@ -455,115 +435,96 @@ void TouchInit(void)
   I2C_Init();
   TouchReset();
   touch_ft6236_debug_info();
-
   /* INT generation for new touch available */
   /* Note TS_INT is active low */
   uint8_t regValue = 0;
   regValue = (FT6206_G_MODE_INTERRUPT_TRIGGER & (FT6206_G_MODE_INTERRUPT_MASK >> FT6206_G_MODE_INTERRUPT_SHIFT)) << FT6206_G_MODE_INTERRUPT_SHIFT;
-
   /* Set interrupt TOUCH_FT6236_I2C_ADDRESS mode in FT6206_GMODE_REG */
   TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, FT6206_GMODE_REG, regValue);
-  //enter standard mode
-  //TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0,0);
-
   /*trigger reset */
   TouchReset();
-
-  //Try to enable gesture
-  /*
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, FT6206_GMODE_REG, regValue);
-
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD1, 0xff);
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD2, 0xff);
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD5, 0xff);
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD6, 0xff);
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD7, 0xff);
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD8, 0xff);
-  TS_IO_Write(TOUCH_FT6236_I2C_ADDRESS, 0xD0, 1);
-  */
 }
 
-
 void handleTouch()
 {
-  ft6x06_TS_GetXY(TOUCH_FT6236_I2C_ADDRESS, &Tx, &Ty, &TouchEvent);
+  unsigned short touchX;
-  uint32_t gesture;
+  unsigned short touchY;
-  ft6x06_TS_GetGestureID(TOUCH_FT6236_I2C_ADDRESS, &gesture);
+  uint32_t tEvent = 0;
+  ft6x06_TS_GetXY(TOUCH_FT6236_I2C_ADDRESS, &touchX, &touchY, &tEvent);
+  //uint32_t gesture;
+  //ft6x06_TS_GetGestureID(TOUCH_FT6236_I2C_ADDRESS, &gesture);
 #if defined( LCD_DIRECTION ) && (LCD_DIRECTION == LCD_VERTICAL)
-  Tx = LCD_WIDTH - Tx;
+  touchX = LCD_WIDTH - touchX;
-  Ty = LCD_HEIGHT - Ty;
+  touchY = LCD_HEIGHT - touchY;
 #else
-  x = ( LCD_WIDTH - 1 ) - Ty;
+  unsigned short tmp = (LCD_WIDTH - 1) - touchY;
-  Ty = Tx;
+  touchY = touchX;
-  Tx = x;
+  touchX = tmp;
 #endif
-  if (TouchEvent == FT6206_TOUCH_EVT_FLAG_CONTACT) {
+  if (tEvent == FT6206_TOUCH_EVT_FLAG_CONTACT) {
-    touchState.x = Tx;
+    int dx = touchX - touchState.x;
-    touchState.y = Ty;
+    int dy = touchY - touchState.y;
 
-    if (TOUCH_NONE == TouchState) {
+    touchState.x = touchX;
-      touchState.event = TE_NONE;
+    touchState.y = touchY;
-      TouchState = TOUCH_CLICK;
+
+    if (touchState.event == TE_NONE || touchState.event == TE_UP)
+    {
+      touchState.startX = touchState.x;
+      touchState.startY = touchState.y;
+      touchState.event = TE_DOWN;
       if (g_eeGeneral.backlightMode & e_backlight_mode_keys)
         backlightOn(); // TODO is that the best place ?
     }
-    else {
+    else if (touchState.event == TE_DOWN)
-      if (TOUCH_CLICK == TouchState) {
+    {
-        x = Tx - Txold;
+      if ((dx >= SLIDE_RANGE) || (dx <= -SLIDE_RANGE) || (dy >= SLIDE_RANGE)|| (dy <= -SLIDE_RANGE)) {
-        y = Ty - Tyold;
-
-        if ((x >= SLIDE_RANGE) || (x <= -SLIDE_RANGE) || (y >= SLIDE_RANGE) || (y <= -SLIDE_RANGE)) {
-          TouchState = TOUCH_SLIDE;
-          touchState.event = TE_SLIDE;
-        }
-        else {
-          touchState.event = TE_DOWN;
-          touchState.startX = touchState.lastX = touchState.x;
-          touchState.startY = touchState.lastY = touchState.y;
-        }
-      }
-      else if (TOUCH_SLIDE == TouchState) {
         touchState.event = TE_SLIDE;
+        touchState.deltaX = (short)dx;
+        touchState.deltaY = (short)dy;
       }
       else {
-        TouchState = TOUCH_NONE;
+        touchState.event = TE_DOWN;
+        touchState.deltaX = 0;
+        touchState.deltaY = 0;
       }
     }
-    Txold = Tx;
+    else if (touchState.event == TE_SLIDE)
-    Tyold = Ty;
+    {
+      touchState.event = TE_SLIDE; //no change
+      touchState.deltaX = (short)dx;
+      touchState.deltaY = (short)dy;
+    }
+
   }
 }
 
 extern "C" void EXTI9_5_IRQHandler(void)
 {
-
   if (EXTI_GetITStatus(EXTI_Line9) != RESET) {
-
-    if (ft6x06_TS_DetectTouch(TOUCH_FT6236_I2C_ADDRESS)) {
-      handleTouch();
-      /*
-      TRACE("X %d Y %d", x, y);
-      uint32_t gesture;
-      ft6x06_TS_GetGestureID(TOUCH_FT6236_I2C_ADDRESS, &gesture);
-      if(gesture != TOUCH_FT6236_GESTURE_NONE) TRACE("gesture %d", gesture);
-      TS_IO_Read(TOUCH_FT6236_I2C_ADDRESS, 0xD3);
-      if(gesture != TOUCH_FT6236_GESTURE_NONE) TRACE("gesture d3 %d", gesture);
-      */
-    }
-    else {
-      if (TOUCH_CLICK == TouchState) {
-        touchState.x = Txold;
-        touchState.y = Tyold;
-        touchState.event = TE_UP;
-        touchState.time = get_tmr10ms();
-      }
-      else if (get_tmr10ms() > touchState.time + 50) {
-        touchState.x = LCD_WIDTH;
-        touchState.y = LCD_HEIGHT;
-        touchState.event = TE_NONE;
-      }
-      TouchState = TOUCH_NONE;
-    }
     EXTI_ClearITPendingBit(EXTI_Line9);
+    touchEventOccured = true;
+  }
+}
+
+bool touchPanelEventOccured()
+{
+  return touchEventOccured;
+}
+
+void touchPanelRead() {
+  if(!touchEventOccured) return;
+  touchEventOccured = false;
+  if (ft6x06_TS_DetectTouch(TOUCH_FT6236_I2C_ADDRESS)) {
+    handleTouch();
+  } else {
+    if (touchState.event == TE_DOWN) {
+      touchState.event = TE_UP;
+    }
+    else {
+      touchState.x = LCD_WIDTH;
+      touchState.y = LCD_HEIGHT;
+      touchState.event = TE_NONE;
+    }
   }
 }