From 4cdcdb68b833f37b34a6b2209256283fa2fc9473 Mon Sep 17 00:00:00 2001 From: Caisking <3449750381@qq.com> Date: Wed, 3 Jul 2024 15:44:59 +0800 Subject: [PATCH] =?utf8?q?=E5=85=B3=E9=97=AD=E5=BF=83=E7=8E=87=E8=A1=80?= =?utf8?q?=E6=B0=A7=E5=A4=A7=E9=83=A8=E5=88=86=E6=97=A5=E5=BF=97=E6=89=93?= =?utf8?q?=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../bloodoxygen/src/BloodOxygenModel.cpp | 2 +- .../nativeui/heartrate/src/HeartModel.cpp | 24 ++++----- .../main/src/dial/DialModelHeartRate.cpp | 8 ++- .../drivers/peripheral/ppg/hx3695/hx3695.c | 50 +++++++++---------- .../peripheral/ppg/hx3695/hx3695_hrs_agc.c | 8 +-- .../peripheral/ppg/hx3695/tyhx_hrs_custom.h | 8 ++- .../peripheral/ppg/service/ppg_service.cpp | 40 +++++++-------- 7 files changed, 76 insertions(+), 64 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp index f02ca0f2e..4f70021db 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/bloodoxygen/src/BloodOxygenModel.cpp @@ -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_++; // 佩戴错误计时器计数 diff --git a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp index 13976a20a..76fd5d39b 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/heartrate/src/HeartModel.cpp @@ -57,7 +57,7 @@ extern "C" return; } int ret = broadcastApi->SubscribeTopic((IUnknown *)broadcastApi, topic, &heartSubscirber); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartSubscribeTopic ret = %d, topic = %u", ret, topic); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartSubscribeTopic ret = %d, topic = %u", ret, topic); broadcastApi->Release((IUnknown *)broadcastApi); } @@ -106,7 +106,7 @@ extern "C" HeartDatas *heartInfo = (HeartDatas *)malloc(sizeof(HeartDatas)); if (heartInfo == nullptr) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[Notify] malloc fail"); } heartInfo->index = index_; heartInfo->maxX = index_; @@ -126,7 +126,7 @@ extern "C" } HeartModel::GetInstance()->SetIndex(index_); */ - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateData = %d %d", heartInfo->index, preheart); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartRateData = %d %d", heartInfo->index, preheart); OHOS::HeartModel::GetInstance()->HeartRatePros(heartInfo); free(heartInfo); heartInfo = nullptr; @@ -182,7 +182,7 @@ namespace OHOS HeartModel::HeartModel() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel::HeartModel()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::HeartModel()"); HeartView = false; BandoffView = false; CheckView = false; @@ -206,7 +206,7 @@ namespace OHOS HeartModel::~HeartModel() { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel::~HeartModel()"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel::~HeartModel()"); HearDatatUnsubscribeTopic(TOPIC_EVENT_HEARTRATE_UPDATA); HearDatatUnsubscribeTopic(TOPIC_EVENT_NEXTDAY_UPDATE); HearDatatUnsubscribeTopic(TOPIC_EVENT_UTCTIME_UPDATE); @@ -345,7 +345,7 @@ namespace OHOS // heartInfo->index = 0; heartInfo->value[heartInfo->index].x = 0; heartInfo->value[heartInfo->index].y = heartRateDist(gen); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " heartRateData: %d %d %d %d %d %d %d %d ", + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " heartRateData: %d %d %d %d %d %d %d %d ", heartInfo->perSec, heartInfo->rest, heartInfo->maxValue, heartInfo->minValue, heartInfo->minX, heartInfo->index, heartInfo->value[0].x, heartInfo->value[0].y); #endif @@ -361,7 +361,7 @@ namespace OHOS if (restHeartRate > HEART_RATE_LIMIT_LOWER && restHeartRate <= HEART_RATE_LIMIT_UPPER) { healthDatas.heartRateRest = restHeartRate; - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "heartRateRest:%d ", healthDatas.heartRateRest); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "heartRateRest:%d ", healthDatas.heartRateRest); } HandleMinHeart(heartInfo->minX, heartInfo->minValue); HandleMaxHeart(heartInfo->maxX, heartInfo->maxValue); @@ -478,12 +478,12 @@ namespace OHOS { if (check < checkstate) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Higher execution instruction exists"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Higher execution instruction exists"); return; } if (state == HeartState::End && heartstate == true) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState End"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState End"); uint8_t md = PPG_SERVICE_CMD_TYPE_STOP_PPG_TEST; send_ppg_cmd_msg(md); heartstate = false; @@ -492,7 +492,7 @@ namespace OHOS } else if (state == HeartState::Start && heartstate == false) { - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartState Start"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartState Start"); uint8_t md = PPG_SERVICE_CMD_TYPE_DO_PPG_TEST; send_ppg_cmd_msg(md); heartstate = true; @@ -516,7 +516,7 @@ namespace OHOS void HeartModel::SetWearStatus(int32_t wear) { // 设置佩戴状态 - // WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "HeartModel Weartest::%d", wear); + // WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "HeartModel Weartest::%d", wear); if (wear_ != 1 && wear != 1) { unwear_counter_++; // 佩戴错误计时器计数 @@ -646,7 +646,7 @@ namespace OHOS HeartRateData *data = new HeartRateData; data->Heart = heart; data->timestamp = HeartPresenter::GetInstance()->GetCurrentTime(); - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, " Save %d %d", data->Heart, data->timestamp); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, " Save %d %d", data->Heart, data->timestamp); SetCheckTime(data->timestamp); HealthService::GetInstance()->UpdateHealthData(*data); // 关闭自动检测心率 如果有其他高级心率检测在进行，则不会进行关闭[低优先级] diff --git a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHeartRate.cpp b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHeartRate.cpp index 89fed7267..d4c9bc436 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHeartRate.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/main/src/dial/DialModelHeartRate.cpp @@ -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; diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c index 6fbff27ca..b73fa068b 100644 --- a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c +++ b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695.c @@ -251,16 +251,16 @@ bool Efuse_judge(void) // hx3695_write_reg(0x50,REG_52); // hx3695_write_reg(0x50,REG_53); - 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); + //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); if ((REG_50 == 0x40) && (REG_51 ==0x50) && (REG_52 ==0x10) && (REG_53 ==0x22)) { Efuse_Mode_Check(); - TYHX_LOG("this chip is before MC \r\n"); + //TYHX_LOG("this chip is before MC \r\n"); } else { - 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); - TYHX_LOG("this chip is after MC \r\n"); + //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); + //TYHX_LOG("this chip is after MC \r\n"); } return true; } @@ -370,7 +370,7 @@ bool hx3695_chip_check(void) if (chip_id == 0x65) { - printf("hx3695_chip_check ok chip_id: 0x%x \r\n",chip_id); + //printf("hx3695_chip_check ok chip_id: 0x%x \r\n",chip_id); //Efuse_Mode_Check(); return true; } @@ -2227,7 +2227,7 @@ bool hx3695_init(WORK_MODE_T mode) hx3695_msg_callback_t func; - TYHX_LOG("this chip hx3695_init mode: %d !! \r\n", mode); + //TYHX_LOG("this chip hx3695_init mode: %d !! \r\n", mode); hx3695_ppg_on(); @@ -2239,7 +2239,7 @@ bool hx3695_init(WORK_MODE_T mode) switch (work_mode_flag) { case HRS_MODE: - TYHX_LOG(" hx3695_init mode : HRS_MODE \n"); + //TYHX_LOG(" hx3695_init mode : HRS_MODE \n"); #ifdef HRS_ALG_LIB tyhx_hrs_set_living(1, 10, 30); if(hx3695_hrs_enable()== SENSOR_OP_FAILED) @@ -2312,7 +2312,7 @@ bool hx3695_init(WORK_MODE_T mode) AGC_LOG("hx3695 check id failed!\r\n"); return false; } - TYHX_LOG(" hx3695_init mode : LEAK_LIGHT_MODE \n"); + //TYHX_LOG(" hx3695_init mode : LEAK_LIGHT_MODE \n"); hx3695_factroy_test(LEAK_LIGHT_TEST); func = hx3695_get_send_msg_callback_func(); @@ -2328,7 +2328,7 @@ bool hx3695_init(WORK_MODE_T mode) AGC_LOG("hx3695 check id failed!\r\n"); return false; } - TYHX_LOG(" hx3695_init mode : GRAY_CARD_MODE \n"); + //TYHX_LOG(" hx3695_init mode : GRAY_CARD_MODE \n"); hx3695_factroy_test(GRAY_CARD_TEST); func = hx3695_get_send_msg_callback_func(); @@ -2352,7 +2352,7 @@ bool hx3695_init(WORK_MODE_T mode) break; case FT_LED_OFF_MODE: - TYHX_LOG(" hx3695_init mode : FT_LED_OFF_MODE \n"); + //TYHX_LOG(" hx3695_init mode : FT_LED_OFF_MODE \n"); hx3695_factroy_test(LED_OFF_TEST); break; @@ -2379,7 +2379,7 @@ bool hx3695_init(WORK_MODE_T mode) void hx3695_agc_Int_handle(void) { - TYHX_LOG(" hx3695_init mode : HRS_MODE \n"); + //TYHX_LOG(" hx3695_init mode : HRS_MODE \n"); switch (work_mode_flag) { case HRS_MODE: @@ -2731,7 +2731,7 @@ void hx3695_hrs_ppg_Int_handle(void) // result.gr_data_final = hrs_s_dat.green_data[0]; // result.ir_data_final = hrs_s_dat.ir_data[0]; // hx3695_factory_test_process(NULL, APP_FACTORY_TEST_HR_START, &result); - PRINT("*count : %d \r\n",*count); + //PRINT("*count : %d \r\n",*count); if(*count < 10) { memset(gsensordata,0.0f,sizeof(gsenson_t) * 8); @@ -2753,11 +2753,11 @@ void hx3695_hrs_ppg_Int_handle(void) gsen_fifo_z_send[ii] = gsensordata[ii].z * 4096 / 10; } //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); - 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); + //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); } hrs_wear_status = hx3695_hrs_get_wear_status(); - PRINT("hrs_wear_status: %d !!\r\n", hrs_wear_status); + //PRINT("hrs_wear_status: %d !!\r\n", hrs_wear_status); if(hrs_wear_status == MSG_HRS_WEAR) { @@ -2798,8 +2798,8 @@ void hx3695_hrs_ppg_Int_handle(void) hrsresult.hr_living_qu = alg_results.hr_result_qual; hrsresult.hr_living_std = alg_results.hr_result_std; - PRINT("hx3695 data_cnt: %d, hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n", - alg_results.data_cnt, hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs); + //PRINT("hx3695 data_cnt: %d, hr_living: %d, hr_living_qu: %d, hr_living_std: %d, hr_result:%d \r\n", + //alg_results.data_cnt, hrsresult.hr_living, hrsresult.hr_living_qu, hrsresult.hr_living_std, hrsresult.lastesthrs); if(hrs_mode_state) { @@ -2828,7 +2828,7 @@ void hx3695_hrs_ppg_Int_handle(void) if (++hr_no_living_dur > 12 * 1000 / tyhx_long_timer_tick) { //hr_stop_detect(); - PRINT("MSG_HRS_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living); + //PRINT("MSG_HRS_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living); hr_no_living_dur = 0; curr_wear = 0; } @@ -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) { //hr_stop_detect(); - PRINT("MSG_HRS_NO_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living); + //PRINT("MSG_HRS_NO_WEAR:%d liv:%d", hrs_wear_status, hrsresult.hr_living); hr_no_living_dur = 0; curr_wear = 0; } @@ -3183,7 +3183,7 @@ void hx3695_spo2_ppg_Int_handle(void) DEBUG_PRINTF("\r\n send1 jlink cnt=%d\r\n",*count); /*屏蔽*/ - PRINT("*count[%d] \r\n",*count); + //("*count[%d] \r\n",*count); if(*count < 10) { //gsensor_get_n_data(8,gsensordata); @@ -3202,8 +3202,8 @@ void hx3695_spo2_ppg_Int_handle(void) // gsen_fifo_y_send[ii] = gsensordata[ii].y * 2048; // gsen_fifo_z_send[ii] = gsensordata[ii].z * 2048; // } - PRINT("hxdata:%d/%d %d %d %d %d %d %d\r\n", - 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]); + //("hxdata:%d/%d %d %d %d %d %d %d\r\n", + //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]); //printf("FFF==>spo2 red_buf : %d, %d, %d, %d \n", 1+ii, *count, red_buf[ii], ir_buf[0]); } @@ -3217,9 +3217,9 @@ void hx3695_spo2_ppg_Int_handle(void) //hx3695_factory_test_process(NULL, APP_FACTORY_TEST_SPO2_START, &result); - 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); + //("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); spo2_wear_status = hx3695_spo2_get_wear_status(); - PRINT("spo2_wear_status : %d\r\n",spo2_wear_status); + //PRINT("spo2_wear_status : %d\r\n",spo2_wear_status); if(spo2_wear_status == MSG_SPO2_WEAR) { tyhx_spo2_alg_send_data(red_buf, ir_buf, green_buf, cal.R_LEDDAC, cal.IR_LEDDAC1, cal.G_LEDDAC, @@ -3250,7 +3250,7 @@ void hx3695_spo2_ppg_Int_handle(void) if (++spo2_no_living_dur > 12 * 1000 / tyhx_long_timer_tick) { //gui_send_msg_by_evt(MSG_SPO2_MEASURE_CANCEL); - PRINT("MSG_SPO2_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status); + //("MSG_SPO2_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status); spo2_no_living_dur = 0; curr_wear = 0; } @@ -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) { //gui_send_msg_by_evt(MSG_SPO2_MEASURE_CANCEL); - PRINT("MSG_SPO2_NO_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status); + //PRINT("MSG_SPO2_NO_WEAR:%d liv:%d", spo2_wear_status, spo2_alg_results.spo2_living_status); spo2_no_living_dur = 0; curr_wear = 0; } diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.c b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.c index 60a15b995..5aafb1c6f 100644 --- a/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.c +++ b/code/sdk/drivers/peripheral/ppg/hx3695/hx3695_hrs_agc.c @@ -404,8 +404,8 @@ HRS_CAL_SET_T PPG_hrs_agc(void) calReg_Hrs.work = true; read_hrs_data_packet(agc_buf); - TYHX_LOG("phase_0x03 %d,%d,%d,%d,%d,%d,%d,%d \r\n", - agc_buf[0], agc_buf[1], agc_buf[2], agc_buf[3],agc_buf[4], agc_buf[5],agc_buf[6], agc_buf[7]); + //TYHX_LOG("phase_0x03 %d,%d,%d,%d,%d,%d,%d,%d \r\n", + //agc_buf[0], agc_buf[1], agc_buf[2], agc_buf[3],agc_buf[4], agc_buf[5],agc_buf[6], agc_buf[7]); g1_led_val = agc_buf[1]; g1_amb_val = (agc_buf[0] + agc_buf[2])/2 ; @@ -413,8 +413,8 @@ HRS_CAL_SET_T PPG_hrs_agc(void) g2_led_val = agc_buf[4]; g2_amb_val = (agc_buf[3] + agc_buf[5])/2 ; - TYHX_LOG("cal dat g1=%d,g2=%d, a1=%d,a2=%d \r\n", - g1_led_val, g1_amb_val, g2_led_val, g2_amb_val ); + //TYHX_LOG("cal dat g1=%d,g2=%d, a1=%d,a2=%d \r\n", + //g1_led_val, g1_amb_val, g2_led_val, g2_amb_val ); PPG_hrs_Calibration_Routine(&calReg_Hrs, g1_led_val, g2_led_val, g1_amb_val, g2_amb_val ); diff --git a/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h b/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h index 0abec51b1..bd64ef3ed 100644 --- a/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h +++ b/code/sdk/drivers/peripheral/ppg/hx3695/tyhx_hrs_custom.h @@ -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, ...) \ diff --git a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp index 327194f8b..c9ad9231e 100644 --- a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp +++ b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp @@ -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; } } -- 2.17.1