关闭心率血氧大部分日志打印 443/1 443/head
authorCaisking <3449750381@qq.com>
Wed, 3 Jul 2024 07:44:59 +0000 (15:44 +0800)
committerCaisking <3449750381@qq.com>
Wed, 3 Jul 2024 07:44:59 +0000 (15:44 +0800)
code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp
code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp
code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHeartRate.cpp
code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c
code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.c
code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h
code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp

index f02ca0f..4f70021 100644 (file)
@@ -75,7 +75,7 @@ namespace OHOS
     void BloodOxygenModel::SetWearStatus(int32_t wear)
     {
         // 设置佩戴状态
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "BloodOxygenModel Weartest::%d", wear);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BloodOxygenModel Weartest::%d", wear);
         if (wear_ != 1 && wear != 1)
         {
             unwear_counter_++; // 佩戴错误计时器计数
index 13976a2..76fd5d3 100644 (file)
@@ -57,7 +57,7 @@ extern "C"
             return;\r
         }\r
         int ret = broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, &heartSubscirber);\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartSubscribeTopic ret = %d, topic = %u", ret, topic);\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartSubscribeTopic ret = %d, topic = %u", ret, topic);\r
         broadcastApi->Release((IUnknown *)broadcastApi);\r
     }\r
 \r
@@ -106,7 +106,7 @@ extern "C"
                 HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas));\r
                 if (heartInfo == nullptr)\r
                 {\r
-                    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail");\r
+                    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail");\r
                 }\r
                 heartInfo->index = index_;\r
                 heartInfo->maxX = index_;\r
@@ -126,7 +126,7 @@ extern "C"
                 }\r
                 HeartModel::GetInstance()->SetIndex(index_);\r
                 */\r
-                WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateData = %d %d", heartInfo->index, preheart);\r
+                WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartRateData = %d %d", heartInfo->index, preheart);\r
                 OHOS::HeartModel::GetInstance()->HeartRatePros(heartInfo);\r
                 free(heartInfo);\r
                 heartInfo = nullptr;\r
@@ -182,7 +182,7 @@ namespace OHOS
 \r
     HeartModel::HeartModel()\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel::HeartModel()");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::HeartModel()");\r
         HeartView = false;\r
         BandoffView = false;\r
         CheckView = false;\r
@@ -206,7 +206,7 @@ namespace OHOS
 \r
     HeartModel::~HeartModel()\r
     {\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel::~HeartModel()");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::~HeartModel()");\r
         HearDatatUnsubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA);\r
         HearDatatUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE);\r
         HearDatatUnsubscribeTopic(TOPIC_EVENT_UTCTIME_UPDATE);\r
@@ -345,7 +345,7 @@ namespace OHOS
         // heartInfo->index = 0;\r
         heartInfo->value[heartInfo->index].x = 0;\r
         heartInfo->value[heartInfo->index].y = heartRateDist(gen);\r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " heartRateData: %d %d %d %d %d %d %d %d ",\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " heartRateData: %d %d %d %d %d %d %d %d ",\r
                       heartInfo->perSec, heartInfo->rest, heartInfo->maxValue, heartInfo->minValue, heartInfo->minX, heartInfo->index, heartInfo->value[0].x, heartInfo->value[0].y);\r
 \r
 #endif\r
@@ -361,7 +361,7 @@ namespace OHOS
         if (restHeartRate > HEART_RATE_LIMIT_LOWER && restHeartRate <= HEART_RATE_LIMIT_UPPER)\r
         {\r
             healthDatas.heartRateRest = restHeartRate;\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateRest:%d ", healthDatas.heartRateRest);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartRateRest:%d ", healthDatas.heartRateRest);\r
         }\r
         HandleMinHeart(heartInfo->minX, heartInfo->minValue);\r
         HandleMaxHeart(heartInfo->maxX, heartInfo->maxValue);\r
@@ -478,12 +478,12 @@ namespace OHOS
     {\r
         if (check < checkstate)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Higher execution instruction exists");\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Higher execution instruction exists");\r
             return;\r
         }\r
         if (state == HeartState::End && heartstate == true)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState End");\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState End");\r
             uint8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST;\r
             send_ppg_cmd_msg(md);\r
             heartstate = false;\r
