From bdb4facca5649e1a73bae6afd019188636cbf4ed Mon Sep 17 00:00:00 2001 From: penglei <1624952103@qq.com> Date: Mon, 17 Jun 2024 19:14:50 +0800 Subject: [PATCH] =?utf8?q?=E8=A1=A5=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../fd230/fs/system/ReBoot/6S24027.bin | 2 +- .../fd230/fs/system/ReBoot/6S24028.bin | 2 +- .../fd230/fs/system/ReBoot/6S24029.bin | 2 +- .../drivers/peripheral/cywee/Inc/cywee_hal.h | 2 +- .../peripheral/cywee/service/cywee_service.c | 6 +++--- .../drivers/peripheral/cywee/src/main_dml.c | 20 ++++--------------- .../peripheral/ppg/service/ppg_service.cpp | 2 +- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin index 4ceea62cd..d04cbd239 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24027.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f7b36b876abdd998b2927fd5c7383fa59f0d829d43a8daedfb51e897f561fca +oid sha256:5308e5feca09ca15036164a04543287b350a02186e4681299394fed681ac0dca size 146040 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin index 36626a1a0..8f652493f 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24028.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f6a67b9062aaa46eff812864455a1646cb6cf8e11d9a3514a0fbf69622e63705 +oid sha256:d4505667567257525d90db975552c8ae2e9757e606025497df6878f2e3dd99dd size 146040 diff --git a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin index 441c2a7ea..4fb68c2eb 100644 --- a/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin +++ b/code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/system/ReBoot/6S24029.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0941d6e7be59b6279b221bc91164b07243f6b0cafeb999d8a1f738d878d97cdb +oid sha256:e08795fdde6362abb0f7aa9bac7a6587cdf7d79ee73dd5284a7c2990d5c15567 size 146040 diff --git a/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h b/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h index 905d38cea..cc96fc6c4 100644 --- a/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h +++ b/code/sdk/drivers/peripheral/cywee/Inc/cywee_hal.h @@ -507,7 +507,7 @@ void cywee_hrs_wearstatus_update(int hrs_data,int wearstatus); void cywee_set_user_info(int user_info[5]); void cywee_get_sleep_data(void); void cywee_reset_daily_data(void); -void cywee_inactivity_mode_change(int mode,int enable); +void cywee_inactivity_mode_change(int mode); void cywee_activity_mode_change(int mode); void cywee_time_sync(void); void cywee_hand_updown_switch(int cmd); diff --git a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c index f79e13f1d..32af17bfb 100644 --- a/code/sdk/drivers/peripheral/cywee/service/cywee_service.c +++ b/code/sdk/drivers/peripheral/cywee/service/cywee_service.c @@ -337,15 +337,15 @@ static void cywee_service_check_task(void const *arg) break; case CYWEE_SERVICE_CMD_SEDENTARY_MODE: - cywee_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY,mail.data[0]); + cywee_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY); break; case CYWEE_SERVICE_CMD_NAP_MODE: - cywee_inactivity_mode_change(INACTIVITY_MODE_NAP,mail.data[0]); + cywee_inactivity_mode_change(INACTIVITY_MODE_NAP); break; case CYWEE_SERVICE_CMD_SLEEPING_MODE: - cywee_inactivity_mode_change(INACTIVITY_MODE_SLEEPING,mail.data[0]); + cywee_inactivity_mode_change(INACTIVITY_MODE_SLEEPING); break; case CYWEE_SERVICE_CMD_OPEN_HAND_UPDOWN: diff --git a/code/sdk/drivers/peripheral/cywee/src/main_dml.c b/code/sdk/drivers/peripheral/cywee/src/main_dml.c index 8705a79f6..cdda9ddbf 100644 --- a/code/sdk/drivers/peripheral/cywee/src/main_dml.c +++ b/code/sdk/drivers/peripheral/cywee/src/main_dml.c @@ -255,15 +255,9 @@ void activity_mode_setstatus(int cmd) CWM_SettingControl(SCL_ACTIVITY_PAUSE, &scl); } -void cywee_inactivity_mode_change(int mode,int enable) +void cywee_inactivity_mode_change(int mode) { cywee_time_sync(); - - if(enable == 0) - CWM_Sensor_Disable(IDX_ALGO_INACTIVITY_OUTPUT); - else - CWM_Sensor_Enable(IDX_ALGO_INACTIVITY_OUTPUT); - switch (mode) { //无作用 @@ -515,15 +509,9 @@ void CWM_AP_SensorListen(pSensorEVT_t sensorEVT) { { CWM_OS_dbgPrintf("CUSTOM_OFFBODY_DETECT !!! \r\n"); if((int)sensorEVT->fData[2] == 1) - { - set_keep_in_wear_det_mode(1); - send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_WEAR_MODE_TEST); - } + send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_DO_WEAR_MODE_TEST); else - { send_ppg_cmd_msg(PPG_SERVICE_CMD_TYPE_STOP_WEAR_MODE_TEST); - set_keep_in_wear_det_mode(0); - } } if((int)sensorEVT->fData[1] == CUSTOM_ON_CHARGING) @@ -997,7 +985,7 @@ int cywee_main_dml(void) // //CWM_OS_dbgPrintf("[DBG] %s %d\n", __func__,__LINE__); CWM_Sensor_Enable(IDX_ALGO_WATCH_HANDUP); CWM_Sensor_Enable(IDX_ALGO_ACTIVITY_OUTPUT); - //CWM_Sensor_Enable(IDX_ALGO_INACTIVITY_OUTPUT); + CWM_Sensor_Enable(IDX_ALGO_INACTIVITY_OUTPUT); // CWM_Sensor_Enable(IDX_ALGO_SEDENTARY); // CWM_Sensor_Enable(IDX_ALGO_SLEEP); CWM_Sensor_Enable(IDX_ACCEL); @@ -1013,7 +1001,7 @@ int cywee_main_dml(void) cywee_activity_mode_change(SPORT_ACTIVE_MODE_NORMAL); - //cywee_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY); + cywee_inactivity_mode_change(INACTIVITY_MODE_SEDENTARY); //cywee_inactivity_mode_change(INACTIVITY_MODE_SLEEPING); diff --git a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp index fc13389d5..5aa5df38b 100644 --- a/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp +++ b/code/sdk/drivers/peripheral/ppg/service/ppg_service.cpp @@ -68,7 +68,7 @@ static bool ppg_service_running_stat = false; static bool ppg_sensor_exist = false; static uint8_t wear_mode_state = 0; -static uint8_t keep_in_wear_det_mod = 0; //持续坚持 佩戴检测模式 +static uint8_t keep_in_wear_det_mod = 1; //持续坚持 佩戴检测模式 void set_keep_in_wear_det_mode(uint8_t mod) -- 2.17.1