Commit 41d6c9cd authored by chen's avatar chen

fix:修改了禅道上的QAC问题

parent 6a6192e0
...@@ -22,9 +22,9 @@ DataVSPeedDampingStruct DataVSPeedDamping; ...@@ -22,9 +22,9 @@ DataVSPeedDampingStruct DataVSPeedDamping;
uint16_t ESpeedCAFD; uint16_t ESpeedCAFD;
uint16_t DataESpeedActual; // uint16_t DataESpeedActual;
uint16_t DataESpeedDisp; // uint16_t DataESpeedDisp;
uint8_t DataESpeedValid; // uint8_t DataESpeedValid;
DataESpeedSamplerStruct DataESpeedSampler; DataESpeedSamplerStruct DataESpeedSampler;
DataESpeedStruct DataESpeed ; DataESpeedStruct DataESpeed ;
DataFreESpeedSamplerStruct DataFreESpeedSampler; DataFreESpeedSamplerStruct DataFreESpeedSampler;
......
...@@ -112,7 +112,7 @@ extern void GUI_BJ_Gear_Display(uint8_t Mode, uint8_t Valid ); ...@@ -112,7 +112,7 @@ extern void GUI_BJ_Gear_Display(uint8_t Mode, uint8_t Valid );
extern void GUI_PopAlarm_Display(INT16U PopupAlarmDis); extern void GUI_PopAlarm_Display(INT16U PopupAlarmDis);
void GUI_ECU_Display(void); 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_EndMileage(uint8_t Valid, uint16_t EndMileage);
void Gui_AvgSpeed(uint8_t Valid, uint8_t AvgSpeed); void Gui_AvgSpeed(uint8_t Valid, uint8_t AvgSpeed);
void Gui_AvgOilCon(uint8_t Valid, uint8_t AvgOilCon, uint8_t Valid_M); void Gui_AvgOilCon(uint8_t Valid, uint8_t AvgOilCon, uint8_t Valid_M);
......
...@@ -79,7 +79,7 @@ void SetFuelInit(void) ...@@ -79,7 +79,7 @@ void SetFuelInit(void)
FuelInit.FuelCapacityBoundary[7] = 70000-4000-15500; FuelInit.FuelCapacityBoundary[7] = 70000-4000-15500;
FuelInit.FuelCapacityBoundary[8] = 70000-4000-8000; FuelInit.FuelCapacityBoundary[8] = 70000-4000-8000;
FuelInit.FuelCapacityBoundary[9] = 70000-4000-6000; FuelInit.FuelCapacityBoundary[9] = 70000-4000-6000;
FuelInit.FuelCapacityBoundary[10] = 70000-4000-0000; FuelInit.FuelCapacityBoundary[10] = 70000-4000;
InitFuelParamter(&FuelInit); InitFuelParamter(&FuelInit);
FuelSaveLen = 0; FuelSaveLen = 0;
......
...@@ -2409,7 +2409,7 @@ void R_DEV_ClkPrepare(void) ...@@ -2409,7 +2409,7 @@ void R_DEV_ClkPrepare(void)
loc_ClkGenCfg.Pll [ 2 ].Mode = R_DEV_PLL_OFF; loc_ClkGenCfg.Pll [ 2 ].Mode = R_DEV_PLL_OFF;
loc_ClkGenCfg.Pll [ 2 ].DithMode = R_DEV_PLL_DITH_FIXED; loc_ClkGenCfg.Pll [ 2 ].DithMode = R_DEV_PLL_DITH_FIXED;
loc_ClkGenCfg.Pll [ 2 ].DithRange = 0; 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 ].FrequencyHz = 120000000;
loc_ClkGenCfg.Pll [ 2 ].StabiTimeNs = 1000000; loc_ClkGenCfg.Pll [ 2 ].StabiTimeNs = 1000000;
loc_ClkGenCfg.Pll [ 2 ].StpReqMsk = 0; loc_ClkGenCfg.Pll [ 2 ].StpReqMsk = 0;
......
...@@ -336,7 +336,7 @@ r_dma_TransEndStatType_t R_G3DMA_TransEndStat(uint32_t Unit, uint32_t ChId) ...@@ -336,7 +336,7 @@ r_dma_TransEndStatType_t R_G3DMA_TransEndStat(uint32_t Unit, uint32_t ChId)
{ {
uint32_t base_addr; uint32_t base_addr;
uint32_t reg_dcst; uint32_t reg_dcst;
r_dma_TransEndStatType_t val; r_dma_TransEndStatType_t val = 0;
if ( Unit < R_G3DMA_MACRO_NUM ) if ( Unit < R_G3DMA_MACRO_NUM )
{ {
......
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
#define BUZZER_PLAY_USER_H__ #define BUZZER_PLAY_USER_H__
#include "Buzzer_Play.h" #include "Buzzer_Play.h"
extern void Buzzer_Play_Init_Example(void); 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 #endif
\ No newline at end of file
...@@ -47,6 +47,8 @@ BFC_BIN_RESULT Gui_GetFontInfo(uint16_t unicodeID) ...@@ -47,6 +47,8 @@ BFC_BIN_RESULT Gui_GetFontInfo(uint16_t unicodeID)
uint16_t TotalFontCount = 0; uint16_t TotalFontCount = 0;
uint16_t mdatasize = 0; uint16_t mdatasize = 0;
uint16_t i = 0; uint16_t i = 0;
m_Format.DataSize = 0;
m_Format.OffData = 0;
for (i = 0; i < g_BFC_BIN_FONT.NumOfCharRanges; i++) for (i = 0; i < g_BFC_BIN_FONT.NumOfCharRanges; i++)
{ {
......
...@@ -134,7 +134,7 @@ void Sys_Startup_Init(void) ...@@ -134,7 +134,7 @@ void Sys_Startup_Init(void)
{ {
uint32_t i; uint32_t i;
uint32_t *pRam; uint32_t *pRam;
uint8_t u8StartupMode; uint8_t u8StartupMode = 0;
__DI( ); __DI( );
TestBackupRam = Clock_Get_Startup_Mode( ); TestBackupRam = Clock_Get_Startup_Mode( );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment