From 03aab3358e137516ad0920264db2c51f42aef51a Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Mon, 19 Aug 2024 15:01:26 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E8=BF=90=E5=8A=A8=E6=95=B0?= =?utf8?q?=E6=8D=AE=E6=AD=A5=E5=B9=85=E4=B8=BA0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230app/nativeui/traing/src/TraingModel.cpp | 2 +- code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h | 4 ++-- .../drivers/peripheral/cywee/service/cywee_service.c | 12 ++++++------ code/sdk/drivers/peripheral/cywee/src/main_dml.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp index b295f2153..d13f55e88 100644 --- a/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp +++ b/code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp @@ -557,7 +557,7 @@ namespace OHOS sportdata->apc = cyweeInfo->avg_pace; sportdata->fpc = cyweeInfo->max_pace; sportdata->cdc = cyweeInfo->avg_step_freq; - sportdata->std = cyweeInfo->avg_step_len; + sportdata->std = cyweeInfo->avg_step_len * 100; // 前者cm 后者m } /*打印函数*/ diff --git a/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h b/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h index 51a086467..b71e67019 100644 --- a/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h +++ b/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h @@ -459,7 +459,7 @@ typedef struct int distance;//距离 int calories;//卡路里 int step_frequency;//步频 - int step_length;//步幅 + float step_length;//步幅 int pace;//配速 int BMR_calories;//基础卡路里 int hrs;//心率 @@ -470,7 +470,7 @@ typedef struct typedef struct { int avg_step_freq;//平均步频 - int avg_step_len;//平均步长 + float avg_step_len;//平均步长 int avg_pace;//平均配速 int max_step_freq;//最大步频 int max_pace;//最大配速 diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c index 9e0d689ac..7a7b732b2 100644 --- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c +++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c @@ -71,7 +71,7 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen switch (c_activity_result_t.activity_mode) { case SPORT_ACTIVE_MODE_NORMAL: - PRINT("normal mode activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n", + PRINT("normal mode activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%.2f], pace[%d],hrs[%d]\n", c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs); CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t)); @@ -79,7 +79,7 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen case SPORT_ACTIVE_MODE_TREADMILL: PRINT("CYWEE_MSG_TYPE_TREADMILL_UPDATE\r\n"); memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t)); - PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n", + PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%.2f], pace[%d],hrs[%d]\n", c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs); CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t)); @@ -87,7 +87,7 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen case SPORT_ACTIVE_MODE_OUTDOOR_RUNNING: PRINT("CYWEE_MSG_TYPE_OUTDOOR_RUNNING_UPDATE\r\n"); memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t)); - PRINT("outdoor running activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n", + PRINT("outdoor running activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%.2f], pace[%d],hrs[%d]\n", c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs); CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t)); @@ -95,7 +95,7 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen case SPORT_ACTIVE_MODE_INDOOR_RUNNING: PRINT("CYWEE_MSG_TYPE_INDOOR_RUNNING_UPDATE\r\n"); memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t)); - PRINT("indoor running activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n", + PRINT("indoor running activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%.2f], pace[%d],hrs[%d]\n", c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs); CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t)); @@ -103,7 +103,7 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen case SPORT_ACTIVE_MODE_FITNESS_PEDOMETERR: PRINT("CYWEE_MSG_TYPE_FITNESS_PEDOMETERR_UPDATE\r\n"); memcpy(&c_activity_result_t, msg_data, sizeof(cywee_activity_result_t)); - PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%d], pace[%d],hrs[%d]\n", + PRINT("activit_mode[%d], steps[%d], distance[%d], calories[%d], step frequency[%d], step length[%.2f], pace[%d],hrs[%d]\n", c_activity_result_t.activity_mode, c_activity_result_t.steps, c_activity_result_t.distance, c_activity_result_t.calories, c_activity_result_t.step_frequency,c_activity_result_t.step_length, c_activity_result_t.pace, c_activity_result_t.hrs); CustomEventPublish(TOPIC_EVENT_ACTIVITY_UPDATE, &c_activity_result_t, sizeof(cywee_activity_result_t)); @@ -124,7 +124,7 @@ void cywee_msg_callback(uint8_t msg_type, uint8_t *msg_data, int32_t msg_datalen { PRINT("CYWEE_MSG_TYPE_ACTIVITY_EXTRA_INFO_UPDATE\r\n"); memcpy(&c_activity_result_extre_info_t, msg_data, sizeof(cywee_activity_result_extre_info_t)); - PRINT("avg_step_freq[%d],avg_step_len[%d],avg_pace[%d],max_step_freq[%d],max_pace[%d],activity_zone[%d],ativity_zone_moderate_duration[%d],ativity_zone_high_duration[%d],MHR_zone[%d],distance_motion[%d]\n", + PRINT("avg_step_freq[%d],avg_step_len[%.2f],avg_pace[%d],max_step_freq[%d],max_pace[%d],activity_zone[%d],ativity_zone_moderate_duration[%d],ativity_zone_high_duration[%d],MHR_zone[%d],distance_motion[%d]\n", c_activity_result_extre_info_t.avg_step_freq, c_activity_result_extre_info_t.avg_step_len, c_activity_result_extre_info_t.avg_pace,c_activity_result_extre_info_t.max_step_freq, c_activity_result_extre_info_t.max_pace,c_activity_result_extre_info_t.activity_zone, diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c index debf88b77..7687a6689 100644 --- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c +++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c @@ -869,7 +869,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { memset(&c_activity_result_extre_info_t,0,sizeof(cywee_activity_result_extre_info_t)); c_activity_result_extre_info_t.avg_step_freq = (int)sensorEVT->fData[1]; - c_activity_result_extre_info_t.avg_step_len = (int)sensorEVT->fData[2]; + c_activity_result_extre_info_t.avg_step_len = (float)sensorEVT->fData[2]; c_activity_result_extre_info_t.avg_pace = (int)sensorEVT->fData[3]; c_activity_result_extre_info_t.max_step_freq = (int)sensorEVT->fData[4]; c_activity_result_extre_info_t.max_pace = (int)sensorEVT->fData[5]; @@ -907,7 +907,7 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { c_activity_result_t.distance = (int)sensorEVT->fData[2]; c_activity_result_t.calories = (int)sensorEVT->fData[3]; c_activity_result_t.step_frequency = (int)sensorEVT->fData[5]; - c_activity_result_t.step_length = (int)sensorEVT->fData[6]; + c_activity_result_t.step_length = (float)sensorEVT->fData[6]; c_activity_result_t.pace = (int)sensorEVT->fData[7]; c_activity_result_t.hrs = hrs; cywee_func(CYWEE_MSG_TYPE_ACTIVITY_UPDATE,&c_activity_result_t,sizeof(cywee_activity_result_t)); -- 2.17.1