Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into...

diff --cc code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
index 9a5ca7c,e585505..e21d3d4
--- 1/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
--- 2/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
@@@ -290,10 -290,9 +290,9 @@@ const hal_gpio_config_t g_gpio_function
      {   S_AGPIO_L18, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },
  
  #ifdef ENABLE_CYWEE
--    /**G sensor G_INT1 S_AGPIO_L11 G_INT2 S_AGPIO_L19*/
-     //{   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, HAL_GPIO_LEVEL_LOW, GPIO_INTERRUPT_RISING_EDGE, cywee_int_callback },
-     // {   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
-     {   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_RISING_EDGE, cywee_int_callback },
++    /**G sensor G_INT1 S_AGPIO_L11 G_INT2 S_AGPIO_L19   采用timer 时这些中断要屏蔽*/
+     //{   S_AGPIO_L11, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
+     //{   S_AGPIO_L19, HAL_GPIO_DIRECTION_INPUT, NULL, GPIO_INTERRUPT_DEDGE, cywee_int_callback },
  #endif   
      /**S_AGPIO_R1 GPO alipay默认resetpin*/
      {   S_AGPIO_R1, HAL_GPIO_DIRECTION_OUTPUT, HAL_GPIO_LEVEL_HIGH, 0, NULL },

diff --cc code/sdk/drivers/peripheral/cywee/service/cywee_service.c
Simple merge