Skip to content

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

✨ feat:重新上下15电

parent 41da5f7a
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 118 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ c381ee2d
...@@ -586,33 +586,43 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -586,33 +586,43 @@ void Function_Check_Ctrl(uint32_t cmd)
{ {
case 0: case 0:
{ {
LED3 = 0; //右转 // LED3 = 0; //右转
LED4 = 0; // LED4 = 0;
LINE_OUT_NEG_05 = 0; // LINE_OUT_NEG_05 = 0;
LINE_OUT_NEG_06 = 1; // LINE_OUT_NEG_06 = 1;
LINE_jinguang = 0; // LINE_jinguang = 0;
POWER_CTRL_KL30_Current = 0; // POWER_CTRL_KL30_Current = 0;
if(Auto_ONOFF == 0) // if(Auto_ONOFF == 0)
{ // {
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
} // }
LINE_OUT_NEG_02 = 1; // LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; // LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
POWER_CTRL_KL30 = 0; // POWER_CTRL_KL30 = 0;
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
break; break;
} }
case 1: case 1:
{ {
LED3 = 0; // LED3 = 0;
LED4 = 0; // LED4 = 0;
LINE_OUT_NEG_05 = 1; // LINE_OUT_NEG_05 = 1;
LINE_OUT_NEG_06 = 0; // LINE_OUT_NEG_06 = 0;
POWER_CTRL_KL30_Current = 0; // POWER_CTRL_KL30_Current = 0;
LINE_jinguang = 1; // LINE_jinguang = 1;
POWER_CTRL_KL30 = 0; // POWER_CTRL_KL30 = 0;
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 0;
if(ACCONOFF_delay_3s >= 30)
{
RELAY_KEY_MCU = 1;
}
break; break;
} }
case 2: case 2:
...@@ -775,43 +785,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -775,43 +785,6 @@ void Function_Check_Ctrl(uint32_t cmd)
LINE_OUT_NEG_04 = 0; LINE_OUT_NEG_04 = 0;
break; break;
} }
// case 21:
// {
// LINE_OUT_POS_01 = 1;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_01 = 0;
// break;
// }
// case 22:
// {
// LINE_OUT_POS_01 = 1;
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_01 = 1;
// Display_Menu_Type = 3;
// if( (Get_ID_HandBrakeSts() != 1) ||
// (Get_CAN_CH0_ID_10FF4117_Sig_Seatbeltsts() != 1) ||
// (Get_CAN_CH0_ID_10FF1017_Sig_HighBeamSts() != 1) ||
// (Get_CAN_CH0_ID_10FF1017_Sig_LowBeamSts() != 1) || (Get_CAN_CH0_ID_10FF1017_Sig_FrontFogLightSts() != 1) )
// {
// LED_Waring = 1;
// }
// else
// {
// LED_Waring = 0;
// }
// break;
// }
// case 23:
// {
// LINE_OUT_POS_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_01 = 0;
// break;
// }
default: default:
break; break;
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ c381ee2d
...@@ -175,18 +175,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -175,18 +175,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
{ {
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
// if(Get_Display_Type( ) == 2)
// {
// MENU_CHECK_STEP_SUB( );
// }
if(clearOdoFlag == 0)
{
clearOdoFlag = 1;
}
else
{
clearOdoFlag = 0;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
......
YueJin_test_bench/source/Appliciation/R485_Communication_Matrix.c
View file @ c381ee2d
...@@ -1103,6 +1103,52 @@ uint32_t R485_SendMACaddress_0x42(void) ...@@ -1103,6 +1103,52 @@ uint32_t R485_SendMACaddress_0x42(void)
uint32_t R485_Send_test(void) uint32_t R485_Send_test(void)
{ {
uint32_t u32sendendflag = 0; uint32_t u32sendendflag = 0;
u32sendendflag = R485_AIMA_Send(); switch (MENU_CHECK_STEP)
{
case 0:
break;
case 1:
break;
case 2:
break;
case 3:
break;
case 4:
u32sendendflag = R485_AIMA_Send();
break;
case 5:
break;
case 6:
break;
case 7:
break;
case 8:
break;
case 9:
break;
case 10:
break;
case 11:
break;
case 12:
break;
case 13:
break;
default:
break;
}
return u32sendendflag; return u32sendendflag;
} }
\ No newline at end of file
YueJin_test_bench/source/Appliciation/Task.c
View file @ c381ee2d
...@@ -322,19 +322,29 @@ uint32_t ONOFFtime; ...@@ -322,19 +322,29 @@ uint32_t ONOFFtime;
uint8_t compareresult; uint8_t compareresult;
uint8_t flashtime = 0; uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
uint8_t ACCONOFF_delay_3s;
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;
loc_timer++; // loc_timer++;
if ( loc_timer >= 3 ) // if ( loc_timer >= 3 )
// {
// loc_timer = 0;
// // HW_CHECK_IPK_EXIST( );
// Recv_Byte1();
// }
Display_PageNum();
if(MENU_CHECK_STEP == 1)
{ {
loc_timer = 0; if(ACCONOFF_delay_3s < 30)
// HW_CHECK_IPK_EXIST( ); {
Recv_Byte1(); ACCONOFF_delay_3s++;
}
}
else
{
ACCONOFF_delay_3s = 0;
} }
Display_PageNum();
// Freln_Duty_HZ_Service(); // Freln_Duty_HZ_Service();
if(RS485_send_time<0xFFFFFFFF) if(RS485_send_time<0xFFFFFFFF)
......
YueJin_test_bench/source/Appliciation/Task.h
View file @ c381ee2d
...@@ -9,6 +9,7 @@ extern uint32_t send0x42time; ...@@ -9,6 +9,7 @@ extern uint32_t send0x42time;
extern uint32_t bleOFFtoONtime; extern uint32_t bleOFFtoONtime;
extern uint8_t startONfalg; extern uint8_t startONfalg;
extern uint32_t startIGONtime; extern uint32_t startIGONtime;
extern uint8_t ACCONOFF_delay_3s;
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);
......
YueJin_test_bench/source/Appliciation/api_RS485.c
View file @ c381ee2d
...@@ -538,44 +538,6 @@ void RS485_User_Tx_Data(void) ...@@ -538,44 +538,6 @@ void RS485_User_Tx_Data(void)
} }
break; break;
// case RS485_Tx_ID49_Idx:
// sendfinishflag = R485_Send_0x41();
// if(sendfinishflag == 0)
// {
// RS485_send_time = 0;
// RS485_TX_finish = 1;
// if(RS485_TX_finish == 1)
// {
// RS485_send_num ++;
// }
// }
// break;
// case RS485_Tx_ID4A_Idx:
// sendfinishflag = R485_Send_0x42();
// if(sendfinishflag == 0)
// {
// RS485_send_time = 0;
// RS485_TX_finish = 1;
// if(RS485_TX_finish == 1)
// {
// RS485_send_num++;
// }
// }
// break;
// case 3:
// sendfinishflag = R485_Send_0x45();
// if(sendfinishflag == 0)
// {
// RS485_send_time = 0;
// RS485_TX_finish = 1;
// if(RS485_TX_finish == 1)
// {
// RS485_send_num = 0;
// }
// }
// break;
default: default:
flag = 1; flag = 1;
RS485_send_time = 0; RS485_send_time = 0;
......
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