From: @CHENG <2393524978@qq.com> Date: Thu, 14 Nov 2024 01:25:15 +0000 (+0800) Subject: k18小板关闭活体 X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=dd1b0e83a3b8e9aa91c7ce98a09e6eca6c0ed299;p=mirrors%2FASR3603_Z5.git k18小板关闭活体 --- diff --git a/1.doc/K18/BLE_Watch/keil/VC9202/vc9202_common.h b/1.doc/K18/BLE_Watch/keil/VC9202/vc9202_common.h index 833d750c..4d51681d 100644 --- a/1.doc/K18/BLE_Watch/keil/VC9202/vc9202_common.h +++ b/1.doc/K18/BLE_Watch/keil/VC9202/vc9202_common.h @@ -32,7 +32,7 @@ ***************************************************************************/ #define VC9202_CFG_WEAR_DETECTION (FUNC_ENABLE) // FUNC_DISABLE FUNC_ENABLE #define VC9202_CFG_WEAR_DEFAULT_STATUS (WEAR_IS_HOLD) //1 is default wear,0 is default not wear WEAR_IS_HOLD WEAR_IS_DROP -#define VC9202_CFG_WEAR_BIO_EN (FUNC_ENABLE) +#define VC9202_CFG_WEAR_BIO_EN (FUNC_DISABLE) // (FUNC_ENABLE) #define VC9202_CFG_WEAR_ALG_EN (FUNC_DISABLE) //开启心率摘下功能,必须开启满足(ATC|BIO)为真 #define VC9202_CFG_WEAR_ACT_EN (FUNC_DISABLE) #define VC9202_CFG_WEAR_THRESHOLD_EN (FUNC_ENABLE) //绝对阈值宏开关 diff --git a/1.doc/K18/BLE_Watch/keil/uart.c b/1.doc/K18/BLE_Watch/keil/uart.c index 9798e032..21056714 100644 --- a/1.doc/K18/BLE_Watch/keil/uart.c +++ b/1.doc/K18/BLE_Watch/keil/uart.c @@ -15,7 +15,7 @@ char send_step_data_flag= 0;//step数据标致位 char send_wear_data_flag= 0;//wear数据标致位 uint8_t *uart0_rivce_data = NULL; //uint8_t uart0_rivce_data[UART_READ_MAX] ; -char *Versions = "202409021459-v0.5.3.041924"; +char *Versions = "202411110950-v0.5.3.041924"; // "202409021459-v0.5.3.041924"; int uart0_data_len =0; static int32_t system_curr_time = 0;//设置时间的时候保存的系统运行时间 diff --git a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c index 0bc2ccb9..b8ff214d 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c +++ b/2.sdk/sdk/gui/lv_watch/lv_apps/custom_function/heng_ai_sleep_k18.c @@ -95,7 +95,7 @@ void mmi_hengai_k18_sleep_task_create(void) MMI_WATCH_SLEEP_MSG_QUEUE_SIZE, MMI_WATCH_SLEEP_TASK_STACK_SIZE, MMI_WATCH_SLEEP_TASK_PRIORITY, - "mmi_hengai_k18_sleep_task"); + "k18_sleep"); printf("[@CHENG_DEBUG][%s][%d]: task_id=0x%x\n", __FUNCTION__, __LINE__, s_hengai_k18_sleep_task_id); } diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch.c b/2.sdk/sdk/gui/lv_watch/lv_watch.c index 7fa75a84..1c725559 100644 --- a/2.sdk/sdk/gui/lv_watch/lv_watch.c +++ b/2.sdk/sdk/gui/lv_watch/lv_watch.c @@ -119,7 +119,9 @@ static void mmi_data_init_after_watch_create(void) // create task mmi_protocol_timing_task_create(); +#ifdef __MMI_ZHSX_SUPPORT_HEALTH_SENSOR__ mmi_health_measure_task_init(); +#endif #ifdef __MMI_WECHAT_SUPPORT__ mmi_wechat_msg_info_init();