血压

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 bb988c4..bb06c08 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.c
@@ -54,8 +54,8 @@ int * s_FR8012HAQ_blood_data = NULL;//血压数据
 int s_FR8012HAQ_blood_data_len = 0;//接收的血压数据长度
 
 #define s_FR8012HAQ_emo_data_mxa_len 8*1024  //60秒存的字节数大小
-int * s_FR8012HAQ_emo_data = NULL;//血压数据
-int s_FR8012HAQ_emo_data_len = 0;//æ\8e¥æ\94¶的血压数据长度
+char * s_FR8012HAQ_emo_data = NULL;//情绪数据
+int s_FR8012HAQ_emo_data_len = 0;//æ\83\85绪的血压数据长度
 static unsigned char s_FR8012HAQ_blood_oxygen = 0x0;//血氧
 static unsigned char s_FR8012HAQ_HRV = 0x0;//hrv
 unsigned char s_FR8012HAQ_wear_status = 1;//佩戴状态
@@ -574,8 +574,14 @@ int fr8012haq_parse_returned_data(int timeout)
     len =uart4_recv_data(UART4_buf,UART4_BUF_LEN,timeout);//读串口数据
     if(len)
     {
-        FR8012HAQ_LOG("UART4:len:%d str:%s",len,UART4_buf);
-        FR8012HAQ_LOG("%s\n", (char *)UART4_buf+110);
+        // FR8012HAQ_LOG("UART4:len:%d str:%s",len,UART4_buf);
+        // FR8012HAQ_LOG("%s\n", (char *)UART4_buf+110);
+        int print_len_tmp = len ;
+        FR8012HAQ_LOG("UART4:len:%d ",len);
+        FR8012HAQ_LOG("str:%s",UART4_buf);
+        FR8012HAQ_LOG("%s",UART4_buf+255-4);
+        FR8012HAQ_LOG("\n\n");
+
         if(strstr(UART4_buf,"\"cmd\":\"2\""))
         {
             ret = 2;
@@ -642,6 +648,7 @@ int fr8012haq_parse_returned_data(int timeout)
                 str_tmp += strlen("\"emo_data\":[");
                 char *emo_str_tmp = strstr(str_tmp,"]]");
                 num_buf_len = emo_str_tmp+1-str_tmp;
+                FR8012HAQ_LOG("emo_data:num_buf_len:%d\n",num_buf_len);
                 if(s_FR8012HAQ_emo_data_len+num_buf_len+1 < s_FR8012HAQ_emo_data_mxa_len)
                 {
                     if(s_FR8012HAQ_emo_data_len != 0)//加逗号
@@ -650,9 +657,15 @@ int fr8012haq_parse_returned_data(int timeout)
                         s_FR8012HAQ_emo_data_len++;
                     }
                     memcpy(&s_FR8012HAQ_emo_data[s_FR8012HAQ_emo_data_len],str_tmp,num_buf_len);
+                    FR8012HAQ_LOG("emo_data one:%s\n",&s_FR8012HAQ_emo_data[s_FR8012HAQ_emo_data_len]);
                     s_FR8012HAQ_emo_data_len+=num_buf_len;
                 }
-                FR8012HAQ_LOG("emo_data:%s\n",s_FR8012HAQ_emo_data);
+
+                FR8012HAQ_LOG("emo_data!!!:%s",s_FR8012HAQ_emo_data);
+                FR8012HAQ_LOG("%s",(char *)s_FR8012HAQ_emo_data+255-12);
+                FR8012HAQ_LOG("%s",s_FR8012HAQ_emo_data+255+255-12);
+                FR8012HAQ_LOG("\n");
+                FR8012HAQ_LOG("emo_data:len:%d\n",s_FR8012HAQ_emo_data_len);
                 
             }
             /*体温*/
@@ -714,6 +727,9 @@ int fr8012haq_parse_returned_data(int timeout)
             {    
                 //unsigned char hrs = 0;
                 str_tmp += strlen("\"yyl_data\":[");
+                //time
+                
+                Hal_Rtc_Gettime_Count(&yyl_out_data[yyl_out_data_len].time);
                 //timestamp
                 num_buf_len = find_c(str_tmp,'/');
                 if(num_buf_len>=sizeof(num_buf))

diff --git a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h
index a9c8b7f..23faa05 100644 (file)
--- a/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h
+++ b/2.sdk/sdk/gui/lv_drivers/indev/FR8012HAQ/fr8012haq.h
@@ -14,6 +14,7 @@
 //#define DEBUG_PPG_ONLY     // 只用IR 判断佩带和非佩戴, 靠近感应功能关闭,  但是FR8012HAQ_PROX.C要合入编译
 
 typedef struct {
+       uint32_t         time;
     uint32_t         timestamp;  
     uint32_t         areaUP;
     uint16_t         areaUPBase;