Commit a40a5b7a authored by 何锐's avatar 何锐

feat:增加纯色界面检测

parent 57e1a8b3
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define CAN_ID_1 0x781 //诊断ID #define CAN_ID_1 0x781 //诊断ID
#define CAN_ID_2 0x521 #define CAN_ID_2 0x521
#define CAN_ID_3 0x522 #define CAN_ID_3 0x522
#define CAN_ID_4 0x0A01F0AC #define CAN_ID_4 0x10260225
#define CAN_ID_5 0x621 #define CAN_ID_5 0x621
//外部软件诊断步骤 //外部软件诊断步骤
...@@ -192,7 +192,7 @@ void can_submit(void) ...@@ -192,7 +192,7 @@ void can_submit(void)
data3[4] = 0x00; data3[4] = 0x00;
data3[5] = 0x00; data3[5] = 0x00;
data4[0] = 0x01; //白 data4[0] = 0x01; //白
break; break;
case 6: case 6:
data2[1] = 0x00; data2[1] = 0x00;
...@@ -200,7 +200,7 @@ void can_submit(void) ...@@ -200,7 +200,7 @@ void can_submit(void)
data3[4] = 0x00; data3[4] = 0x00;
data3[5] = 0x00; data3[5] = 0x00;
data4[0] = 0x02; // data4[0] = 0x02; //
break; break;
case 7: case 7:
data2[1] = 0x00; data2[1] = 0x00;
...@@ -208,7 +208,7 @@ void can_submit(void) ...@@ -208,7 +208,7 @@ void can_submit(void)
data3[4] = 0x00; data3[4] = 0x00;
data3[5] = 0x00; data3[5] = 0x00;
data4[0] = 0x03; //绿 data4[0] = 0x03; //
break; break;
case 8: case 8:
data2[1] = 0x00; data2[1] = 0x00;
...@@ -216,7 +216,7 @@ void can_submit(void) ...@@ -216,7 +216,7 @@ void can_submit(void)
data3[4] = 0x00; data3[4] = 0x00;
data3[5] = 0x00; data3[5] = 0x00;
data4[0] = 0x04; // data4[0] = 0x04; //
break; break;
case 9: case 9:
data2[1] = 0x00; data2[1] = 0x00;
...@@ -224,7 +224,7 @@ void can_submit(void) ...@@ -224,7 +224,7 @@ void can_submit(void)
data3[4] = 0x00; data3[4] = 0x00;
data3[5] = 0x00; data3[5] = 0x00;
data4[0] = 0x05; //黑白格 data4[0] = 0x05; //
break; break;
case 10: case 10:
data2[1] = 0x00; data2[1] = 0x00;
...@@ -232,7 +232,16 @@ void can_submit(void) ...@@ -232,7 +232,16 @@ void can_submit(void)
data3[4] = 0x00; data3[4] = 0x00;
data3[5] = 0x00; data3[5] = 0x00;
data4[0] = 0x06; //黑 data4[0] = 0x06; //绿
break;
case 11:
data2[1] = 0x00;
data3[4] = 0x00;
data3[5] = 0x00;
data4[0] = 0x07; //蓝
break; break;
default: default:
break; break;
......
...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd); ...@@ -69,7 +69,7 @@ void Function_Check_Ctrl(uint32_t cmd);
void MENU_CHECK_STEP_ADD(void) void MENU_CHECK_STEP_ADD(void)
{ {
if(MENU_CHECK_STEP > 9) if(MENU_CHECK_STEP > 10)
{ {
MENU_CHECK_STEP = 1; MENU_CHECK_STEP = 1;
} }
......
...@@ -4743,7 +4743,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4743,7 +4743,7 @@ void Display_Send_Vspead(uint8_t menu)
} }
if(menu > 0) if(menu > 0)
{ {
if(menu < 11 ) if(menu < 12 )
{ {
// GUI_General_Digit_Display(menu, Num_15, 2, 0, pagenum, 3); // GUI_General_Digit_Display(menu, Num_15, 2, 0, pagenum, 3);
// TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);//车速 // TFT_LCD_Draw_Bmp(3, 40, ( uint8_t * )gImage_Dey_words_1X6_Y16);//车速
...@@ -4935,7 +4935,13 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4935,7 +4935,13 @@ void Display_Send_Vspead(uint8_t menu)
break; break;
// case 11: case 11:
WaterTemp = 0;
fuel_val = 0;
VSpeed_val = 199;
ESpeed_val = 12000;
mbuffdfka[0] = 0;
mbuffdfka[1] = 0;
// WaterTemp = 6; // WaterTemp = 6;
// fuel_val = 6; // fuel_val = 6;
// VSpeed_val = 155; // VSpeed_val = 155;
...@@ -4948,7 +4954,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -4948,7 +4954,7 @@ void Display_Send_Vspead(uint8_t menu)
// TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25+30, ( uint8_t * )gImage_pic_21X0_Y0);//sport // TFT_LCD_Draw_Bmp(20, 40+25+25+25+25+25+25+25+25+30, ( uint8_t * )gImage_pic_21X0_Y0);//sport
// TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯 // TFT_LCD_Draw_Bmp(150, 40+25+25+25+25+25+25+25+25, ( uint8_t * )gImage_pic_18X0_Y0);//制动失效指示灯
// break; break;
// case 12: // case 12:
// WaterTemp = 6; // WaterTemp = 6;
// fuel_val = 6; // fuel_val = 6;
...@@ -5003,7 +5009,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -5003,7 +5009,7 @@ void Display_Send_Vspead(uint8_t menu)
// MENU_CHECK_STEP = 0; // MENU_CHECK_STEP = 0;
break; break;
} }
if(menu < 11) if(menu < 12)
{ {
// GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40); // GUI_General_Digit_Display(VSpeed_val, Num_15, 3, 2, ODODigitNum09PosX, 40);
// GUI_General_Digit_Display(ESpeed_val, Num_15, 5, 3, ODODigitNum09PosX,40+25); // GUI_General_Digit_Display(ESpeed_val, Num_15, 5, 3, ODODigitNum09PosX,40+25);
......
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