@@ -492,7 +492,7 @@ namespace OHOS
         }\r
         else if (state == HeartState::Start && heartstate == false)\r
         {\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start");\r
             uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST;\r
             send_ppg_cmd_msg(md);\r
             heartstate = true;\r
@@ -516,7 +516,7 @@ namespace OHOS
     void HeartModel::SetWearStatus(int32_t wear)\r
     {\r
         // 设置佩戴状态\r
-        // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel Weartest::%d", wear);\r
+        // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel Weartest::%d", wear);\r
         if (wear_ != 1 && wear != 1)\r
         {\r
             unwear_counter_++; // 佩戴错误计时器计数\r
@@ -646,7 +646,7 @@ namespace OHOS
             HeartRateData *data = new HeartRateData;\r
             data->Heart = heart;\r
             data->timestamp = HeartPresenter::GetInstance()->GetCurrentTime();\r
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " Save %d %d", data->Heart, data->timestamp);\r
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " Save %d %d", data->Heart, data->timestamp);\r
             SetCheckTime(data->timestamp);\r
             HealthService::GetInstance()->UpdateHealthData(*data);\r
             // 关闭自动检测心率 如果有其他高级心率检测在进行,则不会进行关闭[低优先级]\r
index 89fed72..d4c9bc4 100644 (file)
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-07-03 14:49:52
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-07-03 15:31:01
+ * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHeartRate.cpp
+ */
 /***
  * @Date: 2024-04-15 10:55:58
  * @LastEditors: Caisking 3449750381@qq.com
@@ -28,7 +34,7 @@ namespace OHOS
 
     void DialModelHeartRate::UpdateHeartRate(int16_t heartRate)
     {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "UpdateHeartRate = %d", heartRate);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "UpdateHeartRate = %d", heartRate);
         // 筛选表盘心率数据
         if (heartRate == 0)
             return;
index 6fbff27..b73fa06 100644 (file)
@@ -251,16 +251,16 @@ bool Efuse_judge(void)
 //     hx3695_write_reg(0x50,REG_52); \r
 //     hx3695_write_reg(0x50,REG_53); \r
     \r
-       TYHX_LOG("EFUSE MC1 :0x50=0x%2x  0x51= 0x%2x  0x52= 0x%2x  0x53= 0x%2x  \r\n",REG_50,REG_51,REG_52,REG_53);\r
+       //TYHX_LOG("EFUSE MC1 :0x50=0x%2x  0x51= 0x%2x  0x52= 0x%2x  0x53= 0x%2x        \r\n",REG_50,REG_51,REG_52,REG_53);\r
     if ((REG_50 == 0x40) && (REG_51 ==0x50) && (REG_52 ==0x10) && (REG_53 ==0x22))\r
     {             \r
         Efuse_Mode_Check();        \r
-        TYHX_LOG("this chip is before MC \r\n");        \r
+        //TYHX_LOG("this chip is before MC \r\n");        \r
     }\r
     else\r
     {\r
-        TYHX_LOG("EFUSE MC3 :0x50=0x%2x  0x51= 0x%2x  0x52= 0x%2x  0x53= 0x%2x  \r\n",REG_50,REG_51,REG_52,REG_53);\r
-        TYHX_LOG("this chip is after MC \r\n");\r
+        //TYHX_LOG("EFUSE MC3 :0x50=0x%2x  0x51= 0x%2x  0x52= 0x%2x  0x53= 0x%2x  \r\n",REG_50,REG_51,REG_52,REG_53);\r
+        //TYHX_LOG("this chip is after MC \r\n");\r
     }\r
        return true;\r
 }\r
@@ -370,7 +370,7 @@ bool hx3695_chip_check(void)
 \r
         if (chip_id == 0x65)\r
         {\r
-            printf("hx3695_chip_check ok  chip_id: 0x%x \r\n",chip_id);\r
+            //printf("hx3695_chip_check ok  chip_id: 0x%x \r\n",chip_id);\r
                        //Efuse_Mode_Check();\r
             return true;\r
         }\r
@@ -2227,7 +2227,7 @@ bool hx3695_init(WORK_MODE_T mode)
   hx3695_msg_callback_t func;\r
 \r
 \r
-       TYHX_LOG("this chip hx3695_init  mode: %d !! \r\n", mode);\r
+       //TYHX_LOG("this chip hx3695_init  mode: %d !! \r\n", mode);\r
        \r
        hx3695_ppg_on();\r
 \r
@@ -2239,7 +2239,7 @@ bool hx3695_init(WORK_MODE_T mode)
     switch (work_mode_flag)\r
     {\r
     case HRS_MODE:\r
-               TYHX_LOG(" hx3695_init mode : HRS_MODE \n");\r
+               //TYHX_LOG(" hx3695_init mode : HRS_MODE \n");\r
 #ifdef HRS_ALG_LIB\r
                                tyhx_hrs_set_living(1, 10, 30);\r
         if(hx3695_hrs_enable()== SENSOR_OP_FAILED)\r
@@ -2312,7 +2312,7 @@ bool hx3695_init(WORK_MODE_T mode)
             AGC_LOG("hx3695 check id failed!\r\n");\r
             return false;\r
         }\r
-        TYHX_LOG(" hx3695_init mode : LEAK_LIGHT_MODE \n");\r
+        //TYHX_LOG(" hx3695_init mode : LEAK_LIGHT_MODE \n");\r
         hx3695_factroy_test(LEAK_LIGHT_TEST);\r
 \r
         func =  hx3695_get_send_msg_callback_func();\r
@@ -2328,7 +2328,7 @@ bool hx3695_init(WORK_MODE_T mode)
             AGC_LOG("hx3695 check id failed!\r\n");\r
             return false;\r
         }\r
-        TYHX_LOG(" hx3695_init mode : GRAY_CARD_MODE \n");\r
+        //TYHX_LOG(" hx3695_init mode : GRAY_CARD_MODE \n");\r
         hx3695_factroy_test(GRAY_CARD_TEST);\r
 \r
         func =  hx3695_get_send_msg_callback_func();\r
@@ -2352,7 +2352,7 @@ bool hx3695_init(WORK_MODE_T mode)
         break;\r
 \r
     case FT_LED_OFF_MODE:\r
-        TYHX_LOG(" hx3695_init mode : FT_LED_OFF_MODE \n");\r
+        //TYHX_LOG(" hx3695_init mode : FT_LED_OFF_MODE \n");\r
         hx3695_factroy_test(LED_OFF_TEST);\r
         break;\r
      \r
@@ -2379,7 +2379,7 @@ bool hx3695_init(WORK_MODE_T mode)
 \r
 void hx3695_agc_Int_handle(void)\r
 {\r
-       TYHX_LOG(" hx3695_init mode : HRS_MODE \n");\r
+       //TYHX_LOG(" hx3695_init mode : HRS_MODE \n");\r
     switch (work_mode_flag)\r
     {\r
     case HRS_MODE:\r
@@ -2731,7 +2731,7 @@ void hx3695_hrs_ppg_Int_handle(void)
        // result.gr_data_final = hrs_s_dat.green_data[0];\r
        // result.ir_data_final = hrs_s_dat.ir_data[0];\r
        // hx3695_factory_test_process(NULL, APP_FACTORY_TEST_HR_START, &result);\r
-    PRINT("*count : %d \r\n",*count);\r
+    //PRINT("*count : %d \r\n",*count);\r
     if(*count < 10)\r
     {\r
         memset(gsensordata,0.0f,sizeof(gsenson_t) * 8);\r
@@ -2753,11 +2753,11 @@ void hx3695_hrs_ppg_Int_handle(void)
               gsen_fifo_z_send[ii] = gsensordata[ii].z * 4096 / 10;\r
           }\r
           //PRINT("hxdata:%d/%d %d %d %.3f %.3f %.3f %d\r\n" ,1+ii,*count,PPG_buf[ii],ir_buf[0],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii],ppg_s_data.green_cur);\r
-          PRINT("hxdata:%d/%d %d %d %d %d %d %d\r\n" ,1+ii,*count,PPG_buf[ii],ir_buf[0],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii],ppg_s_data.green_cur);\r
+          //PRINT("hxdata:%d/%d %d %d %d %d %d %d\r\n" ,1+ii,*count,PPG_buf[ii],ir_buf[0],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii],ppg_s_data.green_cur);\r
 \r
        }\r
       hrs_wear_status = hx3695_hrs_get_wear_status();\r
-      PRINT("hrs_wear_status:    %d !!\r\n", hrs_wear_status);\r
+      //PRINT("hrs_wear_status:    %d !!\r\n", hrs_wear_status);\r
     \r
       if(hrs_wear_status == MSG_HRS_WEAR)\r
       {\r
@@ -2798,8 +2798,8 @@ void hx3695_hrs_ppg_Int_handle(void)
     hrsresult.hr_living_qu = alg_results.hr_result_qual;\r
     hrsresult.hr_living_std = alg_results.hr_result_std;\r
                \r
-    PRINT("hx3695 data_cnt: %d,  hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n",\r
-               alg_results.data_cnt,  hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs);\r
+    //PRINT("hx3695 data_cnt: %d,  hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n",\r
+               //alg_results.data_cnt,  hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs);\r
 \r
     if(hrs_mode_state)\r
     {\r
@@ -2828,7 +2828,7 @@ void hx3695_hrs_ppg_Int_handle(void)
                if (++hr_no_living_dur > 12 * 1000 / tyhx_long_timer_tick)\r
                {\r
                        //hr_stop_detect();\r
-                       PRINT("MSG_HRS_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living);\r
+                       //PRINT("MSG_HRS_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living);\r
                        hr_no_living_dur = 0;\r
                        curr_wear = 0;\r
                }\r
@@ -2836,7 +2836,7 @@ void hx3695_hrs_ppg_Int_handle(void)
        else if(hrs_wear_status == MSG_HRS_NO_WEAR || hrsresult.hr_living == MSG_LIVING_FAIL)\r
        {\r
                //hr_stop_detect();\r
-               PRINT("MSG_HRS_NO_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living);\r
+               //PRINT("MSG_HRS_NO_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living);\r
                hr_no_living_dur = 0;\r
                curr_wear = 0;\r
        }\r
@@ -3183,7 +3183,7 @@ void hx3695_spo2_ppg_Int_handle(void)
         DEBUG_PRINTF("\r\n send1  jlink cnt=%d\r\n",*count);   \r
   \r
   /*屏蔽*/\r
-    PRINT("*count[%d] \r\n",*count);\r
+    //("*count[%d] \r\n",*count);\r
     if(*count < 10)\r
     {\r
        //gsensor_get_n_data(8,gsensordata);\r
@@ -3202,8 +3202,8 @@ void hx3695_spo2_ppg_Int_handle(void)
           //     gsen_fifo_y_send[ii] = gsensordata[ii].y * 2048;\r
           //     gsen_fifo_z_send[ii] = gsensordata[ii].z * 2048;\r
           // }\r
-          PRINT("hxdata:%d/%d %d %d %d %d %d %d\r\n",\r
-            1+ii,*count,red_buf[ii],ir_buf[ii],green_buf[ii],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii]);\r
+          //("hxdata:%d/%d %d %d %d %d %d %d\r\n",\r
+            //1+ii,*count,red_buf[ii],ir_buf[ii],green_buf[ii],gsen_fifo_x_send[ii],gsen_fifo_y_send[ii],gsen_fifo_z_send[ii]);\r
           //printf("FFF==>spo2  red_buf : %d,  %d,  %d,        %d \n", 1+ii, *count, red_buf[ii], ir_buf[0]);\r
        }\r
 \r
