加英文显示变更

source/Application/APP/Data_ODO/Services_ODO_User.c

@@ -108,6 +108,23 @@ void Data_User_Mileage_KL30Init(void)
             LitSpdTyp_Set(1u);
         }
     }
+    /* 语言初始值设置 */
+    if (Menu_Con_EEP_Value.K_Value_Num_Value3 != 0x5Au)
+    {
+        Menu_Con_EEP_Value.K_Value_Num_Value3 = 0x5Au;
+        Menu_Con_EEP_Value.Set_LanguageTyp    = 0u;
+        LanguageTyp_Set(0u);
+        Common_Set_LanguageTyp(0u);
+    }
+    else
+    {
+        LanguageTyp_Set(Menu_Con_EEP_Value.Set_LanguageTyp);
+
+        if (LanguageTyp_Get() > 1u)
+        {
+            LanguageTyp_Set(0u);
+        }
+    }
 }
 
 #if 0 //20230830按领导要求恢复原样

source/Application/APP/FlashCheckSum/FlashCheckSum.h

 #ifndef __FLASHCHECKSUM_H_
 #define __FLASHCHECKSUM_H_
 
-#define REAL_FLASHCHECKSUM      0xFC767058ul
+#define REAL_FLASHCHECKSUM      0x9FB383ECul
 
 #define SPI_START_ADDR 0x10000000ul
-#define SPI_ADDR_RANGE 0x00C4F1E0ul
+#define SPI_ADDR_RANGE 0x02306080ul
 
 unsigned char CheckSpiFlashCRC(void);
 

source/Application/APP/Key/Key.h

@@ -119,6 +119,7 @@ typedef enum
     Vhcl_Info_SCU,
 	Vhcl_Info_ABS,
 	Vhcl_Info_SW,
+	Vhcl_Info_LAN,
     Vhcl_Info_RET,
 
 	Vhcl_Info_Max,
@@ -167,6 +168,8 @@ extern uint8_t VhlInfTyp_Get(void);
 extern uint8_t ResToDef_Get(void);
 extern uint8_t VdoFmtTyp_Get(void);
 extern void VdoFmtTyp_Set(uint8_t SetValue);
+extern uint8_t LanguageTyp_Get(void);
+extern void LanguageTyp_Set(uint8_t SetValue);
 
 extern uint8_t LitSpdTyp_Get(void);
 extern void LitSpdTyp_Set(uint8_t SetValue);

source/Application/RTE/Common_Interface.c

@@ -272,12 +272,10 @@ int32_t SEGGER_RTT_printf(uint16_t BufferIndex, const char * sFormat, ...)
     return 0;
 }
 
-void Common_Set_VdoFmtTyp(uint8_t NUM_Status)
+void Common_Set_Typ(void)
 {
     EEPROM_RW_Result_en_t enResult = EEPROM_RW_FAIL;
 
-    Menu_Con_EEP_Value.Set_VdoFmtTyp = NUM_Status;
-    
     for (uint32_t i=0u; i<10u; i++)
     {
         /*存储*/
@@ -298,32 +296,29 @@ void Common_Set_VdoFmtTyp(uint8_t NUM_Status)
     }
 }
 
+void Common_Set_VdoFmtTyp(uint8_t NUM_Status)
+{
+    Menu_Con_EEP_Value.Set_VdoFmtTyp = NUM_Status;
+    
+    Common_Set_Typ();
+}
+
 extern uint8_t LitSpdTyp; //限速类型,0=89,1=99,2=109
 
 void Common_Set_LitSpdTyp(uint8_t NUM_Status)
 {
-    EEPROM_RW_Result_en_t enResult = EEPROM_RW_FAIL;
-
     Menu_Con_EEP_Value.Set_LitSpdTyp = NUM_Status;
     
-    for (uint32_t i=0u; i<10u; i++)
-    {
-        /*存储*/
-        if (EEPROM_Get_Block_Status (EEPROM_BLOCK_UE_INFO) != EEPROM_STAT_ERROR)
-        {
-            while (EEPROM_Get_Status() == EEPROM_STAT_BUSY)
-            {
-                WDT_Clear();
-            }
-            
-            enResult = EEPROM_Write_Data(EEPROM_BLOCK_UE_INFO, &Menu_Con_EEP_Value, (sizeof(Menu_Con_EEP_Value) / 4u));
-            
-            if (enResult == EEPROM_RW_PASS)
-            {
-                break;
-            }
-        }
-    }
+    Common_Set_Typ();
+}
+
+extern uint8_t LanguageTyp; //语言类型,0=中文,1=英文
+
+void Common_Set_LanguageTyp(uint8_t NUM_Status)
+{
+    Menu_Con_EEP_Value.Set_LanguageTyp = NUM_Status;
+    
+    Common_Set_Typ();
 }
 
 #if 0

