Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into shihao

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0xc400</StartAddress>
+                <StartAddress>0x0</StartAddress>
                 <Size>0x73c00</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
@@ -361,7 +361,7 @@
             </VariousControls>
           </Aads>
           <LDads>
-            <umfTarg>0</umfTarg>
+            <umfTarg>1</umfTarg>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
             <noStLib>0</noStLib>
@@ -968,16 +968,16 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
             </File>
-            <File>
-              <FileName>UartProtocol.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol.h</FilePath>
-            </File>
             <File>
               <FileName>UartProtocol_V1.32_BAT32A239.lib</FileName>
               <FileType>4</FileType>
               <FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol_V1.32_BAT32A239.lib</FilePath>
             </File>
+            <File>
+              <FileName>UartProtocol.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol.h</FilePath>
+            </File>
             <File>
               <FileName>AMT630H_Datas.c</FileName>
               <FileType>1</FileType>

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects/HaoJin750TFT.sct

@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x0000c400 0x00073C00  {    ; load region size_region
-  ER_IROM1 0x0000c400 0x00073C00  {  ; load address = execution address
+LR_IROM1 0x00000000 0x00073C00  {    ; load region size_region
+  ER_IROM1 0x00000000 0x00073C00  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)
@@ -12,8 +12,8 @@ LR_IROM1 0x0000c400 0x00073C00  {    ; load region size_region
   RW_IRAM1 0x20000000 0x0000FF00  {  ; RW data
    .ANY (+RW +ZI)
   }
-  RW_IRAM2 0x2000FF00 0x00000100  {
-   .ANY (+RW +ZI)
+  RW_IRAM2 0x2000FF00 0x00000100  {  ; RW data
+   .ANY (RW_FUNC_PLL)
   }
 }
 

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h

@@ -20,7 +20,7 @@ User definitions
 
 typedef unsigned short 	MD_STATUS;
 
-#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
+#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
 #define APP_BASE (0x0000C400ul)
 
 /* Status list definition */

Firmware/Source/Application/BackLight.c

@@ -30,7 +30,7 @@ typedef struct
 } _st_BacklightLevel;
 
 #define Backlight_Max 10
-#define BacklightLevel_Max 10
+#define BacklightLevel_Max 5
 _st_Backlight BacklightTable[Backlight_Max] =
     {
         /*温度   阻值 */
@@ -50,9 +50,9 @@ _st_BacklightLevel BacklightLevelTable[BacklightLevel_Max] =
         /*背光等级   背光占空比 */
         {1, 100},
         {2, 200},
-        {3, 300},
-        {4, 400},
-        {5, 500},
+        {3, 400},
+        {4, 600},
+        {5, 800},
 
 
 };
@@ -63,93 +63,110 @@ void Data_Light_Res_service(Light_uint8_t deltaTime)//获取光感阻值，并
     uint8_t i, j;
     uint32_t temp32;
     static uint16_t timeCount = 0;
-    if(GET_Backlight() == Backlight_ATUO)
+    if (timeCount >= LIGHT_DATA_TIME)
     {
-        if (timeCount >= LIGHT_DATA_TIME)
+        timeCount = 0;
+        if (NtcDataCount < LIGHT_DATA_NUM)
         {
-            timeCount = 0;
-            if (NtcDataCount < LIGHT_DATA_NUM)
+            /*获取光敏电阻*/
+            LightRes = ADC_Read_Signal(ADC_CH_LIGHT_SENSITIVE); // ADC_Read_Signal(ADC_CH_FUEL1);
+            /*四舍五入*/
+            if (LightRes < 32000)
             {
-                /*获取光敏电阻*/
-                LightRes = ADC_Read_Signal(ADC_CH_LIGHT_SENSITIVE); // ADC_Read_Signal(ADC_CH_FUEL1);
-
-                /*四舍五入*/
-                if (LightRes < 32000)
-                {
-                    if (LightRes % 10 >= 5)
-                    {
-                        LightRes += 5;
-                    }
-                }
-                else
-                {
-                    LightRes = 32000;
-                }
-                /*由小到大插入数据*/
-                for (i = 0; i < NtcDataCount; i++)
-                {
-                    if (LightRes < NtcData[i])
-                    {
-                        break;
-                    }
-                }
-                for (j = NtcDataCount; j > i; j--)
+                if (LightRes % 10 >= 5)
                 {
-                    NtcData[j] = NtcData[j - 1];
+                    LightRes += 5;
                 }
-                NtcData[i] = LightRes;
-                NtcDataCount++;
             }
             else
             {
-                /*一组数据采集完毕，取中间部分计算平均值*/
-                temp32 = 0;
-                for (i = LIGHT_CAL_START; i < LIGHT_CAL_END; i++)
+                LightRes = 32000;
+            }
+            /*由小到大插入数据*/
+            for (i = 0; i < NtcDataCount; i++)
+            {
+                if (LightRes < NtcData[i])
                 {
-                    temp32 += NtcData[i];
+                    break;
                 }
-                LightR = (uint16_t) (temp32 / (LIGHT_CAL_END - LIGHT_CAL_START));
-                NtcDataCount = 0;
-                LightADCompleteFlg = 1;
             }
+            for (j = NtcDataCount; j > i; j--)
+            {
+                NtcData[j] = NtcData[j - 1];
+            }
+            NtcData[i] = LightRes;
+            NtcDataCount++;
+        }
+        else
+        {
+            /*一组数据采集完毕，取中间部分计算平均值*/
+            temp32 = 0;
+            for (i = LIGHT_CAL_START; i < LIGHT_CAL_END; i++)
+            {
+                temp32 += NtcData[i];
+            }
+            LightR = (uint16_t) (temp32 / (LIGHT_CAL_END - LIGHT_CAL_START));
+            NtcDataCount = 0;
+            LightADCompleteFlg = 1;
         }
-        timeCount += deltaTime;
+    }
+    timeCount += deltaTime;
+    if(Menu_Item_Select_Get(MENU_ITEM_SELECT_AUTO))
+    {
         if(LightADCompleteFlg)
         {
-            if(LightR_Status == 0)
+            if(LightR <= 800)
             {
-
-                if(LightR >20)
+                LightR_Status_Count++;
+                if(LightR_Status_Count>=150)
                 {
-                    LightR_Status_Count++;
-                }
-                else
+                    LightR_Status_Count = 0;
+                    LightR_Status = 0;
+                }          
+            }
+            else if(LightR > 800)
+            {
+                LightR_Status_Count++;
+                if(LightR_Status_Count>=150)
                 {
-                    LightR_Status_Count = 0 ;
-                }
+                    LightR_Status_Count = 0;
+                    LightR_Status = 1;
+                }            
+            }
+            if(LightR_Status == 0)
+            {
                 TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 200);                            
             }
             else
             {
-                if(LightR <20)
-                {
-                    LightR_Status_Count++;
-                }
-                else
-                {
-                    LightR_Status_Count = 0 ;
-                }
-                TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 800);           
+                TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 800); 
             }
