From 7512ea1919bd4714e10d4e7a5403a398ff1341e9 Mon Sep 17 00:00:00 2001
From: penglei <1624952103@qq.com>
Date: Mon, 19 May 2025 10:42:18 +0800
Subject: [PATCH] =?utf8?q?=E5=90=88=E5=85=A5ppg,mag,cywee=20=E5=BA=95?=
 =?utf8?q?=E5=B1=82=E6=9C=8D=E5=8A=A1=EF=BC=88=E8=A1=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                                     | 3 ++-
 code/sdk/build/config/target_config/brandy/config.py      | 1 -
 .../zhihui/services/ble_service/bleservice/bleService.c   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0b4941e1b..259e890c8 100644
--- 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 d61b86d13..98742d37f 100644
--- 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 53e5155a7..8da126f24 100644
--- 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
         || uuid_tmp == BLE_UUID_ATE_FACTORYTEST_SERVICE 
 #endif
-#ifdef PPG_SERVICE_SUPPORT
+#ifdef SUPPORT_PPG_SERVICE
         || uuid_tmp == BLE_UUID_PPG_BLE_SERVICE 
         //|| uuid_tmp == ALIPAYY_SERVICE_ID
 #ifdef SUPPORT_CYWEE_SERVICE
@@ -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};
     bts_data_to_uuid_len2(BLE_UUID_ATE_FACTORYTEST_SERVICE, &factory_service_uuid);
 #endif
-#ifdef PPG_SERVICE_SUPPORT
+#ifdef SUPPORT_PPG_SERVICE
     bt_uuid_t ppg_service_uuid = {0};
     bts_data_to_uuid_len2(BLE_UUID_PPG_BLE_SERVICE, &ppg_service_uuid);
 #endif
@@ -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);
     }
 #endif
-#ifdef PPG_SERVICE_SUPPORT
+#ifdef SUPPORT_PPG_SERVICE
     if (ble_gatts_cmp_uuid(uuid, &ppg_service_uuid) == true){
         ble_ppgtest_add_characters_and_descriptors(server_id,srv_handle);
         ret = gatts_start_service(server_id, srv_handle);
@@ -1559,7 +1559,7 @@ static void svr_ble_bt_gatts_characteristic_add_cb(uint8_t server_id, bt_uuid_t
     }
     #endif 
 
-#ifdef PPG_SERVICE_SUPPORT
+#ifdef SUPPORT_PPG_SERVICE
     bt_uuid_t ppgtest_report_uuid = {0};
     bts_data_to_uuid_len2(BLE_UUID_PPG_NOTIFY, &ppgtest_report_uuid);
     if (ble_gatts_cmp_uuid(uuid, &ppgtest_report_uuid) == true) {
-- 
2.17.1