Skip to content

J
jiancetai
Commit 3b5b94c3 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:屏外指示灯全亮

parent 5da94303
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 84 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 3b5b94c3
...@@ -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 > 10) if(MENU_CHECK_STEP > 0)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -582,89 +582,32 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -582,89 +582,32 @@ void Function_Check_Ctrl(uint32_t cmd)
{ {
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_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_01 = 1;
LINE_OUT_POS_02 = 0; LINE_OUT_POS_02 = 1;
LINE_OUT_NEG_01 = 0; LINE_OUT_POS_08 = 1;
LINE_OUT_POS_04 = 0; LINE_OUT_NEG_01 = 1;
/*燃油*/ LINE_OUT_NEG_02 = 1;
FUEL_RES_1 = 0; LINE_OUT_NEG_03 = 0;
FUEL_RES_2 = 0; POWER_CTRL_KL30 = 1u; //B+
FUEL_RES_3 = 0; POWER_CTRL_KL15 = 1u; //KL15
FUEL_RES_4 = 0;
break; break;
} }
case 1: case 1:
{ {
/*负控*/
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_05 = 1;
// LINE_OUT_NEG_06 = 1;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
/*正控*/ /*正控*/
// LINE_OUT_POS_01 = 1; //右转 LINE_OUT_POS_01 = 0;
LINE_OUT_POS_04 = 1; //左转 LINE_OUT_POS_02 = 0;
/*燃油*/ LINE_OUT_POS_08 = 0;
FUEL_RES_1 = 1; //5格 LINE_OUT_NEG_01 = 0;
FUEL_RES_2 = 1; LINE_OUT_NEG_02 = 0;
FUEL_RES_3 = 1; LINE_OUT_NEG_03 = 0;
FUEL_RES_4 = 1; POWER_CTRL_KL30 = 0u; //B+
POWER_CTRL_KL15 = 0u; //KL15
break; break;
} }
case 2: case 2:
{ {
/*负控*/
// LINE_OUT_NEG_01 = 0;
// LINE_OUT_NEG_02 = 0;
// LINE_OUT_NEG_03 = 0;
// LINE_OUT_NEG_04 = 0;
// LINE_OUT_NEG_05 = 1;
// LINE_OUT_NEG_06 = 0;
// LINE_OUT_NEG_07 = 0;
// LINE_OUT_NEG_08 = 0;
// LINE_OUT_NEG_09 = 1;
// LINE_OUT_NEG_10 = 0;
/*正控*/
// LINE_OUT_POS_02 = 1; //远光
LINE_OUT_POS_04 = 0; //左转
/*燃油*/
FUEL_RES_1 = 0; //4格
FUEL_RES_2 = 0;
FUEL_RES_3 = 0;
FUEL_RES_4 = 1;
break; break;
} }
case 3: case 3:
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ 3b5b94c3
...@@ -136,10 +136,6 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent) ...@@ -136,10 +136,6 @@ void Key_Operation_SW2(Key_Event_en_t enKeyEvent)
if ( enKeyEvent == KEY_EVENT_SHORT_PRESS ) if ( enKeyEvent == KEY_EVENT_SHORT_PRESS )
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
if((MENU_CHECK_STEP < 6) && (MENU_CHECK_STEP > 0))
{
IG_OFF_Flag = 1;
}
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
{ {
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 3b5b94c3
...@@ -82,11 +82,11 @@ ...@@ -82,11 +82,11 @@
//左转 //左转
#define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05 #define LINE_OUT_POS_04 GPIO_OUT_APORT00_PIN05
//右转 //正控1
#define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06 #define LINE_OUT_POS_01 GPIO_OUT_PORT10_PIN06
//远光 //正控2
#define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00 #define LINE_OUT_POS_02 GPIO_OUT_PORT09_PIN00
//位置灯 //正控3
#define LINE_OUT_POS_03 GPIO_OUT_APORT00_PIN04 #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
...@@ -95,11 +95,11 @@ ...@@ -95,11 +95,11 @@
#define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08 #define LINE_OUT_POS_09 GPIO_OUT_PORT08_PIN08
#define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07 #define LINE_OUT_POS_10 GPIO_OUT_PORT00_PIN07
//安全带//R挡 //负控1
#define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06 #define LINE_OUT_NEG_01 GPIO_OUT_PORT09_PIN06
//机油压力//L挡 //负控2
#define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05 #define LINE_OUT_NEG_02 GPIO_OUT_PORT09_PIN05
//H挡//发动机故障 //负控3
#define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04 #define LINE_OUT_NEG_03 GPIO_OUT_PORT09_PIN04
//P挡//驻车指示灯 //P挡//驻车指示灯
#define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03 #define LINE_OUT_NEG_04 GPIO_OUT_PORT09_PIN03
......
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