-
-            if(LightR_Status_Count>=150)
-            {
-                LightR_Status_Count = 0;
-                LightR_Status = !LightR_Status;
-            }            
         }
 
     }
+    else if(Menu_Item_Select_Get(MENU_ITEM_BACKLIGHT_AUTO))
+    {
+        if(Backlight_SetPwmLevel() == 1U)
+        {
+            TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 100);
+        }
+        else if(Backlight_SetPwmLevel() == 2U)
+        {
+            TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 200);
+        }
+        else if(Backlight_SetPwmLevel() == 3U)
+        {
+            TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 400);
+        }
+        else if(Backlight_SetPwmLevel() == 4U)
+        {
+            TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 600);
+        }
+        else if(Backlight_SetPwmLevel() == 5U)
+        {
+            TimerM_PWM_set_duty(TIMERM_COUNTER1, TIMERM_CHB, 800);
+        }
+    }
     else
     {
         BackLight_Process();
@@ -214,8 +231,29 @@ Light_uint8_t Backlight_SetPwmEn(void)
 /* 背光等级回调函数 */
 Light_uint8_t Backlight_SetPwmLevel(void)
 {
+    Light_uint8_t Backlight_PwmLevel;
 
-    return 1;
+    if(LightR > 0 && LightR <= 400)
+    {
+        Backlight_PwmLevel = 1U;
+    }
+    else if(LightR > 400 && LightR <= 800)
+    {
+        Backlight_PwmLevel = 2U;
+    }
+    else if(LightR > 800 && LightR <= 1400)
+    {
+        Backlight_PwmLevel = 3U;
+    }
+    else if(LightR > 1400 && LightR <= 2000)
+    {
+        Backlight_PwmLevel = 4U;
+    }
+    else if(LightR > 2000 && LightR <= 2600)
+    {
+        Backlight_PwmLevel = 5U;
+    }
+    return Backlight_PwmLevel;
 }
 
 /* 获取电阻值回调函数 */

Firmware/Source/Application/BackLight.h

@@ -21,10 +21,12 @@
     #define Backlight_NULL ( void * )0u
 #endif /* NULL */
 
+extern Light_uint16_t LightR_Status ;
 void Backlight_KL30_Wakeup_Init(void);
 void BackLight_Process(void);
+Light_uint8_t Backlight_SetPwmLevel(void);
 
 
 
 
-#endif
+#endif
\ No newline at end of file

Firmware/Source/Application/CAN_CH0_CAN_Communication_Matrix.c

@@ -15,7 +15,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,
+        500ul,
         0x101ul,
         (( void * )0),
         (( void * )0),
@@ -75,7 +75,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,
+        500ul,
         0x37Bul,
         (( void * )0),
         (( void * )0),

Firmware/Source/Application/Data_ESpeed.c

@@ -288,27 +288,27 @@ void Data_Engine_Speed_Processing_Service ( void )
             }
         }
     }
-
-    //第4步 增加回差
-    if (DataESpeedDisp <= 80) 
-    {  
-        DataESpeedDisp = DataESPeedDamping.Speed;
-    }
-    else
-    {
-        if ( DataESpeedDisp < DataESPeedDamping.Speed )
-        {
-            DataESpeedDisp = DataESPeedDamping.Speed;
-        }
-        else
-        {
-            Delta = DataESpeedDisp - DataESPeedDamping.Speed;
-            if ( Delta >= DATA_ESPEED_HYSTERESIS )
-            {
-                DataESpeedDisp = DataESPeedDamping.Speed;
-            }
-        }
-    }
+    DataESpeedDisp = DataESPeedDamping.Speed;
+    // //第4步 增加回差
+    // if (DataESpeedDisp <= 80) 
+    // {  
+    //     DataESpeedDisp = DataESPeedDamping.Speed;
+    // }
+    // else
+    // {
+    //     if ( DataESpeedDisp < DataESPeedDamping.Speed )
+    //     {
+    //         DataESpeedDisp = DataESPeedDamping.Speed;
+    //     }
+    //     else
+    //     {
+    //         Delta = DataESpeedDisp - DataESPeedDamping.Speed;
+    //         if ( Delta >= DATA_ESPEED_HYSTERESIS )
+    //         {
+    //             DataESpeedDisp = DataESPeedDamping.Speed;
+    //         }
+    //     }
+    // }
 }
 
 uint8_t Get_EngineValid(void)

Firmware/Source/Application/Data_ESpeed.h

@@ -11,7 +11,7 @@
 #define   DATA_ENGINE_RUNNING_THRESHOLD     400  //发动机运转阈值    
 #define   DATA_ENGINE_STOP_THRESHOLD        300  //发动机停止阈值
 
-#define   DATA_ESPEED_DAMPING_FACTOR        4    //阻尼系数
+#define   DATA_ESPEED_DAMPING_FACTOR        1    //阻尼系数
 #define   DATA_ESPEED_INC_STEP              10   //速度增加时慢加速速度变化步长
 #define   DATA_ESPEED_DEC_STEP              20   //方向改变时急减速速度变化步长
 #define   DATA_ESPEED_APPR_SPEED_MIN        10   //最小逼近速度

Firmware/Source/Application/Data_VSpeed.c

@@ -321,17 +321,7 @@ void Data_Vehicle_Speed_Processing_Service(void)
     }
 
     // 第3步：生成显示车速
-     if ( (DataVSPeedDamping.Speed >= DataVSpeedHysteresis) || (DataVSPeedDamping.Speed < DATA_VSPEED_HYSTERESIS) )
-    {
-        DataVSpeedHysteresis = DataVSPeedDamping.Speed;
-    }
-    else
-    {
-        if ( DataVSpeedHysteresis - DataVSPeedDamping.Speed >= DATA_VSPEED_HYSTERESIS )
-        {
-            DataVSpeedHysteresis = DataVSPeedDamping.Speed;
-        }
-    } 
+    DataVSpeedHysteresis = DataVSPeedDamping.Speed;
 
     VSpeedCal = ( uint32_t )DataVSpeedHysteresis;
 
@@ -339,10 +329,10 @@ void Data_Vehicle_Speed_Processing_Service(void)
     {
         VSpeedCal *= 105; 
         VSpeedCal /= 100;
-        if((VSpeedCal % 10) >= 5)
-        {
-            VSpeedCal += 5; /* 四舍五入 */
-        }
+        // if((VSpeedCal % 10) >= 5)
+        // {
+        //     VSpeedCal += 5; /* 四舍五入 */
+        // }
         DataVSpeedDisp = ( uint16_t )VSpeedCal;
     }
     else

Firmware/Source/Application/Data_VSpeed.h