source/Application/RTE/Common_Interface.h

@@ -235,8 +235,12 @@ typedef struct
     uint8_t K_Value_Num_Value4;            /*29 调表模式/参数 K值*/
     uint8_t K_Value_Num_Value5;            /*29 调表模式/参数 K值*/
     uint8_t Set_VdoFmtTyp;                 /* 倒车影像开关 */
-    uint8_t Set_LitSpdTyp;                 /* 限速类型*/
-    //uint8_t ccc; /* 预留*/
+    uint8_t Set_LitSpdTyp;                 /* 限速类型 */
+    
+    uint8_t Set_LanguageTyp;               /* 语言类型 */
+    uint8_t revers1;
+    uint8_t revers2;
+    uint8_t revers3;
 
     uint32_t TMaintain_Set_Value;          /*27 提示设置/保养设置 单位km*/
     uint32_t TMaintain_Tips_Value;         /*28 提示设置/提示里程 单位km*/
@@ -246,6 +250,7 @@ typedef struct
 extern _Menu_Configure_Value Menu_Con_EEP_Value;
 extern void Common_Set_VdoFmtTyp(uint8_t NUM_Status);
 extern void Common_Set_LitSpdTyp(uint8_t NUM_Status);
+extern void Common_Set_LanguageTyp(uint8_t NUM_Status);
 
 #if 0
 uint8_t Common_Get_TempHigh_Type(void);/*获取水温高状态*/

source/Application/UDS/APP/Common/UDS_Common.c

