Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/brandy/brandy_standard/thread_pri_init.c
Simple merge

diff --cc code/sdk/application/wearable/fd230/nativeapp/nativeui/sleep/src/SleepModel.cpp
Simple merge

diff --cc code/sdk/application/wearable/fd230/service/broadcast/include/broadcast_feature.h
Simple merge

diff --cc code/sdk/build/config/target_config/brandy/config.py
index fd0a2d9,2218894..d61b86d
--- 1/code/sdk/build/config/target_config/brandy/config.py
--- 2/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@@ -345,13 -345,16 +345,13 @@@ target = 
              'VIB_USE_PWM',
              'CONFIG_PWM_SUPPORT',
              # 'ACC_LIS2DOC',
 -            # 'ENABLE_CYWEE',
 -            # 'ENABLE_CUSTOM_I2C',
 -            # 'SUPPORT_AT_CYWEE',
 -            # 'MAG_MMC5603',
 -            # 'ENABLE_VIBRATOR',
 +            'ENABLE_CUSTOM_I2C',
 +            #'ENABLE_VIBRATOR',
              # 'ENABLE_SLIP',
              'ENCODER_SUPPORT',
-             #'SUPPORT_SPO2_NOTIFICATION',
-             #'SUPPORT_SPO2_NOTIFICATION_TEST',
-             # 'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
+             # 'SUPPORT_SPO2_NOTIFICATION',
+             # 'SUPPORT_SPO2_NOTIFICATION_TEST',
+             'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
              # 'ENABLE_FONT_VECTOR_GLOBAL', 
              # 'ENABLE_SHAPING',
              'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
@@@ -362,11 -365,11 +362,11 @@@
              # 'CONFIG_DFX_SUPPORT_DIAG_UP_MACHINE=1',
              #"MEM_CHECK",
              #'ENABLE_WEBSOCKET',
 -            # 'CYWEE_SPORT',
 -            # 'CYWEE_MAC_ACTIVE',
 +            'SUPPORT_CYWEE_SERVICE',
 +            'CYWEE_MAC_ACTIVE',
-             #'SUPPORT_CAT1_SERVICE',
+             'SUPPORT_CAT1_SERVICE',
 -            # 'SUPPORT_TCPIP',                                        
 -            # 'SUPPORT_HID_SERVICE',
 +            #'SUPPORT_TCPIP',                                 
 +            'SUPPORT_HID_SERVICE',
              'SUPPORT_BAIDU_MAP',
              'CFG_FLASH_SIZE=16',
              'SINGLE_USER_PARTITION',
@@@ -397,11 -403,11 +400,11 @@@
                            "custom_config",
                            "rotary_encoder",
                             "nativelauncher",
-                            "ppg_service",
-                           "cywee",
-                             "batterry_service",
-                         #    "bleservice",
-                         #    "blemoder",
 -                        #    "ppg_service",
 -                        #    "cywee",
++                            "ppg_service",
++                            "cywee",
+                            "batterry_service",
+                            "bleservice",
+                            "blemoder",
                          #    "factorytest_service",
                          #    "hid_service",
                          #    "producttest",

diff --cc code/sdk/zhihui/drivers/cywee/Inc/cywee_hal.h
Simple merge

diff --cc code/sdk/zhihui/services/ble_service/bleservice/bleService.c
index 61b6682,f00047d..53e5155
--- 1/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
--- 2/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
+++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
@@@ -1196,11 -1243,17 +1243,15 @@@ static void svr_ble_bt_gatts_service_ad
      uint16_t uuid_tmp = *((uint16_t*)uuid->uuid);\r
      uuid_tmp = SWAP_U16(uuid_tmp);\r
      if ( uuid_tmp == BLE_SERVICE_UUID \r
-         || uuid_tmp == BLE_UUID_HUMAN_INTERFACE_DEVICE \r
+ \r
+         // || uuid_tmp == BLE_UUID_HUMAN_INTERFACE_DEVICE \r
+ #ifdef FACTORYTEST_SERVICE\r
          || uuid_tmp == BLE_UUID_ATE_FACTORYTEST_SERVICE \r
+ #endif\r
+ #ifdef PPG_SERVICE_SUPPORT\r
          || uuid_tmp == BLE_UUID_PPG_BLE_SERVICE \r
-         || uuid_tmp == ALIPAYY_SERVICE_ID\r
 -#endif\r
 -\r
 -        // || uuid_tmp == ALIPAYY_SERVICE_ID\r
 -#ifdef SUPPORT_AT_CYWEE\r
++        //|| uuid_tmp == ALIPAYY_SERVICE_ID\r
 +#ifdef SUPPORT_CYWEE_SERVICE\r
          || uuid_tmp == BLE_UUID_CYWEE_REPORT_SERVICE\r
  #endif\r
           ) \r