@@ -7,7 +7,7 @@
 #define   DATA_VEHICLE_RUNNING_THRESHOLD    25  //汽车行进阈值    
 #define   DATA_VEHICLE_STOP_THRESHOLD       20  //汽车停止阈值
 
-#define   DATA_VSPEED_DAMPING_FACTOR        3   //阻尼系数
+#define   DATA_VSPEED_DAMPING_FACTOR        1   //阻尼系数
 #define   DATA_VSPEED_INC_STEP              2   //速度增加时慢加速速度变化步长
 #define   DATA_VSPEED_DEC_STEP              6   //方向改变时急减速速度变化步长
 #define   DATA_VSPEED_APPR_SPEED_MIN        2   //最小逼近速度

Firmware/Source/Application/GpioUser.c

@@ -80,7 +80,7 @@ void Gpio_Init(_GpioUser_Enum InitMode)
         RTE_GPIO_Config(RTE_GPIO_PORT14_PIN00, GpioOut_Low);     //L_BD433Ctrl_OUT
         RTE_GPIO_Config(RTE_GPIO_PORT14_PIN01, RTE_GPIO_DIR_IN);  //L_BiasBitSW_燃油_OUT---
         RTE_GPIO_Config(RTE_GPIO_PORT14_PIN06, GpioOut_Low);  
-        RTE_GPIO_Config(RTE_GPIO_PORT14_PIN07, GpioOut_Low);      
+        RTE_GPIO_Config(RTE_GPIO_PORT14_PIN07, RTE_GPIO_DIR_IN);      
     }
     else 
     {

Firmware/Source/Component/AMT630H/AMT630H.c

@@ -37,6 +37,9 @@ s_AMT630H_FlashCheck_t AMT630H_FlashCheck;
 unsigned long Delay_Time = 0;
 unsigned long Delay_Time_Set = 0;
 
+extern uint32_t Check_Upgrade;
+extern uint32_t Check_Upgrade_Cnt;
+
 /* Refresh Time */
 unsigned long AMT630H_RefreshTime = 0;
 static uint8_t AMT630H_Animation_Start = 0;
@@ -306,6 +309,8 @@ void Amt630hInit(void)
     AMT630H_FlashCheck.InquireTime = 0;
     AMT630H_FlashCheck.CheckStateTime = 0;
     AMT630H_FlashCheck.Result = 0;
+    Check_Upgrade = 0;
+    Check_Upgrade_Cnt = 0;
 }
 void AMT630H_Sleep(void)
 {

Firmware/Source/Component/AMT630H/AMT630H.h

@@ -18,7 +18,7 @@ typedef struct
     uint8_t Result;
 }s_AMT630H_FlashCheck_t;
 
-#define AMT630H_REFRESH_TIME        25U
+#define AMT630H_REFRESH_TIME        50U
 
 #define AMT630H_ANIMATION_TIME                  3000U   //ms
 #define AMT630H_ANIMATION_PIC_NUM               110U
@@ -39,4 +39,4 @@ void AMT630H_Main(void);
 unsigned char AMT630H_isInitFinish(void);
 extern uint32_t Amt630hInitTimerCnts ;
 
-#endif
+#endif
\ No newline at end of file

Firmware/Source/Component/AMT630H/GraphicsFunc.c

+#include <string.h>
 #include "UartProtocol.h"
 #include "PicBin.h"
 #include <stdint.h>
+#include "UDS_ISO14229_Services.h"
+#include "flash.h"
+
 #define NULL 0
 extern uint8_t UartRevBuff[0x1000];
 extern uint32_t UartRevCnts;
+
 uint8_t *GetUartRecvData(uint32_t *UartRecvBufLen, uint32_t *UartRecvPos)
 {
     *UartRecvBufLen = 0x1000;
@@ -72,7 +77,7 @@ void DisplayNum(uint8_t page, DISPLAY_NUM_ST *pNumData, int32_t NumVal)
 }
 
 /***************** Read 630 ************************/