@@ -3217,9 +3217,9 @@ void hx3695_spo2_ppg_Int_handle(void)
       //hx3695_factory_test_process(NULL, APP_FACTORY_TEST_SPO2_START, &result);\r
 \r
        \r
-        PRINT("hx3695 current value: %d %d %d %d %d %d\r\n", cal.R_LED, cal.IR_LED1, cal.G_LED, cal.R_LEDDAC, cal.IR_LEDDAC1, cal.G_LEDDAC);\r
+        //("hx3695 current value: %d %d %d %d %d %d\r\n", cal.R_LED, cal.IR_LED1, cal.G_LED, cal.R_LEDDAC, cal.IR_LEDDAC1, cal.G_LEDDAC);\r
         spo2_wear_status = hx3695_spo2_get_wear_status();\r
-        PRINT("spo2_wear_status : %d\r\n",spo2_wear_status);\r
+        //PRINT("spo2_wear_status : %d\r\n",spo2_wear_status);\r
         if(spo2_wear_status == MSG_SPO2_WEAR)\r
         {\r
             tyhx_spo2_alg_send_data(red_buf, ir_buf, green_buf, cal.R_LEDDAC, cal.IR_LEDDAC1, cal.G_LEDDAC, \r
@@ -3250,7 +3250,7 @@ void hx3695_spo2_ppg_Int_handle(void)
                if (++spo2_no_living_dur > 12 * 1000 / tyhx_long_timer_tick)\r
                {\r
                        //gui_send_msg_by_evt(MSG_SPO2_MEASURE_CANCEL);\r
-                       PRINT("MSG_SPO2_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status);\r
+                       //("MSG_SPO2_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status);\r
                        spo2_no_living_dur = 0;\r
                        curr_wear = 0;\r
                }\r
@@ -3258,7 +3258,7 @@ void hx3695_spo2_ppg_Int_handle(void)
        else if(spo2_wear_status == MSG_SPO2_NO_WEAR || spo2_alg_results.spo2_living_status == MSG_SPO2_LIVING_FAIL)\r
        {\r
                //gui_send_msg_by_evt(MSG_SPO2_MEASURE_CANCEL);\r
-               PRINT("MSG_SPO2_NO_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status);\r
+               //PRINT("MSG_SPO2_NO_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status);\r
                spo2_no_living_dur = 0;\r
                curr_wear = 0;\r
        }\r
index 60a15b9..5aafb1c 100644 (file)
@@ -404,8 +404,8 @@ HRS_CAL_SET_T   PPG_hrs_agc(void)
     calReg_Hrs.work = true;  \r
                \r
                read_hrs_data_packet(agc_buf);  \r
-               TYHX_LOG("phase_0x03  %d,%d,%d,%d,%d,%d,%d,%d \r\n",\r
-    agc_buf[0], agc_buf[1], agc_buf[2], agc_buf[3],agc_buf[4], agc_buf[5],agc_buf[6], agc_buf[7]);\r
+               //TYHX_LOG("phase_0x03  %d,%d,%d,%d,%d,%d,%d,%d \r\n",\r
+    //agc_buf[0], agc_buf[1], agc_buf[2], agc_buf[3],agc_buf[4], agc_buf[5],agc_buf[6], agc_buf[7]);\r
     \r
                g1_led_val = agc_buf[1];\r
     g1_amb_val = (agc_buf[0] + agc_buf[2])/2 ;\r
@@ -413,8 +413,8 @@ HRS_CAL_SET_T   PPG_hrs_agc(void)
                g2_led_val = agc_buf[4];\r
     g2_amb_val = (agc_buf[3] + agc_buf[5])/2 ;\r
     \r
-    TYHX_LOG("cal dat g1=%d,g2=%d, a1=%d,a2=%d \r\n",\r
-                g1_led_val, g1_amb_val, g2_led_val, g2_amb_val );\r
+    //TYHX_LOG("cal dat g1=%d,g2=%d, a1=%d,a2=%d \r\n",\r
+                //g1_led_val, g1_amb_val, g2_led_val, g2_amb_val );\r
                \r
     PPG_hrs_Calibration_Routine(&calReg_Hrs, g1_led_val, g2_led_val, g1_amb_val, g2_amb_val );\r
     \r
index 0abec51..bd64ef3 100644 (file)
@@ -1,3 +1,9 @@
+/*** 
+ * @Date: 2024-04-30 17:53:18
+ * @LastEditors: Caisking 3449750381@qq.com
+ * @LastEditTime: 2024-07-03 15:11:33
+ * @FilePath: /FD230/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h
+ */
 /*
  * @Author: penglei 1624952103@qq.com
  * @Date: 2024-03-26 20:29:58
@@ -30,7 +36,7 @@ typedef struct {
 } FT_CUSTOM_RESULTS_t;
 
 extern FT_CUSTOM_RESULTS_t hrsresult;
-#define TYHX_DEBUG
+//#define TYHX_DEBUG
 
 #ifdef TYHX_DEBUG
 #define TYHX_LOG(fmt, ...)                    \
index 327194f..c9ad923 100644 (file)
@@ -87,7 +87,7 @@ void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size)
     /* alloc request */
     request = SAMGR_AllocRequestMsg(0, PLATFORM_CORE, BROADCAST_SVR_ID, size);
     if (request == NULL) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "SAMGR_AllocRequestMsg failed");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "SAMGR_AllocRequestMsg failed");
         return;
     }
     request->msgId = topic;
@@ -95,7 +95,7 @@ void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size)
     {
         ret = memcpy_s(request->data, size, (const void *)data, size);
         if (ret != EOK) {
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s rateDataTmp fail! ret = %d", ret);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "ChargerEventPublish memcpy_s rateDataTmp fail! ret = %d", ret);
             return;
         }
     }
