修改马达震动接口，优化cywee ppg控制接口函数命名，合入血压 gnss服务(补)

diff --git a/code/sdk/application/wearable/fd230/service/broadcast/src/broadcast_implement.c b/code/sdk/application/wearable/fd230/service/broadcast/src/broadcast_implement.c
index d38325c..ad29282 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/broadcast/src/broadcast_implement.c
+++ b/code/sdk/application/wearable/fd230/service/broadcast/src/broadcast_implement.c
@@ -20,6 +20,7 @@ static const TopicToCore topicToCoreArray[] = {
     {TOPIC_DEMO_ACORE_MSG, A_CORE_MASK, 1},
     {TOPIC_DEMO_ALL_MSG, A_CORE_MASK, 1},
     {TOPIC_EVENT_ALARM_RING, A_CORE_MASK, 1},
+    {TOPIC_EVENT_ON_TIME, A_CORE_MASK, 1},
     {TOPIC_EVENT_UTCTIME_UPDATE, A_CORE_MASK, 1},
     {TOPIC_EVENT_NEXTDAY_UPDATE, A_CORE_MASK, 1},
     {TOPIC_EVENT_WEARSTATE_UPDATE, A_CORE_MASK, 1},

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index ca626bc..152cf1b 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -385,6 +385,7 @@ target = {
             'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
             # 'SUPPORT_AT_CUSTOMUTILS',
             'SUPPORT_BLE_SERVICE',
+            'SUPPORT_MAG_SERVICE',
             'SUPPORT_PPG_SERVICE',
             'SUPPORT_CYWEE_SERVICE',
             'SUPPORT_BATTERY_SERVICE',
@@ -405,7 +406,7 @@ target = {
             'NANDFLASH_DS35X',
             'BLE_INSTRUCT',
             # 'AILPAY_SUPPORT',
-            # 'FACTORYTEST_SERVICE',
+            # 'SUPPORT_FACT_SERVICE',
             # 'MEMORY_CORRUPTION',
             
         ],
@@ -440,7 +441,6 @@ target = {
                         #    "hid_service",
                            "producttest",
                             "ppg_hal",
-                            "mag_hal",
                             "mag_service",
                             "cywee_dml",
                             #"cyweeBleService",
@@ -523,7 +523,7 @@ target = {
         'ROTARYENCODER_HX3507',
         'NANDFLASH_DS35X',
         # 'BLE_INSTRUCT',
-        # 'FACTORYTEST_SERVICE',
+        # 'SUPPORT_FACT_SERVICE',
     ],
     #添加自定义应用
     'ram_component': [
@@ -632,7 +632,7 @@ target = {
                     'ROTARYENCODER_U8',
                     'NANDFLASH_DS35X',
                     'BLE_INSTRUCT',
-                    'FACTORYTEST_SERVICE',
+                    'SUPPORT_FACT_SERVICE',
                     ],
                'ram_component': [
                           'audio_at_service', 
@@ -742,7 +742,7 @@ target = {
                     'TEST_GPS_UI',
                     'NANDFLASH_F35UQA',
                     #'BLE_INSTRUCT',
-                    'FACTORYTEST_SERVICE',
+                    'SUPPORT_FACT_SERVICE',
                     'PPG_GH3X2X',
                     ],
                'ram_component': [
@@ -856,7 +856,7 @@ target = {
                     'NANDFLASH_F35UQA',
                     'PPG_VC921X',
                     'ROTARYENCODER_HX3508',
-                    'FACTORYTEST_SERVICE',
+                    'SUPPORT_FACT_SERVICE',
                     # 'BLE_INSTRUCT'
                     
                     ],
@@ -942,14 +942,13 @@ target = {
             #'ENABLE_VIBRATOR',
             # 'ENABLE_SLIP',
             'ENCODER_SUPPORT',
-            # 'SUPPORT_SPO2_NOTIFICATION',
-            # 'SUPPORT_SPO2_NOTIFICATION_TEST',
             'SUPPORT_DEVICE_PAIRING_NOTIFICATION',
             # 'ENABLE_FONT_VECTOR_GLOBAL', 
             # 'ENABLE_SHAPING',
             'SUPPORT_CHARGER_PLUG_DETECTION_NOTIFICATION',
             # 'SUPPORT_AT_CUSTOMUTILS',
             'SUPPORT_BLE_SERVICE',
+            'SUPPORT_MAG_SERVICE',
             'SUPPORT_PPG_SERVICE',
             'SUPPORT_CYWEE_SERVICE',
             'SUPPORT_BATTERY_SERVICE',
@@ -971,7 +970,7 @@ target = {
             'BLE_INSTRUCT',
             'PPG_PAH8009',
             # 'AILPAY_SUPPORT',
-            # 'FACTORYTEST_SERVICE',
+            'SUPPORT_FACT_SERVICE',
             # 'MEMORY_CORRUPTION',
             
         ],
@@ -1006,10 +1005,11 @@ target = {
                         #    "hid_service",
                            "producttest",
                             "ppg_hal",
-                            "mag_hal",
                             "mag_service",
                             "cywee_dml",
-                            #"cyweeBleService",
+                            "gnss",
+                            "pgnss_sample",
+                            "cyweeBleService",
                            ],
                'image_analysis': False,
                'fs_image_path':'fd230',
@@ -1070,3 +1070,4 @@ target_group = {
                    'brandy-target1-r', 'brandy-target3-r', 'brandy-target4-r', 'brandy-target5-r', 'brandy-native-js-r', 'brandy-xts-r',
                    'testsuite-brandy-sdk']
 }
+