Skip to content

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

✨ feat:S1检测台初版程序

parent 1e86da41
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 133 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 68178d89
...@@ -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 > 9) if(MENU_CHECK_STEP > 8)
{ {
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
} }
...@@ -603,7 +603,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -603,7 +603,8 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_VBAT_MCU = 1; RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1; RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1; RELAY_KEY_MCU = 1;
left_turn = 1; // Aima_SLF(1u, 0x04, 0x1, 1u);
// left_turn = 1;
} }
break; break;
} }
...@@ -650,8 +651,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -650,8 +651,6 @@ void Function_Check_Ctrl(uint32_t cmd)
RELAY_DC12V_MCU = 1; RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 0; RELAY_KEY_MCU = 0;
} }
// ABC_OUT = 1;
left_turn = 0; left_turn = 0;
break; break;
...@@ -745,48 +744,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -745,48 +744,8 @@ void Function_Check_Ctrl(uint32_t cmd)
ABC_OUT = 0; ABC_OUT = 0;
break; break;
} }
case 9:
{
RELAY_VBAT_MCU = 1;
RELAY_DC12V_MCU = 1;
RELAY_KEY_MCU = 1;
RELAY_LIGHTCONTROL_MCU = 0;
if(ACCONOFF_delay_3s <= 5)
{
ONE_START = 1;
}
else if(ACCONOFF_delay_3s > 5 && ACCONOFF_delay_3s <= 8)
{
ONE_START = 0;
}
else if(ACCONOFF_delay_3s > 10 && ACCONOFF_delay_3s <= 13)
{
ONE_START = 1;
}
else if(ACCONOFF_delay_3s > 13 && ACCONOFF_delay_3s <= 17)
{
ONE_START = 0;
}
else
{
ONE_START = 1;
}
if(ACCONOFF_delay_3s > 17 && CHECK_Value == 0)
{
ACCONOFF_delay_3s = 0;
}
break;
}
default: default:
break; break;
// }
} }
} }
} }
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 68178d89
...@@ -4434,7 +4434,10 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4434,7 +4434,10 @@ void Display_Send_Vspead(uint8_t menu)
{ {
case 0: case 0:
{ {
CHECK_Value = 1; if(CHECK_Ctrl_delay > 20)
{
CHECK_Value = 1;
}
} }
break; break;
case 1: case 1:
...@@ -4446,28 +4449,30 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4446,28 +4449,30 @@ void Display_Send_Vspead(uint8_t menu)
break; break;
} }
case 2: case 2:
if(CHECK_Ctrl_delay >=20)
if(DIS_AD == 0)
{
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_09_Word0X51_Y261);
DIS_VALUE = 1;
}
else
{ {
if(DIS_VALUE == 1) if(DIS_AD == 1)
{ {
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_09_Word0X51_Y261);
if(DIS_AD == 1) DIS_VALUE = 1;
{ }
DIS_VALUE = 0; else
CHECK_Value = 1; {
} if(DIS_VALUE == 1)
else
{ {
CHECK_Value = 0;
if(DIS_AD == 0)
{
DIS_VALUE = 0;
CHECK_Value = 1;
}
else
{
CHECK_Value = 0;
}
} }
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
} }
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
} }
break; break;
case 3: case 3:
...@@ -4480,7 +4485,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4480,7 +4485,7 @@ void Display_Send_Vspead(uint8_t menu)
// CHECK_Value = 0; // CHECK_Value = 0;
// } // }
if(DIS_AD == 0) if(DIS_AD == 1)
{ {
DIS_VALUE = 1; DIS_VALUE = 1;
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_10_Word0X51_Y261); TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_10_Word0X51_Y261);
...@@ -4489,7 +4494,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4489,7 +4494,7 @@ void Display_Send_Vspead(uint8_t menu)
{ {
if(DIS_VALUE == 1) if(DIS_VALUE == 1)
{ {
if(DIS_AD == 1) if(DIS_AD == 0)
{ {
DIS_VALUE = 0; DIS_VALUE = 0;
CHECK_Value = 1; CHECK_Value = 1;
...@@ -4499,26 +4504,14 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4499,26 +4504,14 @@ void Display_Send_Vspead(uint8_t menu)
CHECK_Value = 0; CHECK_Value = 0;
} }
} }
// TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR); // TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
} }
break; break;
case 4: case 4:
if(CHECK_Ctrl_delay >= 30) if(CHECK_Ctrl_delay >= 30)
{ {
CHECK_Value = 1; CHECK_Value = 1;
} }
if(LOGOTY_AD == 1)
{
// CHECK_Value = 1;
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_13_Word0X51_Y261);
}
else
{
// CHECK_Value = 1;
TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
}
break; break;
case 5: case 5:
if(CHECK_Ctrl_delay >= 30) if(CHECK_Ctrl_delay >= 30)
...@@ -4580,46 +4573,10 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4580,46 +4573,10 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR); TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
} }
break;
// case 8:
// if(DIS_AD == 0)
// {
// DIS_VALUE = 1;
// TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_10_Word0X51_Y261);
// }
// else
// {
// if(DIS_VALUE == 1)
// {
// CHECK_Value = 1;
// DIS_VALUE = 0;
// }
// // TFT_LCD_Draw_Box(0, 261, 239, 319, TFT_LCD_FILL_FULL, TFT_LCD_TYPE_CLR);
// }
// break;
case 9:
if(ZYS_A == 1)
{
CHECK_Value = 1;
TFT_LCD_Draw_Bmp(51,261,( uint8_t * )gImage_Alarm_08_Word0X51_Y261);
}
else
{
// Display_TFT_Clear();
}
if(ZYS_B == 1)
{
CHECK_Value = 1;
TFT_LCD_Draw_Bmp(51,200,( uint8_t * )gImage_gImage_ABSX6_Y165);
}
else
{
// Display_TFT_Clear();
}
break; break;
default: default:
MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
break; break;
} }
} }
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 68178d89
...@@ -89,6 +89,12 @@ void RTE_GPIO_Init(void) ...@@ -89,6 +89,12 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_IN; gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;
gpio_temp.enGPIOPIN = GPIO_PIN_7;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_8; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_8;
gpio_temp.enGPIOPIN = GPIO_PIN_12; gpio_temp.enGPIOPIN = GPIO_PIN_12;
gpio_temp.enGPIOMode = GPIO_MODE_PORT; gpio_temp.enGPIOMode = GPIO_MODE_PORT;
...@@ -132,12 +138,6 @@ void RTE_GPIO_Init(void) ...@@ -132,12 +138,6 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;
gpio_temp.enGPIOPIN = GPIO_PIN_9;
gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_IN;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp);
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_AP0;
gpio_temp.enGPIOPIN = GPIO_PIN_10; gpio_temp.enGPIOPIN = GPIO_PIN_10;
gpio_temp.enGPIOMode = GPIO_MODE_PORT; gpio_temp.enGPIOMode = GPIO_MODE_PORT;
gpio_temp.enGPIODir = GPIO_DIR_IN; gpio_temp.enGPIODir = GPIO_DIR_IN;
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.h
View file @ 68178d89
...@@ -7,8 +7,9 @@ ...@@ -7,8 +7,9 @@
#define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04 //485_RE #define LINE_OUT_NEG_09 GPIO_OUT_PORT10_PIN04 //485_RE
#define ONE_START GPIO_OUT_PORT10_PIN13 //一键启动 #define ONE_START GPIO_OUT_PORT10_PIN14 //一键启动
#define ABC_OUT GPIO_OUT_PORT00_PIN04 //ABC轮动报警输出 #define ABC_OUT GPIO_OUT_PORT00_PIN04 //ABC轮动报警输出
#define BCDD_MCU GPIO_OUT_PORT10_PIN00 //脚撑
#define RELAY_VBAT_MCU GPIO_OUT_PORT10_PIN10 #define RELAY_VBAT_MCU GPIO_OUT_PORT10_PIN10
#define RELAY_DC12V_MCU GPIO_OUT_PORT10_PIN09 #define RELAY_DC12V_MCU GPIO_OUT_PORT10_PIN09
...@@ -31,15 +32,11 @@ ...@@ -31,15 +32,11 @@
#define SW8 GPIO_IN_APORT00_PIN05 #define SW8 GPIO_IN_APORT00_PIN05
#define AD_B GPIO_IN_APORT00_PIN06 #define AD_B GPIO_IN_APORT00_PIN06
#define ACC_AD GPIO_IN_APORT00_PIN07 #define DCF_Open GPIO_IN_APORT00_PIN07 //电磁阀开
#define TY_YL_AD GPIO_IN_APORT00_PIN08 #define ZXSW_AD GPIO_IN_APORT00_PIN08
#define WYTY_AD GPIO_IN_APORT00_PIN09 #define DCF_Close GPIO_IN_APORT00_PIN09 //电磁阀关
#define LOGOTY_AD GPIO_IN_APORT00_PIN10 #define DIS_AD GPIO_IN_APORT00_PIN10
#define DIS_AD GPIO_IN_APORT00_PIN11 #define Light_control_headlights GPIO_IN_APORT00_PIN11 //光控大灯
#define Light_control_headlights GPIO_IN_APORT00_PIN12 //光控大灯
#define ZXSW_AD GPIO_IN_APORT00_PIN13
#define ZYS_B GPIO_IN_APORT00_PIN14 //坐桶锁B
#define ZYS_A GPIO_IN_APORT00_PIN15 //坐桶锁A
#define TX_OUT GPIO_OUT_PORT00_PIN08 //一线通TX输出 #define TX_OUT GPIO_OUT_PORT00_PIN08 //一线通TX输出
......
YueJin_test_bench/source/Driver/Analog_Signals/Analog_Signals.c
View file @ 68178d89
...@@ -74,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER]; ...@@ -74,7 +74,7 @@ ADC_Data_st_t stADCData[ADC_SIGNAL_CH_NUMBER];
const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] = const uint8_t u8ADCChList[ADC_CONV_CH_NUMBER] =
{ {
9U, 15U, 12U, 13U, 9U, 15U, 11U, 8U,
}; };
const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] = const ADC_Ch_Cfg_st_t stADCChCfg[ADC_SIGNAL_CH_NUMBER] =
......
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