Merge branch 'lijianshuang' into 'dev'

Lijianshuang

See merge request !93

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x8000</StartAddress>
+                <StartAddress>0x0</StartAddress>
                 <Size>0x40000</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>

Firmware/Source/Component/Mileage/Services_Mileage_User.c

@@ -58,12 +58,12 @@ void Data_User_Mileage_KL30Init(void)
     }
     else
     {
-        ODOInit.Offset = TempBuf[2];
+        ODOInit.Offset = TempBuf[1];
     }
     ODOInit.MaxValue = 1999990;
     Data_ODO_KL30_Init(DataODOBuf, &ODOInit, Func.EEPromWrite_Cbk);
 
-    (void)Data_User_EEPROM_Read(EM_TRIP_BLOCK, TempBuf + 3, 8);
+    (void)Data_User_EEPROM_Read(EM_TRIP_BLOCK, TempBuf + 3, 4);
     if (TempBuf[3] == 0XFFFFFFFF)
     {
         TripInit[EM_TRIP_A].Stamp = 0;
@@ -72,7 +72,15 @@ void Data_User_Mileage_KL30Init(void)
     {
         TripInit[EM_TRIP_A].Stamp = TempBuf[3];
     }
-    TripInit[EM_TRIP_A].Offset = TempBuf[4];
+    if (TempBuf[4] == 0XFFFFFFFF)
+    {
+        TripInit[EM_TRIP_A].Offset = 0;
+    }
+    else
+    {
+        TripInit[EM_TRIP_A].Offset = TempBuf[4];
+    }
+    //TripInit[EM_TRIP_A].Offset = TempBuf[4];
     TripInit[EM_TRIP_A].MaxValue = 9999; /* 最大999.9km 进行复位 */
     TripInit[EM_TRIP_A].IsRestart = 1u;
 

Firmware/utility/程序释放/20240910/ota_data_initial.bin

+
\ No newline at end of file