Commit 547c70f6 authored by 何锐's avatar 何锐

feat:初步完成

parent bad10ca4
...@@ -5476,7 +5476,24 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -5476,7 +5476,24 @@ void Display_Send_Vspead(uint8_t menu)
TFT_LCD_Draw_Bmp(180+18, 40+25+25+25, ( uint8_t * )NO_W); TFT_LCD_Draw_Bmp(180+18, 40+25+25+25, ( uint8_t * )NO_W);
GUI_General_Digit_Display(50, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+5); GUI_General_Digit_Display(50, Num_15, 6, 5, ODODigitNum09PosX, 40+25+25+25+5);
TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y16); // TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y04);
TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y10);
TFT_LCD_Draw_Bmp(3+60, 40+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y18);
TFT_LCD_Draw_Bmp(3+60+60, 40+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y01);
// TFT_LCD_Draw_Bmp(3+40+40+40+55, 40+25+25+25+25+25+25, ( uint8_t * )gImage_icon_01X0_Y13);
TFT_LCD_Draw_Bmp(3, 40+25+25+25+25+25+25+40, ( uint8_t * )gImage_icon_01X0_Y05);
TFT_LCD_Draw_Bmp(3+50, 40+25+25+25+25+25+25+40, ( uint8_t * )gImage_icon_01X0_Y06);
TFT_LCD_Draw_Bmp(3+60+40, 40+25+25+25+25+25+25+40, ( uint8_t * )gImage_icon_01X0_Y11);
TFT_LCD_Draw_Bmp(3+60+60+50, 40+25+25+25+25+25+25+40, ( uint8_t * )gImage_icon_01X0_Y14);
TFT_LCD_Draw_Bmp(3+40+60, 40+25+25+25+25+25+25+40+40, ( uint8_t * )gImage_icon_01X0_Y13);
TFT_LCD_Draw_Bmp(3+40+60+50, 40+25+25+25+25+25+25+40+40, ( uint8_t * )gImage_icon_01X0_Y08);
TFT_LCD_Draw_Bmp(3+40+60+100, 40+25+25+25+25+25+25+40+40, ( uint8_t * )gImage_gImage_TCS1X6_Y16);
General_Number_Disp(GPSPattern, 3, 40+25+25+25+25+25+25+40+40);
General_Number_Disp(FourGPattern, 3+60, 40+25+25+25+25+25+25+40+40);
break; break;
case 5: case 5:
TFT_LCD_Draw_Bmp(160,40+25+25+25+25, ( uint8_t * )gImage_gImage_red1X6_Y16); TFT_LCD_Draw_Bmp(160,40+25+25+25+25, ( uint8_t * )gImage_gImage_red1X6_Y16);
......
...@@ -309,9 +309,6 @@ uint32_t R485_Send_0xD2(void) ...@@ -309,9 +309,6 @@ uint32_t R485_Send_0xD2(void)
R485_IDD2h.Sig.SlopeDescentFunctionStatus = 0x01; //陡坡缓降 R485_IDD2h.Sig.SlopeDescentFunctionStatus = 0x01; //陡坡缓降
R485_IDD2h.Sig.ClaudicationPatternFeedback = 0x01; //龟速行驶 R485_IDD2h.Sig.ClaudicationPatternFeedback = 0x01; //龟速行驶
R485_IDD2h.Sig.TCSDefined = 0x01;
R485_IDD2h.Sig.TCSActivation = 0x02; //TCS
break; break;
case 4: case 4:
...@@ -325,7 +322,7 @@ uint32_t R485_Send_0xD2(void) ...@@ -325,7 +322,7 @@ uint32_t R485_Send_0xD2(void)
R485_IDD2h.Sig.MCUFaultStatus_HandlebarFault = 0x01; //故障灯 R485_IDD2h.Sig.MCUFaultStatus_HandlebarFault = 0x01; //故障灯
R485_IDD2h.Sig.TCSDefined = 0x01; R485_IDD2h.Sig.TCSUserDefined = 0x01;
R485_IDD2h.Sig.TCSActivation = 0x02; //TCS R485_IDD2h.Sig.TCSActivation = 0x02; //TCS
R485_IDD2h.Sig.ClaudicationPatternFeedback = 0x01; //龟速行驶 R485_IDD2h.Sig.ClaudicationPatternFeedback = 0x01; //龟速行驶
...@@ -532,7 +529,6 @@ uint32_t R485_Send_0xD3(void) ...@@ -532,7 +529,6 @@ uint32_t R485_Send_0xD3(void)
case 3: case 3:
// R485_IDD3h.Sig.AutoheadLightSetting = 0x00; //自动大灯 // R485_IDD3h.Sig.AutoheadLightSetting = 0x00; //自动大灯
R485_IDD3h.Sig.RemainingMileageDisSetting = 0; //续航里程 R485_IDD3h.Sig.RemainingMileageDisSetting = 0; //续航里程
R485_IDD3h.Sig.SupportSwitchState = 0x01; //边撑状态
R485_IDD3h.Sig.ElectronicCushionStatus = 0x01; //座桶开启灯 R485_IDD3h.Sig.ElectronicCushionStatus = 0x01; //座桶开启灯
break; break;
...@@ -545,6 +541,7 @@ uint32_t R485_Send_0xD3(void) ...@@ -545,6 +541,7 @@ uint32_t R485_Send_0xD3(void)
R485_IDD3h.Sig.ElectronicCushionStatus = 0x01; //座桶开启灯 R485_IDD3h.Sig.ElectronicCushionStatus = 0x01; //座桶开启灯
// R485_IDD3h.Sig.VehicleStatus = 0x00; // R485_IDD3h.Sig.VehicleStatus = 0x00;
// R485_IDD3h.Sig.AlarmStatus = 0x01; //氛围灯红色(会线束故障挡住显示) // R485_IDD3h.Sig.AlarmStatus = 0x01; //氛围灯红色(会线束故障挡住显示)
R485_IDD3h.Sig.SupportSwitchState = 0x01; //边撑状态
break; break;
case 5: case 5:
......
...@@ -66,7 +66,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void) ...@@ -66,7 +66,7 @@ void Sys_Run_Mode_2ms_Tasks_Group(void)
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
void Sys_Run_Mode_5ms_Tasks_Group(void) void Sys_Run_Mode_5ms_Tasks_Group(void)
{ {
TX_RX_485_service();
} }
/*============================================================================== /*==============================================================================
...@@ -83,7 +83,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -83,7 +83,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
downkeyserve(); downkeyserve();
} }
backsend(); backsend();
TX_RX_485_service();
} }
/*============================================================================== /*==============================================================================
20ms����ִ������ ��0�� 20ms����ִ������ ��0��
...@@ -111,8 +110,41 @@ uint8_t flashtime = 0; ...@@ -111,8 +110,41 @@ uint8_t flashtime = 0;
uint8_t showtime = 0; uint8_t showtime = 0;
uint8_t bleuarttime = 0; uint8_t bleuarttime = 0;
uint8_t querendelay = 0; uint8_t querendelay = 0;
uint8_t clesrodoauto = 0;
uint8_t clesrodookauto = 0;
void Sys_Run_Mode_100ms_Tasks_Group(void) void Sys_Run_Mode_100ms_Tasks_Group(void)
{ {
if(MENU_CHECK_STEP == 9)
{
if(clesrodoauto >= 50)
{
clearOdoFlag = 1;
}
else
{
clesrodoauto++;
}
}
else
{
clesrodoauto = 0;
}
if(clearOdoFlag == 1)
{
if(clesrodookauto >= 160)
{
queren = 1;
}
else
{
clesrodookauto++;
}
}
else
{
clesrodookauto = 0;
}
TimeDelay_3s(); TimeDelay_3s();
PasswordUnlock(); PasswordUnlock();
......
...@@ -489,7 +489,7 @@ uint8_t RS485_User_Tx_Data(void) ...@@ -489,7 +489,7 @@ uint8_t RS485_User_Tx_Data(void)
if(sendfinishflag == 0) if(sendfinishflag == 0)
{ {
RS485_send_time = 0; RS485_send_time = 0;
RS485_TxControl.sendIndex ++; RS485_TxControl.sendIndex = 0;
} }
break; break;
...@@ -500,12 +500,12 @@ uint8_t RS485_User_Tx_Data(void) ...@@ -500,12 +500,12 @@ uint8_t RS485_User_Tx_Data(void)
} }
RS485_TxControl.Openble[0] = 0x59; RS485_TxControl.Openble[0] = 0x59;
RS485_TxControl.Openble[1] = 0x44; RS485_TxControl.Openble[1] = 0x44;
RS485_TxControl.Openble[2] = 0xA; RS485_TxControl.Openble[2] = 0;
RS485_TxControl.Openble[3] = 0x8A; RS485_TxControl.Openble[3] = 0;
RS485_TxControl.Openble[4] = 0xA; RS485_TxControl.Openble[4] = 0;
RS485_TxControl.Openble[5] = 0xA; RS485_TxControl.Openble[5] = 0;
RS485_TxControl.Openble[6] = name2; RS485_TxControl.Openble[6] = 0;
RS485_TxControl.Openble[7] = name1; RS485_TxControl.Openble[7] = 0;
RS485_TxControl.Openble[8] = BlueTooth; RS485_TxControl.Openble[8] = BlueTooth;
RS485_TxControl.Openble[9] = name1; RS485_TxControl.Openble[9] = name1;
......
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