取消雷鸟触摸屏初始化，修复触摸中断误报问题

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 4d395dc..8fedf75 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -1431,7 +1431,8 @@ target = {
             'BOARD_LEINIAO',
             # cat1 相关配置
             'FT_SINGLE_UART',
-            
+            'DISABLE_ROTATE_INPUT',
+            'DISABLE_TOUCH_INPUT',
             'CONFIG_EFUSE_READ_TO_RAM',
              'CUSTOM_UTILS',
             # 'CUSTOM_HID_SERVICE',

diff --git a/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h
index ad378af..8775643 100644 (file)
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_leiniao.h
@@ -201,7 +201,7 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE  }, 
 #endif
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_UP, HAL_PIO_IE_DISABLE  },    // S_AGPIO_R4     tp reset
-    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE  },   // S_AGPIO_R5     touch int
+    { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE  },   // S_AGPIO_R5     touch int
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_ENBALE },    // S_AGPIO_R6     PRG_INT 心率中断
     { HAL_PIO_FUNC_GPIO, HAL_PIO_DRIVE_MAX, HAL_PIO_PULL_MAX, HAL_PIO_IE_DISABLE },   // S_AGPIO_R7     GYRO_INT2
 #ifdef SUPPORT_GYRO_SERVICE

diff --git a/code/sdk/middleware/services/gui/hal/input/src/input_manager.c b/code/sdk/middleware/services/gui/hal/input/src/input_manager.c
index 2d1bd61..8d29f08 100644 (file)
--- a/code/sdk/middleware/services/gui/hal/input/src/input_manager.c
+++ b/code/sdk/middleware/services/gui/hal/input/src/input_manager.c
@@ -84,21 +84,34 @@ static void InitInputDevices(void)
         g_inputDevs[i].type = INDEV_TYPE_UNKNOWN;
         g_inputDevs[i].initState = INDEV_UNINITIALIZED;
     }
-
+#if defined(DISABLE_ROTATE_INPUT)
     /* Init Encoder Device */
+    g_inputDevs[INDEV_TYPE_ENCODER].type = INDEV_TYPE_ENCODER;
+    g_inputDevs[INDEV_TYPE_ENCODER].funcs.Init = NULL;
+    g_inputDevs[INDEV_TYPE_ENCODER].funcs.Close = NULL;
+    g_inputDevs[INDEV_TYPE_ENCODER].funcs.RegisterReportEventCb = NULL;
+    g_inputDevs[INDEV_TYPE_ENCODER].funcs.UnregisterReportEventCb = NULL;
+#else
     g_inputDevs[INDEV_TYPE_ENCODER].type = INDEV_TYPE_ENCODER;
     g_inputDevs[INDEV_TYPE_ENCODER].funcs.Init = re_init;
     g_inputDevs[INDEV_TYPE_ENCODER].funcs.Close = re_close;
     g_inputDevs[INDEV_TYPE_ENCODER].funcs.RegisterReportEventCb = re_register_report_event_cb;
     g_inputDevs[INDEV_TYPE_ENCODER].funcs.UnregisterReportEventCb = re_unregister_report_event_cb;
-
+#endif
     /* Init Touch Device */
+#if defined(DISABLE_TOUCH_INPUT)
+    g_inputDevs[INDEV_TYPE_TOUCH].type = INDEV_TYPE_TOUCH;
+    g_inputDevs[INDEV_TYPE_TOUCH].funcs.Init = NULL;
+    g_inputDevs[INDEV_TYPE_TOUCH].funcs.Close = NULL;
+    g_inputDevs[INDEV_TYPE_TOUCH].funcs.RegisterReportEventCb = NULL;
+    g_inputDevs[INDEV_TYPE_TOUCH].funcs.UnregisterReportEventCb = NULL;
+#else
     g_inputDevs[INDEV_TYPE_TOUCH].type = INDEV_TYPE_TOUCH;
     g_inputDevs[INDEV_TYPE_TOUCH].funcs.Init = ts_init;
     g_inputDevs[INDEV_TYPE_TOUCH].funcs.Close = ts_close;
     g_inputDevs[INDEV_TYPE_TOUCH].funcs.RegisterReportEventCb = ts_register_report_event_cb;
     g_inputDevs[INDEV_TYPE_TOUCH].funcs.UnregisterReportEventCb = ts_unregister_report_event_cb;
-
+#endif
     /* Init Touch Device */
     g_inputDevs[INDEV_TYPE_KEY].type = INDEV_TYPE_KEY;
     g_inputDevs[INDEV_TYPE_KEY].funcs.Init = button_init;