@@@ -1221,20 -1274,23 +1272,23 @@@
      bt_uuid_t ble_service_uuid = {0};\r
      bts_data_to_uuid_len2(BLE_SERVICE_UUID, &ble_service_uuid);\r
  \r
-     bt_uuid_t hid_service_uuid = {0};\r
-     bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid);\r
+     // bt_uuid_t hid_service_uuid = {0};\r
+     // bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid);\r
  \r
-     // bt_uuid_t alipay_service_uuid = {0};\r
-     // bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid);//0x3802\r
+     // // bt_uuid_t alipay_service_uuid = {0};\r
+     // // bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid);//0x3802\r
  \r
+ #ifdef FACTORYTEST_SERVICE\r
      bt_uuid_t factory_service_uuid = {0};\r
      bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid);\r
- \r
+ #endif\r
+ #ifdef PPG_SERVICE_SUPPORT\r
      bt_uuid_t ppg_service_uuid = {0};\r
      bts_data_to_uuid_len2(BLE_UUID_PPG_BLE_SERVICE, &ppg_service_uuid);\r
+ #endif\r
  \r
  \r
 -#ifdef SUPPORT_AT_CYWEE\r
 +#ifdef SUPPORT_CYWEE_SERVICE\r
  \r
      bt_uuid_t cywee_ble_service_uuid = {0};\r
      bts_data_to_uuid_len2(BLE_UUID_CYWEE_REPORT_SERVICE, &cywee_ble_service_uuid);\r
@@@ -1937,13 -2067,15 +2065,15 @@@ void svr_ble_bluetooth_init(void
      #ifdef SUPPORT_HID_SERVICE\r
      // ble_hid_server_init();\r
      #endif\r
+     #ifdef AILPAY_SUPPORT\r
      svr_alipay_bluetooth_init(g_ble_server_id);\r
+     #endif\r
  \r
-     ble_factory_server_init(g_ble_server_id);\r
+     // ble_factory_server_init(g_ble_server_id);\r
      \r
-     ble_ppgtest_server_init(g_ble_server_id);\r
+     // ble_ppgtest_server_init(g_ble_server_id);\r
  \r
 -#ifdef SUPPORT_AT_CYWEE\r
 +#ifdef SUPPORT_CYWEE_SERVICE\r
      ble_cywee_server_init(g_ble_server_id);\r
  #endif\r
      gattc_reg_id();\r
@@@ -2107,17 -2241,18 +2239,17 @@@ static void blesrv_service_check_task(v
          //     mail.msg_data[2]);\r
  \r
          #if 1\r
-         if (server_handle == get_factory_ate_write_handl()) \r
-         {\r
-             factory_recv_cmd_data(p_msgbuf,msg_len,server_handle);\r
-         }\r
-         else if (server_handle == get_factory_ota_write_handl())\r
-         {\r
-             factory_recv_ota_data(p_msgbuf,msg_len,server_handle);\r
-         }\r
+         // if (server_handle == get_factory_ate_write_handl()) \r
+         // {\r
+         //     factory_recv_cmd_data(p_msgbuf,msg_len,server_handle);\r
+         // }\r
+         // else if (server_handle == get_factory_ota_write_handl())\r
+         // {\r
+         //     factory_recv_ota_data(p_msgbuf,msg_len,server_handle);\r
+         // }\r
  \r
 -#ifdef SUPPORT_AT_CYWEE\r
 -        // else \r
 -        if (server_handle == get_cywee_ate_write_handl())\r
 +#ifdef SUPPORT_CYWEE_SERVICE\r
 +        else if (server_handle == get_cywee_ate_write_handl())\r
          {\r
              cywee_recv_cmd_data(p_msgbuf,msg_len,server_handle);\r
          }\r

diff --cc code/sdk/zhihui/utils/custom_cmd_service.c
index 41caa6a,0ce5a58..07d7ba1
--- 1/code/sdk/zhihui/utils/custom_cmd_service.c
--- 2/code/sdk/zhihui/utils/custom_cmd_service.c
+++ b/code/sdk/zhihui/utils/custom_cmd_service.c
@@@ -40,10 -40,11 +40,10 @@@
  #include "alarmclocktimerconfig/include/AlarmClockTimerConfig.h"
  
  #else
- void HandleUpdatelcdMode(int f){}
- void set_ota_upgrade(void){}
+ // void HandleUpdatelcdMode(int f){}
+ // void set_ota_upgrade(void){}
  void custom_timer_callback(void){}
 -// void Check_ble_adv_status(void){}
 -// void check_dial_space(void){}
 +
  
  int uapi_hfp_disconnect_(void){return 0;}
  int uapi_hfp_connect_(void){return 0;}

diff --cc code/sdk/zhihui/utils/custom_utils.c
Simple merge

diff --cc code/sdk/zhihui/utilscpp/custom_utilscpp.cpp
Simple merge