gengxin

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 fe32e01..989a7fc 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -1,7 +1,7 @@
 
 
 
-#include "lv_drv_conf_CUSTOM.h"
+#include "lv_drv_conf.h"
 #if USE_FR8012HAQ
 
 #include <stdio.h> 

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/HX3918/hx3918.c b/2.sdk/sdk/gui/lv_drivers/indev/HX3918/hx3918.c
index 34f03ea..d6ff906 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/HX3918/hx3918.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/HX3918/hx3918.c
@@ -1,7 +1,7 @@
 
 
 
-#include "lv_drv_conf_CUSTOM.h"
+#include "lv_drv_conf.h"
 #if USE_HX3918
 
 #include <stdio.h>

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_example.c b/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_example.c
index dedd355..d5c9e3c 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_example.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_example.c
@@ -1,4 +1,6 @@
-#include "lv_drv_conf_CUSTOM.h"
+
+
+#include "lv_drv_conf.h"
 #if USE_WMM300
 #include "whale_algo.h"
 #include <stdio.h>

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_port.c b/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_port.c
index 590264c..24fa838 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_port.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/WMM300/alg_port.c
@@ -1,5 +1,6 @@
 
-#include "lv_drv_conf_CUSTOM.h"
+
+#include "lv_drv_conf.h"
 #if USE_WMM300
 #include "whale_algo.h"
 

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 d98bef1..ebff112 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/my_xMotion.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/my_xMotion.c
@@ -7,7 +7,7 @@
 *      INCLUDES
 *********************/
 #include "my_xMotion.h"
-#include "lv_drv_conf_CUSTOM.h"
+#include "lv_drv_conf.h"
 #if USE_MY_XMOTION
 
 #include <stdio.h>
@@ -302,8 +302,8 @@ int Gsensor_xyz_len = 0;
 #define ACC_0G_X      4096//8192 //4096
 #define ACC_0G_Y      4096//8192   
 #define ACC_0G_Z      4096//8192       
