Skip to content

J
jiancetai
Commit 9e93071c authored by 梁百峰's avatar 梁百峰
Browse files
Options

🐞 fix:旋转显示，增加燃油上电，修复问题

parent ade23359
Show whitespace changes
Inline Side-by-side
Showing with 254 additions and 142 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 9e93071c
...@@ -274,8 +274,8 @@ void can_submit(void) ...@@ -274,8 +274,8 @@ void can_submit(void)
//故障灯 //故障灯
CAN_Frame_st_t m_msg6; CAN_Frame_st_t m_msg6;
uint8_t data6[8] = {0, 0, 0, 0, 0, 0, 0, 0};//0x0C50FFD2 uint8_t data6[8] = {0, 0, 0, 0, 0, 0, 0, 0};//0x0C50FFD2
CAN_Frame_st_t m_msg7; // CAN_Frame_st_t m_msg7;
uint8_t data7[8] = {0, 0, 0, 0, 0, 0, 0, 0}; // uint8_t data7[8] = {0, 0, 0, 0, 0, 0, 0, 0};
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
...@@ -642,8 +642,7 @@ void can_submit(void) ...@@ -642,8 +642,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
data5[0] = 1 << 6; data5[1] = 0 ;
data5[1] = 1 << 4;
init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
data6[4] = 2; data6[4] = 2;
...@@ -677,8 +676,7 @@ void can_submit(void) ...@@ -677,8 +676,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
data5[0] = 1 << 6; data5[1] = 0 ;
data5[1] = 1 << 4;
init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
data6[4] = 2; data6[4] = 2;
...@@ -713,8 +711,7 @@ void can_submit(void) ...@@ -713,8 +711,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
data5[0] = 1 << 6; data5[1] = 0 ;
data5[1] = 1 << 4;
init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
data6[4] = 2; data6[4] = 2;
...@@ -747,23 +744,22 @@ void can_submit(void) ...@@ -747,23 +744,22 @@ void can_submit(void)
init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4); init_CAN_Frame(&m_msg4, 0x212, 8, 1, data4);
data5[0] = 1 << 6; data5[1] = 1 ;
data5[1] = 1 << 4;
init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5); init_CAN_Frame(&m_msg5, 0x282, 8, 1, data5);
data6[4] = 2; data6[4] = 2;
init_CAN_Frame(&m_msg6, 0x091, 8, 1, data6); init_CAN_Frame(&m_msg6, 0x091, 8, 1, data6);
break; break;
case 14: // case 14:
while(1) // // while(1)
{ // // {
;//这里让芯片复位要不然的话重新走仪表配置流程有点麻烦，复位的话可以直接省去修改很多条件 // // ;//这里让芯片复位要不然的话重新走仪表配置流程有点麻烦，复位的话可以直接省去修改很多条件
} // // }
break; // break;
default: default:
break; break;
} }
if(MENU_CHECK_STEP != 0) if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP<=13)
{ {
can_mid(m_msg1); can_mid(m_msg1);
can_mid(m_msg2); can_mid(m_msg2);
...@@ -1065,6 +1061,47 @@ uint8_t resettime = 0; ...@@ -1065,6 +1061,47 @@ uint8_t resettime = 0;
uint8_t resetflag = 0; uint8_t resetflag = 0;
extern uint32_t fakedelay; extern uint32_t fakedelay;
uint32_t resetpowtime = 0; uint32_t resetpowtime = 0;
uint32_t FUresetpowtime = 0;
uint8_t fuelreset1 = 0;
uint8_t fuelreset2 = 0;
uint8_t fuelreset3 = 0;
uint8_t fuelreset4 = 0;
void resetpowerfuel(void)
{
if(FUresetpowtime < 100)
{
FUresetpowtime++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
}
else
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
FUresetpowtime = 0;
if(fuelreset1 == 1)
{
fuelreset1 = 2;
}
else if(fuelreset2 == 1)
{
fuelreset2 = 2;
}
else if(fuelreset3 == 1)
{
fuelreset3 = 2;
}
else if(fuelreset4 == 1)
{
fuelreset4 = 2;
}
else
{
;
}
}
}
void resetpower(void) void resetpower(void)
{ {
......
YueJin_test_bench/source/Appliciation/CAN_APP.h
View file @ 9e93071c
...@@ -52,4 +52,5 @@ extern uint8_t ruanjianbanbenhao[8]; ...@@ -52,4 +52,5 @@ extern uint8_t ruanjianbanbenhao[8];
void Get_PN_msg(void); void Get_PN_msg(void);
void change_UDS_DID(void); void change_UDS_DID(void);
void resetchangeUDSfuc(void); void resetchangeUDSfuc(void);
void resetpowerfuel(void);
#endif #endif
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 9e93071c
...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
if(MENU_CHECK_STEP > 14) if(MENU_CHECK_STEP > 13)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -557,6 +557,7 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数 ...@@ -557,6 +557,7 @@ void Read_IPK_Session_Type(void)//请求仪表发送 软硬件版本号 等数
} }
} }
uint8_t LED_Waring = 0; uint8_t LED_Waring = 0;
extern uint8_t resetflag;
void Function_Check_Ctrl(uint32_t cmd) void Function_Check_Ctrl(uint32_t cmd)
{ {
uint8_t p [ 20 ]; uint8_t p [ 20 ];
...@@ -575,12 +576,19 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -575,12 +576,19 @@ void Function_Check_Ctrl(uint32_t cmd)
{ {
// Display_Send_Vspead(MENU_CHECK_STEP); Display_Send_Vspead(MENU_CHECK_STEP);
Display_Send_Vspead(0); // Display_Send_Vspead(0);
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
{ {
if(resetflag == 0)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
}
/*负控*/ /*负控*/
LINE_OUT_NEG_01 = 0; LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0; LINE_OUT_NEG_02 = 0;
...@@ -622,10 +630,10 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -622,10 +630,10 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_09 = 1; LINE_OUT_NEG_09 = 1;
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 1; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 1;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 1; FUEL_RES_1 = 1;
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
...@@ -649,8 +657,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -649,8 +657,8 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_09 = 1; LINE_OUT_NEG_09 = 1;
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 1;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -676,8 +684,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -676,8 +684,8 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0; LINE_OUT_POS_02 = 1;
LINE_OUT_POS_03 = 1; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
...@@ -703,8 +711,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -703,8 +711,8 @@ void Function_Check_Ctrl(uint32_t cmd)
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 1;
LINE_OUT_POS_04 = 1; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
FUEL_RES_1 = 0; FUEL_RES_1 = 0;
FUEL_RES_2 = 0; FUEL_RES_2 = 0;
...@@ -728,7 +736,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -728,7 +736,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 1; LINE_OUT_NEG_10 = 1;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -754,7 +762,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -754,7 +762,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 1; LINE_OUT_NEG_10 = 1;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -780,7 +788,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -780,7 +788,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -806,7 +814,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -806,7 +814,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -832,7 +840,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -832,7 +840,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -858,7 +866,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -858,7 +866,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 0; LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -884,7 +892,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -884,7 +892,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 1; LINE_OUT_NEG_10 = 1;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -910,7 +918,7 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -910,7 +918,7 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_10 = 1; LINE_OUT_NEG_10 = 1;
/*正控*/ /*正控*/
LINE_OUT_POS_01 = 0; LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 1; LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0; LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0; LINE_OUT_POS_04 = 0;
/*燃油*/ /*燃油*/
...@@ -946,6 +954,38 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -946,6 +954,38 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_RES_4 = 1; FUEL_RES_4 = 1;
break; break;
} }
case 14:
{
if(resetflag == 0)
{
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
}
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 0;
LINE_OUT_NEG_07 = 0;
LINE_OUT_NEG_08 = 0;
LINE_OUT_NEG_09 = 0;
LINE_OUT_NEG_10 = 0;
/*正控*/
LINE_OUT_POS_01 = 0;
LINE_OUT_POS_02 = 0;
LINE_OUT_POS_03 = 0;
LINE_OUT_POS_04 = 0;
/*燃油*/
FUEL_RES_1 = 0;
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 0;
}
default: default:
break; break;
} }
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 9e93071c
...@@ -3895,7 +3895,7 @@ void Get_static_Current(void) ...@@ -3895,7 +3895,7 @@ void Get_static_Current(void)
{ {
static uint32_t loc_Timer = 0; static uint32_t loc_Timer = 0;
static uint32_t loc_ret = 0; static uint32_t loc_ret = 0;
if(MENU_CHECK_STEP == 13) if(MENU_CHECK_STEP == 14)
{ {
loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE); loc_Current_0 = ADC_Read_Signal(ADC_CH_KL15_VOLTAGE);
loc_ret += loc_Current_0; loc_ret += loc_Current_0;
...@@ -3915,20 +3915,20 @@ void Get_static_Current(void) ...@@ -3915,20 +3915,20 @@ void Get_static_Current(void)
{ {
TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0); TFT_LCD_Draw_Bmp(190, 60, ( uint8_t * )gImage_Number_15_white_PiontX0_Y0);
GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60); GUI_General_Digit_Display(loc_ret1, Num_15, 3, 0, CurrentDigitNum09PosX, 60);
if(loc_ret1 > 10) // if(loc_ret1 > 10)
{ // {
MENU_CHECK_STEP = 13; // MENU_CHECK_STEP = 14;
CurrentWrong = 1; // CurrentWrong = 1;
} // }
else // else
{ // {
CurrentWrong = 0; // CurrentWrong = 0;
} // }
loc_ret1 = 0; loc_ret1 = 0;
} }
else else
{ {
MENU_CHECK_STEP = 13; MENU_CHECK_STEP = 14;
// CurrentWrong = 1; // CurrentWrong = 1;
} }
} }
...@@ -4019,7 +4019,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4019,7 +4019,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比 // TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //% // TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [5] = {0,0x2E,0,1,0xff}; uint8_t mbuff [5] = {0,0x2E,0,5,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
...@@ -4451,15 +4451,15 @@ void Display_Send_ODO(uint8_t fuel) ...@@ -4451,15 +4451,15 @@ void Display_Send_ODO(uint8_t fuel)
} }
const uint16_t pagenum[] = {250,240};
void Display_Send_Vspead(uint8_t menu) void Display_Send_Vspead(uint8_t menu)
{ {
static uint8_t Type_Clear = 0; static uint8_t Type_Clear = 0;
uint8_t VSpeed_val = 0; uint32_t VSpeed_val = 0;
uint16_t ESpeed_val = 0; uint32_t ESpeed_val = 0;
uint8_t fuel_val = 0; uint32_t fuel_val = 0;
uint8_t WaterTemp = 0; uint32_t WaterTemp = 0;
// static uint8_t Type_Clear_FLAG = 0; // static uint8_t Type_Clear_FLAG = 0;
if ( (Type_Clear != menu )) if ( (Type_Clear != menu ))
{ {
...@@ -4470,28 +4470,29 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4470,28 +4470,29 @@ void Display_Send_Vspead(uint8_t menu)
{ {
if(menu < 14 ) if(menu < 14 )
{ {
GUI_General_Digit_Display(menu, Num_15, 2, 0, pagenum, 3);
// TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);//车速 // TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);//车速
TFT_LCD_Draw_Bmp(3, 40+25+25, ( uint8_t * )NO_V);//车速 TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )NO_V);//车速
TFT_LCD_Draw_Bmp(3+18, 40+25+25, ( uint8_t * )NO_S); TFT_LCD_Draw_Bmp(3+18, 40, ( uint8_t * )NO_S);
TFT_LCD_Draw_Bmp(3+18+18, 40+25+25, ( uint8_t * )NO_P); TFT_LCD_Draw_Bmp(3+18+18, 40, ( uint8_t * )NO_P);
TFT_LCD_Draw_Bmp(3+18+18+18, 40+25+25, ( uint8_t * )NO_E); TFT_LCD_Draw_Bmp(3+18+18+18, 40, ( uint8_t * )NO_E);
TFT_LCD_Draw_Bmp(3+18+18+18+18, 40+25+25, ( uint8_t * )NO_E); TFT_LCD_Draw_Bmp(3+18+18+18+18, 40, ( uint8_t * )NO_E);
TFT_LCD_Draw_Bmp(3+18+18+18+18+18, 40+25+25, ( uint8_t * )NO_D); TFT_LCD_Draw_Bmp(3+18+18+18+18+18, 40, ( uint8_t * )NO_D);
TFT_LCD_Draw_Bmp(180, 40, ( uint8_t * )gImage_Dey_words_5X195_Y16);//km/h TFT_LCD_Draw_Bmp(180, 40, ( uint8_t * )gImage_Dey_words_5X195_Y16);//km/h
TFT_LCD_Draw_Bmp(3, 40+25+25+25, ( uint8_t * )NO_E);//转速 TFT_LCD_Draw_Bmp(3, 40+25, ( uint8_t * )NO_E);//转速
TFT_LCD_Draw_Bmp(3+18, 40+25+25+25, ( uint8_t * )NO_S); TFT_LCD_Draw_Bmp(3+18, 40+25, ( uint8_t * )NO_S);
TFT_LCD_Draw_Bmp(3+18+18, 40+25+25+25, ( uint8_t * )NO_P); TFT_LCD_Draw_Bmp(3+18+18, 40+25, ( uint8_t * )NO_P);
TFT_LCD_Draw_Bmp(3+18+18+18, 40+25+25+25, ( uint8_t * )NO_E); TFT_LCD_Draw_Bmp(3+18+18+18, 40+25, ( uint8_t * )NO_E);
TFT_LCD_Draw_Bmp(3+18+18+18+18, 40+25+25+25, ( uint8_t * )NO_E); TFT_LCD_Draw_Bmp(3+18+18+18+18, 40+25, ( uint8_t * )NO_E);
TFT_LCD_Draw_Bmp(3+18+18+18+18+18, 40+25+25+25, ( uint8_t * )NO_D); TFT_LCD_Draw_Bmp(3+18+18+18+18+18, 40+25, ( uint8_t * )NO_D);
GUI_Display_Version_Code_Service(180, 40+25, "RPM", Letter_Num_11, PCodeText_Space_size);
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40, ( uint8_t * )gImage_WZ_word0_12X0_Y0);//燃油 TFT_LCD_Draw_Bmp(3, 40+25+40, ( uint8_t * )gImage_WZ_word0_12X0_Y0);//燃油
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25, ( uint8_t * )gImage_WZ_word0_11X0_Y0);//水温 TFT_LCD_Draw_Bmp(3, 40+25+40+25, ( uint8_t * )gImage_WZ_word0_11X0_Y0);//水温
// TFT_LCD_Draw_Bmp(3, 40+25, ( uint8_t * )gImage_Dey_words_3X6_Y75);//剩余燃油量： // TFT_LCD_Draw_Bmp(3, 40+25, ( uint8_t * )gImage_Dey_words_3X6_Y75);//剩余燃油量：
// TFT_LCD_Draw_Bmp(180, 40+25, ( uint8_t * )gImage_Dey_words_8X224_Y107);//% // TFT_LCD_Draw_Bmp(180, 40+25, ( uint8_t * )gImage_Dey_words_8X224_Y107);//%
TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_gImage_checkComX6_Y165);//这个可能是检测台版本号，记不得了 TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25, ( uint8_t * )gImage_gImage_checkComX6_Y165);//这个可能是检测台版本号，记不得了
} }
switch (menu) switch (menu)
{ {
...@@ -4504,8 +4505,8 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4504,8 +4505,8 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_03X0_Y0);//两驱 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_03X0_Y0);//两驱
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_01X0_Y0);//左转指示灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_01X0_Y0);//左转指示灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_14X0_Y0);//opc指示灯 TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_14X0_Y0);//opc指示灯
break; break;
...@@ -4518,8 +4519,8 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4518,8 +4519,8 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_04X0_Y0);//两驱未到位 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_04X0_Y0);//两驱未到位
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_03X0_Y0);//右转指示灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_03X0_Y0);//右转指示灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_19X0_Y0);//beginner驾驶模式 TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_19X0_Y0);//beginner驾驶模式
...@@ -4533,8 +4534,8 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4533,8 +4534,8 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_05X0_Y0);//四驱 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_05X0_Y0);//四驱
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_04X0_Y0);//远光指示灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_04X0_Y0);//远光指示灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_09X0_Y0);//work驾驶模式 TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_09X0_Y0);//work驾驶模式
break; break;
case 4: case 4:
...@@ -4546,7 +4547,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4546,7 +4547,7 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//四驱未到位 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//四驱未到位
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_05X0_Y0);//位置灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_05X0_Y0);//位置灯
// TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_09X0_Y0);//work驾驶模式 // TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_09X0_Y0);//work驾驶模式
break; break;
...@@ -4559,8 +4560,8 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4559,8 +4560,8 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_01X0_Y0);//四驱锁死 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_01X0_Y0);//四驱锁死
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_06X0_Y0);//发动机故障灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_06X0_Y0);//发动机故障灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_06X0_Y0);//H档 TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_06X0_Y0);//H档
break; break;
case 6: case 6:
...@@ -4572,8 +4573,8 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4572,8 +4573,8 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//锁死未到位 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//锁死未到位
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_16X0_Y0);//驻车灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_16X0_Y0);//驻车灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_07X0_Y0);//P档 TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_07X0_Y0);//P档
break; break;
case 7: case 7:
...@@ -4585,9 +4586,9 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4585,9 +4586,9 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_03X0_Y0);//两驱 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_03X0_Y0);//两驱
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_11X0_Y0);//驾驶员安全带 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_11X0_Y0);//驾驶员安全带
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_10X0_Y0);//R档 TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_10X0_Y0);//R档
TFT_LCD_Draw_Bmp(120, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break; break;
...@@ -4600,9 +4601,9 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4600,9 +4601,9 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_04X0_Y0);//两驱未到位 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_04X0_Y0);//两驱未到位
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_10X0_Y0);//机油压力 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_10X0_Y0);//机油压力
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_09X0_Y0);//L档 TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_WZ_word0_09X0_Y0);//L档
TFT_LCD_Draw_Bmp(120, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 TFT_LCD_Draw_Bmp(140, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break; break;
...@@ -4615,9 +4616,9 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4615,9 +4616,9 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_05X0_Y0);//四驱 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_05X0_Y0);//四驱
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_17X0_Y0);//EPS故障指示灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_17X0_Y0);//EPS故障指示灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_13X0_Y0);//N TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_13X0_Y0);//N
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break; break;
case 10: case 10:
...@@ -4629,9 +4630,9 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4629,9 +4630,9 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//四驱未到位 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//四驱未到位
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_02X0_Y0);//履带模式灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_02X0_Y0);//履带模式灯
// TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_13X0_Y0);//N档 // TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_13X0_Y0);//N档
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break; break;
...@@ -4644,9 +4645,9 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4644,9 +4645,9 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_01X0_Y0);//四驱锁死 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_01X0_Y0);//四驱锁死
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_02X0_Y0);//履带模式灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_02X0_Y0);//履带模式灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_21X0_Y0);//sport TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25+30, ( uint8_t * )gImage_pic_21X0_Y0);//sport
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break; break;
case 12: case 12:
...@@ -4658,9 +4659,9 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4658,9 +4659,9 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态： TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_18X0_Y0);//后桥差速状态：
TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_15X0_Y0);//锁死未到位 TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_15X0_Y0);//锁死未到位
TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_02X0_Y0);//履带模式灯 TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_02X0_Y0);//履带模式灯
TFT_LCD_Draw_Bmp(70, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_20X0_Y0);//normal TFT_LCD_Draw_Bmp(100, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_20X0_Y0);//normal
TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 TFT_LCD_Draw_Bmp(160, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
break; break;
case 13: case 13:
WaterTemp = 6; WaterTemp = 6;
...@@ -4668,7 +4669,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4668,7 +4669,7 @@ void Display_Send_Vspead(uint8_t menu)
VSpeed_val = 199; VSpeed_val = 199;
ESpeed_val = 9999; ESpeed_val = 9999;
GUI_Display_Version_Code_Service(70, 40+25+25+25+25+25+25+25, "ALL", Letter_Num_11, PCodeText_Space_size); GUI_Display_Version_Code_Service(70, 40+25+25+25+25+25+25+25+25, "ALL", Letter_Num_11, PCodeText_Space_size);
// POWER_CTRL_KL30 = 0u; //B+ // POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15 // POWER_CTRL_KL15 = 0u; //KL15
...@@ -4678,13 +4679,13 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4678,13 +4679,13 @@ void Display_Send_Vspead(uint8_t menu)
//Display_Version_Info(0); //Display_Version_Info(0);
//Send_Init(); //Send_Init();
//Send_ODO_Init(); //Send_ODO_Init();
// HW_Static_Current_Check(1);
break; break;
case 14: case 14:
while(1) // while(1)
{ // {
; // ;
} // }
// case 14: // case 14:
// GUI_Display_Version_Code_Service(25, 20, "Please enter password ", Letter_Num_11, PCodeText_Space_size); // GUI_Display_Version_Code_Service(25, 20, "Please enter password ", Letter_Num_11, PCodeText_Space_size);
// break; // break;
...@@ -4696,18 +4697,19 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4696,18 +4697,19 @@ void Display_Send_Vspead(uint8_t menu)
// // } // // }
// Display_TFT_Clear(); // Display_TFT_Clear();
// break; // break;
// case 16: // case 16
// break; HW_Static_Current_Check(1);
break;
default: default:
MENU_CHECK_STEP = 0; // MENU_CHECK_STEP = 0;
break; break;
} }
if(menu < 14 && menu != 0) if(menu < 14 && menu != 0)
{ {
GUI_General_Digit_Display(VSpeed_val, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25); GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(ESpeed_val, Num_15, 6, 5, ODODigitNum09PosX,40+25+25+25); GUI_General_Digit_Display(ESpeed_val, Num_15, 4, 3, ODODigitNum09PosX,40+25);
GUI_General_Digit_Display(fuel_val, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+40); GUI_General_Digit_Display(fuel_val, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40);
GUI_General_Digit_Display(WaterTemp, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+40+25); GUI_General_Digit_Display(WaterTemp, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40+25);
} }
} }
......
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @ 9e93071c
...@@ -76,7 +76,7 @@ void Buzzer_Stop(void); ...@@ -76,7 +76,7 @@ void Buzzer_Stop(void);
extern void Buzzer_Init(void); extern void Buzzer_Init(void);
extern void Buzzer_Warning(void); extern void Buzzer_Warning(void);
void Display_Send_Vspead(uint8_t menu); void Display_Send_Vspead(uint8_t menu);
extern void Get_static_Current(void);
void GUI_General_Digit_Display(uint32_t Digit, const uint8_t *Font[], uint8_t Len, uint8_t Blank, const uint16_t *px, uint16_t y); void GUI_General_Digit_Display(uint32_t Digit, const uint8_t *Font[], uint8_t Len, uint8_t Blank, const uint16_t *px, uint16_t y);
void GUI_Display_Version_Code_Service(uint8_t StarX, uint16_t PosY, uint8_t * Str, const uint8_t * Version[] , uint8_t SpaceKeySize); void GUI_Display_Version_Code_Service(uint8_t StarX, uint16_t PosY, uint8_t * Str, const uint8_t * Version[] , uint8_t SpaceKeySize);
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 9e93071c
...@@ -81,13 +81,13 @@ ...@@ -81,13 +81,13 @@
//左转 //左转
#define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06 #define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
//右转 //右转
#define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00 #define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06
//远光 //远光
#define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04 #define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00
//位置灯 //位置灯
#define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05 #define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04
#define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06 #define LINE_OUT_POS_05 GPIO_OUT_APORT00_PIN06
#define LINE_OUT_POS_06 GPIO_OUT_APORT00_PIN13 #define LINE_OUT_POS_06 GPIO_OUT_APORT00_PIN13
#define LINE_OUT_POS_07 GPIO_OUT_APORT00_PIN14 #define LINE_OUT_POS_07 GPIO_OUT_APORT00_PIN14
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 9e93071c
...@@ -43,6 +43,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void) ...@@ -43,6 +43,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void)
Can_Write_Fun(2); //报文外发 Can_Write_Fun(2); //报文外发
COM_RX_Process( ); COM_RX_Process( );
RTE_ADC_Services( ); RTE_ADC_Services( );
Get_static_Current();
} }
/*============================================================================== /*==============================================================================
...@@ -63,8 +64,39 @@ extern uint8_t SWtestresult; ...@@ -63,8 +64,39 @@ extern uint8_t SWtestresult;
extern uint8_t HWtestresult; extern uint8_t HWtestresult;
extern uint8_t PNtestresult; extern uint8_t PNtestresult;
extern uint8_t resetflag; extern uint8_t resetflag;
extern uint8_t fuelreset1;
extern uint8_t fuelreset2;
extern uint8_t fuelreset3;
extern uint8_t fuelreset4;
void Sys_Run_Mode_10ms_Tasks_Group(void) void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
if(MENU_CHECK_STEP == 1 && fuelreset1 == 0)
{
fuelreset1 = 1;
}
else if(MENU_CHECK_STEP == 2 && fuelreset2 == 0)
{
fuelreset2 = 1;
}
else if(MENU_CHECK_STEP == 3 && fuelreset3 == 0)
{
fuelreset3 = 1;
}
else if(MENU_CHECK_STEP == 4 && fuelreset4 == 0)
{
fuelreset4 = 1;
}
if(MENU_CHECK_STEP == 0)
{
fuelreset1 = 0;
fuelreset2 = 0;
fuelreset3 = 0;
fuelreset4 = 0;
}
if(fuelreset1 == 1 || fuelreset2 == 1 || fuelreset3 == 1 || fuelreset4 == 1)
{
resetpowerfuel();
}
BusOff_Service( ); BusOff_Service( );
Key_Service( ); Key_Service( );
......
YueJin_test_bench/source/Driver/GPIO/GPIO.c
View file @ 9e93071c
...@@ -42,23 +42,23 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] = ...@@ -42,23 +42,23 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x5020u, 0x5020u}, {0x0020u, 0x0000u},
{0x0620u, 0x0620u}, {0x0620u, 0x0600u},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u},
{0x5630u, 0x5630u},
{0x0A6Fu, 0x0A6Fu},
{0x29CFu, 0x29CFu},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0630u, 0x0600u},
{0x4220u, 0x2207u},
{0x79CFu, 0x79FFu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0008u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x1FFFu, 0x1FFFu}, {0x0000u, 0x0003u},
{0x0000u, 0x0008u},
{0x0000u, 0x0008u},
{0x1FFFu, 0x1FF7u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
...@@ -72,27 +72,27 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] = ...@@ -72,27 +72,27 @@ const uint16_t g_u16GPIOConfigArray[56U][2U] =
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x8000u, 0x8000u}, {0x8800u, 0x0000u},
{0x8000u, 0x8000u}, {0x8800u, 0x0000u},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u},
{0x8000u, 0x8000u},
{0x0020u, 0x0000u},
{0x7FFFu, 0x7FFFu},
{0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0001u, 0x0001u}, {0x0004u, 0x0200u},
{0x0001u, 0x0001u}, {0x8800u, 0x0000u},
{0x8020u, 0x0000u},
{0x77FFu, 0xFFFFu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x0001u, 0x0001u}, {0x0005u, 0x0000u},
{0x0005u, 0x0000u},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x00FEu, 0x00FEu},
{0x0000u, 0x0000u}, {0x0000u, 0x0000u},
{0x000Fu, 0x0200u}, {0x0000u, 0x0080u},
{0x0005u, 0x0000u},
{0x0001u, 0x0005u},
{0x00FAu, 0x00FFu},
{0x8080u, 0x1000u},
{0x000Fu, 0x673Fu},
{0xFFFFu, 0xFFFFu}, {0xFFFFu, 0xFFFFu},
}; };
static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode) static void GPIO_PIN_Init(GPIO_Config_Mode_en_t enGPIOConfigMode)
......
YueJin_test_bench/source/Driver/GPIO/TM035HFZGZx.c
View file @ 9e93071c
...@@ -38,7 +38,7 @@ void LCD_Init(void) ...@@ -38,7 +38,7 @@ void LCD_Init(void)
Sim_8080_Data_Write ( 0x0C ); Sim_8080_Data_Write ( 0x0C );
Sim_8080_Data_Write ( 0x26 ); Sim_8080_Data_Write ( 0x26 );
Sim_8080_Command_Write ( 0x21 ); Sim_8080_Command_Write ( 0x21 );
Sim_8080_Data_Write ( 0x00 ); //翻转，正反面翻转 00 01 Sim_8080_Data_Write ( 0x01 ); //翻转，正反面翻转 00 01
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
...@@ -58,7 +58,7 @@ void LCD_Init(void) ...@@ -58,7 +58,7 @@ void LCD_Init(void)
Sim_8080_Data_Write ( 0x00 ); Sim_8080_Data_Write ( 0x00 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Command_Write ( 0xA2 ); Sim_8080_Command_Write ( 0xA2 );
Sim_8080_Data_Write ( 0x10 ); //180度翻转；00 10 Sim_8080_Data_Write ( 0x00 ); //180度翻转；00 10
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
Sim_8080_Data_Write ( 0xA5 ); Sim_8080_Data_Write ( 0xA5 );
......
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