同步DS分支的库文件

diff --git a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
index 2fe4dae..e4fe59e 100644 (file)
--- a/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
+++ b/2.sdk/project/Z5_HA_K18/product/craneg_modem/config/watch/lv_watch_conf_CUSTOM.h
@@ -211,10 +211,14 @@
 #define __MMI_CUSTOM_HENGAI_HEALTH__
 #define __MMI_CUSTOM_HENGAI_HEALTH_UPLOAD_USE_TCP__
 
-#define __MMI_CUSTOM_HENGAI_TCMS__
+//#define __MMI_CUSTOM_HENGAI_TCMS__
 
 #define __MMI_CHIP_TEMPERATURE_MONITOR_SUPPORT__
 
+#define __MMI_SLEEP_FUNCTION_SUPPORT__
+#define __MMI_CUSTOM_HENGAI_SLEEP__
+
+
 
 #endif
 

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
index 5fd6f7d..defecb1 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -1260,7 +1260,9 @@ void FR8012HAQ_result_set_wear_status(unsigned char wear_status)
                s_FR8012HAQ_wear_status = 1;
         //fr8012haq_timer_cfg(TRUE);//恢复定时器
 
+       #ifdef __MMI_CUSTOM_HENGAI_TCMS__
                mmi_hengai_tcms_action();
+       #endif
                //printf("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
     }else
     {

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/my_xMotion.c b/2.sdk/sdk/gui/lv_drivers/indev/my_xMotion.c
index e92b1fd..c8df97b 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/my_xMotion.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/my_xMotion.c
@@ -799,7 +799,9 @@ int xMotion_my_init()
     xMotion_Set_Raise_Parma(0);
     xMotion_Control(SHAKE_X,ENABLE_X);//shake
     xMotion_Control(PEDOMETER_X, ENABLE_X); //pedometer
+#if FALL_ENABLE
     xMotion_Set_Fall_Parma(3);//设置灵敏度，有效范围[1~5] , 默认为 3 （最灵敏）;
+#endif
     xMotion_Control(FALL_X,ENABLE_X);// 打开跌倒检测算法
     sedentary_control(1);//0:on  1:off  2:auto
 

diff --git a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
index 3604f3a..cdfb0c9 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
+++ b/2.sdk/sdk/gui/lv_watch/mmi_protocol/mmi_protocol_fzd.c
@@ -3603,12 +3603,21 @@ bool mmi_protocol_fzd_action_hengai_activation(char * req_code)
        unsigned char * content_buff = NULL;
        unsigned int content_lenth = 256;
 
+#ifdef MMI_PROJECT_Z5_HA_K18
+       char * name = "Z5_HA_K18"; // É豸Ãû³Æ
+       char * model = "Z5_HA_K18"; // É豸ÐͺÅ
+       char * firm = "zh"; // É豸³§ÉÌ
+       char * sensor = "whale"; // ´«¸ÐÆ÷ÐͺÅ
+       uint16_t fs = 50; // ²ÉÑùÂÊ
+       char * sinklib_version = "v0.3.2.101122"; // ϳÁ¿â°æ±¾ºÅ
+#else
        char * name = "Z5_HA_K7"; // É豸Ãû³Æ
        char * model = "Z5_HA_K7"; // É豸ÐͺÅ
        char * firm = "zh"; // É豸³§ÉÌ
        char * sensor = "whale"; // ´«¸ÐÆ÷ÐͺÅ
        uint16_t fs = 50; // ²ÉÑùÂÊ
        char * sinklib_version = "v0.3.2.101122"; // ϳÁ¿â°æ±¾ºÅ
+#endif
 
        content_buff = (unsigned char *)lv_mem_alloc(content_lenth);
        if(NULL == content_buff)

diff --git a/2.sdk/sdk/product/craneg_modem/cust/xMotion/inc/xMotion.h b/2.sdk/sdk/product/craneg_modem/cust/xMotion/inc/xMotion.h
index 2fc1978..aca887c 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/cust/xMotion/inc/xMotion.h
+++ b/2.sdk/sdk/product/craneg_modem/cust/xMotion/inc/xMotion.h
@@ -33,7 +33,7 @@ Macro definitions - Algorithm Build Options
 #define ANDROID             0
 
 #define PEDOMETER_ENABLE    1
-#define FALL_ENABLE         0
+#define FALL_ENABLE         1 // 0
 #define SLEEP_ENABLE        0
 #define SEDENTARY_ENABLE    1
 #define FLIP_ENABLE         0

diff --git a/2.sdk/sdk/product/craneg_modem/cust/xMotion/lib/xMotion.a b/2.sdk/sdk/product/craneg_modem/cust/xMotion/lib/xMotion.a
index a364daf..426b4f1 100644 (file)
Binary files a/2.sdk/sdk/product/craneg_modem/cust/xMotion/lib/xMotion.a and b/2.sdk/sdk/product/craneg_modem/cust/xMotion/lib/xMotion.a differ