@@ -106,13 +106,13 @@ void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size)
     /* public request */
     api = SAMGR_GetInstance()->GetFeatureApi(BROADCAST_SERVICE_NAME, BROADCAST_FEATURE_NAME);
     if (api == NULL) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GetFeatureApi failed");
         SAMGR_FreeRequestMsg(request);
         return;
     }
     ret = api->QueryInterface(api, DEFAULT_VERSION, (void **)&broadcastApi);
     if (ret != 0 || broadcastApi == NULL) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "QueryInterface failed");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "QueryInterface failed");
         SAMGR_FreeRequestMsg(request);
         return;
     }
@@ -125,7 +125,7 @@ void CustomEventPublish(uint16_t topic, uint8_t *data , uint32_t size)
 //漏光测试
 errcode_t update_leaklight_event_notify(uint8_t *data)
 {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "send lightdata to ui %s",data);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "send lightdata to ui %s",data);
     CustomEventPublish(TOPIC_EVENT_LEAKLIGHT_UPDATA,(uint8_t*)data,strlen((char*)data));
     return 0;
 }
@@ -140,7 +140,7 @@ errcode_t update_leaklight_event_sendmsg_toUI(uint8_t *data)
 //灰卡测试
 errcode_t update_graycard_event_notify(uint8_t *data)
 {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "send carddata to ui %s",data);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "send carddata to ui %s",data);
     CustomEventPublish(TOPIC_EVENT_GRAYCARD_UPDATA,(uint8_t*)data,strlen((char*)data));
     return 0;
 }
