修改ble打印 及错误判断

diff --git a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
index 0381dc7..8faa4ec 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
+++ b/code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
@@ -1076,7 +1076,7 @@ const char *get_health_HEART_data_path( uint8_t day)
         JSON_F_buf=NULL;
         
     }
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "!!!!!!!!!!!%x strlen(buf):%d",JSON_F_buf,strlen(buf));
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "!!!!!!!!!!!%x strlen(buf):%d",JSON_F_buf,strlen(buf));
     uint8_t len = PATH_MAX_LEN+1;
     JSON_F_buf=(char *)malloc(len);
     memset(JSON_F_buf,0,len);
@@ -1084,7 +1084,7 @@ const char *get_health_HEART_data_path( uint8_t day)
     {
         strcpy(JSON_F_buf,buf);
     }
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",JSON_F_buf);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s",JSON_F_buf);
    #endif
    return JSON_F_buf;
 }
@@ -1106,7 +1106,7 @@ const char *get_health_OXYGEN_data_path(uint8_t day)
         JSON_F_buf=NULL;
         
     }
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "!!!!!!!!!!!%x strlen(buf):%d",JSON_F_buf,strlen(buf));
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "!!!!!!!!!!!%x strlen(buf):%d",JSON_F_buf,strlen(buf));
     uint8_t len = PATH_MAX_LEN+1;
     JSON_F_buf=(char *)malloc(len);
     memset(JSON_F_buf,0,len);
@@ -1114,7 +1114,7 @@ const char *get_health_OXYGEN_data_path(uint8_t day)
     {
         strcpy(JSON_F_buf,buf);
     }
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "%s",JSON_F_buf);
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "%s",JSON_F_buf);
    #endif
    return JSON_F_buf;
 }

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
index 075b798..56255aa 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
@@ -323,11 +323,12 @@ static bool Check_CRC(uint8_t *data,uint16_t len,uint8_t crcvalue)//计算20byte
     \r
     crcbuf = get_crc_from_lrc(lrcValue); \r
 \r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Check_CRC lrc: 0x%x ,ret crc: 0x%x ,crcvalue 0x%x , len:%d\r\n",lrcValue,crcbuf,crcvalue,len);\r
