fix: 首版测试程序；屏蔽部分打印log等级W；ble初始化放在收到uuid后

qianjiang/main/Protocol_User.c

@@ -247,7 +247,7 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
 
                 if(Ble_User.UseridUpdate == 0)
                 {
-                    // bsp_Ble_Init();
+                    bsp_Ble_Init();
 
                     printf("get uuid and init ble!!! \r\n");
                 }

qianjiang/main/app_BT_User.c

@@ -20,7 +20,6 @@ void BT_User_Init(void )
     BT_User.ReconnTime = BT_ReConn_T - 500;
     BT_User.HF_Ctrl = HF_Idle;
 
-    printf("BT INIT!!\r\n");
 }
 
 void BT_Connect_Event_Pro(void )
@@ -89,13 +88,13 @@ void BT_User_Process(void )
         BT_User.ReconnTime++;
         if(BT_User.ReconnTime >= BT_ReConn_T)
         {
-            printf("Connect Start..............................\n");
+            printf("Connect Start.................\n");
             if(app_BT_Get_BondDev() == 1)
             {
                 esp_hf_client_connect(peer_addr);
             }
             
-            printf("Connect..............................\n");
+            printf("Connect Over\n");
 
             BT_User.ReconnTime = 0;
         }

qianjiang/main/app_Ble_User.c

@@ -74,36 +74,37 @@ void Ble_Clear_Tx_Buffer(void )
 uint8_t Ble_Get_User_Info(void )
 {
     uint8_t i = 0;
-    for(i = 24; i<32;i++)
-    {
-        ble_uerid[i] = 0x30+i-24;
-        ble_pwd[i] = 0x30+i-24;
-    }
-
-    ble_uerid[0] = 'v';
-    ble_uerid[1] = 'i';
-    ble_uerid[2] = 'v';
-    ble_uerid[3] = 'a';
-    ble_uerid[4] = 'v';
-    ble_uerid[5] = 'i';
-    ble_uerid[6] = 'v';
-    ble_uerid[7] = 'a';
-    ble_uerid[8] = 'v';
-    ble_uerid[9] = 'i';
-    ble_uerid[10] = 'v';
-    ble_uerid[11] = 'a';
-    ble_uerid[12] = 'v';
-    ble_uerid[13] = 'i';
-    ble_uerid[14] = 'v';
-    ble_uerid[15] = 'a';
-    ble_uerid[16] = 'v';
-    ble_uerid[17] = 'i';
-    ble_uerid[18] = 'v';
-    ble_uerid[19] = 'a';
-    ble_uerid[20] = 'v';
-    ble_uerid[21] = 'i';
-    ble_uerid[22] = 'v';
-    ble_uerid[23] = 'a';
+    uint8_t ret = 0;
+    // for(i = 24; i<32;i++)
+    // {
+    //     ble_uerid[i] = 0x30+i-24;
+    //     ble_pwd[i] = 0x30+i-24;
+    // }
+
+    // ble_uerid[0] = 'v';
+    // ble_uerid[1] = 'i';
+    // ble_uerid[2] = 'v';
+    // ble_uerid[3] = 'a';
+    // ble_uerid[4] = 'v';
+    // ble_uerid[5] = 'i';
+    // ble_uerid[6] = 'v';
+    // ble_uerid[7] = 'a';
+    // ble_uerid[8] = 'v';
+    // ble_uerid[9] = 'i';
+    // ble_uerid[10] = 'v';
+    // ble_uerid[11] = 'a';
+    // ble_uerid[12] = 'v';
+    // ble_uerid[13] = 'i';
+    // ble_uerid[14] = 'v';
+    // ble_uerid[15] = 'a';
+    // ble_uerid[16] = 'v';
+    // ble_uerid[17] = 'i';
+    // ble_uerid[18] = 'v';
+    // ble_uerid[19] = 'a';
+    // ble_uerid[20] = 'v';
+    // ble_uerid[21] = 'i';
+    // ble_uerid[22] = 'v';
+    // ble_uerid[23] = 'a';
 
 
     ble_pwd[0] = 'C';
@@ -131,7 +132,16 @@ uint8_t Ble_Get_User_Info(void )
     ble_pwd[22] = 'v';
     ble_pwd[23] = 'a';
 
-    return 1;
+    if(Ble_User.UseridUpdate)
+    {
+        ret = 1;
+    }
+    else
+    {
+        ret = 0;
+    }
+
+    return ret;
 }
 
 void Get_Ble_Raw_Data(uint8_t *data, uint32_t len)