@@ -26,10 +26,10 @@ const uint8_t Ser22_DID_F18A[8] =  {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x
 const uint8_t Ser22_DID_F18B[4] =  {0x20, 0x20, 0x20, 0x20};                                                                /*IC 生产日期*/
 const uint8_t Ser22_DID_F18C[20] = {0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20};                                         
                                                                                                             /*IC 系列号*/
-const uint8_t Ser22_DID_F190[17] = {'S', 'V', ':', '1', '.', '3', '.', '0', ' ', 'H', 'V', ':', '1', '.', '0', '.', '3'};                  
+const uint8_t Ser22_DID_F190[17] = {'S', 'V', ':', '1', '.', '3', '.', '1', ' ', 'H', 'V', ':', '1', '.', '0', '.', '3'};                  
      	                                                                                                    /*车辆标识号 VIN*/
 const uint8_t Ser22_DID_F193[6] =  {'V', '1', '.', '0', '.', '2'};                                          /*IC 硬件版本号*/
-const uint8_t Ser22_DID_F195[6] =  {'V', '1', '.', '3', '.', '0'};                                          /*IC 逻辑程序软件版本号*/
+const uint8_t Ser22_DID_F195[6] =  {'V', '1', '.', '3', '.', '1'};                                          /*IC 逻辑程序软件版本号*/
 
 DiagMSGUnion DiagMSG;
 DiagFlagUnion DiagFlag;

source/Driver/Graphic/loc_graphics_data.h

@@ -219,21 +219,21 @@ static const SpritesHandler_t SpriteHandler[Max_Sprite] =
     //{AirP1_Sprite,     {330,  43,  164, 30,  1},  TARGET_VRAM, &AirP1SpriteBuf,   &AirP1Index,   AirP1LogicLayerAttr,   MAX_AirP1_SUP_LAYER,   &AirP1Update,   &AirP1En,   /*NULL*/GUI_AirP1  },
     //{Clock_Sprite,     {400,  21,  90,  20,  1},  TARGET_VRAM, &ClockSpriteBuf,   &ClockIndex,   ClockLogicLayerAttr,   MAX_Clock_SUP_LAYER,   &ClockUpdate,   &ClockEn,   NULL/*GUI_Clock*/  },
     {Top4_Sprite,      {500,  15,  266, 30,  1},  TARGET_VRAM, &Top4SpriteBuf,    &Top4Index,    Top4LogicLayerAttr,    MAX_Top4_SUP_LAYER,    &Top4Update,    &Top4En,    /*NULL*/GUI_Top4   },
-    {Top5_Sprite,      {770,  19,  200, 30,  1},  TARGET_VRAM, &Top5SpriteBuf,    &Top5Index,    Top5LogicLayerAttr,    MAX_Top5_SUP_LAYER,    &Top5Update,    &Top5En,    /*NULL*/GUI_Top5   },
+    {Top5_Sprite,      {758,  11,  212, 38,  1},  TARGET_VRAM, &Top5SpriteBuf,    &Top5Index,    Top5LogicLayerAttr,    MAX_Top5_SUP_LAYER,    &Top5Update,    &Top5En,    /*NULL*/GUI_Top5   },
     //{AirP2_Sprite,     {764,  43,  164, 30,  1},  TARGET_VRAM, &AirP2SpriteBuf,   &AirP2Index,   AirP2LogicLayerAttr,   MAX_AirP2_SUP_LAYER,   &AirP2Update,   &AirP2En,   /*NULL*/GUI_AirP2  },
     {Top6_Sprite,      {1173, 25,  90,  78,  2},  TARGET_VRAM, &Top6SpriteBuf,    &Top6Index,    Top6LogicLayerAttr,    MAX_Top6_SUP_LAYER,    &Top6Update,    &Top6En,    /*NULL*/GUI_Top6   },
     {Top7_Sprite,      {398,  73,  480, 30,  2},  TARGET_VRAM, &Top7SpriteBuf,    &Top7Index,    Top7LogicLayerAttr,    MAX_Top7_SUP_LAYER,    &Top7Update,    &Top7En,    /*NULL*/GUI_Top7   },
-    {Bottm1_Sprite,    {307,  372, 662, 30,  1},  TARGET_VRAM, &Bottm1SpriteBuf,  &Bottm1Index,  Bottm1LogicLayerAttr,  MAX_Bottm1_SUP_LAYER,  &Bottm1Update,  &Bottm1En,  /*NULL*/GUI_Bottm1 },
-    {Bottm2_Sprite,    {30,   412, 272, 30,  1},  TARGET_VRAM, &Bottm2SpriteBuf,  &Bottm2Index,  Bottm2LogicLayerAttr,  MAX_Bottm2_SUP_LAYER,  &Bottm2Update,  &Bottm2En,  /*NULL*/GUI_Bottm2 },
-    {Bottm2P_Sprite,   {30,   444, 224, 30,  1},  TARGET_VRAM, &Bottm2PSpriteBuf, &Bottm2PIndex, Bottm2PLogicLayerAttr, MAX_Bottm2P_SUP_LAYER, &Bottm2PUpdate, &Bottm2PEn, /*NULL*/GUI_Bottm2P},
+    {Bottm1_Sprite,    {307,  376, 662, 30,  1},  TARGET_VRAM, &Bottm1SpriteBuf,  &Bottm1Index,  Bottm1LogicLayerAttr,  MAX_Bottm1_SUP_LAYER,  &Bottm1Update,  &Bottm1En,  /*NULL*/GUI_Bottm1 },
+    {Bottm2_Sprite,    {21,   412, 394, 30,  1},  TARGET_VRAM, &Bottm2SpriteBuf,  &Bottm2Index,  Bottm2LogicLayerAttr,  MAX_Bottm2_SUP_LAYER,  &Bottm2Update,  &Bottm2En,  /*NULL*/GUI_Bottm2 },
+    {Bottm2P_Sprite,   {22,   440, 250, 34,  1},  TARGET_VRAM, &Bottm2PSpriteBuf, &Bottm2PIndex, Bottm2PLogicLayerAttr, MAX_Bottm2P_SUP_LAYER, &Bottm2PUpdate, &Bottm2PEn, /*NULL*/GUI_Bottm2P},
     {Bottm3_Sprite,    {292,  434, 96,  30,  1},  TARGET_VRAM, &Bottm3SpriteBuf,  &Bottm3Index,  Bottm3LogicLayerAttr,  MAX_Bottm3_SUP_LAYER,  &Bottm3Update,  &Bottm3En,  /*NULL*/GUI_Bottm3 },
-    {Bottm4_Sprite,    {408,  412, 174, 30,  1},  TARGET_VRAM, &Bottm4SpriteBuf,  &Bottm4Index,  Bottm4LogicLayerAttr,  MAX_Bottm4_SUP_LAYER,  &Bottm4Update,  &Bottm4En,  /*NULL*/GUI_Bottm4 },
-    {Bottm5_Sprite,    {408,  444, 212, 30,  1},  TARGET_VRAM, &Bottm5SpriteBuf,  &Bottm5Index,  Bottm5LogicLayerAttr,  MAX_Bottm5_SUP_LAYER,  &Bottm5Update,  &Bottm5En,  /*NULL*/GUI_Bottm5 },
-    {Bottm6_Sprite,    {686,  412, 176, 30,  1},  TARGET_VRAM, &Bottm6SpriteBuf,  &Bottm6Index,  Bottm6LogicLayerAttr,  MAX_Bottm6_SUP_LAYER,  &Bottm6Update,  &Bottm6En,  /*NULL*/GUI_Bottm6 },
-    {Bottm7_Sprite,    {686,  444, 212, 30,  1},  TARGET_VRAM, &Bottm7SpriteBuf,  &Bottm7Index,  Bottm7LogicLayerAttr,  MAX_Bottm7_SUP_LAYER,  &Bottm7Update,  &Bottm7En,  /*NULL*/GUI_Bottm7 },
+    {Bottm4_Sprite,    {408,  412, 204, 30,  1},  TARGET_VRAM, &Bottm4SpriteBuf,  &Bottm4Index,  Bottm4LogicLayerAttr,  MAX_Bottm4_SUP_LAYER,  &Bottm4Update,  &Bottm4En,  /*NULL*/GUI_Bottm4 },
+    {Bottm5_Sprite,    {408,  432, 244, 46,  3},  TARGET_VRAM, &Bottm5SpriteBuf,  &Bottm5Index,  Bottm5LogicLayerAttr,  MAX_Bottm5_SUP_LAYER,  &Bottm5Update,  &Bottm5En,  /*NULL*/GUI_Bottm5 },
+    {Bottm6_Sprite,    {673,  412, 188, 30,  1},  TARGET_VRAM, &Bottm6SpriteBuf,  &Bottm6Index,  Bottm6LogicLayerAttr,  MAX_Bottm6_SUP_LAYER,  &Bottm6Update,  &Bottm6En,  /*NULL*/GUI_Bottm6 },
+    {Bottm7_Sprite,    {673,  444, 218, 30,  1},  TARGET_VRAM, &Bottm7SpriteBuf,  &Bottm7Index,  Bottm7LogicLayerAttr,  MAX_Bottm7_SUP_LAYER,  &Bottm7Update,  &Bottm7En,  /*NULL*/GUI_Bottm7 },
     //{Bottm8_Sprite,    {579,  408, 122, 64,  1},  TARGET_SDRAM, &Bottm8SpriteBuf,  &Bottm8Index,  Bottm8LogicLayerAttr,  MAX_Bottm8_SUP_LAYER,  &Bottm8Update,  &Bottm8En,  /*NULL*/GUI_Bottm8 },
     {Bottm9_Sprite,    {891,  434, 90,  30,  1},  TARGET_VRAM, &Bottm9SpriteBuf,  &Bottm9Index,  Bottm9LogicLayerAttr,  MAX_Bottm9_SUP_LAYER,  &Bottm9Update,  &Bottm9En,  /*NULL*/GUI_Bottm9 },
-    {Bottm10_Sprite,   {1118, 412, 130, 30,  1},  TARGET_VRAM, &Bottm10SpriteBuf, &Bottm10Index, Bottm10LogicLayerAttr, MAX_Bottm10_SUP_LAYER, &Bottm10Update, &Bottm10En, /*NULL*/GUI_Bottm10},
+    {Bottm10_Sprite,   {1098,  412, 150, 30,  1},  TARGET_VRAM, &Bottm10SpriteBuf, &Bottm10Index, Bottm10LogicLayerAttr, MAX_Bottm10_SUP_LAYER, &Bottm10Update, &Bottm10En, /*NULL*/GUI_Bottm10},
     {Bottm11_Sprite,   {1012, 445, 234, 20,  1},  TARGET_VRAM, &Bottm11SpriteBuf, &Bottm11Index, Bottm11LogicLayerAttr, MAX_Bottm11_SUP_LAYER, &Bottm11Update, &Bottm11En, /*NULL*/GUI_Bottm11},
     {Stop_Sprite,      {12,   375, 96,  30,  1},  TARGET_VRAM, &StopSpriteBuf,    &StopIndex,    StopLogicLayerAttr,    MAX_Stop_SUP_LAYER,    &StopUpdate,    &StopEn,    /*NULL*/GUI_Stop   },
     {Park_Sprite,      {1131, 374, 132, 32,  1},  TARGET_VRAM, &ParkSpriteBuf,    &ParkIndex,    ParkLogicLayerAttr,    MAX_Park_SUP_LAYER,    &ParkUpdate,    &ParkEn,    /*NULL*/GUI_Park   },

source/System/main.c

@@ -104,6 +104,8 @@
 //20231108 修改故障码显示Lv3-0问题：显示、查询、调度不同步
 //20231110 修改IGNON和IGNOFF切换时显示异常问题：IGNON显示“请拉手刹”，车身闪一下
 //20231113 增加内部软硬件版本号，修改报警声延时20多秒才有问题（开机声音时长设大了）
+//V1.3.1
+//20240112 同步0038加英文变更程序修改，去掉菜单自动退出（查看信息不方便）
 
 #include "r_typedefs.h"
 #include "sys_scheduler.h"