关闭就DM宏
authorp15692025051 <846603105@qq.com>
Fri, 12 Jan 2024 06:39:29 +0000 (14:39 +0800)
committerp15692025051 <846603105@qq.com>
Fri, 12 Jan 2024 06:39:29 +0000 (14:39 +0800)
更新血压模块代码

2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
2.sdk/sdk/gui/lv_watch/app_adaptor/app_adaptor_sensor_interface.c
2.sdk/sdk/product/craneg_modem/config/watch/lv_conf.h
2.sdk/sdk/product/craneg_modem/softutil/msfota/src/hallcd/msfota_hal_conf.h

index be2513d..7d6960f 100644 (file)
@@ -23,7 +23,9 @@
 
 char fr8012haq_ppg_timerout_flag = 0;
 static void * fr8012haq_ppg_timer = NULL;
-
+char is_HA_activate = 0;//恒爱算法库是否激活
+unsigned char HA_key_code[128+1] = {0};
+unsigned char HA_req_code[128+1] = {0};
 char fr8012haq_agc_timerout_flag = 0;
 static void * fr8012haq_agc_timer = NULL;
 /************************simware add start***********************************/
@@ -370,7 +372,7 @@ void fr8012haq_timerout_cb(void)
     //FR8012HAQ_LOG("fr8012haq_timerout_cb\n");
     OS_Activate_HISR(&fr8012haq_hisr_ref);
 }
-void fr8012haq_timer_cfg(bool en)    //320ms
+void fr8012haq_timer_cfg(bool en)    
 {
     //FR8012HAQ_LOG("fr8012haq_timer_cfg :%d!!!!!!\n\n",en);
     if(en)
@@ -481,7 +483,7 @@ void FR8012HAQ_test(uint32_t mode)
                 break;
             }
         }
-        if(fr8012haq_parse_returned_data() == 1)//必须解析到执行成功
+        if(fr8012haq_parse_returned_data(60) == 1)//必须解析到执行成功
             break;
         UOS_SleepMs(100);
     }
@@ -540,10 +542,10 @@ static void fr8012haq_stop(void)
 #define DATA_HANDLE (1<<24)
 #define UART4_BUF_LEN 2*1024
 
