Merge branch 'CJL' into 'dev'

Cjl

See merge request !128

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c

@@ -4539,6 +4539,7 @@ void Checkself_SEG_Display(void)
     uint8_t min = 0;
     uint32_t ODO = 0;
     uint32_t Mileage = 0;
+    uint16_t speedCount = 0;
 
     if (Common_GetIgnOnTime() >= 200)
     {

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -50,13 +50,13 @@ static void Power_KL30_Init(void)
     ClearODO_Flag = 0;
     Gpio_Init(Gpio_KL30_Init);
     Analog_Signal_Conv_Init();
+    
+    Can_Init();
+    CAN_TX_Init();
     Sys_KL30_Init();
     Simulated_IIC_2_Init();
     eeprom_StoreInfo_Init();
-
-    Can_Init();
     Data_TPMS_KL30_Init ();
-    CAN_TX_Init();
     //CAN_TX_SetEnable(&CAN_CH0_CanMsgTxOp, CAN_N_TX_Enable);
     DFlash_init();
     Data_Read_DiagPara();

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -312,13 +312,13 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x131 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x132 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x131 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x132 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x25 // 0x24 = 2024年, program year
-#define PROG_M 0x02 // 0x03 = 3月, program month
-#define PROG_D 0x10 // 0x19 = 19日, program day
+#define PROG_M 0x03 // 0x03 = 3月, program month
+#define PROG_D 0x06 // 0x19 = 19日, program day
 
 /******************************************************************************
  Bootloader Variable