Skip to content

J
jiancetai
Commit 8f381709 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:老化台程序更新

parent 4448fe82
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 237 deletions
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 8f381709
...@@ -73,19 +73,23 @@ void MENU_CHECK_STEP_ADD(void) ...@@ -73,19 +73,23 @@ void MENU_CHECK_STEP_ADD(void)
{ {
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
if(MENU_CHECK_STEP > 9)
{
MENU_CHECK_STEP = 0;
}
if(MENU_CHECK_STEP == 1) if(MENU_CHECK_STEP == 1)
{ {
MENU_CHECK_STEP = 2; MENU_CHECK_STEP = 2;
} }
else if(MENU_CHECK_STEP == 6)
{
MENU_CHECK_STEP = 9;
}
else if(MENU_CHECK_STEP > 10)
{
MENU_CHECK_STEP = 0;
}
} }
void MENU_CHECK_STEP_SUB(void) void MENU_CHECK_STEP_SUB(void)
{ {
if ( MENU_CHECK_STEP != 0 ); // if ( MENU_CHECK_STEP != 0 );
MENU_CHECK_STEP--; // MENU_CHECK_STEP--;
} }
...@@ -731,16 +735,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -731,16 +735,8 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
switch (MENU_CHECK_STEP) switch (MENU_CHECK_STEP)
{ {
case 0: case 0: //首界面上电
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 0; RightturnSignal = 0;
LeftturnSignal = 0; LeftturnSignal = 0;
Bluetoothlight = 0; Bluetoothlight = 0;
...@@ -752,14 +748,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -752,14 +748,6 @@ void Function_Check_Ctrl(uint32_t cmd)
case 1: case 1:
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 0; RightturnSignal = 0;
LeftturnSignal = 0; LeftturnSignal = 0;
Bluetoothlight = 0; Bluetoothlight = 0;
...@@ -770,14 +758,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -770,14 +758,6 @@ void Function_Check_Ctrl(uint32_t cmd)
} }
case 2: case 2:
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 1; RightturnSignal = 1;
LeftturnSignal = 0; LeftturnSignal = 0;
Bluetoothlight = 1; Bluetoothlight = 1;
...@@ -809,14 +789,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -809,14 +789,6 @@ void Function_Check_Ctrl(uint32_t cmd)
case 5: case 5:
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 0; RightturnSignal = 0;
LeftturnSignal = 0; LeftturnSignal = 0;
Bluetoothlight = 0; Bluetoothlight = 0;
...@@ -825,43 +797,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -825,43 +797,8 @@ void Function_Check_Ctrl(uint32_t cmd)
Lowbeam = 1; Lowbeam = 1;
break; break;
} }
case 6: case 6: //密码认证
{ {
//密码认证
if(KeyStep == 3)
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
}
else
{
if(TimeDelay_3s() == 0)
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
}
else
{
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
}
}
RightturnSignal = 0; RightturnSignal = 0;
LeftturnSignal = 0; LeftturnSignal = 0;
Bluetoothlight = 0; Bluetoothlight = 0;
...@@ -870,16 +807,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -870,16 +807,8 @@ void Function_Check_Ctrl(uint32_t cmd)
Lowbeam = 0; Lowbeam = 0;
break; break;
} }
case 7: case 7: //蓝牙盖板
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 0; RightturnSignal = 0;
LeftturnSignal = 0; LeftturnSignal = 0;
Bluetoothlight = 1; Bluetoothlight = 1;
...@@ -888,16 +817,8 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -888,16 +817,8 @@ void Function_Check_Ctrl(uint32_t cmd)
Lowbeam = 0; Lowbeam = 0;
break; break;
} }
case 8: case 8: //蓝牙检测
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
Lowbeam = 0; Lowbeam = 0;
LeftturnSignal = 0; LeftturnSignal = 0;
highbeam = 0; highbeam = 0;
...@@ -905,81 +826,9 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -905,81 +826,9 @@ void Function_Check_Ctrl(uint32_t cmd)
Bluetoothlight = 0; Bluetoothlight = 0;
break; break;
} }
// case 9:
// { case 9: //全亮
// // LED3 = 1;
// // LED4 = 1;
// // LINE_OUT_NEG_05 = 0;
// // LINE_jinguang = 1;
// // POWER_CTRL_KL30_Current = 1;
// // POWER_CTRL_KL30 = 1;
// Lowbeam = 0;
// LeftturnSignal = 0;
// highbeam = 0;
// RightturnSignal = 0;
// Bluetoothlight = 0;
// break;
// }
// case 10:
// {
// // if(Auto_ONOFF == 0)
// // {
// // LINE_OUT_NEG_01 = 1;
// // LINE_OUT_NEG_04 = 1;
// // }
// // LINE_OUT_NEG_02 = 1;
// // LINE_OUT_NEG_03 = 1;
// // LED3 = 1;
// // LED4 = 1;
// // LINE_OUT_NEG_05 = 0;
// // LINE_jinguang = 1;
// // POWER_CTRL_KL30 = 1;
// // POWER_CTRL_KL30_Current = 1;
// Lowbeam = 0;
// LeftturnSignal = 0;
// highbeam = 0;
// RightturnSignal = 0;
// Bluetoothlight = 0;
// break;
// }
// case 11: //下电蓝牙外屏
// {
// // POWER_CTRL_KL30_Current = 1;
// // if(Auto_ONOFF == 0)
// // {
// // LINE_OUT_NEG_01 = 0;
// // }
// // LINE_OUT_NEG_02 = 0;
// // LINE_OUT_NEG_03 = 1;
// // LINE_OUT_NEG_04 = 0;
// Lowbeam = 0;
// LeftturnSignal = 0;
// highbeam = 0;
// RightturnSignal = 0;
// Bluetoothlight = 0;
// break;
// }
// case 12:
// {
// Lowbeam = 0;
// LeftturnSignal = 0;
// highbeam = 0;
// RightturnSignal = 0;
// Bluetoothlight = 0;
// break;
// }
case 9:
{ {
if(Auto_ONOFF == 0)
{
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
RightturnSignal = 1; RightturnSignal = 1;
LeftturnSignal = 1; LeftturnSignal = 1;
Bluetoothlight = 1; Bluetoothlight = 1;
...@@ -988,27 +837,6 @@ void Function_Check_Ctrl(uint32_t cmd) ...@@ -988,27 +837,6 @@ void Function_Check_Ctrl(uint32_t cmd)
Lowbeam = 1; Lowbeam = 1;
break; break;
} }
// case 14:
// {
// Lowbeam = 0;
// LeftturnSignal = 0;
// highbeam = 0;
// RightturnSignal = 0;
// Bluetoothlight = 1;
// break;
// }
// case 15: //全上电连蓝牙
// {
// LINE_OUT_NEG_05 = 0;
// if(Auto_ONOFF == 0)
// {
// LINE_OUT_NEG_01 = 1;
// LINE_OUT_NEG_04 = 1;
// }
// LINE_OUT_NEG_02 = 1;
// LINE_OUT_NEG_03 = 1;
// break;
// }
default: default:
break; break;
} }
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 8f381709
...@@ -4902,7 +4902,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4902,7 +4902,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,1,1,2,8,0xff}; uint8_t mbuff [7] = {2,5,1,2,0,3,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ 8f381709
...@@ -172,11 +172,7 @@ void RTE_GPIO_Init(void) ...@@ -172,11 +172,7 @@ void RTE_GPIO_Init(void)
// LINE_OUT_POS_06 = 0; // LINE_OUT_POS_06 = 0;
// LINE_OUT_POS_07 = 0; // LINE_OUT_POS_07 = 0;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
#if(0) #if(0)
gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0; gpio_temp.enGPIOPort = GPIO_PORT_GROUP_0;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ 8f381709
...@@ -115,7 +115,7 @@ void BluetoothAutoDisConnect(void) ...@@ -115,7 +115,7 @@ void BluetoothAutoDisConnect(void)
MENU_CHECK_STEPLAST = MENU_CHECK_STEP; MENU_CHECK_STEPLAST = MENU_CHECK_STEP;
} }
uint16_t u16LJSText; uint16_t u16LJSText;
uint32_t AutoTime = 160; uint32_t AutoTime = 150;
uint32_t ONOFFtime = 450; uint32_t ONOFFtime = 450;
uint8_t flashtime = 0; uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
...@@ -150,10 +150,24 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -150,10 +150,24 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
else else
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
AutoTime = 160; if(MENU_CHECK_STEP == 10)
{
AutoTime = 0;
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0;
}
else
{
AutoTime = 150;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1;
}
} }
} }
...@@ -167,14 +181,14 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -167,14 +181,14 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
if(LINE_OUT_NEG_01 == 1) if(LINE_OUT_NEG_01 == 1)
{ {
LINE_OUT_NEG_01 = 0; // LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0; // LINE_OUT_NEG_04 = 0;
ONOFFtime = 450; ONOFFtime = 450;
} }
else else
{ {
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
ONOFFtime = 0; ONOFFtime = 0;
} }
} }
......
YueJin_test_bench/source/Appliciation/api_RS485.c
View file @ 8f381709
...@@ -425,41 +425,7 @@ uint8_t bluetoothdelaytime; ...@@ -425,41 +425,7 @@ uint8_t bluetoothdelaytime;
uint8_t BlueToothSwitch; uint8_t BlueToothSwitch;
void BTEnableDelayPowerReset(void) void BTEnableDelayPowerReset(void)
{ {
if((BlueTooth == 1) && (BlueToothSwitch != 1))
{
if(bluetoothdelaytime <= 50)
{
bluetoothdelaytime++;
}
else if(bluetoothdelaytime <= 55)
{
bluetoothdelaytime++;
Auto_ONOFF = 3;
LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_04 = 0;
LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0;
}
else
{
Auto_ONOFF = 0;
BlueToothSwitch = 1;
bluetoothdelaytime = 0;
LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_04 = 1;
LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1;
}
}
else if((BlueTooth == 0) && (BlueToothSwitch == 1))
{
BlueToothSwitch = 0;
bluetoothdelaytime = 0;
}
else
{
bluetoothdelaytime = 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