-int fr8012haq_parse_returned_data(void)
+int fr8012haq_parse_returned_data(int timeout)
 {
     static char *UART4_buf = NULL;
-    char *tem_data = NULL;
+    char *str_tmp = NULL;
     char num_buf[20] = {0};
     unsigned char num_buf_len = 0;
     int i = 0,ret = -1;
@@ -553,102 +555,133 @@ int fr8012haq_parse_returned_data(void)
     if(UART4_buf == NULL)
         return -1;
     memset(UART4_buf,0,UART4_BUF_LEN);
-    len =uart4_recv_data(UART4_buf,UART4_BUF_LEN,60);
+    len =uart4_recv_data(UART4_buf,UART4_BUF_LEN,timeout);//读串口数据
     FR8012HAQ_LOG("fr8012haq_parse_returned_data:len:%d!!!!\n",len);
     if(len)
     {
         FR8012HAQ_LOG("UART4:len:%d str:%s",len,UART4_buf);
         FR8012HAQ_LOG("%s\n", (char *)UART4_buf+110);
-
-        /*心率*/
-        tem_data = strstr(UART4_buf,"\"hrs_data\":\"");
-        if(tem_data)
+        if(strstr(UART4_buf,"\"cmd\":\"2\""))
         {
-            unsigned char hrs = 0;
-            tem_data += strlen("\"hrs_data\":\"");
-            num_buf_len = find_c(tem_data,'\"');
-            if(num_buf_len>=sizeof(num_buf))
-                num_buf_len = sizeof(num_buf)-1;
-            memcpy(num_buf,tem_data,num_buf_len);
-            hrs = atoi(num_buf);
-            FR8012HAQ_result_set_heart_rate(hrs);
             ret = 2;
-        }
-        /*血氧*/
-        tem_data = strstr(UART4_buf,"\"spo2_data\":\"");
-        if(tem_data)
-        {  
-            unsigned char spo2 = 0;
-            tem_data += strlen("\"spo2_data\":\"");
-            num_buf_len = find_c(tem_data,'\"');
-            if(num_buf_len>=sizeof(num_buf))
-                num_buf_len = sizeof(num_buf)-1;
-            memcpy(num_buf,tem_data,num_buf_len);
-            spo2 = atoi(num_buf);
-            FR8012HAQ_result_set_blood_oxygen(spo2);
-            ret = 2;
-        }
-        /*血压*/
-        tem_data = strstr(UART4_buf,"\"bp_data\":\"");
-        if(tem_data)
-        {
-            tem_data += strlen("\"bp_data\":\"");
-            num_buf_len = find_c(tem_data,'\"');
-            FR8012HAQ_LOG("bp:hex_str:%s\n",tem_data);
-            FR8012HAQ_LOG("bp:int:");
-            for(i=0;i<num_buf_len;i+=6)
+            /*心率*/
+            str_tmp = strstr(UART4_buf,"\"hrs_data\":\"");
+            if(str_tmp)
             {
-                memcpy(num_buf,&tem_data[i],6);
-                num_buf[6] = 0;
-                //FR8012HAQ_LOG("num_buf:0x%s\n",num_buf);
-                if(s_FR8012HAQ_blood_data && s_FR8012HAQ_blood_data_len < s_FR8012HAQ_blood_data_mxa_len/4)
+                unsigned char hrs = 0;
+                str_tmp += strlen("\"hrs_data\":\"");
+                num_buf_len = find_c(str_tmp,'\"');
+                if(num_buf_len>=sizeof(num_buf))
+                    num_buf_len = sizeof(num_buf)-1;
+                memcpy(num_buf,str_tmp,num_buf_len);
+                hrs = atoi(num_buf);
+                FR8012HAQ_result_set_heart_rate(hrs);
+            }
+            /*血氧*/
+            str_tmp = strstr(UART4_buf,"\"spo2_data\":\"");
+            if(str_tmp)
+            {  
+                unsigned char spo2 = 0;
+                str_tmp += strlen("\"spo2_data\":\"");
+                num_buf_len = find_c(str_tmp,'\"');
+                if(num_buf_len>=sizeof(num_buf))
+                    num_buf_len = sizeof(num_buf)-1;
+                memcpy(num_buf,str_tmp,num_buf_len);
+                spo2 = atoi(num_buf);
+                FR8012HAQ_result_set_blood_oxygen(spo2);
+            }
+            /*血压*/
+            str_tmp = strstr(UART4_buf,"\"bp_data\":\"");
+            if(str_tmp)
+            {
+                str_tmp += strlen("\"bp_data\":\"");
+                num_buf_len = find_c(str_tmp,'\"');
+                FR8012HAQ_LOG("bp:hex_str:%s\n",str_tmp);
+                FR8012HAQ_LOG("bp:int:");
+                for(i=0;i<num_buf_len;i+=6)
                 {
-                    s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len] = strtol(num_buf, NULL, 16);
-                    if(s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]>=DATA_HANDLE/2)
+                    memcpy(num_buf,&str_tmp[i],6);
+                    num_buf[6] = 0;
+                    //FR8012HAQ_LOG("num_buf:0x%s\n",num_buf);
+                    if(s_FR8012HAQ_blood_data && s_FR8012HAQ_blood_data_len < s_FR8012HAQ_blood_data_mxa_len/4)
                     {
-                        s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]-=DATA_HANDLE;
+                        s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len] = strtol(num_buf, NULL, 16);
+                        if(s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]>=DATA_HANDLE/2)
+                        {
+                            s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]-=DATA_HANDLE;
+                        }
+                        FR8012HAQ_LOG("%d ",s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]);
+                        //FR8012HAQ_LOG("s_FR8012HAQ_blood_data[%d]:%x\n",s_FR8012HAQ_blood_data_len,s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]);
+                        s_FR8012HAQ_blood_data_len++;
                     }
-                    FR8012HAQ_LOG("%d ",s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]);
-                    //FR8012HAQ_LOG("s_FR8012HAQ_blood_data[%d]:%x\n",s_FR8012HAQ_blood_data_len,s_FR8012HAQ_blood_data[s_FR8012HAQ_blood_data_len]);
-                    s_FR8012HAQ_blood_data_len++;
+                }  
+                FR8012HAQ_LOG("\n");
+            }
+            /*体温*/
+            str_tmp = strstr(UART4_buf,"\"temper_data\":\"");
+            if(str_tmp)
+            {
+                
+                //unsigned char hrs = 0;
+                str_tmp += strlen("\"temper_data\":\"");
+                num_buf_len = find_c(str_tmp,'\"');
+                if(num_buf_len>=sizeof(num_buf))
+                    num_buf_len = sizeof(num_buf)-1;
+                memcpy(num_buf,str_tmp,num_buf_len);
+                temp = atof(num_buf); 
+            }
+            /*佩戴*/
+            str_tmp = strstr(UART4_buf,"\"wear_data\":\"");
+            if(str_tmp)
+            {    
+                //unsigned char hrs = 0;
+                str_tmp += strlen("\"wear_data\":\"");
+                if(*str_tmp == '0')
+                {
+                    FR8012HAQ_result_set_wear_status(0);
+                }else
+                {
+                    FR8012HAQ_result_set_wear_status(1);
                 }
-            }  
-            FR8012HAQ_LOG("\n");
-            ret = 2;
-        }
-        /*体温*/
-        tem_data = strstr(UART4_buf,"\"temper_data\":\"");
-        if(tem_data)
-        {
+            }
+            /*恒爱算法库是否激活*/
+            str_tmp = strstr(UART4_buf,"\"is_HA_activate\":\"");
+            if(str_tmp)
+            {    
+                //unsigned char hrs = 0;
+                str_tmp += strlen("\"is_HA_activate\":\"");
+                if(*str_tmp == '1')
+                    is_HA_activate = 1;
+                else
+                    is_HA_activate = 0;
+            }
+            /*恒爱算法库请求码返回*/
+            str_tmp = strstr(UART4_buf,"\"HA_req_code\":\"");
+            if(str_tmp)
+            {    
+                //unsigned char hrs = 0;
+                memset(HA_req_code,0,sizeof(HA_req_code));
+                str_tmp += strlen("\"HA_req_code\":\"");
+                num_buf_len = find_c(str_tmp,'\"');
+                if(num_buf_len >= sizeof(HA_req_code))
+                {
+                    num_buf_len = sizeof(HA_req_code)-1;
+                }
+                memcpy(HA_req_code,str_tmp,num_buf_len);
+            }
             
-            //unsigned char hrs = 0;
-            tem_data += strlen("\"temper_data\":\"");
-            num_buf_len = find_c(tem_data,'\"');
-            if(num_buf_len>=sizeof(num_buf))
-                num_buf_len = sizeof(num_buf)-1;
-            memcpy(num_buf,tem_data,num_buf_len);
-            temp = atof(num_buf); 
-            ret = 2; 
         }
-        /*佩戴*/
-        tem_data = strstr(UART4_buf,"\"wear_data\":\"");
-        if(tem_data)
-        {    
-            //unsigned char hrs = 0;
-            tem_data += strlen("\"wear_data\":\"");
-            if(*tem_data == '0')
-            {
-                FR8012HAQ_result_set_wear_status(0);
-            }else
+        if(strstr(UART4_buf,"\"cmd\":\"3\""))
+        {  
+            if(strstr(UART4_buf,"\"HA_activate\":\"1\""))
             {
-                FR8012HAQ_result_set_wear_status(1);
+                ret = 3;
             }
-            ret = 2;
         }
         /*********************************************/
         /*执行工作模式成功*/
-        tem_data = strstr(UART4_buf,"\"cmd\":\"1\",\"work_mode\":\"1\"");
-        if(tem_data)
+        str_tmp = strstr(UART4_buf,"\"cmd\":\"1\",\"work_mode\":\"1\"");
+        if(str_tmp)
         {
             ret = 1;
         }
@@ -684,11 +717,11 @@ void fr8012haq_process_data(uint32_t *process_data)
             break;
         case WEAR_MODE:
             /* code */
-            uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"wear\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"wear\"}"));
+            //uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"wear\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"wear\"}"));
             break;
         case HRV_MODE:
             /* code */
-            uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"hrv\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"hrv\"}"));
+            //uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"hrv\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"hrv\"}"));
             break;
         // case YYL_MODE:
         //     /* code */
@@ -699,9 +732,74 @@ void fr8012haq_process_data(uint32_t *process_data)
     }
     //FR8012HAQ_LOG("fr8012haq_process_data2:%d!!!!\n",FR8012HAQ_jobs_mode);
     
-    fr8012haq_parse_returned_data();
+    fr8012haq_parse_returned_data(60);
    
 }
