From: penglei <1624952103@qq.com> Date: Mon, 19 May 2025 02:38:09 +0000 (+0800) Subject: Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0... X-Git-Tag: leiniao_debug_1.0.0_20250922_020716~298^2~5 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7d2503badd4ad17a1f1e9e137ae3725139560b7a;p=mirrors%2FFD230.git Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk650pathc0423 --- 7d2503badd4ad17a1f1e9e137ae3725139560b7a diff --cc code/sdk/build/config/target_config/brandy/config.py index fd0a2d96d,2218894ed..d61b86d13 --- a/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/services/ble_service/bleservice/bleService.c index 61b6682f2,f00047da3..53e5155a7 --- a/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); uuid_tmp = SWAP_U16(uuid_tmp); if ( uuid_tmp == BLE_SERVICE_UUID - || uuid_tmp == BLE_UUID_HUMAN_INTERFACE_DEVICE + + // || uuid_tmp == BLE_UUID_HUMAN_INTERFACE_DEVICE + #ifdef FACTORYTEST_SERVICE || uuid_tmp == BLE_UUID_ATE_FACTORYTEST_SERVICE + #endif + #ifdef PPG_SERVICE_SUPPORT || uuid_tmp == BLE_UUID_PPG_BLE_SERVICE - || uuid_tmp == ALIPAYY_SERVICE_ID -#endif - - // || uuid_tmp == ALIPAYY_SERVICE_ID -#ifdef SUPPORT_AT_CYWEE ++ //|| uuid_tmp == ALIPAYY_SERVICE_ID +#ifdef SUPPORT_CYWEE_SERVICE || uuid_tmp == BLE_UUID_CYWEE_REPORT_SERVICE #endif ) @@@ -1221,20 -1274,23 +1272,23 @@@ bt_uuid_t ble_service_uuid = {0}; bts_data_to_uuid_len2(BLE_SERVICE_UUID, &ble_service_uuid); - bt_uuid_t hid_service_uuid = {0}; - bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid); + // bt_uuid_t hid_service_uuid = {0}; + // bts_data_to_uuid_len2(BLE_UUID_HUMAN_INTERFACE_DEVICE, &hid_service_uuid); - // bt_uuid_t alipay_service_uuid = {0}; - // bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid);//0x3802 + // // bt_uuid_t alipay_service_uuid = {0}; + // // bts_data_to_uuid_len2(ALIPAYY_SERVICE_ID, &alipay_service_uuid);//0x3802 + #ifdef FACTORYTEST_SERVICE bt_uuid_t factory_service_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid); - + #endif + #ifdef PPG_SERVICE_SUPPORT bt_uuid_t ppg_service_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_PPG_BLE_SERVICE, &ppg_service_uuid); + #endif -#ifdef SUPPORT_AT_CYWEE +#ifdef SUPPORT_CYWEE_SERVICE bt_uuid_t cywee_ble_service_uuid = {0}; bts_data_to_uuid_len2(BLE_UUID_CYWEE_REPORT_SERVICE, &cywee_ble_service_uuid); @@@ -1937,13 -2067,15 +2065,15 @@@ void svr_ble_bluetooth_init(void #ifdef SUPPORT_HID_SERVICE // ble_hid_server_init(); #endif + #ifdef AILPAY_SUPPORT svr_alipay_bluetooth_init(g_ble_server_id); + #endif - ble_factory_server_init(g_ble_server_id); + // ble_factory_server_init(g_ble_server_id); - ble_ppgtest_server_init(g_ble_server_id); + // ble_ppgtest_server_init(g_ble_server_id); -#ifdef SUPPORT_AT_CYWEE +#ifdef SUPPORT_CYWEE_SERVICE ble_cywee_server_init(g_ble_server_id); #endif gattc_reg_id(); @@@ -2107,17 -2241,18 +2239,17 @@@ static void blesrv_service_check_task(v // mail.msg_data[2]); #if 1 - if (server_handle == get_factory_ate_write_handl()) - { - factory_recv_cmd_data(p_msgbuf,msg_len,server_handle); - } - else if (server_handle == get_factory_ota_write_handl()) - { - factory_recv_ota_data(p_msgbuf,msg_len,server_handle); - } + // if (server_handle == get_factory_ate_write_handl()) + // { + // factory_recv_cmd_data(p_msgbuf,msg_len,server_handle); + // } + // else if (server_handle == get_factory_ota_write_handl()) + // { + // factory_recv_ota_data(p_msgbuf,msg_len,server_handle); + // } -#ifdef SUPPORT_AT_CYWEE - // else - if (server_handle == get_cywee_ate_write_handl()) +#ifdef SUPPORT_CYWEE_SERVICE + else if (server_handle == get_cywee_ate_write_handl()) { cywee_recv_cmd_data(p_msgbuf,msg_len,server_handle); } diff --cc code/sdk/zhihui/utils/custom_cmd_service.c index 41caa6aad,0ce5a58a3..07d7ba156 --- a/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;}