-#define  FALL_DETECH_LOW_THRESHOLD 35
-#define FALL_COUNTER_THRESHOLD 7
+#define  FALL_DETECH_LOW_THRESHOLD MMI_FALL_DETECT_THRESHOLD_DEFAULT // 35
+#define FALL_COUNTER_THRESHOLD MMI_FALL_COUNTER_THRESHOLD_DEFAULT //7
 typedef struct
 {
     float x;

diff --git a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
index d55d832..b73f066 100644 (file)
--- a/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
+++ b/2.sdk/sdk/gui/lv_watch/lv_watch_res.h
@@ -1020,6 +1020,8 @@ LV_IMG_DECLARE(img_poweron_logo);
 
 #define ICON_HENGAI_BP_LEFT_ARROW           "R:/png/custom_function/ICON_HENGAI_BP_LEFT_ARROW.png"
 #define ICON_HENGAI_BP_RIGHT_ARROW           "R:/png/custom_function/ICON_HENGAI_BP_RIGHT_ARROW.png"
+#define ICON_HENGAI_BP_UP_ARROW           "R:/png/custom_function/ICON_HENGAI_BP_UP_ARROW.png"
+#define ICON_HENGAI_BP_DOWN_ARROW           "R:/png/custom_function/ICON_HENGAI_BP_DOWN_ARROW.png"
 
 #define ANIM_HENGAI_BP_MEASURE                                 "R:/gif/custom_function/ANIM_HENGAI_BP_MEASURE.gif"
 #define ANIM_HENGAI_BP_CALIBRATE                                       "R:/gif/custom_function/ANIM_HENGAI_BP_CALIBRATE.gif"

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 87603b9..77250de 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
@@ -2366,11 +2366,11 @@ bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONTACT(unsigned char * next_buff, unsi
        nv_watch_vc_contact_t t_vc_contact = {0};
        char temp_buffer[4] = {0};
        char * temp_ptr = next_buff;
-       uint8_t i = 0;
-       uint8_t t_len = 0;
+       uint16_t i = 0;
+       uint16_t t_len = 0;
        char t_content_buffer[NV_WATCH_VC_CONTACT_NUMBER_LEN] = {0};
-       uint8_t t_next = 0, t_current = 0;
-       uint8_t t_offset = 0;
+       uint16_t t_next = 0, t_current = 0;
+       uint16_t t_offset = 0;
        
        while((NULL != temp_ptr) && (i < next_buff_len))
        {
@@ -2393,7 +2393,7 @@ bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONTACT(unsigned char * next_buff, unsi
                        }
                        else if(1 == t_current) // name
                        {
-                               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+                               //PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_offset);
 
                                memset(t_content_buffer, 0x0, sizeof(t_content_buffer));
                                mmi_unicode_hex_str_to_utf8_str(temp_ptr, t_offset, t_content_buffer, &t_len);
@@ -2402,7 +2402,7 @@ bool mmi_protocol_fzd_parse_WATCH_GET_VC_CONTACT(unsigned char * next_buff, unsi
                        }
                        else // user id
                        {
-                               PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: \n", __FUNCTION__, __LINE__);
+                               //PROTOCOL_DEBUG_PRINTF("[@CHENG_DEBUG][%s][%d]: %d\n", __FUNCTION__, __LINE__, t_offset);
                                
                                memset(t_content_buffer, 0x0, sizeof(t_content_buffer));
                                mmi_unicode_hex_str_to_utf8_str(temp_ptr, t_offset, t_content_buffer, &t_len);
@@ -2584,20 +2584,14 @@ bool mmi_protocol_fzd_action_VC_CALL_RESPONSE(char * number, char * ticket, MODE
        bool result = false;
        MMI_PROTOCOL_FZD_ACTION_ENUM action = MMI_FZD_WATCH_VC_CALL_RESPONSE;
 
-       if(NULL == number) // hang up
-       {
-               result = mmi_protocol_fzd_send_without_data(action);
-       }
-       else // reject
-       {
-               unsigned char content_buff[NV_WATCH_VC_CONTACT_NUMBER_LEN + 64 + 8] = {0};
-               unsigned int content_lenth = 0;
+       unsigned char content_buff[NV_WATCH_VC_CONTACT_NUMBER_LEN + 64 + 8] = {0};
+       unsigned int content_lenth = 0;
 
        sprintf(content_buff, ",%s,%s,%d", number, ticket, type);
        content_lenth = strlen(content_buff);
 
-               result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
-       }
+       result = mmi_protocol_fzd_send_with_data(action, content_buff, content_lenth);
+
        return result;
 }
 #endif

diff --git a/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h b/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h
index 2652bf8..a1e5fea 100644 (file)
--- a/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h
+++ b/2.sdk/sdk/product/craneg_modem/config/watch/lv_drv_conf.h
@@ -17,6 +17,20 @@
 
 #if 1 // @CHENG_MODIFY
 #include "lv_drv_conf_CUSTOM.h"
+
+
+// fall detect
+#ifdef MMI_CUSTOMER_FALL_DETECT_THRESHOLD
+#define MMI_FALL_DETECT_THRESHOLD_DEFAULT              MMI_CUSTOMER_FALL_DETECT_THRESHOLD
+#else
+#define MMI_FALL_DETECT_THRESHOLD_DEFAULT              (35) // (40)
+#endif
+#ifdef MMI_CUSTOMER_FALL_COUNTER_THRESHOLD
+#define MMI_FALL_COUNTER_THRESHOLD_DEFAULT             MMI_CUSTOMER_FALL_COUNTER_THRESHOLD
+#else
+#define MMI_FALL_COUNTER_THRESHOLD_DEFAULT             (7)
+#endif
+
 #endif
 
 #if 0 // @CHENG_MODIFY