+//返回0未激活,联网后判断一次是否激活,没激活需要执行激活参数
+char get_is_HA_activate(void)
+{
+    return is_HA_activate;
+}
+//获取激活码
+char *get_HA_req_code(void )
+{
+    if(strlen(HA_req_code)>2 && is_HA_activate == 0)
+        return HA_req_code;
+    else
+        return NULL;
+}
+//激活恒爱库,返回0失败,返回1成功
+int HA_lib_activate(char *key_code)
+{
+    char send_data[256] = {0};
+    int send_data_len = 0,ret = 0;
+    char count = 5;
+    strncpu(HA_key_code,sizeof(HA_key_code),key_code);
+    if(strlen(HA_key_code)>2)
+    {
+        while(count -- )
+        {
+            send_data_len = snprintf(send_data,sizeof(send_data),"{\"cmd\":\"3\",\"set_HA_key_code\":\"%s\"}\n",HA_key_code);
+            uart4_send_data(send_data,send_data_len);
+            if(fr8012haq_parse_returned_data(500)==3)
+            {
+                break;
+                ret = 1;
+            }
+                
+        }
+        
+    }
+    return ret;
+}
+//恒爱算法库初始化
+void HA_lib_init(void)
+{
+    char count = 5;
+    char send_data[100] = {0};
+    int send_data_len = 0;
+    //获取sensor恒爱库激活状态
+    uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"is_HA_activate\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"is_HA_activate\"}"));
+    fr8012haq_parse_returned_data(500);
+    if(get_is_HA_activate() == 0)//没激活,需要激活
+    {
+        //发送IMEI号
+        char imei[16] = {0};
+           app_adp_get_imei_req(imei);
+        send_data_len = snprintf(send_data,sizeof(send_data),"{\"cmd\":\"3\",\"set_IMEI\":\"%s\"}\n",imei);
+        uart4_send_data(send_data,send_data_len);
+        fr8012haq_parse_returned_data(500);
+        //获取HA_req_code
+        while(count--)
+        {
+            
+            uart4_send_data("{\"cmd\":\"2\",\"get_data\":\"HA_req_code\"}",sizeof("{\"cmd\":\"2\",\"get_data\":\"HA_req_code\"}\n"));
+            if(fr8012haq_parse_returned_data(500)==2)
+                break;
+        }
+        
+    }
+}
 void hal_fr8012haq_int_init(void)
 {
     // code implement by user
@@ -710,7 +808,6 @@ void hal_fr8012haq_int_init(void)
     mfp_config(fr8012haq_mfp_cfgs);
     fr8012haq_en_gpio_init();
     FR8012HAQ_LOG("FR8012HAQ ID : 0x%02x\n",get_fr8012haq_id());
-    
 }
 void Fr8012haq_Init(void)
 {
@@ -730,6 +827,7 @@ void Fr8012haq_Init(void)
         sensor_drv_register(FR8012HAQ_ID,&sensor_drv);
         FR8012HAQ_LOG("Fr8012haq_Init1.1!!!!\n\n");
     }
+    uart4_debug();
     FR8012HAQ_LOG("Fr8012haq_Init2!!!!\n\n");
     fr8012haq_create_hisr();
     FR8012HAQ_LOG("Fr8012haq_Init3!!!!\n\n");
@@ -737,6 +835,7 @@ void Fr8012haq_Init(void)
     FR8012HAQ_LOG("Fr8012haq_Init4!!!!\n\n");
     FR8012HAQ_restart();
     uart4_debug();
+    HA_lib_init();
     // while(1)
     // {
     //     UOS_SleepMs(1000);
index bd8a578..6a0e34c 100644 (file)
@@ -153,17 +153,21 @@ uint32_t mmi_sleep_roll_number_get(void)
 
 
 // heart sensor
+extern char is_wearingstatus ;
 unsigned char mmi_hsensor_measure_get_wear_status(void)
 {
+    unsigned char wear = 1;
 #if USE_HX3918
-    return HX3918_result_get_wear_status();
+    wear = HX3918_result_get_wear_status();
 #elif USE_FR8012HAQ
-    return FR8012HAQ_result_get_wear_status();
+    wear = FR8012HAQ_result_get_wear_status();
 #elif USE_WMM300
-    return wmm300_result_get_wear_status();
+    wear= wmm300_result_get_wear_status();
 #else
-    return 1;
+    wear = 1;
 #endif
+    is_wearingstatus = wear;
+    return wear;
 }
 
 void mmi_hsensor_measure_value_clear(void)
index 2702ec9..6034b4c 100644 (file)
@@ -847,7 +847,7 @@ extern int uart_printf(const char* fmt, ...);
 #define USE_LV_WATCH_SD_AUTO_MOUNT 0
 
 /* DM */
-#define USE_LV_DM 1
+#define USE_LV_DM 0
 
 /*multi-task safe setting for lv_task, exclude other lv_objx */
 #define LV_TASK_MULTITASK_SAFE
index 14394cd..c92247c 100644 (file)
@@ -835,7 +835,7 @@ extern int uart_printf(const char* fmt, ...);
 #define USE_LV_WATCH_SD_AUTO_MOUNT 1
 
 /* DM */
-#define USE_LV_DM 1
+#define USE_LV_DM 0
 
 /* WLAN */
 #define USE_LV_WLAN 0