@@ -311,6 +321,8 @@ void Ble_MsgRec_Authr_Result_Analysis(void )
     {
         Ble_User.Ble_Sts = Ble_Authr;
         Ble_User.Request_Navi = 1;
+
+        printf("Authr suc\n");
     }
 }
 
@@ -389,8 +401,8 @@ void Ble_MsgRec_Navi_Analysis(void )
     Ble_Navi_Data.Navi_Dte[3] = BleRecData.Msg.Param[5];
 
 
-    printf("Navi sts %d    Navi_Turn %x   Navi_Dte0 %x   Navi_Dte1 %x   Navi_Dte2 %x   Navi_Dte3 %x\r\n", \
-    Ble_Navi_Data.Navi_Sts, Ble_Navi_Data.Navi_Turn, Ble_Navi_Data.Navi_Dte[0], Ble_Navi_Data.Navi_Dte[1], Ble_Navi_Data.Navi_Dte[2],Ble_Navi_Data.Navi_Dte[3]);
+    // printf("Navi sts %d    Navi_Turn %x   Navi_Dte0 %x   Navi_Dte1 %x   Navi_Dte2 %x   Navi_Dte3 %x\r\n", 
+    // Ble_Navi_Data.Navi_Sts, Ble_Navi_Data.Navi_Turn, Ble_Navi_Data.Navi_Dte[0], Ble_Navi_Data.Navi_Dte[1], Ble_Navi_Data.Navi_Dte[2],Ble_Navi_Data.Navi_Dte[3]);
 
     Ble_User.Navi_Updat = 1;
     Ble_User.Navi_T = 0;

qianjiang/main/main_user.c

@@ -114,34 +114,6 @@ static void Sys_Run_Tasks(void *arg)
                 //     printf("Prot_Normal \r\n");
                 // }
 
-                // if(Prot_User.State >= Prot_Start)
-                // {
-                //     // if(pData->DataLen == 33)
-                //     {
-                //         // if(BT_User.HF_Ctrl != pData->Data[0])
-                //         // {
-                //         //     BT_User.HF_Ctrl = pData->Data[0];
-                //         // }
-
-                //         // if(strncmp((const char *) ble_uerid, (const char *)&(pData->Data[1]), 32) != 0)
-                //         // {
-                //         //     memcpy(( uint8_t * )ble_uerid, (uint8_t *)&(pData->Data[1]), 32);
-                //         // }
-
-                //         esp_log_buffer_hex(TAG, ble_uerid, 32);
-                //         // esp_log_buffer_hex(TAG, &(pData->Data[1]), 32);
-
-                //         if(Ble_User.UseridUpdate == 0)
-                //         {
-                //             bsp_Ble_Init();
-
-                //             printf("get uuid and init ble!!! \r\n");
-                //         }
-
-                //         Ble_User.UseridUpdate = 0xAA;
-                //     }
-                // }
-
 
             }
         }
@@ -158,10 +130,10 @@ void app_main(void)
     Ble_User_Init();
     Get_Mac_Init();
     bsp_BT_Init();
-    bsp_Ble_Init();
+    // bsp_Ble_Init();
     bsp_Uart_Init();
 
-    printf("KL30 INIT OVER~~~~~~~~~");
+    printf("KL30 INIT OVER~~~~~~\r\n");
 
     xTaskCreatePinnedToCore(Sys_Run_Tasks, "Sys_Run_Tasks", 4096, NULL, 3, NULL, 1);
 }

qianjiang/sdkconfig

@@ -1336,15 +1336,16 @@ CONFIG_HEAP_TRACING_OFF=y
 #
 # CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
 # CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
-# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
-CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_WARN=y
+# CONFIG_LOG_DEFAULT_LEVEL_INFO is not set
 # CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
 # CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
-CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_DEFAULT_LEVEL=2
 CONFIG_LOG_MAXIMUM_EQUALS_DEFAULT=y
+# CONFIG_LOG_MAXIMUM_LEVEL_INFO is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_DEBUG is not set
 # CONFIG_LOG_MAXIMUM_LEVEL_VERBOSE is not set
-CONFIG_LOG_MAXIMUM_LEVEL=3
+CONFIG_LOG_MAXIMUM_LEVEL=2
 CONFIG_LOG_COLORS=y
 CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 # CONFIG_LOG_TIMESTAMP_SOURCE_SYSTEM is not set