增加PPGService

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
index 3fd1bcd..7abcf4b 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
@@ -72,7 +72,7 @@ namespace OHOS
         {
             // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "startspo2 End");
             // uint16_t md = PPG_SERVICE_CMD_TYPE_STOP_SPO2_TEST;
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             // send_ppg_cmd_msg(md);
 #endif
             // startspo2 = false;
@@ -90,7 +90,7 @@ namespace OHOS
             // }
             // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "startspo2 Start");
             // uint16_t md = PPG_SERVICE_CMD_TYPE_DO_SPO2_TEST;
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             // send_ppg_cmd_msg(md);
 #endif
             // startspo2 = true;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp
index 39e3162..29b86d1 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heart_blood/CheckInvalidPresenter.cpp
@@ -38,7 +38,7 @@
 #include <thread>
 #include <sys/time.h>
 
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
 #include "ppg_service.h"
 #endif
 

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp
index 0e77b29..8abe2a0 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/heartrate/src/HeartModel.cpp
@@ -18,7 +18,7 @@
 \r
 #include "heart_blood/health_service/health_service.h"\r
 \r
-#ifdef SUPORT_PPG_SERVICE\r
+#ifdef SUPPORT_PPG_SERVICE\r
 #include "ppg_service.h"\r
 #endif\r
 \r
@@ -44,7 +44,7 @@
 #include <sys/stat.h>\r
 #include <unistd.h>\r
 \r
-// #include "battery_hal.h"\r
+#include "battery_hal.h"\r
 \r
 #include "languagecode/LanguageInit.h"\r
 #include "ui_service.h"\r
@@ -395,7 +395,7 @@ void HeartModel::SetResult(HeartResult result) { heartresult_ = result; }
 HeartResult HeartModel::GetResult() { return heartresult_; }\r
 // 控制心率检测\r
 void HeartModel::Heart_Control(HeartState state, HeartCheck check) {\r
-  #ifdef SUPORT_PPG_SERVICE\r
+\r
   //优先级低不对高优先级处理\r
   if (check < checkstate) {\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,\r
@@ -422,8 +422,8 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
     unwear_counter_ = 0;\r
     display_counter_ = 0;\r
     displayheart = 0;\r
+#ifdef SUPPORT_PPG_SERVICE\r
     uint8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;\r
-#ifdef SUPORT_PPG_SERVICE\r
     errcode_t ret = send_ppg_cmd_msg(md);\r
     if(ret != ERRCODE_SUCC)\r
     {\r
@@ -454,7 +454,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
       return;\r
     }\r
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
-#ifdef SUPORT_PPG_SERVICE\r
+#ifdef SUPPORT_PPG_SERVICE\r
     uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST;\r
     send_ppg_cmd_msg(md);\r
 #endif\r
@@ -468,7 +468,7 @@ void HeartModel::Heart_Control(HeartState state, HeartCheck check) {
       uapi_save_runtime_log(RUNTIME_LOG_HEART_MEASURE);\r
     }\r
   }\r
-  #endif\r
+\r
 }\r
 // 开始检测\r
 void HeartModel::Heart_Start(HeartCheck check) {\r

diff --git a/code/sdk/build/config/target_config/brandy/config.py b/code/sdk/build/config/target_config/brandy/config.py
index 88d33de..4aab42d 100644 (file)
--- a/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py
@@ -398,7 +398,7 @@ target = {
                           "custom_config",
                           "rotary_encoder",
                            "nativelauncher",
-                            #"ppg_service",
+                            "ppg_service",
                             #"cywee_service",
                            "batterry_service",
                            "bleservice",

diff --git a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
index e6364e2..37eba81 100644 (file)
--- a/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
+++ b/code/sdk/zhihui/UI/producttest/src/testhrsenson.cpp
@@ -109,7 +109,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf);
             label_hrsenson_value_vison->SetText(buf);
             RootView::GetInstance()->Invalidate();
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
             send_ppg_cmd_msg(md);
 #endif
@@ -127,7 +127,7 @@ namespace OHOS
             WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",buf);
             label_hrsenson_value_vison->SetText(buf);
             RootView::GetInstance()->Invalidate();
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
             send_ppg_cmd_msg(md);
 #endif
@@ -140,7 +140,7 @@ namespace OHOS
             uint32_t apre_val = 0;
             uint32_t aps_val = 9;
             vc9202_get_leaklight_data(&led_cur,&apre_val,&aps_val);
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
 #endif
             sprintf(buf,"leaklight:\ngreen:%d\nred:%d\nir:%d",led_cur,apre_val,aps_val);
@@ -189,7 +189,7 @@ namespace OHOS
     {
         if(button_1!=NULL)
         {
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             int8_t md = PPG_SERVICE_CMD_TYPE_DO_GRAYCARD_TEST;
             send_ppg_cmd_msg(md);
 #endif
@@ -201,7 +201,7 @@ namespace OHOS
     {
         if(button_2!=NULL)
         {
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
             int8_t md = PPG_SERVICE_CMD_TYPE_DO_LEAKLIGHT_TEST;
             send_ppg_cmd_msg(md);
 #endif
@@ -332,7 +332,7 @@ namespace OHOS
 
         testhrsensonScrollView->SetTouchable(true);
         testhrsensonScrollView->SetDraggable(true);
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
         int8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;
         send_ppg_cmd_msg(md);
 #endif

diff --git a/code/sdk/zhihui/drivers/cywee/dml/main_dml.c b/code/sdk/zhihui/drivers/cywee/dml/main_dml.c
index 971c006..0aaf12d 100644 (file)
--- a/code/sdk/zhihui/drivers/cywee/dml/main_dml.c
+++ b/code/sdk/zhihui/drivers/cywee/dml/main_dml.c
@@ -716,14 +716,14 @@ void cywee_dml_set_activity_mode_setstatus(int cmd)
 
     if(cmd == 0)
     {
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
         send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_PPG_TEST);
 #endif
         uapi_save_runtime_log(RUNTIME_LOG_HEART_SPORT_MEASURE);
     }
     else
     {
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
         send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
 #endif
         uapi_save_runtime_log(RUNTIME_LOG_OXYGEN_SPORT_MEASURE_END);
@@ -1016,7 +1016,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 CWM_OS_dbgPrintf("CUSTOM_HEARTRATE !!! \r\n");
                 if((int)sensorEVT->fData[2] == 1)
                 {
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
                     send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_PPG_TEST);
 #endif
                     uapi_save_runtime_log(RUNTIME_LOG_HEART_SPORT_MEASURE);
@@ -1024,7 +1024,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) {
                 }
                 else
                 {
-#ifdef SUPORT_PPG_SERVICE
+#ifdef SUPPORT_PPG_SERVICE
                     send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);
 #endif
                     uapi_save_runtime_log(RUNTIME_LOG_OXYGEN_SPORT_MEASURE_END);

diff --git a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
index c9a4737..29bf3d5 100644 (file)
--- a/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
+++ b/code/sdk/zhihui/services/factorytest_service/factorytest_protocol.c
@@ -402,14 +402,14 @@ void aging_task(void)
                 return;\r
             }\r
             uapi_get_timestampe_ss(&current_time);\r
-#ifdef SUPORT_PPG_SERVICE\r
+#ifdef SUPPORT_PPG_SERVICE\r
             send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_SINGLE_CHECK_MODE_TEST);\r
 #endif\r
             LOS_Msleep(200);\r
             #ifdef PPG_HX3695\r
             FT_RESULTS_t ft_result = hx3695_factroy_test(SINGLE_CHECK_TEST);\r
             #endif\r
-#ifdef SUPORT_PPG_SERVICE\r
+#ifdef SUPPORT_PPG_SERVICE\r
             send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST);\r
 #endif\r
             #ifdef PPG_HX3695\r