Commit d8858eeb authored by 何锐's avatar 何锐

feat:履带灯先配置后取消

parent b093933f
...@@ -1158,7 +1158,7 @@ void resetpower(void) ...@@ -1158,7 +1158,7 @@ void resetpower(void)
} }
void resetchangeUDSfuc(void) void resetchangeUDSfuc(void)
{ {
if((MENU_CHECK_STEP == 0 || MENU_CHECK_STEP == 10) && resettime == 0) if((MENU_CHECK_STEP == 0 || MENU_CHECK_STEP == 10 || MENU_CHECK_STEP == 11) && resettime == 0)
{ {
...@@ -1166,7 +1166,7 @@ void resetchangeUDSfuc(void) ...@@ -1166,7 +1166,7 @@ void resetchangeUDSfuc(void)
UDS_time = 0; UDS_time = 0;
getseedresult = 0; getseedresult = 0;
fakedelay = 0; fakedelay = 0;
if(MENU_CHECK_STEP == 10) if((MENU_CHECK_STEP == 10) || (MENU_CHECK_STEP == 11))
{ {
resetpower(); resetpower();
} }
...@@ -1177,7 +1177,7 @@ void resetchangeUDSfuc(void) ...@@ -1177,7 +1177,7 @@ void resetchangeUDSfuc(void)
} }
} }
if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP != 10) if(MENU_CHECK_STEP != 0 && MENU_CHECK_STEP != 10 && MENU_CHECK_STEP != 11)
{ {
resettime = 0; resettime = 0;
} }
...@@ -1193,7 +1193,14 @@ void change_UDS_DID(void) ...@@ -1193,7 +1193,14 @@ void change_UDS_DID(void)
if(MENU_CHECK_STEP != 0) if(MENU_CHECK_STEP != 0)
{ {
vspeedpeizhi = 0x4; vspeedpeizhi = 0x4;
// trackmode = 1; if(MENU_CHECK_STEP == 10)
{
trackmode = 1;
}
else
{
trackmode = 0;
}
} }
else else
{ {
......
...@@ -58,5 +58,6 @@ uint32_t Get_ODO_Value(void); ...@@ -58,5 +58,6 @@ uint32_t Get_ODO_Value(void);
extern uint8_t zhenduanstep; extern uint8_t zhenduanstep;
extern uint8_t ruanjianbanbenhao[10]; extern uint8_t ruanjianbanbenhao[10];
extern uint8_t yingjianbanbenhao[10]; extern uint8_t yingjianbanbenhao[10];
extern uint8_t resettime;
extern uint32_t resetpowtime;
#endif #endif
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "CAN_Communication_Matrix.h" #include "CAN_Communication_Matrix.h"
#include "COM_CAN.h" #include "COM_CAN.h"
#include "GenDelay.h" #include "GenDelay.h"
#include "CAN_APP.h"
uint32_t NO_IPK_EXIST_Status; uint32_t NO_IPK_EXIST_Status;
uint32_t NO_IPK_EXIST; uint32_t NO_IPK_EXIST;
//uint32_t NO_IPK_EXIST_Back; //uint32_t NO_IPK_EXIST_Back;
...@@ -82,6 +83,11 @@ void MENU_CHECK_STEP_ADD(void) ...@@ -82,6 +83,11 @@ void MENU_CHECK_STEP_ADD(void)
MENU_CHECK_STEP++; MENU_CHECK_STEP++;
} }
if(MENU_CHECK_STEP == 11)
{
resettime = 0;
resetpowtime = 0;
}
} }
void MENU_CHECK_STEP_SUB(void) void MENU_CHECK_STEP_SUB(void)
{ {
......
...@@ -4019,7 +4019,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4019,7 +4019,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 [5] = {0,0x2E,1,6,0xff}; uint8_t mbuff [5] = {0,0x2E,1,7,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
......
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