Skip to content

V
VC66_7C
Commit e94bb947 authored by hu's avatar hu
Browse files
Options

调整电池显示时间

parent 89790734
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 11287 additions and 11283 deletions
ghs/project
View file @ e94bb947
No preview for this file type
ghs/project.hex
View file @ e94bb947
This diff is collapsed.
ghs/project.siz
View file @ e94bb947
project .intvect 1536
project .text 316668
project .rodata 411127
project .text 316700
project .rodata 411095
project .secinfo 120
project .syscall 6
project .romdata 9029
......
source/Application/APP/Data_Voltmeter/Data_Voltmeter.c
View file @ e94bb947
......@@ -113,6 +113,7 @@ static void Data_Voltmeter_2_Gui(void)
static uint8_t u8GuiMode = 0 ;
VoltmeterVariable.AvrVoltage = Get_VoltFilter();
VoltmeterVariable.AvrVoltage += 800u;/*增加二极管压降补偿*/
if ((VoltmeterVariable.AvrVoltage >= 17000) && (VoltmeterVariable.AvrVoltage <= 30500))
{
......
source/Application/APP/GaugesMode/Gauges.c
View file @ e94bb947
......@@ -32,9 +32,9 @@ uint8_t ModeGaugesTestFlag[GAUGES_TOTAL_NUM] = {0u};
/*两套参数第一个是正常走行速度，第二个为快速走动8*/
const uint16_t GaugesDisDelayMax[2u][IndicatTypeTOtal] =
{
/*StepperMotor MotorGasType MotorTempType LCDGasType LEDOtherType GasType TempType 不同类型表头走行速度不同*/
{0u, 20u, 20u, 0u, 2u, 20u, 40u},
{0u, 0u, 0u, 2u, 2u, 2u, 40u},
/*StepperMotor MotorGasType MotorTempType LCDGasType LEDOtherType LEDGasType LEDTempType LEDBattery 不同类型表头走行速度不同*/
{0u, 20u, 20u, 0u, 2u, 20u, 40u, 200u},
{0u, 0u, 0u, 2u, 2u, 2u, 40u, 20u},
};
/**@brief Query Sector function
......@@ -402,7 +402,7 @@ void GaugeMoveing(uint8_t GaugesNum)
{
tmp = (GaugesInitTimes < (GaugesStarMoveTimeMax[GaugesNum] + Gauages_Init_Time_Max[ModeGaugesTestFlag[GaugesNum]]));
GetGaugesDisplayMode (GaugesNum);
if ((GaugesModuleType [GaugesNum] == FreeMoveType) || (GaugesModuleType [GaugesNum] == LEDTempType))
if ((GaugesModuleType [GaugesNum] == FreeMoveType) || (GaugesModuleType [GaugesNum] == LEDTempType) || (GaugesModuleType [GaugesNum] == LEDBattery))
{
if (ModeGaugesTestFlag[GaugesNum] && tmp)
{
......@@ -424,7 +424,7 @@ void GaugeMoveing(uint8_t GaugesNum)
else
{
/*水温表上升最后一格需要调整时间*/
if ((GaugesNum == 2) && (DirecSign[2] == 1u) && (GaugesCurrentPos[2] == (DestPostion[2] - 10u)))
if ((GaugesNum == TempGauges) && (DirecSign[TempGauges] == 1u) && (GaugesCurrentPos[TempGauges] == (DestPostion[TempGauges] - 10u)))
{
GaugesMoveTimesTmp = 2000u;
}
......@@ -434,9 +434,15 @@ void GaugeMoveing(uint8_t GaugesNum)
}
}
}
MoveTypePara = 10u;
/*电压放大倍数不同，单独处理*/
if (GaugesNum == VoltGauges)
{
MoveTypePara = 100u;
}
else
{
MoveTypePara = 10u;
}
}
else
{
......
source/Application/APP/GaugesMode/Gauges.h
View file @ e94bb947
......@@ -31,6 +31,7 @@ typedef enum
LEDOtherType,
LEDGasType,
LEDTempType,
LEDBattery,
IndicatTypeTOtal,
FreeMoveType,
......
source/Application/APP/GaugesMode/GaugesInterface.c
View file @ e94bb947
......@@ -49,7 +49,7 @@ static const uint16_t GaugesDataInInit[GaugesTotal][3][25] =
};
/*指示类型*/ /*表头1 表头2 表头3 表头4*/ /*表头5*/ /*表头6*/ /*表头7*/
static const uint8_t GaugesIndicatType[GaugesTotal] = {LEDOtherType, LEDOtherType, LEDTempType, LEDGasType, LEDGasType, LEDGasType, LEDOtherType}; /*初始化表头显示类型，例如水温，气压*/
static const uint8_t GaugesIndicatType[GaugesTotal] = {LEDOtherType, LEDOtherType, LEDTempType, LEDGasType, LEDGasType, LEDGasType, LEDBattery}; /*初始化表头显示类型，例如水温，气压*/
/*每个表头包含的参数个数*/ /*表头1 表头2 表头3 表头4*/
static const uint8_t GaugesParaNum[GaugesTotal] = {8, 6, 13, 19, 19, 19, 14};
......
source/Application/Graphic/GUI/GUI.c
View file @ e94bb947
......@@ -919,11 +919,11 @@ void Gui_ADAS_Display(uint8_t Mode)
if (FLASH_SYNC_1Hz)
{
/*车*/
GUI_General_Display(ADAS_Sprite, CN_che_shanshuo, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_che_yinying_1, GUI_BLENDMODE_SRC_OVER);
/*道*/
GUI_General_Display(ADAS_Sprite, CN_Road1_shanshuo, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road2_shanshuo, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road3_shanshuo, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road1_yinying_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road2_yinying_1, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_Road3_yinying_1, GUI_BLENDMODE_SRC_OVER);
}
else
{
......@@ -935,7 +935,7 @@ void Gui_ADAS_Display(uint8_t Mode)
((Sys_Sta_A0 == 3u) && ((AEBS_Sta_A0 == 0u) || (AEBS_Sta_A0 == 2u))))
{
/*车*/
GUI_General_Display(ADAS_Sprite, CN_che_shanshuo, GUI_BLENDMODE_SRC_OVER);
GUI_General_Display(ADAS_Sprite, CN_che_yinying_1, GUI_BLENDMODE_SRC_OVER);
/*道*/
ADAS_Value = 3u;
......@@ -1002,7 +1002,7 @@ void Gui_ADAS_Display(uint8_t Mode)
/*左车道线*/
if (FLASH_SYNC_1Hz == 1u)
{
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_yinying_1, GUI_BLENDMODE_CUSTOM); /*虚*/
}
else
{
......@@ -1012,7 +1012,7 @@ void Gui_ADAS_Display(uint8_t Mode)
/*右车道线*/
if (FLASH_SYNC_1Hz == 1u)
{
GUI_General_Display(ADAS_Sprite, CN_RightRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
GUI_General_Display(ADAS_Sprite, CN_RightRoad_yiying_1, GUI_BLENDMODE_CUSTOM); /*虚*/
}
else
{
......@@ -1024,7 +1024,7 @@ void Gui_ADAS_Display(uint8_t Mode)
/*左车道线*/
if ((LDW_Sys_Sta == 3u) && (LLDW_Sta == 0u))
{
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
GUI_General_Display(ADAS_Sprite, CN_LeftRoad_yinying_1, GUI_BLENDMODE_CUSTOM); /*虚*/
}
else if ((LDW_Sys_Sta == 3u) && (LLDW_Sta == 1u))
{
......@@ -1051,7 +1051,7 @@ void Gui_ADAS_Display(uint8_t Mode)
/*右车道线*/
if ((LDW_Sys_Sta == 3u) && (RLDW_Sta == 0u))
{
GUI_General_Display(ADAS_Sprite, CN_RightRoad_shanshuo, GUI_BLENDMODE_CUSTOM); /*虚*/
GUI_General_Display(ADAS_Sprite, CN_RightRoad_yiying_1, GUI_BLENDMODE_CUSTOM); /*虚*/
}
else if ((LDW_Sys_Sta == 3u) && (RLDW_Sta == 1u))
{
......
source/Driver/Graphic/images.c
View file @ e94bb947
This diff is collapsed.
source/Driver/Graphic/images.h
View file @ e94bb947
......@@ -468,36 +468,34 @@ enum SpriteName
CN_dingsuxunhang_STANDBY,
CN_ADAS_wenzi,
CN_che,
CN_che_shanshuo,
CN_che_yinying,
CN_che_yinying_1,
CN_che_yinying_2,
CN_jiao1,
CN_jiao2,
CN_jiao3,
CN_jiao4,
CN_LeftRoad,
CN_LeftRoad_1,
CN_LeftRoad_shanshuo,
CN_LeftRoad_shanshuo_1,
CN_LeftRoad_shanshuo_2,
CN_LeftRoad_yinying,
CN_LeftRoad_yinying_1,
CN_LeftRoad_yinying_2,
CN_LeftRoad_yinying_3,
CN_RightRoad,
CN_RightRoad_1,
CN_RightRoad_shanshuo,
CN_RightRoad_shanshuo_1,
CN_RightRoad_shanshuo_2,
CN_RightRoad_yiying,
CN_RightRoad_yiying_1,
CN_RightRoad_yiying_2,
CN_RightRoad_yiying_3,
CN_Road1,
CN_Road1_shanshuo,
CN_Road1_shanshuo_1,
CN_Road1_yinying,
CN_Road1_yinying_1,
CN_Road1_yinying_2,
CN_Road1_yinying_3,
CN_Road2,
CN_Road2_shanshuo,
CN_Road2_shanshuo_1,
CN_Road2_yinying,
CN_Road2_yinying_1,
CN_Road2_yinying_2,
CN_Road2_yinying_3,
CN_Road3,
CN_Road3_shanshuo,
CN_Road3_shanshuo_1,
CN_Road3_yinying,
CN_Road3_yinying_1,
CN_Road3_yinying_2,
CN_Road3_yinying_3,
CN_tanhao1,
CN_tanhao2,
CN_fengexian,
......
utility/AD/cfg/Analog_Signals_RH850_庆铃重卡.xlsm
View file @ e94bb947
No preview for this file type
utility/AD/inc/Analog_Signals.h
View file @ e94bb947
......@@ -4,7 +4,7 @@
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2021/10/26 10:37:53
* Date : 2021/11/23 11:42:23
* Cfg Tool Ver : 1.1.0
* Engineer : wangboyu
* (c) Heilongjiang TYW electronics co., LTD
......
utility/AD/src/Analog_Signals.c
View file @ e94bb947
......@@ -4,7 +4,7 @@
* \attention
*
* This file is automatically generated by analog signals configuration tool.
* Date : 2021/10/26 10:37:53
* Date : 2021/11/23 11:42:23
* Cfg Tool Ver : 1.1.0
* Engineer : wangboyu
* (c) Heilongjiang TYW electronics co., LTD
......
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