-\r
+    #ifdef BLE_LOG\r
+     WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Check_CRC lrc: 0x%x ,ret crc: 0x%x ,crcvalue 0x%x , len:%d\r\n",lrcValue,crcbuf,crcvalue,len);\r
+    #endif\r
        if(crcbuf == crcvalue)\r
     {\r
-        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "Check_CRC true:\r\n");\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Check_CRC true:\r\n");\r
            return true;\r
     }\r
        else{\r
@@ -368,7 +369,9 @@ static cJSON *cjson_json_tmp = NULL;
 errcode_t sendBleData(uint8_t *buf,uint16_t len)\r
 {\r
     errcode_t ret = ERRCODE_FAIL;\r
-    printf("bigDataBufState:%d and  sendbigDataBufState %d\r\n",bigDataBufState,sendbigDataBufState);\r
+    #ifdef BLE_LOG\r
+        printf("bigDataBufState:%d and  sendbigDataBufState %d\r\n",bigDataBufState,sendbigDataBufState);\r
+    #endif\r
     if(bigDataBufState == true || sendbigDataBufState == true)return ERRCODE_FAIL; //在手表发送分包数据时 手表不允许发指令给app\r
     if(Bleconnect == true )\r
     {\r
@@ -2385,7 +2388,9 @@ void getAPPaddressbook(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalDat
 void type2AE4Data(ble_read_data *buffer_handle,uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *totalData,uint8_t crcvalue)\r
 {\r
     uint16_t typeID = buf_cmd[1]*256+buf_cmd[2];\r
+     #ifdef BLE_LOG\r
     printf("type2AE4Data typeID:0x%04X\r\n",typeID);\r
+    #endif\r
     switch (typeID) //ID\r
     {\r
         case USER_INFOR_CMD://app下发的获取用户信息\r
@@ -4518,7 +4523,9 @@ void GetDMPModeCmd(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,ui
 void type2AE3Data(ble_read_data *buffer_handle,uint8_t *cmd_buf ,uint8_t *data,uint16_t datalen,uint8_t *totaldata,uint8_t crcvalue)\r
 {\r
     uint16_t cmd = cmd_buf[1]*256+cmd_buf[2];\r
+     #ifdef BLE_LOG\r
     printf("typeHexOneData:0x%04X\r\n",cmd);\r
+    #endif\r
     // uint8_t typeID = cmd_buf[2];\r
     switch (cmd)\r
     {\r
@@ -4753,7 +4760,9 @@ void Read_JSON_file_buf_send_bin_Data(uint8_t day, uint8_t num,uint16_t id,char
     if(fp==NULL)\r
     {\r
         send_big_data(1,NULL,0,0,1,1,id,1);\r
-        printf("打开文件失败 %s \r\n",path);\r
+        #ifdef BLE_LOG\r
+            printf("打开文件失败 %s \r\n",path);\r
+        #endif\r
         if(path)\r
         {\r
             ym_free(path);\r
@@ -4779,10 +4788,14 @@ void Read_JSON_file_buf_send_bin_Data(uint8_t day, uint8_t num,uint16_t id,char
         path = NULL;\r
     }\r
     cJSON *heart_data=cJSON_Parse(buf);\r
-    printf("读文件\r\n");\r
+    #ifdef BLE_LOG\r
+        printf("读文件\r\n");\r
+    #endif\r
     if(heart_data==NULL)\r
     {\r
-        printf("解析失败\r\n");\r
+        #ifdef BLE_LOG\r
+            printf("解析失败\r\n");\r
+        #endif\r
         send_big_data(1,NULL,0,0,1,1,id,1);\r
         sendbigDataBufState = false;//分包同步数据不允许打断\r
         return;\r
@@ -4807,8 +4820,10 @@ void Read_JSON_file_buf_send_bin_Data(uint8_t day, uint8_t num,uint16_t id,char
         uint32_t timestamp=cJSON_GetObjectItem(heart_data_item,"timestamp")->valueint;\r
         uint8_t value=cJSON_GetObjectItem(heart_data_item,"value")->valueint;\r
        // value =450;\r
+        #ifdef BLE_LOG\r
         printf("value :%d\r\n",value);\r
         printf("timestamp :%d\r\n",timestamp);\r
+        #endif\r
         memcpy(send_buf+send_len,&timestamp,timeBit);\r
         send_len+=timeBit;\r
         memcpy(send_buf+send_len,&value,dataBit);\r
@@ -4819,7 +4834,9 @@ void Read_JSON_file_buf_send_bin_Data(uint8_t day, uint8_t num,uint16_t id,char
             //发送数据\r
             if(item_num-1==i)\r
             {\r
-                printf("sendbuf :%s sendbuf_len%d\r\n",send_buf,send_len);\r
+                #ifdef BLE_LOG\r
+                    printf("sendbuf :%s sendbuf_len%d\r\n",send_buf,send_len);\r
+                #endif\r
                 send_big_data(1,send_buf,send_len,item_num*5,Packet_id,packet_total,id,1);\r
                 if(send_buf)\r
                 {\r
@@ -4899,8 +4916,9 @@ void Read_BIN_file_buf_send_bin_Data(uint8_t day,uint32_t pack_size,uint16_t id)
            }\r
            else\r
            {\r
-                \r
-                printf("%d %d %d %d\r\n",data_len,surplus_len,pack_id,pack);\r
+                #ifdef BLE_LOG\r
+                    printf("%d %d %d %d\r\n",data_len,surplus_len,pack_id,pack);\r
+                #endif\r
                 send_big_data(1,data+offset,surplus_len,data_len,pack_id,pack,id,1);\r
                 break;\r
            }\r
@@ -4947,11 +4965,12 @@ void readDevDataBle(uint16_t cmd,uint8_t *data,uint16_t len,uint8_t *totalData,u
                 {\r
                     num=96;\r
                 }\r
+                #ifdef BLE_LOG\r
                 printf("同步心率数据，每包最多：%d 条数据 data:%d %d\r\n",num,data[0],len);\r
+                #endif\r
                 Read_JSON_file_buf_send_bin_Data(data[0],num,0x40,"heart_data_list");\r
                 break;\r
             case 0x41://同步血氧历史数据\r
-                printf("同步血氧数据\r\n");\r
                 EACH_DATA_LEN = SPO2_DATA_LEN;\r
                 num=(ble_nus_max_data_len-18)/EACH_DATA_LEN;\r
                 Read_JSON_file_buf_send_bin_Data(data[0],num,0x41,"spo2_data_list");\r
@@ -5389,7 +5408,9 @@ void CustomEventPublish_TOPIC_EVENT_MESSAGENOTE(void)
 void type2AE1Data(uint8_t *buf_cmd,uint8_t *data,uint16_t datalen,uint8_t *totalData,uint8_t crcvalue)\r
 {\r
     uint16_t typeID = buf_cmd[1]*256+buf_cmd[2];\r
+     #ifdef BLE_LOG\r
     printf("type2AE1Data typeID:0x%4X\r\n",typeID);\r
+    #endif\r
     switch (typeID) //ID\r
     {\r
         case ANDROID_ANCS_CMD://\r
@@ -5997,7 +6018,9 @@ void decode_file_checksum(ble_read_data *buffer_handle)
 void type2AE0Data(ble_read_data *buffer_handle)\r
 {\r
     uint16_t typeID = buffer_handle->cmd_header.cmdtype*256 + buffer_handle->cmd_header.cmdid;\r
-    printf("type2AE0Data typeID:0x%04X datalen %d\r\n",typeID,buffer_handle->totalDataLen);\r
+    #ifdef BLE_LOG\r
+        printf("type2AE0Data typeID:0x%04X datalen %d\r\n",typeID,buffer_handle->totalDataLen);\r
+    #endif\r
     bool checkcrc = (get_crc_from_lrc(buffer_handle->lrcvalue) == buffer_handle->crcvalue);\r
     uint32_t num;\r
     if ( (checkcrc == true ) || \r
@@ -6092,6 +6115,7 @@ void type2AE0Data(ble_read_data *buffer_handle)
 \r
 void dumpHeader(msg_header_t *msgheader)\r
 {\r
+    #ifdef BLE_LOG\r
     printf("dumpHeader(%d) direction %02X, type %02X, id %02X, package_count %d, total_data_len %d,package_index %d , package_len %d\n",\r
     sizeof(msg_header_t),\r
     msgheader->direction,  \r
@@ -6102,6 +6126,7 @@ void dumpHeader(msg_header_t *msgheader)
     msgheader->package_index,  \r
     msgheader->package_len  \r
     );\r
+    #endif\r
 }\r
 \r
 errcode_t check_header(msg_header_t *header )\r
@@ -6239,12 +6264,14 @@ errcode_t handle_recv_file(ble_read_data *buffer_handle,uint8_t *data, uint16_t
 void bleLongRecvData(ble_read_data *buffer_handle,uint8_t *data, uint16_t data_size,uint8_t *buf_cmd,uint8_t *totalData,uint8_t crcvalue)//buf_cmd 指令前17个字节数据\r
 {\r
     uint8_t type=buf_cmd[1];\r
+    #ifdef BLE_LOG\r
     printf("type:%d %d data_size:%d data:%x crcvalue:%x\r\n",\r
     buffer_handle->cmd_header.cmdtype,\r
     buffer_handle->cmd_header.cmdid,\r
     data_size,\r
     data,\r
     crcvalue);\r
+    #endif\r
 \r
     switch (type)\r
     {\r
@@ -6476,14 +6503,17 @@ void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle)
     if (event_size < sizeof(msg_header_t))\r
     {\r
         printf("event size (%d) is less than msg_header_t (%d) ",event_size,sizeof(msg_header_t));\r
-        return ;\r
+       // return ;\r
     }\r
     if(sendbigDataBufState == true)//正在发送大数据不接收任何app指令下发的数据\r
     {\r
         printf("sendbigDataBufState :(%d)",sendbigDataBufState);\r
-        return;\r
+        \r
+    //     return;\r
     }\r
-    printf("bleDataRecv handle:%d\r\n",handle); \r
+    #ifdef BLE_LOG\r
+        printf("bleDataRecv handle:%d\r\n",handle); \r
+    #endif\r
     int last_unused_handle_index = -1;\r
     int handle_index_found = -1;\r
     for(int i = 0;i<MAX_HANDLE_NUM;i++)\r
@@ -6507,7 +6537,7 @@ void bleDataRecv(uint8_t *totalData, uint16_t event_size,uint16_t handle)
 \r
     if(handle_index_found>=0)\r
     {\r
-        printf("handle_index_found:index %d addr %X\r\n",handle_index_found,&handle_l[handle_index_found]); \r
+       // printf("handle_index_found:index %d addr %X\r\n",handle_index_found,&handle_l[handle_index_found]); \r
         handle_l[handle_index_found].handle = handle;\r
         combine_data_internal(&handle_l[handle_index_found],totalData,event_size);\r
     }\r

diff --git a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
index 998ee66..402d075 100644 (file)
--- a/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
+++ b/code/sdk/application/wearable/service/ble_service/bleservice/bleService.c
@@ -981,7 +981,7 @@ errcode_t svr_ble_bt_gatts_noyify(uint8_t *data, uint16_t data_len)//这里是
     data_info.value = data;\r
     data_info.value_len = data_len;\r
     errcode_t ret = gatts_notify_indicate(g_ble_server_id, g_ble_conn_id, &data_info);\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "gatts_notify_indicate ret:0x%x. serverid:%u,conn_id:%u,handle:%u.data_len:%d", ret, g_ble_server_id,\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "gatts_notify_indicate ret:0x%x. serverid:%u,conn_id:%u,handle:%u.data_len:%d", ret, g_ble_server_id,\r
         g_ble_conn_id, g_ble_server_handle,data_len);\r
     \r
     return ret;\r
@@ -999,7 +999,7 @@ static uint8_t falg = 0;
 static void svr_ble_bt_gatts_req_write_cb(uint8_t server_id, uint16_t conn_id, gatts_req_write_cb_t *write_cb_para,\r
     errcode_t status)\r
 { \r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "g_ble_server_handle %d conn_id :%d write_cb_para->length:%d write_cb_para->handle %d write_cb_para->request_id:%d",g_ble_server_handle,conn_id,write_cb_para->length,\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "g_ble_server_handle %d conn_id :%d write_cb_para->length:%d write_cb_para->handle %d write_cb_para->request_id:%d",g_ble_server_handle,conn_id,write_cb_para->length,\r
     write_cb_para->handle,write_cb_para->request_id);\r
     // printf("alipay_handle%d",alipay_handle);\r
     #if 0\r
@@ -1348,7 +1348,7 @@ void blesrv_service_recv_msg_handler(uint16_t srv_handle, uint8_t * msg_data, ui
         return ;\r
     }\r
     memcpy_s((blesrv_mail.msg_data),msg_len,msg_data,msg_len);\r
-    WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"g_blesrv_queue:%d ble_recv:mail.msg_data %X %02X %02X %02X msg_data:%02X %02X %02X\r\n",\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"g_blesrv_queue:%d ble_recv:mail.msg_data %X %02X %02X %02X msg_data:%02X %02X %02X\r\n",\r
         g_blesrv_queue,\r
         blesrv_mail.msg_data,\r
         blesrv_mail.msg_data[0],\r
@@ -1387,7 +1387,7 @@ static void blesrv_service_check_task(void const *arg)
         uint16_t server_handle = mail.service_handle;\r
         uint32_t msg_len = mail.msg_len;\r
 \r
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP,"mail.msg_data:%X,g_blesrv_queue:%d ble_recv:%d %d %02X %02X %02X mail.msg_data: %02X %02X %02X\r\n",\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP,"mail.msg_data:%X,g_blesrv_queue:%d ble_recv:%d %d %02X %02X %02X mail.msg_data: %02X %02X %02X\r\n",\r
             mail.msg_data,\r
             g_blesrv_queue,\r
             msg_len,\r