Merge branch 'jinshuo' into 'dev'

Jinshuo

See merge request !97

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/system_BAT32A279.c

@@ -94,7 +94,7 @@ const uint8_t user_opt_data[4] __attribute__((used)) __attribute__((section(".AR
 //     </e>
 //   </e>
 // </h>
-    0x7E,
+    0x7C,
 
 /**
  * @brief LVD Control BYTE (C1H)

Firmware/Source/Application/BlueTooth.c

@@ -11,7 +11,7 @@ uint16_t LastPhoneBookTotalCount = 0;
 _PICID_Struct PicObj;
 _QRCODE_RECT QRCode_Rect;
 const uint8_t HJBlueToothName[9]= {"HJ750"};
-uint8_t UUIDConfigBuf[21] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+uint8_t UUIDConfigBuf[21] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
 //007502024092400000002
 //0x30,0x30,0x37,0x35,0x30,0x32,0x30,0x32,0x34,0x30,0x39,0x32,0x34,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x31
 uint8_t SetBluetoothCloseCount = 0;
@@ -368,19 +368,22 @@ uint8_t Get_Talking_PhoneBookValid(void)
     for(uint8_t i=0;i<100;i++)
     {
         if(CurBlueToothPhoneName[i]!=0)
-        return 1;
+        {
+            return 1;
+        }
     }
-    
     return 0;
 }
+
 uint8_t Get_UUID_UDSStatus(void)
 {
     for(uint8_t i=0;i<21;i++)
     {
         if(UUIDConfigBuf[i]!=0xFF)
-        return 1;
+        {
+            return 1;
+        }
     }
-    
     return 0;
 }
 

Firmware/Source/Application/BlueTooth.h

@@ -23,7 +23,7 @@ typedef struct {
     uint16_t Vaild;
 }TEXT_STRUCT;
 
-#define INFORMATION_VERSION_DATE   "20240915"
+#define INFORMATION_VERSION_DATE   "20241015"
 #define SW_EXTERNAL_VERSION        "100"
 
 static const uint8_t DATA_Version[8] =  {INFORMATION_VERSION_DATE};

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -21,6 +21,7 @@ uint16_t g_u16voltagenumberdown = 160;
 uint8_t Voltage_Selfcheck = 1;
 uint8_t TFT_SelfCheck = 0;
 uint8_t CoolantOpenShortCirTimeCnt = 0;
+uint8_t HomePageCoolShortCirTimeCnt = 0;
 
 //自检函数
 void AMT630H_GUI_BACKGRAND_SelfCheck(void);
@@ -2914,7 +2915,7 @@ static void AMT630H_GUI_Light()
     {
         SetPagePic(GRAPHICS_PAGE_0, Pic_0747_244_26);
     }
-    if(Get_TelltalesLedSts(em_LED_Coolant_Temperature))
+    if((GET_DataCollantTempSegStatus() == 1)&&(GET_DataCoolantTempSegDisp() == 8))
     {
         if(FLASH_SYNC_1Hz)
         {
@@ -2924,6 +2925,35 @@ static void AMT630H_GUI_Light()
         {
             ;
         }
+        HomePageCoolShortCirTimeCnt = 0;
+    }
+    else if(GET_DataCollantTempSegStatus() == 2)
+    {
+        HomePageCoolShortCirTimeCnt++;
+        if(HomePageCoolShortCirTimeCnt <= 15)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0741_616_20);/*水温灯(红)报警闪烁0.75ms*/
+        }
+        else if(HomePageCoolShortCirTimeCnt <= 20)
+        {
+            ;
+        }
+        else
+        {
+            HomePageCoolShortCirTimeCnt = 0;
+        }
+    }
+    else if(GET_DataCollantTempSegStatus() == 3)
+    {
+        if(FLASH_SYNC_1Hz)
+        {
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0741_616_20);/*水温灯报警闪烁1HZ*/
+        }
+        else
+        {
+            ;
+        }
+        HomePageCoolShortCirTimeCnt = 0;
     }
     if(GetPhoneMirrorst() == 1)     /*WIFI指示灯*/
     {

Firmware/Source/System/Sys_Task_List.c

@@ -20,7 +20,7 @@ void Sys_2ms_Tasks(void)
     Sys_Status_Update_Service();
     Analog_Signal_Conv_Service();
     AMT630H_Main();
-    // Check_MCU_Info_in_630H(); 
+    Check_MCU_Info_in_630H(); 
     DoCAN_Timer_Update(2000u);
     //Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发
     CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u);

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -29,12 +29,12 @@
 /******************************************************************************
     program version
 *******************************************************************************/
-#define SWV 0x106 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x108 // 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 (106UL) /* 内部版本号 105 -> 1.05 */
-#define internal_date    (20240915UL) /* 内部版本日期 20240805 -> 2024.08.05 */
+#define internal_version (108UL) /* 内部版本号 105 -> 1.05 */
+#define internal_date    (20241015UL) /* 内部版本日期 20240805 -> 2024.08.05 */
 
 /**
  *DFlash