-#define READ_MCU_DATA_MAX 0x800
+#define READ_MCU_DATA_MAX 0x40
 enum {
     READ630_IDLE,
     READ630_WAITING_RESP,
@@ -82,6 +87,13 @@ enum {
     READ630_RECV_BACKUP_DATA_CRC,
 };
 
+uint8_t ReadDataBuf[READ_MCU_DATA_MAX]; /* 读取缓存 */
+uint32_t NeedWriteSize; /* 需要写入文件的长度 */
+uint32_t FactOffset;    /* 绝对地址 */
+uint32_t AppOffset;
+uint32_t Check_Upgrade;
+uint32_t Check_Upgrade_Cnt;
+
 static uint8_t Read630State = READ630_IDLE;
 static uint32_t ReqDataBufAddr = 0;
 static uint32_t ReqDataLen = 0;
@@ -171,177 +183,111 @@ void SetRecvDataSt(RECV_MCU_DATA_TYPE type, uint32_t addr, uint32_t len, uint32_
 }
 /***************** Read 630 end ************************/
 
-/* Test */
-static uint8_t TestReadBuf[READ_MCU_DATA_MAX];
-static uint32_t TestDataLen = 0;
-static uint32_t TestDataCrC = 0;
-static uint32_t ReadOffset = 0;
-static uint32_t CalcCrcVal = 0xffffffff;
-static uint32_t TestCycleNum = 0;
-
-static uint32_t CalcCrc32(uint8_t *buf, int Len, uint32_t InitVal)
+void GetReadInfo(READ_ARK630_CMD type)
 {
-    int i;
-    int n = 0;
-    uint32_t crc = InitVal; // Initial value
-    for (n = 0; n < Len; n++) {
-        crc ^= (uint32_t)buf[n] << 24; // crc ^= *data; data++;
-        for (i = 0; i < 8; ++i) {
-            if (crc & 0x80000000) {
-                crc = (crc << 1) ^ 0x04C11DB7; // 0xEDB88320= reverse 0x04C11DB7
-            } else {
-                crc = (crc << 1);
-            }
-        }
-    }
-    return crc;
-}
-
-void TestRead630Update(void)
-{
-    uint32_t tmpLen;
     static uint8_t readSt = 0;
     static uint16_t getStRetryCnts = 0;
-    if (TestDataLen == 0) {
-        if (readSt == 0) {
+    uint32_t tmpRet;
+
+    if (NeedWriteSize == 0)
+    {
+        if (readSt == 0)
+        {
             readSt = 1;
-            ProcMcuOrBackupData(GET_APP_DATA_OFFSET, 0, 0, 0);
+            ProcMcuOrBackupData(type, 0, 0, 0); /* 获取偏移地址 */
             getStRetryCnts = 500;
-        } else {
-            TestDataLen = ProcMcuOrBackupData(GET_STATUS, 0, 0, 0);
-            if ((TestDataLen != 0) || (--getStRetryCnts == 0)) {
-                if (TestDataLen != 0) {
-                    TestDataLen = RespDataLen;
-                    TestDataCrC = RespDataCrc;
-                    ReadOffset = 0;
-                    CalcCrcVal = 0xffffffff;
-                }
-                readSt = 0;
-            }
         }
-    } else {
-        if (readSt == 0) {
-            readSt = 1;
-            ProcMcuOrBackupData(REQ_DATA, ReadOffset, READ_MCU_DATA_MAX, TestReadBuf);
-            getStRetryCnts = 500;
-            ReadOffset += READ_MCU_DATA_MAX;
-        } else {
-            tmpLen = ProcMcuOrBackupData(GET_STATUS, 0, 0, 0);
-            if (ReadOffset == tmpLen) {
-                if (ReadOffset < TestDataLen) {
-                    CalcCrcVal = CalcCrc32(TestReadBuf, READ_MCU_DATA_MAX, CalcCrcVal);
-                    readSt = 0;
-                } else {
-                    CalcCrcVal = CalcCrc32(TestReadBuf, TestDataLen - (ReadOffset - READ_MCU_DATA_MAX), CalcCrcVal);
-                    if (CalcCrcVal != TestDataCrC) {
-                        while (1) {
-                            RTE_WDT_Clear();
-                        }
-                    } else {
-                        TestCycleNum++;
+        else
+        {
+            tmpRet = ProcMcuOrBackupData(GET_STATUS, 0, 0, 0);
+            if ((tmpRet != 2) || (--getStRetryCnts == 0)) /* 非零值为获得的程序地址 */
+            {
+                if (tmpRet != 2)
+                {
+                    NeedWriteSize = 32; /* 此时的NeedWriteSize不重要, 只要跳出循环就行 */
+                    if (type == GET_APP_DATA_OFFSET)
+                    {
+                        FactOffset = 0; /* USB按相对地址获取数据 */
                     }
-                    getStRetryCnts = 500;
-                    TestDataLen = 0;
-                    TestDataCrC = 0;
-                    readSt = 0;
+                    AppOffset = 0x00;
                 }
-            }
-            if (--getStRetryCnts == 0) {
-                ReadOffset -= READ_MCU_DATA_MAX;
                 readSt = 0;
             }
         }
     }
 }
-/* Test end */
 
-/* Test */
-static uint32_t TestBackupDataLen = 0;
-static uint32_t TestBackupDataOffset = 0;
-static uint32_t TestBackupDataOffsetEnd = 0;
-static uint32_t TestBackupDataCrc = 0;
-static uint8_t *pData = (uint8_t*)0x40400;
-void TestWrite630Backup(void)
+/**
+ * @brief 检查Flash中的MCU程序信息, 是否与当前运行的MCU_APP信息相同, 若不同, 则进入升级模式
+ */
+void Check_MCU_in_Flash(READ_ARK630_CMD type)
 {
-    static  int readstep = 0;
-    uint32_t tmpRet;
     static uint8_t readSt = 0;
     static uint16_t getStRetryCnts = 0;
 
-    TestBackupDataLen = 0x100000;
-    if (TestBackupDataOffset == 0) {
-        if (readSt == 0) {
-            readSt = 1;
-            ProcMcuOrBackupData(GET_BACKUP_DATA_OFFSET, 0, 0, NULL);
-            getStRetryCnts = 500;
-        } else {
-            tmpRet = ProcMcuOrBackupData(GET_STATUS, 0, 0, NULL);
-            if ((tmpRet != 2) || (--getStRetryCnts == 0)) {
-                if (tmpRet != 2) {
-                    TestBackupDataOffset = tmpRet;
-                    TestBackupDataOffsetEnd = TestBackupDataOffset + TestBackupDataLen;
-                }
-                readSt = 0;
-            }
-        }
-    } else if (TestBackupDataCrc == 0) {
-        if (readSt == 0) {
+    uint32_t tmpLen;
+    uint8_t saveVersion[16];
+    uint8_t readVersion[16];
+
+    if (NeedWriteSize != 0)
+    {
+        if (readSt == 0)
+        {
             readSt = 1;
-            ProcMcuOrBackupData(GET_BACKUP_DATA_CRC, TestBackupDataOffset, TestBackupDataLen, NULL);
+            (void)memset(ReadDataBuf, 0xFFU, sizeof(ReadDataBuf)); /* 初始化buffer */
+            ProcMcuOrBackupData(REQ_DATA, FactOffset, READ_MCU_DATA_MAX, ReadDataBuf); // 按地址获取程序数据
             getStRetryCnts = 500;
-        } else {
-            tmpRet = ProcMcuOrBackupData(GET_STATUS, 0, 0, NULL);
-            if ((tmpRet != 2) || (--getStRetryCnts == 0)) {
-                if (tmpRet != 2) {
-                    TestBackupDataCrc = tmpRet;
-                }
-                readSt = 0;
-            }
         }
-    } else {
-#if 1
-        if (readSt == 0) {
-            readSt = 1;
-            ProcMcuOrBackupData(REQ_DATA, TestBackupDataOffset, READ_MCU_DATA_MAX, TestReadBuf);
-            getStRetryCnts = 500;
-            TestBackupDataOffset += READ_MCU_DATA_MAX;
-        } else {
-            tmpRet = ProcMcuOrBackupData(GET_STATUS, 0, 0, 0);
-            if (TestBackupDataOffset == tmpRet) {
-                if (TestBackupDataOffset < TestBackupDataOffsetEnd) {
-                    readSt = 0;
-                } else {
-                    readSt = 0;
+        else
+        {
+            tmpLen = ProcMcuOrBackupData(GET_STATUS, 0, 0, 0); /* 获取读取状态 */
+            if (FactOffset + READ_MCU_DATA_MAX == tmpLen)             /* 当返回值为目标位置时为数据获取成功 */
+            {
+                if (AppOffset == 0) /* 首个数据块内解析文件信息 */
+                {
+                    if (type == GET_APP_DATA_OFFSET) /* 从 MCU_APP 升级文件 */
+                    {
+                        flash_read(FLASH_630H_UPDATE_INFO, sizeof(saveVersion), saveVersion); /* 读取630H升级记录 */
+
+                        memcpy(readVersion, &ReadDataBuf[16], 16);          /* 630中读出的版本信息 */
+                        if (memcmp(readVersion, saveVersion, 16) != 0) /* 对比版本不同才更新 */
+                        {
+                            Get_Into_630H_Update_MCU_Mode();
+                        }
+                        else
+                        {
+                            /* 信息相同, 重置状态 */
+                            NeedWriteSize = 0;
+                            Check_Upgrade = 0;
+                            readSt = 0;
+                        }
+                    }
                 }
             }
-            if (--getStRetryCnts == 0) {
-                TestBackupDataOffset -= READ_MCU_DATA_MAX;
+            if (--getStRetryCnts == 0)
+            {
+                /* 读信息超时, 重置状态 */
                 readSt = 0;
             }
         }
-#else
-        if (readSt == 0) {
-            readSt = 1;
-            ProcMcuOrBackupData(WRITE_BACKUP_DATA, TestBackupDataOffset, READ_MCU_DATA_MAX, pData);
-            getStRetryCnts = 1500;
-            TestBackupDataOffset += READ_MCU_DATA_MAX;
-            pData += READ_MCU_DATA_MAX;
-        } else {
-            tmpRet = ProcMcuOrBackupData(GET_STATUS, 0, 0, 0);
-            if (TestBackupDataOffset == tmpRet) {
-                if (TestBackupDataOffset < TestBackupDataOffsetEnd) {
-                    readSt = 0;
-                } else {
-                    readSt = 0;
-                }
-            }
-            if (--getStRetryCnts == 0) {
-                TestBackupDataOffset -= READ_MCU_DATA_MAX;
-                pData -= READ_MCU_DATA_MAX;
-                readSt = 0;
-            }
+    }
+}
+
+void Check_MCU_Info_in_630H(void)
+{
+    
+    if(Check_Upgrade == 1U)
+    {
+        GetReadInfo(GET_APP_DATA_OFFSET);
+        Check_MCU_in_Flash(GET_APP_DATA_OFFSET);
+    }
+    else
+    {
+        Check_Upgrade_Cnt++;
+        if(Check_Upgrade_Cnt >= 2500U) /* 放在2ms任务中, 2500 = 5000ms */
+        {
+            Check_Upgrade_Cnt = 0;
+            Check_Upgrade = 1U;
         }
-#endif
     }
 }
-/* Test end */

Firmware/Source/Component/AMT630H/PicBin.c

@@ -108,7 +108,16 @@ static const uint16_t PicIndexData[] = {
     Pic_0842, 1024, 0, 0, Pic_0843, 1024, 0, 0, Pic_0844, 1024, 0, 0, Pic_0845, 1024, 0, 0, Pic_0846, 1024, 0, 0, Pic_0847, 1024, 0, 0, Pic_0848, 1024, 0, 0, Pic_0849, 1024, 0, 0, Pic_0850, 1024, 0, 0, Pic_0851, 1024, 0, 0, 
     Pic_0852, 1024, 0, 0, Pic_0853, 1024, 0, 0, Pic_0854, 1024, 0, 0, Pic_0855, 1024, 0, 0, Pic_0856, 1024, 0, 0, Pic_0857, 1024, 0, 0, Pic_0858, 1024, 0, 0, Pic_0859, 1024, 0, 0, Pic_0860, 1024, 0, 0, Pic_0861, 73, 211, 324, 
     Pic_0861, 73, 187, 324, Pic_0861, 73, 163, 324, Pic_0861, 73, 139, 324, Pic_0861, 73, 115, 324, Pic_0861, 73, 91, 324, Pic_0862, 53, 54, 297, Pic_0863, 73, 211, 324, Pic_0863, 73, 187, 324, Pic_0863, 73, 163, 324, Pic_0863, 73, 139, 324, 
-    Pic_0863, 73, 115, 324, Pic_0863, 73, 91, 324, Pic_0864, 53, 54, 297, 
+    Pic_0863, 73, 115, 324, Pic_0863, 73, 91, 324, Pic_0864, 53, 54, 297, Pic_0865, 52, 923, 407, Pic_0866, 13, 638, 293, Pic_0867, 15, 637, 293, Pic_0868, 15, 637, 293, Pic_0869, 21, 634, 293, Pic_0870, 15, 637, 293, Pic_0871, 14, 637, 293, 
+    Pic_0872, 15, 637, 293, Pic_0873, 13, 638, 292, Pic_0874, 13, 639, 293, Pic_0875, 17, 636, 292, Pic_0876, 13, 639, 293, Pic_0877, 17, 636, 292, Pic_0878, 13, 638, 293, Pic_0879, 16, 636, 293, Pic_0880, 11, 640, 293, Pic_0881, 14, 639, 293, 
+    Pic_0882, 11, 638, 293, Pic_0883, 3, 643, 293, Pic_0884, 14, 637, 293, Pic_0885, 15, 637, 292, Pic_0886, 11, 640, 293, Pic_0887, 12, 639, 293, Pic_0888, 14, 638, 293, Pic_0889, 14, 638, 292, Pic_0890, 14, 638, 293, Pic_0891, 15, 637, 293, 
+    Pic_0892, 13, 567, 356, Pic_0893, 13, 581, 356, Pic_0892, 13, 595, 356, Pic_0894, 12, 609, 356, Pic_0895, 11, 624, 357, Pic_0892, 13, 636, 356, Pic_0893, 13, 650, 356, Pic_0895, 11, 665, 357, Pic_0896, 4, 679, 372, Pic_0895, 11, 686, 357, 
+    Pic_0896, 4, 699, 372, Pic_0897, 15, 706, 356, Pic_0892, 13, 574, 292, Pic_0893, 13, 588, 292, Pic_0892, 13, 602, 292, Pic_0894, 12, 615, 292, Pic_0895, 11, 630, 293, Pic_0892, 13, 643, 292, Pic_0893, 13, 657, 292, Pic_0895, 11, 672, 293, 
+    Pic_0898, 14, 686, 293, Pic_0899, 11, 703, 293, Pic_0900, 13, 610, 229, Pic_0901, 12, 625, 229, Pic_0901, 12, 639, 229, Pic_0901, 12, 653, 229, Pic_0901, 12, 667, 229, Pic_0900, 13, 610, 164, Pic_0901, 12, 625, 164, Pic_0901, 12, 639, 164, 
+    Pic_0901, 12, 653, 164, Pic_0901, 12, 667, 164, Pic_0902, 13, 638, 293, Pic_0903, 15, 637, 293, Pic_0904, 15, 637, 293, Pic_0905, 21, 634, 293, Pic_0906, 15, 637, 293, Pic_0907, 14, 637, 293, Pic_0908, 15, 637, 293, Pic_0909, 13, 638, 292, 
+    Pic_0910, 13, 639, 293, Pic_0911, 17, 636, 292, Pic_0912, 13, 639, 293, Pic_0913, 17, 636, 292, Pic_0914, 13, 638, 293, Pic_0915, 16, 636, 293, Pic_0916, 11, 640, 293, Pic_0917, 14, 639, 293, Pic_0899, 11, 638, 293, Pic_0918, 3, 643, 293, 
+    Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240, 
+    Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240806 2024-08-06 14:50:45 Compression ratio:70.00% */
+/* Flash Bin Version:20240817 2024-08-17 11:18:35 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -866,6 +866,71 @@
 #define Pic_0862 862
 #define Pic_0863 863
 #define Pic_0864 864
+#define Pic_0865 865
+#define Pic_0866 866
+#define Pic_0867 867
+#define Pic_0868 868
+#define Pic_0869 869
+#define Pic_0870 870
+#define Pic_0871 871
+#define Pic_0872 872
+#define Pic_0873 873
+#define Pic_0874 874
+#define Pic_0875 875
+#define Pic_0876 876
+#define Pic_0877 877
+#define Pic_0878 878
+#define Pic_0879 879
+#define Pic_0880 880
+#define Pic_0881 881
+#define Pic_0882 882
+#define Pic_0883 883
+#define Pic_0884 884
+#define Pic_0885 885
+#define Pic_0886 886
+#define Pic_0887 887
+#define Pic_0888 888
+#define Pic_0889 889
+#define Pic_0890 890
+#define Pic_0891 891
+#define Pic_0892 892
+#define Pic_0893 893
+#define Pic_0894 894
+#define Pic_0895 895
+#define Pic_0896 896
+#define Pic_0897 897
+#define Pic_0898 898
+#define Pic_0899 899
+#define Pic_0900 900
+#define Pic_0901 901
+#define Pic_0902 902
+#define Pic_0903 903
+#define Pic_0904 904
+#define Pic_0905 905
+#define Pic_0906 906
+#define Pic_0907 907
+#define Pic_0908 908
+#define Pic_0909 909
+#define Pic_0910 910
+#define Pic_0911 911
+#define Pic_0912 912
+#define Pic_0913 913
+#define Pic_0914 914
+#define Pic_0915 915
+#define Pic_0916 916
+#define Pic_0917 917
+#define Pic_0918 918
+#define Pic_0919 919
+#define Pic_0920 920
+#define Pic_0921 921
+#define Pic_0922 922
+#define Pic_0923 923
+#define Pic_0924 924
+#define Pic_0925 925
+#define Pic_0926 926
+#define Pic_0927 927
+#define Pic_0928 928
+#define Pic_0929 929
 
 enum {
     Pic_0001_0_0 = 0,
@@ -1946,9 +2011,101 @@ enum {
     Pic_0863_115_324,
     Pic_0863_91_324,
     Pic_0864_54_297,
+    Pic_0865_923_407,
+    Pic_0866_638_293,
+    Pic_0867_637_293,
+    Pic_0868_637_293,
+    Pic_0869_634_293,
+    Pic_0870_637_293,
+    Pic_0871_637_293,
+    Pic_0872_637_293,
+    Pic_0873_638_292,
+    Pic_0874_639_293,
+    Pic_0875_636_292,
+    Pic_0876_639_293,
+    Pic_0877_636_292,
+    Pic_0878_638_293,
+    Pic_0879_636_293,
+    Pic_0880_640_293,
+    Pic_0881_639_293,
+    Pic_0882_638_293,
+    Pic_0883_643_293,
+    Pic_0884_637_293,
+    Pic_0885_637_292,
+    Pic_0886_640_293,
+    Pic_0887_639_293,
+    Pic_0888_638_293,
+    Pic_0889_638_292,
+    Pic_0890_638_293,
+    Pic_0891_637_293,
+    Pic_0892_567_356,
+    Pic_0893_581_356,
+    Pic_0892_595_356,
+    Pic_0894_609_356,
+    Pic_0895_624_357,
+    Pic_0892_636_356,
+    Pic_0893_650_356,
+    Pic_0895_665_357,
+    Pic_0896_679_372,
+    Pic_0895_686_357,
+    Pic_0896_699_372,
+    Pic_0897_706_356,
+    Pic_0892_574_292,
+    Pic_0893_588_292,
+    Pic_0892_602_292,
+    Pic_0894_615_292,
+    Pic_0895_630_293,
+    Pic_0892_643_292,
+    Pic_0893_657_292,
+    Pic_0895_672_293,
+    Pic_0898_686_293,
+    Pic_0899_703_293,
+    Pic_0900_610_229,
+    Pic_0901_625_229,
+    Pic_0901_639_229,
+    Pic_0901_653_229,
+    Pic_0901_667_229,
+    Pic_0900_610_164,
+    Pic_0901_625_164,
+    Pic_0901_639_164,
+    Pic_0901_653_164,
+    Pic_0901_667_164,
+    Pic_0902_638_293,
+    Pic_0903_637_293,
+    Pic_0904_637_293,
+    Pic_0905_634_293,
+    Pic_0906_637_293,
+    Pic_0907_637_293,
+    Pic_0908_637_293,
+    Pic_0909_638_292,
+    Pic_0910_639_293,
+    Pic_0911_636_292,
+    Pic_0912_639_293,
+    Pic_0913_636_292,
+    Pic_0914_638_293,
+    Pic_0915_636_293,
+    Pic_0916_640_293,
+    Pic_0917_639_293,
+    Pic_0899_638_293,
+    Pic_0918_643_293,
+    Pic_0898_637_293,
+    Pic_0897_637_292,
+    Pic_0919_640_293,
+    Pic_0920_639_293,
+    Pic_0921_638_293,
+    Pic_0922_638_292,
+    Pic_0923_638_293,
+    Pic_0924_637_293,
+    Pic_0925_501_160,
+    Pic_0926_619_240,
+    Pic_0926_619_175,
+    Pic_0927_619_240,
+    Pic_0927_619_175,
+    Pic_0928_894_310,
+    Pic_0929_894_310,
 };
 
-#define PIC_INDEX_DATA_CRC 0xD98F6E13
+#define PIC_INDEX_DATA_CRC 0xDE5B7F88
 
 extern void User_PicIndexDataInit(void);
 #endif

Firmware/Source/Component/Analog/Analog_Signals.c

@@ -85,7 +85,7 @@ const __attribute__((aligned(4))) ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBE
     {  3U,   2U,   0U,     2U,     0U,     1U,      ADC_Res_Calc_Circuit101,},
     {  4U,   2U,   0U,     2U,     0U,     1U,      ADC_Res_Calc_Circuit101,},
     {  5U,   3U,   0U,  5000U,     0U,    10U,      ADC_Res_Calc_Circuit201,},
-    {  6U,   2U,   0U,     2U,     0U,     1U,      ADC_Res_Calc_Circuit101,},    
+    {  6U,   0U,   0U,     0U,     0U,     1U,  ADC_Voltage_Calc_Circuit101,},
 
 };
 
@@ -97,7 +97,7 @@ const __attribute__((aligned(4))) ADC_Res_List_st_t stADCResList[ADC_SIGNAL_CH_N
     {          0U,         0U,       500U,       300U,},
     {          0U,         0U,       500U,         0U,},
     {      47000U,         0U,    100000U,         0U,},
-     {          0U,         0U,      500U,         0U,},
+    {          0U,   100000U,          0U,         0U,},
 };
 
 /* Private function prototypes ----------------------------------------------*/

Firmware/Source/Component/Key/Key_user.c

 
 #include "Key_user.h"
 #include "Components.h"
-
+#include "UDS_ISO14229_Services.h"
 
 __align(4)
 
@@ -21,12 +21,18 @@ void Key_Operation_Left(Key_Event_en_t enKeyEvent)//选择
 	case KEY_EVENT_SHORT_PRESS_2:	
 		break;
 	case KEY_EVENT_LONG_PRESS_1:	//2
+	if(Get_Dis_OdoAndTrip() == 1)
+	{
+		Data_Clear_Trip(1);
+	}
 		break;
 	case KEY_EVENT_LONG_PRESS_2:	//3
 		break;
 	case KEY_EVENT_LONG_PRESS_3:	//5s
 		break;
 	case KEY_EVENT_LONG_PRESS_4:	//10s
+        /* 进入630H升级MCU模式 */
+        Get_Into_630H_Update_MCU_Mode();
 		break;
 	case KEY_EVENT_OFF_TO_ON:		
 		break;
@@ -330,7 +336,7 @@ void Get_DisTime_Service(void)
     {
         RTE_RTC_Get_CounterValue(&counter_val);
         counter_val.time.RTC_Hours = RTC_Bcd2ToByte(counter_val.time.RTC_Hours);
-		counter_val.time.RTC_Minutes = RTC_Bcd2ToByte(counter_val.time.RTC_Minutes);
+	counter_val.time.RTC_Minutes = RTC_Bcd2ToByte(counter_val.time.RTC_Minutes);
     }
 }
 

Firmware/Source/Component/Menu/Menu.h

@@ -426,4 +426,4 @@ void Menu_User_WAKEUP(void);
 /*-----------------------------------------------------------------------------------*/
 /*-----------------------------------------------------------------------------------*/
 /*-----------------------------------------------------------------------------------*/
-#endif
+#endif
\ No newline at end of file

Firmware/Source/Component/Menu/Menu_Interface.c

@@ -395,7 +395,7 @@ void Menu_Logic_Operation_Clock_Hour_Tenb_Set(Menu_Key_en_t enKeyType)
 	if(MENU_KEY_CONFIRM_SHORT == enKeyType)
 	{
 		counter_val.time.RTC_Hours = (MenuData.Dis_Hour_Tenb*10 + MenuData.Dis_Hour_Bit);
-    	counter_val.time.RTC_Minutes = (MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit);
+    		counter_val.time.RTC_Minutes = (MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit);
 		RTC_SetTime(&counter_val.time);
 	}
 }
@@ -457,7 +457,7 @@ void Menu_Logic_Operation_Clock_Min_Bit_Set(Menu_Key_en_t enKeyType)
 	if(MENU_KEY_CONFIRM_SHORT == enKeyType)
 	{
 		counter_val.time.RTC_Hours = (MenuData.Dis_Hour_Tenb*10 + MenuData.Dis_Hour_Bit);
-    	counter_val.time.RTC_Minutes = (MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit);
+    		counter_val.time.RTC_Minutes = (MenuData.Dis_Minute_Tenb*10 + MenuData.Dis_Minute_Bit);
 		RTC_SetTime(&counter_val.time);
 	}
 } 

Firmware/Source/Component/Mileage/Services_Mileage_User.c

@@ -218,15 +218,15 @@ uint32_t Get_Trip_Value(void)
     uint32_t Trip = 0;
     if (Get_Dis_Unit() == 0) /* 公制 */
     {
-        Trip = Data_Read_Trip(EM_TRIP_A);
+        Trip = Data_Read_Trip(EM_TRIP_B);
     }
     else if (Get_Dis_Unit() == 1) /* 英制 */
     {
-        Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
+        Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_B));
     }
     else /* 无效值，按照公里处理，理论上不会执行到这 */
     {
-        Trip = Data_Read_Trip(EM_TRIP_A);
+        Trip = Data_Read_Trip(EM_TRIP_B);
     }
     return Trip;
 }
@@ -239,7 +239,7 @@ void Trip_Clear_Km_Service(void)
 {
     if (Get_Dis_Unit() == 0) /* 公制 */
     {
-        if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
+        if (Data_Read_Trip(EM_TRIP_B) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
         {
             Data_Clear_Trip_All();
         }

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -60,7 +60,7 @@ static void Power_KL30_Init(void)
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER1, TIMERM_CHB, ActiveLevel_High);
     g_stRTCInformation.u8RTCSecond = 0;
 	g_stRTCInformation.u8RTCMinute = 0;
-	g_stRTCInformation.u8RTCHour = 8;          
+	g_stRTCInformation.u8RTCHour = 0;          
 	g_stRTCInformation.u8RTCDayOfMonth = 1;
 	g_stRTCInformation.u8RTCMonth = 1;   
 	g_stRTCInformation.u8RTCYear = 20; 

Firmware/Source/Component/Telltales/Telltales_user.c

@@ -234,22 +234,34 @@ static Tellib_uint16_t LED_TCS_Judgement(void)
             {
                 LED_STATE = 1u;/*TCS灯亮*/
             }
-            else
+            else if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x0)
             {
                 LED_STATE = 0u;/*都不亮*/
             }
+            else
+            {
+                LED_STATE = 0u;
+            }
         }
-        else
+        else if(Get_CAN_CH0_ID_37B_Sig_TCS_Work_Mode == 0x0)
         {
             if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x1)
             {
                 LED_STATE = 2u;/*TCS/亮*/
             }
-            else
+            else if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x0)
             {
-                ;
+                LED_STATE = 0u;
             } 
+            else
+            {
+                LED_STATE = 0u;
+            }
         } 
+        else
+        {
+            ;
+        }
     }
     return LED_STATE;
 }

Firmware/Source/Device/Cmsemicon/BAT32A279/Library/Driver/include/flash.h

@@ -15,10 +15,10 @@ typedef enum
 
 extern uint32_t flash_protect_flag;
 
-int EraseChip (uint32_t adr);
-int EraseSector (uint32_t adr);
-int ProgramPage (uint32_t adr, uint32_t sz, uint8_t *buf);
-FLASH_STATUS flash_write(uint32_t adr, uint32_t sz, uint8_t *buf);
-void flashRead(uint8_t *read_address, uint16_t size, uint8_t *readbuf);
+extern int EraseChip (uint32_t adr);
+extern int EraseSector (uint32_t adr);
+extern int ProgramPage (uint32_t adr, uint32_t sz, uint8_t *buf);
+extern FLASH_STATUS flash_write(uint32_t adr, uint32_t sz, uint8_t *buf);
+extern void flash_read(uint32_t read_address, uint16_t size, uint8_t *readbuf);
 
 #endif

Firmware/Source/Device/Cmsemicon/BAT32A279/Library/Driver/src/flash.c

@@ -255,16 +255,15 @@ FLASH_STATUS flash_write(uint32_t adr, uint32_t sz, uint8_t *buf)
     return (status);
 }
 
-void flashRead(uint8_t *read_address, uint16_t size, uint8_t *readbuf)
+void flash_read(uint32_t read_address, uint16_t size, uint8_t *readbuf)
 {
     uint8_t *w_ptr;
     uint32_t i;
     w_ptr = (uint8_t *)read_address;
-
     for (i = 0; i < size; i++)
     {
         *readbuf = *w_ptr++;
-		readbuf++;
+        readbuf++;
     }
 }
 

Firmware/Source/System/Sys_Task_List.c

@@ -20,6 +20,7 @@ void Sys_2ms_Tasks(void)
     Sys_Status_Update_Service();
     Analog_Signal_Conv_Service();
     AMT630H_Main();
+    /* Check_MCU_Info_in_630H(); */
     DoCAN_Timer_Update(2000u);
     //Can_Write_Fun(&CAN_CH0_CanMsgTxOp, 2000u);无外发
     CanMSg_XMS_Analysis(&CAN_CH0_CanMsgOp, 2u);
@@ -74,14 +75,12 @@ uint32_t aaa = 0;
 
 void Sys_100ms_Tasks(void)
 {
-    ODOtest = Data_ODO_Read();
-    Triptest = Data_Read_Trip(0);
     S3_ServerCNTT();
     Get_DisTime_Service();
     Fuel_Cal_Sevice(100u);
     Coolant_Cal_Sevice(100u);
     Services_Mileage_Callback();
-    //Data_Mileage_Clear();
+    // Data_Mileage_Clear();
 
     RTE_GPIO_Config(RTE_GPIO_PORT05_PIN04, GpioOut_High);
     //BackLight_Process();

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -26,15 +26,26 @@
 
 #include "UDS_ISO14229_Server_Config.h"
 
+/******************************************************************************
+    program version
+*******************************************************************************/
+#define SWV 0x102 // 0x100 = 1.00 software version 软件版本号
+#define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
+#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
+
+#define internal_version (105UL) /* 内部版本号 105 -> 1.05 */
+#define internal_date    (20240805UL) /* 内部版本日期 20240805 -> 2024.08.05 */
+
 /**
  *DFlash
  */
 #define NoNeedWait 0x00u
 #define NeedWait   0x01u
-#define APP_STATUS_ADDR   (0x501000)
-#define APP_DATA_INFO     (0x501400)
-#define APP_DATA_WRITE    (0x501800)
-
+#define FLASH_APP_STATUS_INFO  (0x00501000UL) /* APP 程序有效性标识地址 */
+#define FLASH_SECOND_BOOT_INFO (0x00501400UL) /* 二级Boot程序状态地址 */
+#define FLASH_630H_UPDATE_INFO (0x00501800UL) /* 630H升级信息 */
+#define FLASH_APP_RODATA_INFO  (0x00501C00UL) /* 存储只读DID信息 */
+#define FLASH_APP_RWDATA_INFO  (0x00502000UL) /* 存储可写的DID信息 */
 
 #define Data_Flash_Addr_BootValid_OFFSET   0x00000000
 #define Data_Flash_Addr_DiagReceive_OFFSET 0x00002000
@@ -313,41 +324,6 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
-#define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
-#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x100 // 0x100 = 1.00 internal version 内部版本号
-#define PROG_Y 0x24 // 0x24 = 2024年, program year
-#define PROG_M 0x07 // 0x03 = 3月, program month
-#define PROG_D 0x16 // 0x19 = 19日, program day
-
-typedef struct
-{
-    uint32_t Flag;
-    uint8_t  Attemptcnt;
-    uint8_t  RequestSeedCnt;
-    uint8_t  AttemptIIcnt;
-    uint8_t  RequestSeedIICnt;
-} Ser27_FlowCtrlCntUnion;
-
-typedef struct
-{
-    uint32_t Flag;
-    uint8_t DID_F180[6];
-    uint8_t DID_F187[16];
-    uint8_t DID_F193[6];
-    uint8_t DID_F195[6];
-    uint8_t Filldata[2];
-}DiagDFlashData;
-extern DiagDFlashData DiagDataForDFlash;
-
-typedef struct
-{
-    uint32_t Flag;
-    uint8_t DID_F184[32];
-} Ser2EDFlashData;
-extern Ser2EDFlashData Ser2EDataForDFlash;
-
 typedef struct
 {
     uint32_t Flag;
@@ -365,19 +341,10 @@ typedef struct
 void UDS_Service_10_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
 void UDS_Service_11_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
 void UDS_Service_22_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
-void UDS_Service_2E_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
-void UDS_Service_27_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
-void UDS_Service_28_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
 void UDS_Service_3E_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
-void UDS_Service_85_Indication(uint16_t A_TA_type, uint16_t A_Length, uint8_t *A_Data);
 void S3_ServerCNTT(void);
-void Randomcnt(void);
 extern void DIAG_InitParameter(void);
 
-void GetSeed(void);
-void CalculateKey(void);
-void CalculateKeyLv11(void);
-
 typedef void (*InitFunction)(void);
 
 /***********Local Functin*************/
@@ -386,13 +353,11 @@ uint8_t SerXXNRC12Filter(uint8_t insub, const uint8_t *supportsub, uint8_t size,
 uint8_t SerXXNRC13Filter(uint8_t type, uint8_t serlength, const uint8_t *length, uint8_t index);
 uint8_t SerXXNRC22Filter(void);
 uint8_t SerXXNRC31DIDFilter(uint16_t inDID, const uint16_t *DIDList, uint8_t size, uint8_t *index);
-uint8_t SerXXNRC33Filter(const uint8_t *levelList, uint8_t index);
 uint8_t SerXXNRC7EFilter(const uint8_t *SubSupportSession, uint8_t index);
 uint8_t SerXXNRC7FFilter(uint8_t SupportSession);
-extern void Data_Set_DiagPara(void);
 void Write_App_InValid(uint32_t m32);
-void Data_Read_DiagPara(void);
-void DFlash_init(void);
-void Data_Read_DiagPara(void);
+
+extern void Get_Into_630H_Update_MCU_Mode(void);
+extern void Check_MCU_Info_in_630H(void);
 
 #endif

Firmware/utility/Boot_Release/Boot程序版本更新说明.txt

+# 2024.08.16 (2)
+    中微厂家提供了新的cgc.c文件
+    内部版本信息更新(1.03_20240816)
+
+# 2024.08.16
+    修复一级Boot计算Flash Block错误的问题
+    添加630H升级MCU APP的能力
+    内部版本号更新(1.02_20240816)
+
 # 2024.08.08
     修复一级Boot失效的问题
     项目信息统一