Commit 4ef56942 authored by 李鑫3's avatar 李鑫3

feat:添加外发检测,上下电刷新状态

parent c79d9ef8
......@@ -790,12 +790,12 @@ void can_submit(void)
CAN_Frame_st_t m_msg9;
uint8_t data9[8] = {0, 0, 0, 0, 0, 0, 0, 0};//786掉线
if((MENU_CHECK_STEP != 2) && (MENU_CHECK_STEP != 6))
{
data4[0] = 0x00; //ABS
init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4);
can_mid(m_msg4);
}
// if((MENU_CHECK_STEP != 2) && (MENU_CHECK_STEP != 6))
// {
// data4[0] = 0x00; //ABS
// init_CAN_Frame(&m_msg4, 0x153, 8, 1, data4);
// can_mid(m_msg4);
// }
Meter_field_display(MENU_CHECK_STEP);
......
......@@ -72,7 +72,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void)
{
if(MENU_CHECK_STEP > 7)
if(MENU_CHECK_STEP > 8)
{
MENU_CHECK_STEP = 0;
}
......@@ -969,6 +969,10 @@ void Function_Check_Ctrl(uint32_t cmd)
FUEL_T_4=0;
break;
}
case 9:
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
}
......
......@@ -5642,7 +5642,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 5:
fuel_val = 5;
fuel_val = 4;
tem=5;
VSpeed_val = 199;
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_JCT_12X0_Y0);
......
......@@ -312,12 +312,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//--右转输出
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
gpio_temp.enGPIOPIN = GPIO_PIN_14;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);//--右转输出
// gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
// gpio_temp.enGPIOPIN = GPIO_PIN_14;
// gpio_temp.enGPIOMode = GPIO_MODE_PORT;
// gpio_temp.enGPIODir = GPIO_DIR_OUT;
// gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
// GPIO_Config(&gpio_temp);//--右转输出
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;
......
......@@ -93,6 +93,10 @@
// #define LINE_SafeBelt_4_press NEG_8_Ctrl
// #define LINE_SafeBelt_5_press NEG_9_Ctrl
//开机动画打断
#define LINE_OUT_cartoon GPIO_OUT_PORT00_PIN14
//无钥匙
#define LINE_OUT_key GPIO_OUT_PORT00_PIN01
//左转
#define LINE_OUT_POS_04 GPIO_OUT_PORT10_PIN10
......
......@@ -217,10 +217,10 @@ uint16_t u16LJSText;
uint8_t time300ms;
uint8_t clear_odo_time;
uint8_t lestadd=0;
uint8_t delay=0;
uint8_t leftad2=0;
uint8_t rightadd=0;
uint8_t igonoff=0;
uint8_t igoff=0;
uint8_t leftflg=0;
uint8_t rightflg=0;
......@@ -308,19 +308,128 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
}
if((rightflg==1) && (leftflg==1))
// if((rightflg==1) && (leftflg==1))
// {
// igoff++;
// if(igoff==110)
// {
// POWER_CTRL_KL30 = 0u; //B+
// POWER_CTRL_KL15 = 0u; //KL15
// rightflg=0;
// leftflg=0;
// igoff=0;
// }
// }
if((MENU_CHECK_STEP ==1)&& (igonoff==0))
{
igoff++;
if(igoff==110)
delay++;
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_key = 1;
if(delay==60)
{
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
rightflg=0;
leftflg=0;
igoff=0;
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_key =0;
delay=0;
igonoff=1;
}
}
else if((MENU_CHECK_STEP==2) &&(igonoff ==1))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
if(delay==11)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon=1;
delay=0;
igonoff=2;
}
}
else if((MENU_CHECK_STEP==3) &&(igonoff ==2))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //
LINE_OUT_cartoon = 0;
if(delay==11)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon =1;
delay=0;
igonoff=3;
}
}
else if((MENU_CHECK_STEP==4) &&(igonoff ==3))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_cartoon =0;
if(delay==11)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon=1;
delay=0;
igonoff=4;
}
}
else if((MENU_CHECK_STEP==5) &&(igonoff ==4))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_cartoon=0;
if(delay==11)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon=1;
delay=0;
igonoff=5;
}
}
else if((MENU_CHECK_STEP==6) &&(igonoff ==5))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_cartoon=0;
if(delay==11)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon=1;
delay=0;
igonoff=6;
}
}
else if((MENU_CHECK_STEP==7) &&(igonoff ==6))
{
delay++;
POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
LINE_OUT_cartoon=0;
if(delay==11)
{
POWER_CTRL_KL30 = 1u; //B+
POWER_CTRL_KL15 = 1u; //KL15
LINE_OUT_cartoon=1;
delay=0;
igonoff=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