Skip to content

J
jiancetai
Commit 57e1a8b3 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:增加指南针

parent 6a544b05
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 16 deletions
YueJin_test_bench/source/Appliciation/CAN_APP.c
View file @ 57e1a8b3
......@@ -13,6 +13,7 @@
#define CAN_ID_2 0x521
#define CAN_ID_3 0x522
#define CAN_ID_4 0x0A01F0AC
#define CAN_ID_5 0x621
//外部软件诊断步骤
#define SW_OUT_READ_ORDER1 0xF1
......@@ -110,13 +111,13 @@ void CAN_Service(void)
init_CAN_Frame(&m_msg2, CAN_ID_2, 8, 0, data2);
init_CAN_Frame(&m_msg3, CAN_ID_3, 8, 0, data3);
init_CAN_Frame(&m_msg4, CAN_ID_4, 8, 1, data4);
// init_CAN_Frame(&m_msg5, CAN_ID_5, 8, 0, data5);
init_CAN_Frame(&m_msg5, CAN_ID_5, 8, 0, data5);
// init_CAN_Frame(&m_msg6, CAN_ID_6, 8, 0, data6);
can_mid(m_msg2);
can_mid(m_msg3);
can_mid(m_msg4);
// can_mid(m_msg5);
can_mid(m_msg5);
// can_mid(m_msg6);
}
}
......@@ -132,6 +133,10 @@ void can_submit(void)
data3[5] = 0x00;
data4[0] = 0x00;
data5[1] = 0x00;
data5[2] = 0x00;
data5[3] = 0x00; //N字不显示
break;
case 1:
data2[1] = 0x00; //水温
......@@ -140,6 +145,10 @@ void can_submit(void)
data3[5] = 0x00;
data4[0] = 0x00;
data5[1] = 0x01;
data5[2] = 0x54;
data5[3] = 0x08; //N字显示，旋转85°
break;
case 2:
data2[1] = 0x5A;
......@@ -148,6 +157,10 @@ void can_submit(void)
data3[5] = 0x03;
data4[0] = 0x00;
data5[1] = 0x02;
data5[2] = 0xE4;
data5[3] = 0x08; //N字显示，旋转185°
break;
case 3:
data2[1] = 0xAA;
......@@ -156,6 +169,10 @@ void can_submit(void)
data3[5] = 0x03;
data4[0] = 0x00;
data5[1] = 0x04;
data5[2] = 0x48;
data5[3] = 0x08; //N字显示，旋转274°
break;
case 4:
data2[1] = 0xAA;
......@@ -164,6 +181,10 @@ void can_submit(void)
data3[5] = 0x03;
data4[0] = 0x00;
data5[1] = 0x05;
data5[2] = 0x9C;
data5[3] = 0x08; //N字显示，旋转359°
break;
case 5:
data2[1] = 0x00;
......@@ -668,7 +689,7 @@ uint8_t MCU_PartNumbers_Get(void)
if(UDS_MMessage_Get[i + 1] == 0xAA)
{
lingjianhao[PN_Length] = 0xFF;
General_Number_Disp(lingjianhao, 68, 125);
General_Number_Disp(lingjianhao, 0, 150);
UDS_STEP = TIME_READ;
break;
}
......
YueJin_test_bench/source/Appliciation/Check_Ctrl.c
View file @ 57e1a8b3
......@@ -71,7 +71,7 @@ void MENU_CHECK_STEP_ADD(void)
{
if(MENU_CHECK_STEP > 9)
{
MENU_CHECK_STEP = 0;
MENU_CHECK_STEP = 1;
}
else
{
......
YueJin_test_bench/source/Appliciation/Display_Info.c
View file @ 57e1a8b3
......@@ -4282,7 +4282,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(210, 160, ( uint8_t * )gImage_Alarm_13_ImageX222_Y166); //%
// TFT_LCD_Draw_Bmp(3, 290, ( uint8_t * )gImage_gImage_checkVX6_Y165 ); //检测台版本号
uint8_t mbuff [10] = {2,0,2,5,97,1,2,0,1,0xff};
uint8_t mbuff [10] = {2,0,2,6,97,0,2,1,1,0xff};
General_Number_Disp(mbuff, 115, 200); //检测台版本号
// General_Number_Disp(UIDNumber, 85, 120); //固定UID数字
// General_Number_Disp(UIDNumber2, 70, 146); //可调UID数字
......@@ -4734,6 +4734,7 @@ void Display_Send_Vspead(uint8_t menu)
uint32_t ESpeed_val = 0;
uint32_t fuel_val = 0;
uint32_t WaterTemp = 0;
uint32_t Angle = 0;
// static uint8_t Type_Clear_FLAG = 0;
if ( (Type_Clear != menu ))
{
......@@ -4761,7 +4762,7 @@ void Display_Send_Vspead(uint8_t menu)
// TFT_LCD_Draw_Bmp(3+18+18+18+18, 40+25, ( uint8_t * )NO_E);
// TFT_LCD_Draw_Bmp(3+18+18+18+18+18, 40+25, ( uint8_t * )NO_D);
// GUI_Display_Version_Code_Service(180, 40+25, "RPM", Letter_Num_11, PCodeText_Space_size);
// TFT_LCD_Draw_Bmp(3, 40+25+40, ( uint8_t * )gImage_WZ_word0_12X0_Y0);//燃油
TFT_LCD_Draw_Bmp(3, 40+25+40, ( uint8_t * )gImage_WZ_word0_12X0_Y0);//燃油
TFT_LCD_Draw_Bmp(3, 40+25+40+25, ( uint8_t * )gImage_WZ_word0_11X0_Y0);//水温
// TFT_LCD_Draw_Bmp(3, 40+25, ( uint8_t * )gImage_Dey_words_3X6_Y75);//剩余燃油量：
......@@ -4773,10 +4774,11 @@ void Display_Send_Vspead(uint8_t menu)
{
case 1:
WaterTemp = 0;
fuel_val = 5;
fuel_val = 1;
VSpeed_val = 22;
ESpeed_val = 1000;
mbuffdfka[1] = 2;
Angle = 85;
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25+25, ( uint8_t * )gImage_JCT_09X0_YO);//左转：
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
// TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_03X0_Y0);//两驱
......@@ -4788,10 +4790,11 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 2:
WaterTemp = 50;
fuel_val = 4;
fuel_val = 2;
VSpeed_val = 44;
ESpeed_val = 2000;
mbuffdfka[1] = 4;
Angle = 185;
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_JCT_10X0_Y0);
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
// TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_04X0_Y0);//两驱未到位
......@@ -4804,10 +4807,11 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 3:
WaterTemp = 130;
fuel_val = 3;
fuel_val = 4;
VSpeed_val = 66;
ESpeed_val = 3000;
mbuffdfka[1] = 6;
Angle = 274;
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_JCT_11X0_Y0);
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
// TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_05X0_Y0);//四驱
......@@ -4818,10 +4822,11 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 4:
WaterTemp = 130;
fuel_val = 2;
fuel_val = 8;
VSpeed_val = 88;
ESpeed_val = 4000;
mbuffdfka[1] = 8;
Angle = 359;
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_JCT_12X0_Y0);
// TFT_LCD_Draw_Bmp(3, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_17X0_Y0);//后桥锁死状态：
// TFT_LCD_Draw_Bmp(3+120, 40+25+25+25+40+25+25, ( uint8_t * )gImage_WZ_word0_16X0_Y0);//四驱未到位
......@@ -4832,7 +4837,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 5:
WaterTemp = 0;
fuel_val = 1;
fuel_val = 0;
VSpeed_val = 100;
ESpeed_val = 5000;
mbuffdfka[0] = 1;
......@@ -4847,7 +4852,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 6:
WaterTemp = 0;
fuel_val = 1;
fuel_val = 0;
VSpeed_val = 140;
ESpeed_val = 7000;
mbuffdfka[0] = 1;
......@@ -4864,7 +4869,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 7:
WaterTemp = 0;
fuel_val = 1;
fuel_val = 0;
VSpeed_val = 180;
ESpeed_val = 8000;
mbuffdfka[0] = 1;
......@@ -4882,7 +4887,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 8:
WaterTemp = 0;
fuel_val = 1;
fuel_val = 0;
VSpeed_val = 199;
ESpeed_val = 10000;
mbuffdfka[0] = 1;
......@@ -4899,7 +4904,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 9:
WaterTemp = 0;
fuel_val = 1;
fuel_val = 0;
VSpeed_val = 199;
ESpeed_val = 12000;
mbuffdfka[0] = 2;
......@@ -4915,7 +4920,7 @@ void Display_Send_Vspead(uint8_t menu)
break;
case 10:
WaterTemp = 0;
fuel_val = 1;
fuel_val = 0;
VSpeed_val = 199;
ESpeed_val = 12000;
mbuffdfka[0] = 0;
......@@ -5003,7 +5008,12 @@ void Display_Send_Vspead(uint8_t menu)
// 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(fuel_val, Num_15, 1, 0, ODODigitNum09PosX, 40+25+40);
GUI_General_Digit_Display(fuel_val, Num_15, 3, 2, ODODigitNum09PosX, 40+25+40);
GUI_General_Digit_Display(WaterTemp, Num_15, 3, 2, ODODigitNum09PosX, 40+25+40+25);
if(menu > 0 && menu < 5)
{
GUI_General_Digit_Display(Angle, Num_15, 3, 2, ODODigitNum09PosX, 40+25+40+25+25);
}
// General_Number_Disp(mbuffdfka, 135, 154); //时间
}
......
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