Merge branch 'shihao' into 'develop'

Shihao

See merge request !23

source/Appliciation/DataProcess.c

@@ -22,9 +22,9 @@ DataVSPeedDampingStruct DataVSPeedDamping;
 
 
 uint16_t                ESpeedCAFD;     
-uint16_t                DataESpeedActual;
-uint16_t                DataESpeedDisp;
-uint8_t                 DataESpeedValid;
+// uint16_t                DataESpeedActual;
+// uint16_t                DataESpeedDisp;
+// uint8_t                 DataESpeedValid;
 DataESpeedSamplerStruct DataESpeedSampler;
 DataESpeedStruct        DataESpeed ;
 DataFreESpeedSamplerStruct DataFreESpeedSampler;

source/Appliciation/Display/GUI.h

@@ -112,7 +112,7 @@ extern void GUI_BJ_Gear_Display(uint8_t Mode, uint8_t Valid );
 extern void GUI_PopAlarm_Display(INT16U PopupAlarmDis);
 
 void GUI_ECU_Display(void);
-void Gui_TRIP(uint32_t TRIP);
+void Gui_TRIP(uint32_t MileageDisp);
 void Gui_EndMileage(uint8_t Valid, uint16_t EndMileage);
 void Gui_AvgSpeed(uint8_t Valid, uint8_t AvgSpeed);
 void Gui_AvgOilCon(uint8_t Valid, uint8_t AvgOilCon, uint8_t Valid_M);

source/Appliciation/FuelConfig.c

@@ -79,7 +79,7 @@ void SetFuelInit(void)
     FuelInit.FuelCapacityBoundary[7] =  70000-4000-15500;
     FuelInit.FuelCapacityBoundary[8] =  70000-4000-8000;
     FuelInit.FuelCapacityBoundary[9] =  70000-4000-6000;
-    FuelInit.FuelCapacityBoundary[10] = 70000-4000-0000;
+    FuelInit.FuelCapacityBoundary[10] = 70000-4000;
     
     InitFuelParamter(&FuelInit);
     FuelSaveLen = 0;

source/Appliciation/Menu_Interface.c

@@ -21,7 +21,7 @@ void Menu_Logic_Operation_SET_TimeMin(Menu_Key_en_t enKeyType);
 void Menu_Logic_Operation_SET_LDWS(Menu_Key_en_t enKeyType);
 void Menu_u8Data_Updata_Process(uint8_t updateDir , uint8_t datMax, uint8_t datMin, uint8_t datStep, uint8_t *dat);
 void Menu_u16Data_Updata_Process(uint8_t updateDir , uint16_t datMax, uint8_t datMin, uint16_t datStep, uint16_t *dat);
-void Menu_User_Init(PoMa_Reset_en_t PowerType);
+
 
 
 extern uint16_t LocalMinOfs_TBOX;

source/Appliciation/Task.c

@@ -238,9 +238,5 @@ void             Sys_Exact_50us_Tasks(void)
 void Sys_Exact_100ms_Tasks(void)
 {
       Mileage_Rolling_Counter_Update_ISR(Common_Get_Act_V_Speed());
-   
-}
-void Sys_Protect_Task(void);
-void Sys_Protect_Task(void)
-{
 }
+

source/Appliciation/Task.h

@@ -10,6 +10,5 @@ void Sys_Run_Mode_50ms_Tasks_Group(void);
 void Sys_Run_Mode_100ms_Tasks_Group(void);
 void Sys_Exact_50us_Tasks(void);
 void Sys_Exact_100ms_Tasks(void);
-void        Sys_Protect_Task(void);
 
 #endif

source/Driver/Clock/r_dev_clk.c

@@ -2409,7 +2409,7 @@ void R_DEV_ClkPrepare(void)
     loc_ClkGenCfg.Pll [ 2 ].Mode        = R_DEV_PLL_OFF;
     loc_ClkGenCfg.Pll [ 2 ].DithMode    = R_DEV_PLL_DITH_FIXED;
     loc_ClkGenCfg.Pll [ 2 ].DithRange   = 0;
-    loc_ClkGenCfg.Pll [ 2 ].ModFreq     = 00;
+    loc_ClkGenCfg.Pll [ 2 ].ModFreq     = 0;
     loc_ClkGenCfg.Pll [ 2 ].FrequencyHz = 120000000;
     loc_ClkGenCfg.Pll [ 2 ].StabiTimeNs = 1000000;
     loc_ClkGenCfg.Pll [ 2 ].StpReqMsk   = 0;

source/Driver/GPIO/GPIO.c

@@ -46,7 +46,7 @@ void GPIO_Init(GPIO_Config_Mode_en_t enGPIOConfigMode)
         //  GPIO_PIN_Init(GPIO_SLEEP_MODE);
 		RTE_GPIO_Sleep_Init();
         /*All ports except P0 into hold state*/
-        GPIO_STB_PROTECTED_WRITE(SYSPROTCMD0, SYSPROTS0, SYSIOHOLD, 0x7EU);
+        GPIO_STB_PROTECTED_WRITE(SYSPROTCMD0, SYSPROTS0, SYSIOHOLD, 0x76U);
 				//GPIO_PIN_Init(GPIO_SLEEP_MODE);
     }
 }

source/Driver/Sound/Buzzer_Play_User.h

@@ -2,5 +2,5 @@
 #define BUZZER_PLAY_USER_H__
 #include "Buzzer_Play.h"
 extern void Buzzer_Play_Init_Example(void);
-extern void Buzzer_Volume_Set(Buzzer_uint8_t u16BzVo);
+extern void Buzzer_Volume_Set(Buzzer_uint8_t u8BzVo);
 #endif
\ No newline at end of file

source/System/init.c

@@ -134,7 +134,7 @@ void Sys_Startup_Init(void)
 {
     uint32_t  i;
     uint32_t *pRam;
-    uint8_t   u8StartupMode;
+    uint8_t   u8StartupMode = 0;
 
     __DI( );
     TestBackupRam = Clock_Get_Startup_Mode( );