✨ feat:5寸修改蓝牙连接逻辑

YueJin_test_bench/source/Appliciation/Display_Info.c

@@ -4902,7 +4902,7 @@ void Display_Version_Info(uint32_t ON_OFF)
         // TFT_LCD_Draw_Bmp(3,   160,  ( uint8_t * )gImage_Alarm_12_WordX6_Y165);  //24脚输出占空比
         // TFT_LCD_Draw_Bmp(210,   160,  ( uint8_t * )gImage_Alarm_13_ImageX222_Y166);  //%
         TFT_LCD_Draw_Bmp(3,   290,  ( uint8_t * )gImage_gImage_checkVX6_Y165 );      //检测台版本号
-        uint8_t mbuff [7] = {2,5,1,1,2,5,0xff};
+        uint8_t mbuff [7] = {2,5,1,2,0,2,0xff};
         General_Number_Disp(mbuff, 160, 290);  
 
     } 

YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c

@@ -500,24 +500,20 @@ uint32_t R485_Send_0xD3(void)
     
     if(clearOdoFlag == 0)
     {
-        if(BlueTooth == 0)
-        {
-            R485_IDD3h.Sig.MacAddr1 = 0x00;
-            R485_IDD3h.Sig.MacAddr2 = 0x00;
-            R485_IDD3h.Sig.MacAddr3 = 0x00;
-            R485_IDD3h.Sig.MacAddr4 = 0x00;
-            R485_IDD3h.Sig.MacAddr5 = 0x00;
-            R485_IDD3h.Sig.MacAddr6 = 0x00;
-        }
-        else
-        {
+        // if(BlueTooth == 0)
+        // {
+        //     R485_IDD3h.Sig.MacAddr1 = 0x00;
+        //     R485_IDD3h.Sig.MacAddr2 = 0x00;
+        // }
+        // else
+        // {
             R485_IDD3h.Sig.MacAddr1 = name1;//
             R485_IDD3h.Sig.MacAddr2 = name2;
-            R485_IDD3h.Sig.MacAddr3 = 0x04;
-            R485_IDD3h.Sig.MacAddr4 = 0x03;
-            R485_IDD3h.Sig.MacAddr5 = 0x02;
-            R485_IDD3h.Sig.MacAddr6 = 0x01;
-        }
+        // }
+            R485_IDD3h.Sig.MacAddr3 = 0x20;
+            R485_IDD3h.Sig.MacAddr4 = 0x59;
+            R485_IDD3h.Sig.MacAddr5 = 0x28;
+            R485_IDD3h.Sig.MacAddr6 = 0xC1;
 
         switch (MENU_CHECK_STEP)
         {

YueJin_test_bench/source/Appliciation/api_RS485.c

@@ -426,11 +426,11 @@ void BTEnableDelayPowerReset(void)
 {
     if((BlueTooth == 1) && (BlueToothSwitch != 1))
     {
-        if(bluetoothdelaytime <= 50)
+        if(bluetoothdelaytime <= 120)
         {
             bluetoothdelaytime++;
         }
-        else if(bluetoothdelaytime <= 55)
+        else if(bluetoothdelaytime <= 125)
         {
             bluetoothdelaytime++;
             Auto_ONOFF = 3;
@@ -607,12 +607,12 @@ uint8_t RS485_User_Tx_Data(void)
             RS485_TxControl.Openble[7] = 0;
             RS485_TxControl.Openble[8] = BlueToothSwitch;
 
-            RS485_TxControl.Openble[9]  = name1;
-            RS485_TxControl.Openble[10] = name2;
-            RS485_TxControl.Openble[11] = 0x04;
-            RS485_TxControl.Openble[12] = 0x03;
-            RS485_TxControl.Openble[13] = 0x02;
-            RS485_TxControl.Openble[14] = 0x01;
+            RS485_TxControl.Openble[9]  = 0xC1;
+            RS485_TxControl.Openble[10] = 0xA8;
+            RS485_TxControl.Openble[11] = 0x59;
+            RS485_TxControl.Openble[12] = 0x20;
+            RS485_TxControl.Openble[13] = name2;
+            RS485_TxControl.Openble[14] = name1;
             RS485_TxControl.Openble[15] = 0x4B;
             RS485_TxControl.Openble[16] = 0x4A;
             UART_Ch2_Send_Multiple_Byte(RS485_TxControl.Openble,sizeof(RS485_TxControl.Openble));

YueJin_test_bench/source/System/init.c

@@ -126,12 +126,12 @@ void Sys_Startup_Init(void)
 
     EN_5V_CUT_ENABLE = 1;
     
-    Display_TFT_Clear();
-    GUI_Display_Version_Code_Service(25, 20, "Please   Scan   The   Code ", Letter_Num_11, PCodeText_Space_size);
+    // Display_TFT_Clear();
+    // GUI_Display_Version_Code_Service(25, 20, "Please   Scan   The   Code ", Letter_Num_11, PCodeText_Space_size);
 
     /*上电扫码校验功能如果需要扫码校验注释掉firstpowerflag = 2，saomafinish = 3;打开上面两行的注释即可*/
-    // firstpowerflag = 2;
-    // saomafinish = 3;
+    firstpowerflag = 2;
+    saomafinish = 3;
 }
 
 /***********************************************************************