Merge branch 'jinshuo' into 'dev'

Jinshuo

See merge request !82

Firmware/Source/Application/BlueTooth.c

@@ -13,6 +13,7 @@ _QRCODE_RECT QRCode_Rect;
 const uint8_t HJBlueToothName[9]= {"HJ750"};
 uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
 //"600032023120100000995" 
+uint8_t SetBluetoothCloseCount = 0;
 uint8_t OSVersionASCLLList[20] =
 {
     0x56,0x00,
@@ -47,7 +48,8 @@ void TextService(void);
 
 void BlueToothService(void)
 {
-    // SetUUIDTimes++;
+    if(SYS_OPR_STAT_IGN_ON)
+    {
         if(Get_Dis_Bluetooth_Open_Close() == 0)
         {
             if(GetBlueToothVaild == 0)
@@ -59,9 +61,17 @@ void BlueToothService(void)
         else
         {
             if(GetBlueToothVaild == 1)
+            {
+                if(SetBluetoothCloseCount < 30)
                 {
                     SetBluetoothTurnXX(0);
+                }
+                else
+                {
                     GetBlueToothVaild = 0;
+                    SetBluetoothCloseCount = 0;
+                }
+                SetBluetoothCloseCount++;
             }
         }
 
@@ -95,10 +105,10 @@ void BlueToothService(void)
         QRCode_Rect.height = 240;
         QRCode_Rect.width = 240;
         SetScreenType(QRCode_TYPE, QRCode_Rect);
-    if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
-    {
-        OTA_Update_Flag = 0;
-    }
+        // if(Menu_Get_Current_Cursor_Information() != MENU_ITEM_FAULT_INFORMATION)
+        // {
+        //     OTA_Update_Flag = 0;
+        // }
         if(OTA_Update_Flag == 1)
         {
             if(OTA_Update_Count_Open < 5)
@@ -120,25 +130,15 @@ void BlueToothService(void)
         SetTaskbarHeight(150);
         SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
         TextService();
+        }
+    else
+    {
+        GetBlueToothVaild =0;
+        OTA_Update_Flag = 0;
+        SetBluetoothTurnXX(0);
+        SetUpdateCtrl(0,QRCode_Rect);
+    }
     
-    // BlueConnectStatus = GetBlueToothPowerSTATE();
-    // juasfha = BlueToothPhoneData.BlueToothPhoneSate;
-    // juasfha = BlueToothPhoneData.PhoneBookTotalCount;
-    // for(i=0;i<20;i++)
-    // {
-    //     sjhja[i] = BlueToothPhoneData.PhoneNumber[i];
-    // }
-    // for(i=0;i<100;i++)
-    // {
-    //     PhoneName[i] = BlueToothPhoneData.BlueToothPhoneName[i];
-    // }
-    
-    // _QRCODE_RECT QRCode_Rect;
-    // QRCode_Rect.x = QRCode_X;
-    // QRCode_Rect.y = QRCode_Y;
-    // QRCode_Rect.height = QRCode_HEIGHT;
-    // QRCode_Rect.width = QRCode_WIDTH;
-    // SetScreenType(QRCode_TYPE, QRCode_Rect);
 }
 
 TEXT_STRUCT TextPara[TEXT_NUM_TOTAL] = 

Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c

@@ -45,7 +45,7 @@ const st_CANMsgAttribute CAN_CH0_CAN_MSG_CONST_ARRAY[CAN_CH0_ID_TOTAL_MAX] =
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
         {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
-        5000ul,
+        1000ul,
         0x402ul,
         (( void * )0),
         (( void * )0),

Firmware/Source/Component/Key/Key_user.c

@@ -306,7 +306,7 @@ void Get_Into_OTA_Update_Mode(void)
 {
 	if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_FAULT_INFORMATION)
 	{
-		OTA_Update_Flag = ! OTA_Update_Flag;
+		OTA_Update_Flag = 1U;
 	}
 }
 void KEY_LEFT_EVENT_NONE_Service(void)	
@@ -387,8 +387,8 @@ void Get_DisTime_Service(void)
 
 void My_Key_Service(void)
 {
-	/* 自检时不可操作按键 */
-	if(g_u8SelfCheck) 
+	/* 自检和OTA界面时不可操作按键 */
+	if((g_u8SelfCheck) && (OTA_Update_Flag == 0))
     {
 		if((Get_ActualVechileSpeed() == 0) ||((Get_DispVechileSpeed() >= 1990) && (Get_DispEngineSpeed() >= 12000)))
 		{

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -29,12 +29,12 @@
 /******************************************************************************
     program version
 *******************************************************************************/
-#define SWV 0x105 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x106 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x110 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x104 // 0x100 = 1.00 bootloader version boot程序版本号
 
-#define internal_version (105UL) /* 内部版本号 105 -> 1.05 */
-#define internal_date    (20240805UL) /* 内部版本日期 20240805 -> 2024.08.05 */
+#define internal_version (106UL) /* 内部版本号 105 -> 1.05 */
+#define internal_date    (20240915UL) /* 内部版本日期 20240805 -> 2024.08.05 */
 
 /**
  *DFlash