Merge branch 'shihao_esp32' into httpserver

RT200T_2_ESP32/main/Protocol_User.c

@@ -318,15 +318,12 @@ void Uart_Send_Id10_Pro(void )//esp32发送启动完成给底板
 
 void Uart_Send_Id12_Pro(void )//收到底板回复的0x20后,发送蓝牙类型  ID12[0]是判断蓝牙是否连接 不等于0是连接
 {
-    uint8_t ID12[15] = {0};
+    uint8_t ID12[3] = {0};
     ID12[0] |= (uint8_t)(BT_User.BT_Sts << 4);//经典
     ID12[0] |=  Ble_User.Ble_Sts;//ble
-    unsigned int i = 0;
-    for(i = 0;i < 14;i++)
-    {
-        ID12[ i + 1 ] = BT_Device_Name[ i ];
-    }
-    Protocol_Send(0x12, ID12, 15);
+    ID12[1] = 22; //小时
+    ID12[2] = 22; //分钟
+    Protocol_Send(0x12, ID12, 3);
 }
 
 void Uart_Send_Id01_Pro(void)

RT200T_2_ESP32/main/gatts_table_creat_demo.c

@@ -138,7 +138,7 @@ void simple_ota_service(void)
 
 
 
-uint8_t BT_Device_Name[14] = "QJ-Viva";
+uint8_t BT_Device_Name[14] = "RT-Viva";
 
 #define GATTS_TABLE_TAG "GATTS_TABLE_DEMO"
 
@@ -147,9 +147,9 @@ uint8_t BT_Device_Name[14] = "QJ-Viva";
 #define PROFILE_APP_IDX             0
 
 #define ESP_APP_ID                  0x55
-#define SAMPLE_DEVICE_NAME          "QJ-Viva"
+#define SAMPLE_DEVICE_NAME          "RT-Viva"
 #define SVC_INST_ID                 0
-#define SVC_INST_ID1                 1
+#define SVC_INST_ID1                1
 
 
  esp_bd_addr_t rand_addr = {0xC0, 0x30, 0x05, 0x70, 0x09, 0xFA};
@@ -182,7 +182,7 @@ static uint8_t raw_adv_data[] = {
         0x02, 0x01, 0x02,
         0x03, 0x03, 0x69, 0x67,
         0x09, 0xff, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-        0x08, 0x09, 'Q', 'J', '-', 'V', 'i', 'v', 'a',  
+        0x08, 0x09, 'R', 'T', '-', 'V', 'i', 'v', 'a',  
 
         // 0x08, 0x16, 0x60, 0xb3, 0x00, 0x00, 0x00, 0x00, 0x00,
 };

RT200T_2_ESP32/main/gatts_table_creat_demo.h

@@ -79,5 +79,5 @@ extern uint8_t BT_Device_Name[14];
 
 void Get_Mac_Init(void );
 extern int bsp_Uart_Send_Data(uint8_t * data , unsigned int len);
-extern uint8_t BT_Device_Name[14];
+
 #endif
\ No newline at end of file