合入ppg,mag,cywee 底层服务（补）

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0b4941e..259e890 100644 (file)
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -100,6 +100,7 @@
         "cywee_service.h": "c",
         "stdbool.h": "c",
         "custom_runtime.h": "c",
-        "hx3695.h": "c"
+        "hx3695.h": "c",
+        "configmodelc.h": "c"
     }
 }
\ No newline at end of file

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index d61b86d..98742d3 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -375,7 +375,6 @@ target = {
             'NANDFLASH_DS35X',
             'BLE_INSTRUCT',
             # 'AILPAY_SUPPORT',
-            # 'PPG_SERVICE_SUPPORT',
             # 'FACTORYTEST_SERVICE',
             
         ],

diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
index 53e5155..8da126f 100644 (file)
--- a/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
+++ b/code/sdk/zhihui/services/ble_service/bleservice/bleService.c
@@ -1248,7 +1248,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid,
 #ifdef FACTORYTEST_SERVICE\r
         || uuid_tmp == BLE_UUID_ATE_FACTORYTEST_SERVICE \r
 #endif\r
-#ifdef PPG_SERVICE_SUPPORT\r
+#ifdef SUPPORT_PPG_SERVICE\r
         || uuid_tmp == BLE_UUID_PPG_BLE_SERVICE \r
         //|| uuid_tmp == ALIPAYY_SERVICE_ID\r
 #ifdef SUPPORT_CYWEE_SERVICE\r
@@ -1282,7 +1282,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid,
     bt_uuid_t factory_service_uuid = {0};\r
     bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid);\r
 #endif\r
-#ifdef PPG_SERVICE_SUPPORT\r
+#ifdef SUPPORT_PPG_SERVICE\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
@@ -1338,7 +1338,7 @@ static void svr_ble_bt_gatts_service_add_cb(uint8_t server_id, bt_uuid_t *uuid,
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "factorytest service svr_ble_bt_gatts_service_add_cb ret:%d\r\n",ret);\r
     }\r
 #endif\r
-#ifdef PPG_SERVICE_SUPPORT\r
+#ifdef SUPPORT_PPG_SERVICE\r
     if (ble_gatts_cmp_uuid(uuid, &ppg_service_uuid) == true){\r
         ble_ppgtest_add_characters_and_descriptors(server_id,srv_handle);\r
         ret = gatts_start_service(server_id, srv_handle);\r
@@ -1559,7 +1559,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t
     }\r
     #endif \r
 \r
-#ifdef PPG_SERVICE_SUPPORT\r
+#ifdef SUPPORT_PPG_SERVICE\r
     bt_uuid_t ppgtest_report_uuid = {0};\r
     bts_data_to_uuid_len2(BLE_UUID_PPG_NOTIFY, &ppgtest_report_uuid);\r
     if (ble_gatts_cmp_uuid(uuid, &ppgtest_report_uuid) == true) {\r