Skip to content

J
jiancetai
Commit 8b8ef9e4 authored by 李梓源's avatar 李梓源
Browse files
Options

✨ feat:第一版老化台程序

parent f3d02bcc
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 156 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 8b8ef9e4
...@@ -73,7 +73,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -73,7 +73,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 8) if(MENU_CHECK_STEP > 3)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -587,137 +587,81 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -587,137 +587,81 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
General_Number_Disp(p, 190, 10);//刷图：报文检测步数 General_Number_Disp(p, 190, 10);//刷图：报文检测步数
} }
Display_Send_Vspead(MENU_CHECK_STEP); // Display_Send_Vspead(MENU_CHECK_STEP);
Display_AUTO();
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0:
{ {
RELAY_VBAT_MCU = 1; if(ONOFFflag == 0)
RELAY_DC12V_MCU = 1; {
RELAY_KEY_MCU = 1; if(ACCONOFF_delay_3s < 5)
Aima_SLF(1u, 0x03, 0x1, 1u); {
RELAY_VBAT_MCU = 0;
RELAY_DC12V_MCU = 0;
RELAY_KEY_MCU = 0;
}
else
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
}
}
left_turn = 1;
right_turn = 0;
break; break;
} }
case 1: case 1:
{ {
if(CHECK_Ctrl_delay <=10) // RELAY_VBAT_MCU = 1;
{ // RELAY_DC12V_MCU = 1;
RELAY_VBAT_MCU = 0; // RELAY_KEY_MCU = 1;
RELAY_DC12V_MCU = 0;
RELAY_KEY_MCU = 0; right_turn = 1;
}
else
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 0;
}
// ABC_OUT = 1;
left_turn = 0; left_turn = 0;
FULL_BEAM = 0;
break; break;
} }
case 2: case 2:
{ {
RELAY_DC12V_MCU = 1; // RELAY_VBAT_MCU = 1;
RELAY_VBAT_MCU = 1; // RELAY_DC12V_MCU = 1;
if(ONE_KEY_ONOFF <= 20) // RELAY_KEY_MCU = 1;
{
RELAY_KEY_MCU = 1;
ONE_START = 0;
}
else if(ONE_KEY_ONOFF <= 40)
{
RELAY_KEY_MCU = 0;
ONE_START = 1;
}
else if(ONE_KEY_ONOFF <= 60)
{
RELAY_KEY_MCU = 0;
ONE_START = 0;
}
else if(ONE_KEY_ONOFF <=70)
{
RELAY_KEY_MCU = 0;
ONE_START = 1;
}
else if(ONE_KEY_ONOFF>110 && ONE_KEY_ONOFF <=120)
{
ONE_START = 0;
ABC_OUT = 1;
}
else
{
ABC_OUT = 0;
}
break;
}
case 3:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ONE_START = 0;
FULL_BEAM = 0;
break;
}
case 4:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
FULL_BEAM = 1;
ZXSW_12V = 0;
left_turn = 0;
break;
}
case 5:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ZXSW_12V = 1;
FULL_BEAM = 0;
left_turn = 1;
right_turn = 0; right_turn = 0;
break;
}
case 6:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ZXSW_12V = 1;
left_turn = 0; left_turn = 0;
right_turn = 1; FULL_BEAM = 1;
RELAY_LIGHTCONTROL_MCU = 0;
break;
}
case 7:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ZXSW_12V = 0;
right_turn = 0;
RELAY_LIGHTCONTROL_MCU = 1;
ABC_OUT = 0;
break; break;
} }
case 8: case 3:
{ {
RELAY_VBAT_MCU = 1; if(ONOFFflag == 0)
RELAY_DC12V_MCU = 1; {
RELAY_KEY_MCU = 1; if(ONE_KEY_ONOFF < 5)
RELAY_LIGHTCONTROL_MCU = 0; {
RELAY_VBAT_MCU = 0;
RELAY_DC12V_MCU = 0;
RELAY_KEY_MCU = 0;
}
else
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
}
FULL_BEAM = 0;
Aima_SLF(1u, 0x03, 0x1, 1u);
}
break; break;
} }
default: default:
break; break;
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 8b8ef9e4
...@@ -4598,6 +4598,26 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4598,6 +4598,26 @@ void Display_Send_Vspead(uint8_t menu)
// } // }
void Display_AUTO(void)
{
if(Auto_ONOFF == 1)
{
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_gImage_seat1X6_Y16);
}
else
{
TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
if(AutoFlag == 1)
{
TFT_LCD_Draw_Bmp(51,200,( uint8_t * )gImage_gImage_ABSX6_Y165);
}
else
{
TFT_LCD_Draw_Box(0, 200, 239, 261, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
}
......
YueJin_test_bench/source/Appliciation/Display_Info.h
View file @ 8b8ef9e4
...@@ -95,6 +95,7 @@ extern const uint8_t * Letter_Num_11[]; ...@@ -95,6 +95,7 @@ extern const uint8_t * Letter_Num_11[];
extern uint32_t loc_Current_0; extern uint32_t loc_Current_0;
extern void Get_static_Current(void); extern void Get_static_Current(void);
extern void Display_AUTO(void);
extern const uint8_t *Num_15[]; extern const uint8_t *Num_15[];
#define PCodeText_Space_size 2//故障文字 英文空格的像素数 #define PCodeText_Space_size 2//故障文字 英文空格的像素数
......
YueJin_test_bench/source/Appliciation/Key.h
View file @ 8b8ef9e4
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
typedef enum typedef enum
{ {
KEY_4,
KEY_5, KEY_5,
KEY_6, KEY_6,
KEY_7, KEY_7,
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 8b8ef9e4
...@@ -7,21 +7,33 @@ ...@@ -7,21 +7,33 @@
#include "string.h" #include "string.h"
void Key_Operation_SW5(Key_Event_en_t enKeyEvent) void Key_Operation_SW5(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS && CHECK_Value == 1)
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
CHECK_Ctrl_delay = 0; // CHECK_Ctrl_delay = 0;
CHECK_Value = 0; // CHECK_Value = 0;
AutoFlag = 0;
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{
AutoFlag = 1;
} }
} }
void Key_Operation_SW4(Key_Event_en_t enKeyEvent) void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
MENU_CHECK_STEP_SUB(); // MENU_CHECK_STEP_SUB();
if (Auto_ONOFF == 0)
{
Auto_ONOFF = 1;
}
else
{
Auto_ONOFF = 0;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
...@@ -45,29 +57,35 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent) ...@@ -45,29 +57,35 @@ void Key_Operation_SW4(Key_Event_en_t enKeyEvent)
{ {
} }
} }
void Key_Operation_SW6(Key_Event_en_t enKeyEvent)
{
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{
if(Auto_ONOFF == 0)
{
if(RELAY_KEY_MCU == 0)
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
ONOFFflag = 0;
}
else
{
RELAY_VBAT_MCU = 0;
RELAY_DC12V_MCU = 0;
RELAY_KEY_MCU = 0;
ONOFFflag = 1;
}
}
}
}
void Key_Operation_SW7(Key_Event_en_t enKeyEvent) void Key_Operation_SW7(Key_Event_en_t enKeyEvent)
{ {
// if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
// {
// if(zhenduanflag != 2 && zhenduanflag != 3)
// {
// zhenduanflag = 2;
// }
// else
// {
// zhenduanflag = 0;
// }
// }
// 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) void Key_Operation_SW8(Key_Event_en_t enKeyEvent)
{ {
...@@ -171,6 +189,20 @@ Key_Real_Status_en_t Key_Real_sw4(void) ...@@ -171,6 +189,20 @@ Key_Real_Status_en_t Key_Real_sw4(void)
} }
return enKeyRealStatus; return enKeyRealStatus;
} }
Key_Real_Status_en_t Key_Real_sw6(void)
{
Key_Real_Status_en_t enKeyRealStatus = KEY_LINE_LOOSEN;
if ( SW6 == 0U )
{
enKeyRealStatus = KEY_LINE_PRESS;
}
else
{
enKeyRealStatus = KEY_LINE_LOOSEN;
}
return enKeyRealStatus;
}
Key_Real_Status_en_t Key_Real_sw7(void) Key_Real_Status_en_t Key_Real_sw7(void)
{ {
...@@ -281,8 +313,9 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent) ...@@ -281,8 +313,9 @@ void Key_Operation_SW10(Key_Event_en_t enKeyEvent)
} }
/*---------------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------------------*/
const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = { const Key_Attribute_st_t stKeyAttribute [ KEY_NUM_MAX ] = {
{KEY_TYPE_LINE, Key_Real_sw5, Key_Operation_SW5}, //SW5
{KEY_TYPE_LINE, Key_Real_sw4, Key_Operation_SW4}, //SW4 {KEY_TYPE_LINE, Key_Real_sw4, Key_Operation_SW4}, //SW4
{KEY_TYPE_LINE, Key_Real_sw5, Key_Operation_SW5}, //SW5
{KEY_TYPE_LINE, Key_Real_sw6, Key_Operation_SW6},
{KEY_TYPE_LINE, Key_Real_sw7, Key_Operation_SW7}, {KEY_TYPE_LINE, Key_Real_sw7, Key_Operation_SW7},
{KEY_TYPE_LINE, Key_Real_sw8, Key_Operation_SW8}, {KEY_TYPE_LINE, Key_Real_sw8, Key_Operation_SW8},
{KEY_TYPE_LINE, Key_Real_sw2, Key_Operation_SW2}, //SW2- {KEY_TYPE_LINE, Key_Real_sw2, Key_Operation_SW2}, //SW2-
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ 8b8ef9e4
...@@ -1112,16 +1112,16 @@ uint32_t R485_Send_test(void) ...@@ -1112,16 +1112,16 @@ uint32_t R485_Send_test(void)
break; break;
case 2: case 2:
AIMAtest.Sig.PGear = 0; // AIMAtest.Sig.PGear = 0;
u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg)); // u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg));
break; break;
case 3: case 3:
AIMAtest.Sig.PGear = 1; // AIMAtest.Sig.PGear = 1;
u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg)); // u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg));
break; break;
case 4: case 4:
AIMAtest.Sig.PGear = 0; // AIMAtest.Sig.PGear = 0;
u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg)); // u32sendendflag = R485_Send(0x05, AIMAtest.Msg, sizeof(AIMAtest.Msg));
break; break;
case 5: case 5:
break; break;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 8b8ef9e4
...@@ -325,6 +325,7 @@ uint8_t showtime = 0; ...@@ -325,6 +325,7 @@ uint8_t showtime = 0;
uint8_t ACCONOFF_delay_3s; uint8_t ACCONOFF_delay_3s;
uint16_t ONE_KEY_ONOFF; uint16_t ONE_KEY_ONOFF;
uint16_t CHECK_Ctrl_delay = 200; uint16_t CHECK_Ctrl_delay = 200;
uint8_t ONOFFflag;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
// static uint32_t loc_timer = 0; // static uint32_t loc_timer = 0;
...@@ -344,9 +345,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -344,9 +345,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
if(MENU_CHECK_STEP == 9 ) if(MENU_CHECK_STEP == 0 )
{ {
if(ACCONOFF_delay_3s < 200) if(ACCONOFF_delay_3s < 20)
{ {
ACCONOFF_delay_3s++; ACCONOFF_delay_3s++;
} }
...@@ -356,9 +357,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -356,9 +357,9 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
ACCONOFF_delay_3s = 0; ACCONOFF_delay_3s = 0;
} }
if(MENU_CHECK_STEP == 2 || MENU_CHECK_STEP == 8) if(MENU_CHECK_STEP == 3 )
{ {
if(ONE_KEY_ONOFF < 300) if(ONE_KEY_ONOFF < 20)
{ {
ONE_KEY_ONOFF++; ONE_KEY_ONOFF++;
} }
...@@ -372,6 +373,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -372,6 +373,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
RS485_send_time++; RS485_send_time++;
} }
if(AutoFlag == 1) if(AutoFlag == 1)
{ {
if(AutoTime <= 200) if(AutoTime <= 200)
...@@ -381,22 +383,23 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -381,22 +383,23 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
else else
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
// if(MENU_CHECK_STEP == 0)
// {
// MENU_CHECK_STEP = 0;
// }
if(MENU_CHECK_STEP == 0) if(MENU_CHECK_STEP == 0)
{ {
MENU_CHECK_STEP = 0; AutoTime = 120;
}
if(MENU_CHECK_STEP == 13)
{
AutoTime = 0;
} }
else else
{ {
AutoTime = 160; AutoTime = 150;
} }
} }
} }
if(Auto_ONOFF == 1) if(Auto_ONOFF == 1)
{ {
if(ONOFFtime <=420) if(ONOFFtime <=420)
...@@ -406,18 +409,24 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -406,18 +409,24 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
else else
{ {
if(LINE_OUT_NEG_01 == 1) if(RELAY_KEY_MCU == 1)
{ {
LINE_OUT_NEG_01 = 0; RELAY_DC12V_MCU = 0;
RELAY_VBAT_MCU = 0;
RELAY_KEY_MCU = 0;
ONOFFtime = 0; ONOFFtime = 0;
} }
else else
{ {
LINE_OUT_NEG_01 = 1; RELAY_DC12V_MCU = 1;
RELAY_VBAT_MCU = 1;
RELAY_KEY_MCU = 1;
ONOFFtime = 0; ONOFFtime = 0;
} }
} }
} }
if(flashtime < 3) if(flashtime < 3)
{ {
flashtime++; flashtime++;
......
YueJin_test_bench/source/Appliciation/Task.h
View file @ 8b8ef9e4
...@@ -12,6 +12,7 @@ extern uint32_t startIGONtime; ...@@ -12,6 +12,7 @@ extern uint32_t startIGONtime;
extern uint8_t ACCONOFF_delay_3s; extern uint8_t ACCONOFF_delay_3s;
extern uint16_t ONE_KEY_ONOFF; extern uint16_t ONE_KEY_ONOFF;
extern uint16_t CHECK_Ctrl_delay; extern uint16_t CHECK_Ctrl_delay;
extern uint8_t ONOFFflag;
void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void); void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void);
void Sys_Run_Mode_2ms_Tasks_Group(void); void Sys_Run_Mode_2ms_Tasks_Group(void);
void Sys_Run_Mode_5ms_Tasks_Group(void); void Sys_Run_Mode_5ms_Tasks_Group(void);
......
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