Merge branch 'xxh' into 'develop'

添加内部版本号与底板交互

See merge request !7

qianjiang/main/Protocol_User.c

@@ -33,6 +33,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 
+#include "main_user.h"
+
 
 
 #define TAG "Prot_User"
@@ -251,6 +253,8 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
                 {
                     bsp_Ble_Init();
 
+                    SW_Send_Cnt_Set(150);
+
                     // printf("get uuid and init ble!!! \r\n");
                 }
 
@@ -343,10 +347,10 @@ void Uart_Send_Id12_Pro(void )
         ID12[17] = time->u8Sec;
     }
 
-    if(ID12[15] != 0xff)
-    {
-        // printf("hour = %d, minute = %d, SEC = %d\n", ID12[15], ID12[16], ID12[17]);
-    }
+    // if(ID12[15] != 0xff)
+    // {
+    //     printf("hour = %d, minute = %d, SEC = %d\n", ID12[15], ID12[16], ID12[17]);
+    // }
     
     Protocol_Send(0x12, ID12, PROTOCOL_ID_12_DATA_LEN);
 }
@@ -377,7 +381,21 @@ void Uart_Send_Id02_Pro(void)
 }
 
 
+void Uart_Send_Id13(void)
+{
+    uint8_t wtemp[3] = {0};
+    wtemp[0] = BL_INTERNAL_SW_YEAR;
+    wtemp[1] = BL_INTERNAL_SW_MONTH;
+    wtemp[2] = BL_INTERNAL_SW_DAY;
+    Protocol_Send(0x13, wtemp, 3);   
+}
+
+uint16_t SW_Send_Cnt = 0;
 
+void SW_Send_Cnt_Set(uint16_t val)
+{
+    SW_Send_Cnt = val;
+}
 
 void Prot_Send_Msg_Process(void )
 {
@@ -403,5 +421,12 @@ void Prot_Send_Msg_Process(void )
             Prot_User.TimeDelay = 0;
              //printf("send 0x01 0x02 \r\n");
         }
+
+        SW_Send_Cnt++;
+        if(SW_Send_Cnt >= 200)
+        {
+            Uart_Send_Id13();
+            SW_Send_Cnt = 0;
+        }
     }
 }

qianjiang/main/Protocol_User.h

@@ -39,4 +39,7 @@ void Prot_Send_Msg_Process(void );
 
 void Uart_Send_Id12_Pro(void );
 
+
+void SW_Send_Cnt_Set(uint16_t val);
+
 #endif

qianjiang/main/app_Ble_User.c

@@ -621,6 +621,7 @@ void Ble_DisConnect_Event_Pro(void )
     Ble_Clear_Rx_Buffer();
 
     BleTime.TimeReqCnt = 0;
+
 }
 
 

qianjiang/main/main_user.c

@@ -29,7 +29,7 @@
 #include "bt_app_hf.h"
 
 
-static const float Inter_SW = 1.1;
+//  const float Inter_SW = 1.1;
 
 #define TAG "MAIN_USER"
 extern esp_bd_addr_t peer_addr;
@@ -138,7 +138,7 @@ void app_main(void)
     bsp_Uart_Init();
 
     // printf("KL30 INIT OVER~~~~~~\r\n");
-    ESP_LOGE("MAIN", "Internal Sw = %f", Inter_SW);
+    // ESP_LOGE("MAIN", "Internal Sw = %f", Inter_SW);
 
     xTaskCreatePinnedToCore(Sys_Run_Tasks, "Sys_Run_Tasks", 4096, NULL, 3, NULL, 1);
 }

qianjiang/main/main_user.h

 #ifndef _MAIN_USER_H_
 #define _MAIN_USER_H_
 
-
+#define BL_INTERNAL_SW_YEAR 24
+#define BL_INTERNAL_SW_MONTH 7
+#define BL_INTERNAL_SW_DAY 22
 
 
 #endif
\ No newline at end of file

qianjiang/main/simple_ota_example.c

@@ -144,6 +144,16 @@ void simple_ota_example_task(void *pvParameter)
         esp_restart();
     } else {
         ESP_LOGE(TAG, "Firmware upgrade failed");
+        for(i = 5; i > 0; i--)
+        {
+            printf("============ System will restart in %d second. ============\n", i);
+            vTaskDelay(1000 / portTICK_PERIOD_MS);
+        }
+        // printf("============         System rebooting...      ============\n");
+        // printf("==========================================================\n");
+        // printf("\n");
+
+        esp_restart();
     }
     while (1) {
         vTaskDelay(1000 / portTICK_PERIOD_MS);