@@ -196,12 +196,12 @@ errcode_t update_wearstatus_event_sendmsg_toUI(int32_t wearstatus)
 #include "hx3695.h"
 void hx3695_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen)
 {
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "hx3695_msg_callback");
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "hx3695_msg_callback");
     FT_CUSTOM_RESULTS_t sensor_data; // 使用更通用的名称 sensor_data
 #if 1
     if (msg_datalen < sizeof(FT_CUSTOM_RESULTS_t)) {
         // 数据长度不足以填充整个结构体
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Invalid data length for SPO2 update");
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Invalid data length for SPO2 update");
         //return;
     }
 #endif
@@ -210,39 +210,39 @@ void hx3695_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datale
     {
         case HX3695_MSG_TYPE_HRS_UPDATE:
            //每秒心率
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_HRS_UPDATE = %d", sensor_data.lastesthrs);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_HRS_UPDATE = %d", sensor_data.lastesthrs);
             update_hrs_event_sendmsg_toUI(sensor_data.lastesthrs);
             break;
         case HX3695_MSG_TYPE_HRV_UPDATE:
             break;
         case HX3695_MSG_TYPE_SPO2_UPDATE:
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_SPO2_UPDATE = %d", sensor_data.lastestspo2);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_SPO2_UPDATE = %d", sensor_data.lastestspo2);
             update_spo2_event_sendmsg_toUI(sensor_data.lastestspo2);
             break;
         case HX3695_MSG_TYPE_LEAKLIGHT_UPDATE:
             memset_s(light_databuf,64,0,64);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "LEAKLIGHT_UPDATE");
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_leak_green_UPDATE = %d", sensor_data.leak_green);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_leak_red_UPDATE = %d", sensor_data.leak_red);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_leak_ir_UPDATE = %d", sensor_data.leak_ir);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "LEAKLIGHT_UPDATE");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_leak_green_UPDATE = %d", sensor_data.leak_green);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_leak_red_UPDATE = %d", sensor_data.leak_red);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_leak_ir_UPDATE = %d", sensor_data.leak_ir);
             sprintf((char *)light_databuf,"%d,%d,%d",sensor_data.leak_green,sensor_data.leak_red,sensor_data.leak_ir);
             update_leaklight_event_sendmsg_toUI(light_databuf);
             break;
         case HX3695_MSG_TYPE_GRAYCARD_UPDATE:
             memset_s(card_databuf,64,0,64);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GRAYCARD_UPDATE");
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_card_green_UPDATE = %d", sensor_data.card_green);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_card_red_UPDATE = %d", sensor_data.card_red);
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_card_ir_UPDATE = %d", sensor_data.card_ir);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "GRAYCARD_UPDATE");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_card_green_UPDATE = %d", sensor_data.card_green);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_card_red_UPDATE = %d", sensor_data.card_red);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_card_ir_UPDATE = %d", sensor_data.card_ir);
             sprintf((char *)card_databuf,"%d,%d,%d",sensor_data.card_green,sensor_data.card_red,sensor_data.card_ir);
             update_graycard_event_sendmsg_toUI(card_databuf);
             break;
         case HX3695_MSG_TYPE_WEARSTAT_UPDATE:
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_WEARSTATUS_UPDATE = %d", sensor_data.wearstatus);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HX3695_MSG_TYPE_WEARSTATUS_UPDATE = %d", sensor_data.wearstatus);
             update_wearstatus_event_sendmsg_toUI(sensor_data.wearstatus);
             break;
         default:
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Unknown sensor message type");
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Unknown sensor message type");
             break;
     }
 }