Merge branch 'dev' of http://tyw-server.synology.me:12345/ty/tianying_ty100 into CHENJIALE

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/Objects/TianYing.sct

@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x00008000 0x00040000  {    ; load region size_region
-  ER_IROM1 0x00008000 0x00040000  {  ; load address = execution address
+LR_IROM1 0x00000000 0x00040000  {    ; load region size_region
+  ER_IROM1 0x00000000 0x00040000  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)

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

@@ -362,7 +362,7 @@
           </Aads>
           <LDads>
             <umfTarg>0</umfTarg>
-            <Ropi>1</Ropi>
+            <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
             <noStLib>0</noStLib>
             <RepFail>1</RepFail>
@@ -503,16 +503,6 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Application\CAN_User\Can_App.h</FilePath>
             </File>
-            <File>
-              <FileName>Data_Coolant.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\Source\Application\Data_Coolant\Data_Coolant.c</FilePath>
-            </File>
-            <File>
-              <FileName>Data_Coolant.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\..\..\Source\Application\Data_Coolant\Data_Coolant.h</FilePath>
-            </File>
             <File>
               <FileName>Data_TPMS.c</FileName>
               <FileType>1</FileType>
@@ -593,6 +583,16 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Application\FaultCode\code.h</FilePath>
             </File>
+            <File>
+              <FileName>Data_Coolant.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\Source\Application\Data_Coolant\Data_Coolant.c</FilePath>
+            </File>
+            <File>
+              <FileName>Data_Coolant.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\..\..\Source\Application\Data_Coolant\Data_Coolant.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT

@@ -14,7 +14,6 @@ SET CPU_CLOCK=0x00B71B00
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\gui_display.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_user.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can_app.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_coolant.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_tpms.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\faultcode.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_voltage.__i"
@@ -23,6 +22,7 @@ SET CPU_CLOCK=0x00B71B00
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_lib.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\protocol_user.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\code.__i"
+"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\data_coolant.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\bu98r10.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\services_mileage_user.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\eemanager_interface.__i"

Firmware/Source/Application/Data_Coolant/Data_Coolant.h

@@ -17,12 +17,14 @@ typedef struct __attribute__((aligned(4)))
   uint8_t u8_DestSeg;
   uint8_t u8_CurSeg;
   uint8_t u8_UpFlashtimer ;
+  uint8_t u8_Holdtimer ;
   uint8_t u8_DownFlashtimer ;  
   uint8_t u8_Uptimer ;
   uint8_t u8_Downtimer ;  
   uint8_t u8_Flashflg;
   uint8_t u8_Warnflg;
   uint8_t u8_Flg;
+  uint8_t u8Reserved;
 
 }DataCoolantTempDisStruct;
 
@@ -43,15 +45,16 @@ typedef struct __attribute__((aligned(4)))
 void Data_Coolant_Temp_KL30_Init(void);
 void Data_Coolant_Temp_KL15_Init(void);
 void Data_Coolant_Temp_Processing_Service(void);
-void Get_Coolant_Temp_Seg(uint16_t Temp_Value);
-void Data_Coolant_Temp_Display ( void );
+uint8_t Get_Coolant_Temp_Seg(uint16_t Temp_Value);
+void Data_Coolant_Temp_Display (void);
 
 
 uint8_t GET_DataCollantTempSegValid(void);
 uint8_t GET_DataCoolantTempSegDisp(void);
 uint16_t GET_DataCoolantTempValueDisp(void);
 uint8_t GET_DataCollantTempWarnflg(void);
+uint16_t GET_DataCoolantSegValue(void);
 
-extern DataCoolantTempStruct DataCoolantTemp ;
+extern DataCoolantTempStruct DataCoolantTemp;
 
 #endif

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -119,7 +119,7 @@ void Gauge_Service(void)
                 Gauge_Clock_Display();                
                 SEG_SET_FuelDial(1, Get_CurFuelSetp());
                 SEG_SET_EspeedDial(1,  Get_DispEngineSpeed()/500);
-                SEG_SET_CoolantDial(1, GET_DataCoolantTempSegDisp(), GET_DataCoolantTempValueDisp(), GET_DataCollantTempSegValid());
+                SEG_SET_CoolantDial(1, GET_DataCoolantTempSegDisp(), GET_DataCoolantSegValue(), GET_DataCollantTempSegValid());
                 SEG_SET_Voltage_NUM(1, Get_Battery_Voltage());
             #if(IC_Current == TY200_080000b_ty) 
                 SEG_SET_TPMS_DISPLAY(1, Get_Front_TPMS_Sig_Value(), Get_Rear_TPMS_Sig_Value(), 0 ,Get_Front_TPMS_Sig_Vaild(), Get_Rear_TPMS_Sig_Vaild());