Skip to content

J
jiancetai
Commit c96bb4ae authored by 梁百峰's avatar 梁百峰
Browse files
Options

🐞 fix:删除清大计确认键

parent af19864e
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 103 deletions
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ c96bb4ae
...@@ -3770,12 +3770,12 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3770,12 +3770,12 @@ void Display_Version_Info(uint32_t ON_OFF)
} }
else else
{ {
// TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错 TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_cuo ); //软件版本号对比 错
// firstpowerflag = 3; firstpowerflag = 3;
// MENU_CHECK_STEP = 0; MENU_CHECK_STEP = 0;
//正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可 //正在调试取消版本号对比 想要取消版本号对比将上方注释掉并解开下方注释即可
TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对 // TFT_LCD_Draw_Bmp(200, 90+25+25+30+25+30+30, ( uint8_t * )gImage_dui ); //软件版本号对比 对
firstpowerflag = 2; // firstpowerflag = 2;
} }
} }
else else
...@@ -3799,7 +3799,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -3799,7 +3799,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 [4] = {1,1,0,0xff}; uint8_t mbuff [7] = {2,5,0,5,2,9,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
YueJin_test_bench/source/Appliciation/Key_user.c
View file @ c96bb4ae
...@@ -211,7 +211,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -211,7 +211,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
// { // {
// clearOdoFlag = 0; // clearOdoFlag = 0;
// } // }
queren = 0; // queren = 0;
} }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......
YueJin_test_bench/source/Appliciation/RTE_GPIO.c
View file @ c96bb4ae
...@@ -119,7 +119,7 @@ void RTE_GPIO_Init(void) ...@@ -119,7 +119,7 @@ void RTE_GPIO_Init(void)
gpio_temp.enGPIODir = GPIO_DIR_OUT; gpio_temp.enGPIODir = GPIO_DIR_OUT;
gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1; gpio_temp.enGPIOAltFun = GPIO_ALTER_FUN_1;
GPIO_Config(&gpio_temp); GPIO_Config(&gpio_temp);
queren = 0; // queren = 0;
LINE_OUT_POS_06 = 0; LINE_OUT_POS_06 = 0;
LINE_OUT_POS_07 = 0; LINE_OUT_POS_07 = 0;
......
YueJin_test_bench/source/Appliciation/Task.c
View file @ c96bb4ae
...@@ -52,7 +52,7 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void) ...@@ -52,7 +52,7 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
TFT_LCD_Display_Update_Service( ); TFT_LCD_Display_Update_Service( );
Fre_In_Service(FRE_VEHICLE); Fre_In_Service(FRE_VEHICLE);
MENU_CHECK_STEP = 11; // MENU_CHECK_STEP = 11;
//Fre_In_Service(FRE_ENGINE); //Fre_In_Service(FRE_ENGINE);
} }
/*============================================================================*/ /*============================================================================*/
...@@ -107,8 +107,12 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -107,8 +107,12 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
LINE_OUT_NEG_09 = 1; LINE_OUT_NEG_09 = 1;
if(LINE_OUT_NEG_09 == 1) if(LINE_OUT_NEG_09 == 1)
{ {
if(connectbleFlag == 0) if(connectbleFlag == 1)
{ {
MENU_CHECK_STEP = 16;
}
// if(connectbleFlag == 0)
// {
if(zhenduanflag == 0) if(zhenduanflag == 0)
{ {
// R485_Send_Line_0x47(MENU_CHECK_STEP); // R485_Send_Line_0x47(MENU_CHECK_STEP);
...@@ -128,110 +132,102 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -128,110 +132,102 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
{ {
; ;
} }
} // }
else // else
{ // {
// if(send0x42time<0xFFFFFFFF) // if(RS485_TX_finish == 0)
// { // {
// send0x42time++;
// }
// if(bleOFFtoONtime<0xFFFFFFFF)
// {
// bleOFFtoONtime++;
// }
if(RS485_TX_finish == 0)
{
if(startONfalg == 0) // if(startONfalg == 0)
{ // {
if(send0x42time<130) // if(send0x42time<130)
{ // {
// if(sendflag == 1) // // if(sendflag == 1)
// { // // {
R485_Send_0x42(); // R485_Send_0x42();
// sendflag = 0; // // sendflag = 0;
// } // // }
queren = 0; // // queren = 0;
} // }
else // else
{ // {
// bleOFFtoONtime = 0; // // bleOFFtoONtime = 0;
LINE_OUT_NEG_01 = 0; // LINE_OUT_NEG_01 = 0;
LINE_OUT_NEG_02 = 0; // LINE_OUT_NEG_02 = 0;
LINE_OUT_NEG_03 = 0; // LINE_OUT_NEG_03 = 0;
LINE_OUT_NEG_04 = 0; // LINE_OUT_NEG_04 = 0;
startONfalg = 1; // startONfalg = 1;
Display_TFT_Clear(); // Display_TFT_Clear();
} // }
} // }
else // else
{ // {
if(startIGONtime >= 50) // if(startIGONtime >= 50)
{ // {
LINE_OUT_NEG_01 = 1; // LINE_OUT_NEG_01 = 1;
LINE_OUT_NEG_02 = 1; // LINE_OUT_NEG_02 = 1;
LINE_OUT_NEG_03 = 1; // LINE_OUT_NEG_03 = 1;
LINE_OUT_NEG_04 = 1; // LINE_OUT_NEG_04 = 1;
if(startIGONtime >= 100) // if(startIGONtime >= 100)
{ // {
Openble[0] = 0x59; // Openble[0] = 0x59;
Openble[1] = 0x44; // Openble[1] = 0x44;
Openble[2] = 0xA; // Openble[2] = 0xA;
Openble[3] = 0x8A; // Openble[3] = 0x8A;
Openble[4] = 0xA; // Openble[4] = 0xA;
Openble[5] = 0xA; // Openble[5] = 0xA;
Openble[6] = name2; // Openble[6] = name2;
Openble[7] = name1; // Openble[7] = name1;
Openble[8] = 1; // Openble[8] = 1;
Openble[9] = btmac[0]; // Openble[9] = btmac[0];
Openble[10] = btmac[1]; // Openble[10] = btmac[1];
Openble[11] = btmac[2]; // Openble[11] = btmac[2];
Openble[12] = btmac[3]; // Openble[12] = btmac[3];
Openble[13] = btmac[4]; // Openble[13] = btmac[4];
Openble[14] = btmac[5]; // Openble[14] = btmac[5];
Openble[15] = 0x4B; // Openble[15] = 0x4B;
Openble[16] = 0x4A; // Openble[16] = 0x4A;
// RS485_User_Tx_Data(); // // RS485_User_Tx_Data();
if(sendflag == 1) // if(sendflag == 1)
{ // {
R485_Send_0x41(); // R485_Send_0x41();
sendflag = 0; // sendflag = 0;
} // }
else // else
{ // {
R485_Send_0x80(); // R485_Send_0x80();
sendflag = 1; // sendflag = 1;
} // }
blename[4] = 0xFF; // blename[4] = 0xFF;
// if(send0x42time % 20 == 0) // // if(send0x42time % 20 == 0)
// { // // {
UART_Ch2_Send_Multiple_Byte(Openble,sizeof(Openble)); // UART_Ch2_Send_Multiple_Byte(Openble,sizeof(Openble));
// if(startIGONtime > 500) // // if(startIGONtime > 500)
// { // // {
// queren = 1; // // queren = 1;
// } // // }
// } // // }
} // }
} // }
} // }
RS485_send_time = 0; // RS485_send_time = 0;
RS485_TX_finish = 1; // RS485_TX_finish = 1;
} // }
else // else
{ // {
} // }
} // }
} }
...@@ -292,7 +288,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -292,7 +288,7 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
if(clearodotime >= 1500) if(clearodotime >= 1500)
{ {
// Port_SetPortPinLevel(2,9,PortGpioHigh); // Port_SetPortPinLevel(2,9,PortGpioHigh);
queren = 1; // queren = 1;
} }
else else
{ {
......
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