Merge branch 'shihao' into 'dev'

Shihao

See merge request !5

le19源码/Source/Application/Key/Key.c

@@ -21,12 +21,17 @@ uint8_t      EnergyRecovery0_Key;
 uint8_t Key_SW_OTA_Timer;
 uint8_t Key_SW_EnergyRecovery_Timer;
 uint8_t Key_SW_EnergyRecovery0_Timer;
-uint8_t     EnergyRecovery_Level = 2;
+#pragma location="BACKUP_RAM_CONTENT"
+uint8_t     EnergyRecovery_Level;
 
 /*uint8_t Key_sts;
 static void btn_Int_Trip_cb(button_event_t event);*/
 
 static void btn_Ext_Trip_cb(button_event_t event);
+void EnergyRecovery_KL30_Init(void)
+{
+    EnergyRecovery_Level = 2;
+}
 
 void ClearNOuseButton(void)
 {

le19源码/Source/Application/Key/Key.h

@@ -55,5 +55,6 @@ void EnergyRecovery_Key_Detect(void);
 void EnergyRecovery0_Key_Detect(void);
 uint8_t EnergyRecovery_Key_val(void);
 uint8_t EnergyRecovery0_Key_val(void);
+void EnergyRecovery_KL30_Init(void);
 
 #endif
\ No newline at end of file

le19源码/Source/Application/Power/PowerManagement.c

@@ -348,6 +348,7 @@ void Power_KL30_Init(void)
     Gauge_KL30_Init( );
     Temp_Calc_Init();
     Maintenance_Init_Example();
+    EnergyRecovery_KL30_Init();
 }
 /**********************************************************************************************************
  *@Function:          Power_Wakeup_Init

le19源码/Source/Application/UDS/APP/Common/UDS_Common.c

@@ -28,7 +28,7 @@ Ser2EToDFlashInfoUnion Ser2EToDFlashInfo;
 DTCToDFlashInfoUnion DTCToDFlashInfo;
  const uint8_t DID_F180[16]= {'1','0','3',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};
  const uint8_t DID_F187[21]={'9','9','0','0','1','6','2','7','4','4',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};
- const uint8_t DID_F189[16]={'0','0','1','.','0','0','1',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};//主机厂定义的软件版本编号
+ const uint8_t DID_F189[16]={'0','0','1','.','0','0','2',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};//主机厂定义的软件版本编号
  const uint8_t DID_F191[16]={'0','0','1','.','0','0','1',0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20};//主机厂定义的硬件版本编号
  const uint8_t DID_F193[16]={'H','V','0','0','1','.','0','0','1',0x20,0x20,0x20,0x20,0x20,0x20,0x20};//供应商定义的硬件版本编号
  const uint8_t DID_F199[4]={0x20u,0x23u,0x02u,0x24u};
@@ -39,7 +39,7 @@ DTCToDFlashInfoUnion DTCToDFlashInfo;
  const uint8_t Ser22_DID_F18A[6] = {'4', '5', '1', '0', '0', '3'}; 
  const uint8_t Ser22_DID_F18B[4] = {0x20, 0x23, 0x02, 0x24};       
  const uint8_t Ser22_DID_F18C[24] = "0000";                          
- const uint8_t Ser22_DID_F195[16] = "SV001.001       ";//供应商定义的软件版本编号                 	 
+ const uint8_t Ser22_DID_F195[16] = "SV001.002       ";//供应商定义的软件版本编号                 	 
  const uint8_t Ser22_DID_F1A2[4] ={0x20,0x23,0x02,0x24};
  /*const uint8_t Ser22_DID_F1AA[8];                                  
  const uint8_t Ser22_DID_F1AE[] = "";                              

utility/lg02y_backram区变量初始化检查.txt

+未初始化
+DataODOCalc.Rsvd
+
+已初始化
+TimerRecord
+Data_ODO_SyncCnt
+Data_ODO_SyncKM
+Data_ODO_SyncReason
+DataMileageRollingCounter
+DataMileage
+Data_ODO_Val
+DataODOValid
+EEPROM_St
+Input_ODO_Para
+Data_ODO_ClearCnt
+Data_ODO_ClearKM
+DataTripA
+DataTripAValid
+DataTripACalc
+NVMEEPROMFault
+NVMUpdateCtrl
+NVMODO_back
+
+定义,但没调用相关函数
+Data_Interval_Para
+Servicekm
+ServiceTimer
+DataMileageRollingCounter1
+DataMileage1
+DataODOValid1
+EEPROM_St1
+Input_ODO_Para1
+ClkStartupTest
+ClkStartupTest
+
+
+
+
+
+

utility/程序释放/LE19_2023-11-29/LE19程序说明.txt

+Updata.bin是一键升级小盒专用程序
+ALL是烧写器烧写的程序
+APP是诊断工具升级的程序
\ No newline at end of file