From: penglei <1624952103@qq.com> Date: Thu, 8 Jan 2026 04:21:16 +0000 (+0800) Subject: 更新3695算法库,优化心率计算 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=refs%2Fchanges%2F3048%2F1;p=mirrors%2FFD230.git 更新3695算法库,优化心率计算 --- diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/CMakeLists.txt b/code/sdk/zhihui/drivers/ppg/hx3695/CMakeLists.txt index 53bbac26b..e665c405a 100644 --- a/code/sdk/zhihui/drivers/ppg/hx3695/CMakeLists.txt +++ b/code/sdk/zhihui/drivers/ppg/hx3695/CMakeLists.txt @@ -58,7 +58,7 @@ set(MAIN_COMPONENT if("PPG_HX3695" IN_LIST DEFINES) find_library(LIB_PATH_HX3695 libhx3695.a ${CMAKE_CURRENT_SOURCE_DIR}) find_library(LIB_PATH_HX3695_HRV libHX3697_hs_20241230_103__01_hrv.a ${CMAKE_CURRENT_SOURCE_DIR}) - find_library(LIB_PATH_HX3695_HRS libHX3697_hs_20241230_3153__01_hrs.a ${CMAKE_CURRENT_SOURCE_DIR}) + find_library(LIB_PATH_HX3695_HRS lib_3695_hrs_2026_0107_11k.a ${CMAKE_CURRENT_SOURCE_DIR}) find_library(LIB_PATH_HX3695_SPO libHX3697_hs_20240607_3333__02_spo.a ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(${TARGET_NAME} PRIVATE -Wl,--whole-archive diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c index 9573e8160..3a28e43e2 100644 --- a/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c +++ b/code/sdk/zhihui/drivers/ppg/hx3695/hx3695.c @@ -50,8 +50,8 @@ uint8_t s_cal_state = 0; uint8_t check_touch_cnt = 0; static wear_msg_code_t wear_status = MSG_NO_WEAR; static wear_msg_code_t wear_status_pre = MSG_NO_INIT; -WORK_MODE_T work_mode_flag = HRS_MODE; -ppg_sensor_data_t ppg_sensor_data; +static WORK_MODE_T work_mode_flag = HRS_MODE; +static ppg_sensor_data_t ppg_sensor_data; int16_t gsen_data_x_fifo[64]; int16_t gsen_data_y_fifo[64]; int16_t gsen_data_z_fifo[64]; @@ -333,9 +333,11 @@ uint16_t hx3695_led_data_analysis(ppg_sensor_data_t *ppg_sensor_dat, uint16_t fi } for(ii=0;ii<4;ii++) { + // printf("led_data[%d].led_state:%d\n",ii,ppg_sensor_dat->led_data[ii].led_state); if(ppg_sensor_dat->led_data[ii].led_state == Activated) { ppg_sensor_dat->led_data[ii].data_count = count+1; + // printf("ppg_sensor_dat->led_data[%d].data_count:%d\n",ii,ppg_sensor_dat->led_data[ii].data_count); } } return count+1; @@ -497,6 +499,8 @@ bool hx3695_check_wear(ppg_sensor_data_t *ppg_sensor_dat) } else if(ppg_sensor_dat->led_data[3].data_val[ii] < CHECK_UNWEAR_THRE) { + // printf("ppg_sensor_dat->led_data[3].data_val[ii] < CHECK_UNWEAR_THRE\n"); + // printf("ppg_sensor_dat->led_data[3].data_val[ii] :%d \n",ppg_sensor_dat->led_data[3].data_val[ii]); if(check_touch_cnt>0) { check_touch_cnt--; @@ -1446,9 +1450,59 @@ void hx3695_alg_send_data(ppg_sensor_data_t *ppg_sensor_dat, WORK_MODE_T mode, u ble_ppgtest_server_send_input_report(&ble_data,1); } #endif - } - +// #ifdef SUPPORT_PPG_BLE_SERVICE +// if(uapi_dev_runtime_get_hrs_ble_status()) +// { +// uint8_t encoded_hrm[17] = {0};//PPG_DATA_LEN_MAX>17会导致APP连接提示定义设备与所选类型不匹配 +// uint8_t red_bit = 0; +// uint8_t ir_bit = 0; +// uint8_t green_bit = 0; +// // HRS_CAL_SET_T cal= get_hrs_agc_status(); + +// for(int ii=0; iiled_data[0].data_val[ii]<0) +// { +// red_bit = 0x80; +// ppg_sensor_dat->led_data[0].data_val[ii] = -ppg_sensor_dat->led_data[0].data_val[ii]; +// } +// // ppg_sensor_dat->led_data[2].data_val[ii] +// if(ppg_sensor_dat->led_data[3].data_val[ii]<0) +// { +// ir_bit = 0x80; +// ppg_sensor_dat->led_data[3].data_val[ii] = -ppg_sensor_dat->led_data[3].data_val[ii]; +// } + +// encoded_hrm[0] = 0x55;//心率标志位,一定要设置正确 +// encoded_hrm[1] = (uint8_t)(hrs_result.data_cnt - data_count + ii) % 256;//原始data_cnt会一直自加,但是这里只有一个字节,0-255循环 +// encoded_hrm[2] = (uint8_t)(hrs_result.hr_result & 0xFF);//心率值 + +// encoded_hrm[3] = (uint8_t)((ppg_sensor_dat->led_data[0].data_val[ii] & 0xFF0000) >> 16) | red_bit; //绿灯原始数据 +// encoded_hrm[4] = (uint8_t)((ppg_sensor_dat->led_data[0].data_val[ii] & 0xFF00) >> 8); //绿灯原始数据 +// encoded_hrm[5] = (uint8_t)(ppg_sensor_dat->led_data[0].data_val[ii] & 0xFF); //绿灯原始数据 + +// encoded_hrm[6] = (uint8_t)((ppg_sensor_dat->led_data[3].data_val[ii] & 0xFF0000) >> 16) | ir_bit; //ir原始数据 +// encoded_hrm[7] = (uint8_t)((ppg_sensor_dat->led_data[3].data_val[ii] & 0xFF00) >> 8); //ir原始数据 +// encoded_hrm[8] = (uint8_t)(ppg_sensor_dat->led_data[3].data_val[ii] & 0xFF); //ir原始数据 + +// encoded_hrm[9] = (uint8_t)((gsen_data_x_fifo[ii]&0xFF00)>>8);//模拟x,1234换成填入自己的x数据 +// encoded_hrm[10] = (uint8_t)(gsen_data_x_fifo[ii]&0xFF); +// encoded_hrm[11] = (uint8_t)((gsen_data_y_fifo[ii]&0xFF00)>>8);//模拟y,-1234换成填入自己的y数据 +// encoded_hrm[12] = (uint8_t)(gsen_data_y_fifo[ii]&0xFF); +// encoded_hrm[13] = (uint8_t)((gsen_data_z_fifo[ii]&0xFF00)>>8);//模拟z,3987换成填入自己的z数据 +// encoded_hrm[14] = (uint8_t)(gsen_data_z_fifo[ii]&0xFF); + +// encoded_hrm[15] = ppg_sensor_dat->led_data[0].led_current;//绿灯电流 +// encoded_hrm[16] = wear_status;//红外电流 + +// ble_ppgtest_server_send_input_report(encoded_hrm,17); +// } + +// } +// #endif + } break; } case SPO2_MODE: @@ -1482,6 +1536,9 @@ void hx3695_alg_send_data(ppg_sensor_data_t *ppg_sensor_dat, WORK_MODE_T mode, u void hx3695_ppg_Int_handle(ppg_sensor_data_t *ppg_sensor_dat) { + // uint32_t time = 0; + // uapi_get_timestampe_ms(&time); + // printf("time:%d\n",time); uint16_t count = 0; uint16_t ii = 0; if(s_ppg_state == 0) @@ -1489,6 +1546,7 @@ void hx3695_ppg_Int_handle(ppg_sensor_data_t *ppg_sensor_dat) return; } count = hx3695_read_fifo_data(ppg_sensor_dat); + // printf("count:%d\n",count); if(count > 0) { hx3695_check_wear(ppg_sensor_dat); diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/lib_3695_hrs_2026_0107_11k.a b/code/sdk/zhihui/drivers/ppg/hx3695/lib_3695_hrs_2026_0107_11k.a new file mode 100644 index 000000000..1ffd5f800 Binary files /dev/null and b/code/sdk/zhihui/drivers/ppg/hx3695/lib_3695_hrs_2026_0107_11k.a differ diff --git a/code/sdk/zhihui/drivers/ppg/hx3695/tyhx_hrs_alg.h b/code/sdk/zhihui/drivers/ppg/hx3695/tyhx_hrs_alg.h index f7eeaf46d..41cdde0ca 100644 --- a/code/sdk/zhihui/drivers/ppg/hx3695/tyhx_hrs_alg.h +++ b/code/sdk/zhihui/drivers/ppg/hx3695/tyhx_hrs_alg.h @@ -1,21 +1,21 @@ -//vesion3.1.53 +//vesion3.1.55 #ifndef _TYHX_HRS_ALG_H_ #define _TYHX_HRS_ALG_H_ #include - -// /* portable 8-bit unsigned integer */ -// typedef unsigned char uint8_t; -// /* portable 8-bit signed integer */ -// typedef signed char int8_t; -// /* portable 16-bit unsigned integer */ -// typedef unsigned short int uint16_t; -// /* portable 16-bit signed integer */ -// typedef signed short int int16_t; -// /* portable 32-bit unsigned integer */ -// //typedef unsigned int uint32_t; -// /* portable 32-bit signed integer */ -// //typedef signed int int32_t; +#include "hx3695.h" +/* portable 8-bit unsigned integer */ +//typedef unsigned char uint8_t; +/* portable 8-bit signed integer */ +//typedef signed char int8_t; +/* portable 16-bit unsigned integer */ +//typedef unsigned short int uint16_t; +/* portable 16-bit signed integer */ +//typedef signed short int int16_t; +/* portable 32-bit unsigned integer */ +//typedef unsigned int uint32_t; +/* portable 32-bit signed integer */ +//typedef signed int int32_t; #ifndef bool #define bool unsigned char @@ -29,24 +29,7 @@ #endif -///////////////////////// config /////////////////////////// -#define BP_CUSTDOWN_ALG_LIB -#define SHARED_RAM -#define NO_MATH_LIB - -//define DEBUG_DATA -////////////////////////////////////////////////////////////// - - -// #ifdef DEBUG_DATA -// #define DEBUG_PRINTF(...) SEGGER_RTT_printf(0,__VA_ARGS__) -// #else -// #define DEBUG_PRINTF(...) -// #endif - -#ifdef SHARED_RAM -extern uint8_t alg_ram[11 * 1024] __attribute__((aligned(4))); -#endif +#ifdef HRS_ALG_LIB typedef enum { NORMAL_MODE, @@ -55,7 +38,7 @@ typedef enum { JUMP_MODE, ALLDAY_HR_MODE, HIGH_POW_MODE, - CLICK_MODE + TRAINER_MODE } hrs_sports_mode_t; typedef enum { @@ -67,25 +50,25 @@ typedef enum { typedef enum { MSG_LIVING_INITIAL, - MSG_LIVING_TRUE, + MSG_LIVING_TRUE, MSG_LIVING_FAIL } living_msg_code_t; typedef struct { - hrs_alg_msg_code_t hrs_alg_status; - living_msg_code_t living_status; - uint32_t data_cnt; - uint8_t hr_result; - uint16_t cal_result; - uint8_t hr_result_qual; - uint32_t hr_result_std; - hrs_sports_mode_t hr_mode; - uint8_t stress; - uint8_t breath; - uint32_t rri; - uint32_t rri_num; - uint32_t rri_std; - uint32_t rmssd; + hrs_alg_msg_code_t hrs_alg_status; + living_msg_code_t living_status; + uint32_t data_cnt; + uint8_t hr_result; + uint16_t cal_result; + uint8_t hr_result_qual; + uint32_t hr_result_std; + hrs_sports_mode_t hr_mode; + uint8_t motion; + uint8_t stress; + uint32_t rri; + uint32_t rri_num; + uint32_t rri_std; + uint32_t rri_rmssd; } hrs_results_t; #ifdef BP_CUSTDOWN_ALG_LIB @@ -110,7 +93,7 @@ typedef struct { typedef struct { bp_msg_code_t bp_alg_status; uint8_t sbp; - uint8_t dbp; + uint8_t dbp; uint32_t data_cnt; uint8_t hr_result; bool object_flg; @@ -131,7 +114,7 @@ bool tyhx_motion_pedometer(int16_t gsen_data_x, int16_t gsen_data_y, int16_t gse hrs_results_t tyhx_hrs_alg_get_results(void); void tyhx_hrs_set_alg_para(hrs_sports_mode_t sports_mode, uint16_t static_thre_val, uint8_t gsen_fun_lv_val); void tyhx_hrs_set_living(uint8_t mode, uint8_t qu_thre, uint8_t st_thre); - +#endif //HRS_ALG_LIB #endif diff --git a/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c b/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c index 6fe4e81fc..84be0ca7c 100644 --- a/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c +++ b/code/sdk/zhihui/services/gnss/sample/pgnss_sample/pgnss_sample.c @@ -175,7 +175,7 @@ static int decode_nmea(char c) ret=0; if(nmea_decode(&g_nmeadata,c) ==1 ) ///调用解析函数 { - dump_nmea_str(&(g_nmeadata.gpsParse)); + // dump_nmea_str(&(g_nmeadata.gpsParse)); if (g_nmeadata.gpsParse.sentence_type == GPS_SENTENCE_TH002 ) { //一组数据最后一条 @@ -505,7 +505,8 @@ static void ListenGnssData(tiot_handle handle) { int32_t i = 0; int32_t timeout_count = 0; // 连续超时计数器 - + char temp_buf[512] = {0}; + // 初始化GNSS服务缓冲区 if (init_gnss_service_buffer() != 0) { printf("Error: Failed to initialize GNSS service buffer\n"); @@ -557,7 +558,7 @@ static void ListenGnssData(tiot_handle handle) int str_len = strnlen(pbuf, ret - MSG_CONTENT_IDX); if (str_len > 0) { - printf("%s\r\n", pbuf); + // printf("%s\r\n", pbuf); if (g_is_pgnss_logon && g_gnssLogFp != NULL) { int fprintf_result = fprintf(g_gnssLogFp, "%s\n", pbuf); @@ -580,12 +581,13 @@ static void ListenGnssData(tiot_handle handle) { if (decode_nmea(pbuf[index])==1) { - // dump_location_data(&g_global_gpsData); - char *temp_buf = (char *)malloc(512); - if (temp_buf == NULL) { - printf("error: malloc temp_buf failed!\n"); - continue; - } + dump_location_data(&g_global_gpsData); + memset_s(temp_buf,sizeof(temp_buf),0,sizeof(temp_buf)); + // char *temp_buf = (char *)malloc(512); + // if (temp_buf == NULL) { + // printf("error: malloc temp_buf failed!\n"); + // continue; + // } dump_location_data_to_buf(&g_global_gpsData, temp_buf, 512); // printf("temp_buf : %s\n",temp_buf); @@ -604,8 +606,8 @@ static void ListenGnssData(tiot_handle handle) } } - printf("decode_nmea done\r\n"); - free(temp_buf); + // printf("decode_nmea done\r\n"); + // free(temp_buf); } } } diff --git a/code/sdk/zhihui/services/gnss/src/NMEA0183.c b/code/sdk/zhihui/services/gnss/src/NMEA0183.c index d45ad1309..ccda54c48 100644 --- a/code/sdk/zhihui/services/gnss/src/NMEA0183.c +++ b/code/sdk/zhihui/services/gnss/src/NMEA0183.c @@ -240,7 +240,7 @@ static unsigned char nmea_term_complete(gps_nmea_t* pnmea, gps_data_t* pdata) // } // pdata->starcount = pnmea->starcount; add_start_to_gpsbuf(pnmea,pdata); - printf("gsv starcount copy to pdata \r\n"); + // printf("gsv starcount copy to pdata \r\n"); break; case GPS_SENTENCE_GLL: @@ -252,7 +252,7 @@ static unsigned char nmea_term_complete(gps_nmea_t* pnmea, gps_data_t* pdata) case GPS_SENTENCE_TH000: pdata->th000_signal_vga = pnmea->th000_signal_vga; pdata->last_gps_time_ms = now; - printf("th000 copy to pdata \r\n" ); + // printf("th000 copy to pdata \r\n" ); break; case GPS_SENTENCE_TH001: pdata->th001_errorcode = pnmea->th001_errorcode; @@ -260,7 +260,7 @@ static unsigned char nmea_term_complete(gps_nmea_t* pnmea, gps_data_t* pdata) pdata->th001_trace_star_count = pnmea->th001_trace_star_count; pdata->th001_valid_star_count = pnmea->th001_valid_star_count; pdata->last_gps_time_ms = now; - printf("th001 copy to pdata \r\n" ); + // printf("th001 copy to pdata \r\n" ); case GPS_SENTENCE_TH002: pdata->last_gps_time_ms = now; break; @@ -498,7 +498,7 @@ static unsigned char nmea_term_complete(gps_nmea_t* pnmea, gps_data_t* pdata) break; case GPS_SENTENCE_TH000 + 1:/*VGA 档位(第 2 字段)描述了当前的信号增益档位,有效范围为2~13,正常信号时,其档位值为 7~9;如果档位值显示为 2,说明可能存在强干扰,导致增益饱和;如果档位值为 13,说明信号特别弱,可能射频链路增益不足*/ pnmea->th000_signal_vga = (unsigned int)sring_to_int((const char*)pnmea->term, (void*)0); - printf("th000 signal_vga %d,%s\n",pnmea->th000_signal_vga,pnmea->term); + // printf("th000 signal_vga %d,%s\n",pnmea->th000_signal_vga,pnmea->term); pnmea->gps_data_good = 1; break; case GPS_SENTENCE_TH001 + 4: @@ -1424,7 +1424,7 @@ void dump_location_data(gps_data_t*locationdata) char* msgbuf=(char*)malloc(MSGBUF_LEN); if (msgbuf == NULL) return ; dump_location_data_to_buf(locationdata,msgbuf,MSGBUF_LEN); - printf("%s",msgbuf); + // printf("%s",msgbuf); free(msgbuf); }