Commit 27406b02 authored by 何锐's avatar 何锐

feat:增加左右转向检测

parent 442385e7
...@@ -4094,7 +4094,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4094,7 +4094,7 @@ void Display_Version_Info(uint32_t ON_OFF)
// TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比 // TFT_LCD_Draw_Bmp(3, 160, ( uint8_t * )gImage_Alarm_12_WordX6_Y165); //24脚输出占空比
// TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //% // TFT_LCD_Draw_Bmp(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号 TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [7] = {2,5,0,9,2,3,0xff}; uint8_t mbuff [7] = {2,5,1,0,1,4,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
...@@ -4643,6 +4643,16 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4643,6 +4643,16 @@ void Display_Send_Vspead(uint8_t menu)
uint8_t FourGPattern [3] = {0x04,0x47,0xFF}; uint8_t FourGPattern [3] = {0x04,0x47,0xFF};
General_Number_Disp(GPSPattern, 3, 40+25+25+25+25+25+25+40+40); General_Number_Disp(GPSPattern, 3, 40+25+25+25+25+25+25+40+40);
General_Number_Disp(FourGPattern, 3+100, 40+25+25+25+25+25+25+40+40); General_Number_Disp(FourGPattern, 3+100, 40+25+25+25+25+25+25+40+40);
if(youzhuanget == 1)
{
TFT_LCD_Draw_Bmp(3+40+60+60, 40+25+25+25+25+25+25, ( uint8_t * )gImage_cuo11 );
}
else
{
TFT_LCD_Draw_Bmp(3+40+60+60, 40+25+25+25+25+25+25, ( uint8_t * )gImage_dui11 );
}
break; break;
case 3: case 3:
TFT_LCD_Draw_Bmp(160, 40+25+25+25+25, ( uint8_t * )gImage_gImage_orange1X6_Y16); TFT_LCD_Draw_Bmp(160, 40+25+25+25+25, ( uint8_t * )gImage_gImage_orange1X6_Y16);
...@@ -4692,6 +4702,14 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4692,6 +4702,14 @@ void Display_Send_Vspead(uint8_t menu)
// uint8_t TCSPattern[4] = {0x54,0x43,0x53,0xFF}; // uint8_t TCSPattern[4] = {0x54,0x43,0x53,0xFF};
// General_Number_Disp(TCSPattern, 3, 40+25+25+25+25+25+25+40); // General_Number_Disp(TCSPattern, 3, 40+25+25+25+25+25+25+40);
if(zuozhuanget == 1)
{
TFT_LCD_Draw_Bmp(3+40+60+60, 40+25+25+25+25+25+25, ( uint8_t * )gImage_cuo11 );
}
else
{
TFT_LCD_Draw_Bmp(3+40+60+60, 40+25+25+25+25+25+25, ( uint8_t * )gImage_dui11 );
}
break; break;
case 4: case 4:
......
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
#define EN_5V_CUT_ENABLE GPIO_OUT_PORT00_PIN12 #define EN_5V_CUT_ENABLE GPIO_OUT_PORT00_PIN12
#define zuozhuanaaa GPIO_IN_PORT10_PIN07 #define zuozhuanget GPIO_IN_PORT10_PIN07 //左转指示灯输出检测
#define youzhuanaaa GPIO_IN_APORT00_PIN15 //左转灯 #define youzhuanget GPIO_IN_APORT00_PIN15 //右转指示灯输出检测
//zh: //zh:
......
...@@ -60,9 +60,6 @@ void Sys_Run_Mode_5ms_Tasks_Group(void) ...@@ -60,9 +60,6 @@ void Sys_Run_Mode_5ms_Tasks_Group(void)
/*============================================================================== /*==============================================================================
10ms����ִ������ ��0�� 10ms����ִ������ ��0��
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
uint8_t zuozhuan[100] = {0};
uint8_t i = 0;
uint8_t j = 0;
void Sys_Run_Mode_10ms_Tasks_Group(void) void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
Key_Service(); Key_Service();
...@@ -106,19 +103,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -106,19 +103,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
TimeDelay_3s(); TimeDelay_3s();
PasswordUnlock(); PasswordUnlock();
if((i<100)&&(j<100))
{
zuozhuan[i] = zuozhuanaaa;
i++;
zuozhuan[j] = zuozhuanaaa;
j++;
}
else
{
i = 0;
j = 0;
}
static uint32_t loc_timer = 0; static uint32_t loc_timer = 0;
loc_timer++; loc_timer++;
......
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