Skip to content

J
jiancetai
Commit 6a33871d authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:特殊程序上电所有指示灯全亮

parent 1c53d23e
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 158 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 6a33871d
......@@ -687,7 +687,7 @@ void can_submit(void)
init_CAN_Frame(&m_msg2, 0x110, 8, 1, data2);
/* 时间 */
data3[3] = 0x10; //时
data3[3] = 0x0F; //时
data3[4] = 0; //分
data3[5] = 0; //秒
init_CAN_Frame(&m_msg3, 0x421, 8, 1, data3);
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 6a33871d
......@@ -4323,7 +4323,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(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [10] = {2,0,2,5,97,0,7,3,0,0xff};
uint8_t mbuff [10] = {2,0,2,5,97,0,8,2,1,0xff};
General_Number_Disp(mbuff, 115, 25); //检测台版本号
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
......@@ -4798,13 +4798,13 @@ void Display_Send_Vspead(uint8_t menu)
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, ( 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+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+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(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+40+25+25, ( uint8_t * )gImage_JCT_25X0_Y0);//时间
// TFT_LCD_Draw_Bmp(3, 40+25+40+25+25, ( uint8_t * )gImage_JCT_25X0_Y0);//时间
}
switch (menu)
{
......@@ -5039,9 +5039,9 @@ void Display_Send_Vspead(uint8_t menu)
{
GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40);
GUI_General_Digit_Display(ESpeed_val, Num_15, 5, 3, ODODigitNum09PosX,40+25);
GUI_General_Digit_Display(fuel_val, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40);
GUI_General_Digit_Display(WaterTemp, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40+25);
General_Number_Disp(mbuffdfka, 135, 154); //时间
// GUI_General_Digit_Display(fuel_val, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40);
// GUI_General_Digit_Display(WaterTemp, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40+25);
// General_Number_Disp(mbuffdfka, 135, 154); //时间
}
}
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 6a33871d
......@@ -6,181 +6,181 @@
extern uint8_t resetflag;
void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
// Display_Add( );
// Display_TFT_Clear( );
Display_TFT_Clear_UID();
if(change > 0)
{
change--;
UUIDX -= 10;
}
else
{
change = 13;
UUIDX = 197;
}
// Display_TFT_Clear();
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
{
;
}
else
{
// Display_Add( );
// Display_TFT_Clear( );
}
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
// // Display_Add( );
// // Display_TFT_Clear( );
// Display_TFT_Clear_UID();
// if(change > 0)
// {
// change--;
// UUIDX -= 10;
// }
// else
// {
// change = 13;
// UUIDX = 197;
// }
// // Display_TFT_Clear();
// }
// else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
// {
// }
// else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
// {
// if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
// {
// ;
// }
// else
// {
// // Display_Add( );
// // Display_TFT_Clear( );
// }
}
else
{
}
// }
// else
// {
// }
}
void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
if(UIDNumber2[change] < 9)
{
UIDNumber2[change]++;
}
else
{
UIDNumber2[change] = 0;
}
// if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
// {
// ;
// }
// else
// {
// // Display_Sub( );
// // Display_TFT_Clear( );
// }
// if(UIDNumber2[change] < 9)
// {
// UIDNumber2[change]++;
// }
// else
// {
// UIDNumber2[change] = 0;
// }
// // if ( (LED_Waring == 1) || (UDS_Warning_Voltage ==1))
// // {
// // ;
// // }
// // else
// // {
// // // Display_Sub( );
// // // Display_TFT_Clear( );
// // }
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1))
{
;
}
else
{
// Display_Sub( );
// Display_TFT_Clear( );
}
// }
// else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
// {
// }
// else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
// {
// if ( (LED_Waring == 1) || (UDS_Warning_Voltage == 1))
// {
// ;
// }
// else
// {
// // Display_Sub( );
// // Display_TFT_Clear( );
// }
}
else
{
}
// }
// else
// {
// }
}
void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(POWER_CTRL_KL15)
{
POWER_CTRL_KL15 = 0;
}
else
{
POWER_CTRL_KL15 = 1;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
}
else
{
}
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
// if(POWER_CTRL_KL15)
// {
// POWER_CTRL_KL15 = 0;
// }
// else
// {
// POWER_CTRL_KL15 = 1;
// }
// }
// else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
// {
// }
// else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
// {
// }
// else
// {
// }
}
void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
}
else
{
}
// }
// else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
// {
// }
// else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
// {
// }
// else
// {
// }
}
uint8_t IG_OFF_Flag;
void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
{
/*清零ODO*/
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
MENU_CHECK_STEP_ADD( );
if((MENU_CHECK_STEP < 7) && (MENU_CHECK_STEP > 1))
{
IG_OFF_Flag = 1;
}
}
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
}
else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
{
if ( LED_Waring == 1 || (UDS_Warning_Voltage ==1))
{
;
}
else
{
MENU_CHECK_STEP_ADD( );
}
}
else
{
}
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
// MENU_CHECK_STEP_ADD( );
// if((MENU_CHECK_STEP < 7) && (MENU_CHECK_STEP > 1))
// {
// IG_OFF_Flag = 1;
// }
// }
// else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
// {
// }
// else if ( enKeyEvent == KEY_EVENT_SUPER_LONG_PRESS )
// {
// if ( LED_Waring == 1 || (UDS_Warning_Voltage ==1))
// {
// ;
// }
// else
// {
// MENU_CHECK_STEP_ADD( );
// }
// }
// else
// {
// }
}
void Key_Operation_SW1(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
writeflag = 1;
zhenduanstep = 11;
UIDStep = 0;
writebeing = 1;
// if(UIDNumber2[change] < 9)
// {
// UIDNumber2[change]++;
// }
// else
// {
// UIDNumber2[change] = 0;
// }
Display_TFT_Clear_UID2();
}
else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 11))
{
LINE_OUT_NEG_02 = 1;
}
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
// writeflag = 1;
// zhenduanstep = 11;
// UIDStep = 0;
// writebeing = 1;
// // if(UIDNumber2[change] < 9)
// // {
// // UIDNumber2[change]++;
// // }
// // else
// // {
// // UIDNumber2[change] = 0;
// // }
// Display_TFT_Clear_UID2();
// }
// else if (( enKeyEvent == KEY_EVENT_LONG_PRESS ) && (MENU_CHECK_STEP == 11))
// {
// LINE_OUT_NEG_02 = 1;
// }
}
/*-------------------------------------------------*/
......
YueJin_test_bench/source/System/init.c
View file @ 6a33871d
......@@ -90,6 +90,8 @@ void Sys_Startup_Init(void)
{
UIDcode1[i] = 0;
}
MENU_CHECK_STEP = 11;
}
/***********************************************************************
* \brief Initializations during work state switch to system sleep
......
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