Commit 4448fe82 authored by 何锐's avatar 何锐

feat:老化板同时连多块表只发不收

parent 8ffeb956
...@@ -4902,7 +4902,7 @@ void Display_Version_Info(uint32_t ON_OFF) ...@@ -4902,7 +4902,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 [7] = {2,5,1,1,2,7,0xff}; uint8_t mbuff [7] = {2,5,1,1,2,8,0xff};
General_Number_Disp(mbuff, 160, 290); General_Number_Disp(mbuff, 160, 290);
} }
...@@ -5632,7 +5632,7 @@ void Display_Send_Vspead(uint8_t menu) ...@@ -5632,7 +5632,7 @@ void Display_Send_Vspead(uint8_t menu)
case 9: case 9:
// GUI_Display_Version_Code_Service(25, 20, "Please enter password ", Letter_Num_11, PCodeText_Space_size); // GUI_Display_Version_Code_Service(25, 20, "Please enter password ", Letter_Num_11, PCodeText_Space_size);
Battery_evel = 0; Battery_evel = 0;
VSpeed_val = 99; VSpeed_val = 0;
GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25+25+25, "ALL", Letter_Num_11, PCodeText_Space_size); GUI_Display_Version_Code_Service(3, 40+25+25+25+25+25+25+25, "ALL", Letter_Num_11, PCodeText_Space_size);
break; break;
// case 14: // case 14:
......
...@@ -39,14 +39,14 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void) ...@@ -39,14 +39,14 @@ void Sys_Run_Mode_Pseudo_Real_Time_Tasks(void)
Fre_In_Service(FRE_VEHICLE); Fre_In_Service(FRE_VEHICLE);
if(UART_Ch0_Get_TX_Busy_Flag()) // if(UART_Ch0_Get_TX_Busy_Flag())
{ // {
LINE_OUT_NEG_09 = 1; //发送 LINE_OUT_NEG_09 = 1; //发送
} // }
else // else
{ // {
LINE_OUT_NEG_09 = 0; //接收 // LINE_OUT_NEG_09 = 0; //接收
} // }
} }
...@@ -140,10 +140,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -140,10 +140,6 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
} }
Display_PageNum(); Display_PageNum();
if(RS485_send_time<0xFFFFFFFF)
{
RS485_send_time++;
}
if(firstpowerflag == 2) if(firstpowerflag == 2)
{ {
if(AutoFlag == 1) if(AutoFlag == 1)
...@@ -155,19 +151,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void) ...@@ -155,19 +151,7 @@ void Sys_Run_Mode_100ms_Tasks_Group(void)
else else
{ {
MENU_CHECK_STEP_ADD( ); MENU_CHECK_STEP_ADD( );
if(MENU_CHECK_STEP == 0) AutoTime = 160;
{
MENU_CHECK_STEP = 0;
}
if(MENU_CHECK_STEP == 13)
{
AutoTime = 0;
}
else
{
AutoTime = 160;
}
} }
} }
......
...@@ -25,6 +25,7 @@ static uint8_t u8RS485RecVldID[RS485_Rx_ID_Idx_Max]; ...@@ -25,6 +25,7 @@ static uint8_t u8RS485RecVldID[RS485_Rx_ID_Idx_Max];
uint32_t RS485_send_time = 0; uint32_t RS485_send_time = 0;
// uint32_t RS485_send_num = 0; // uint32_t RS485_send_num = 0;
uint8_t RS485_TX_finish = 0; uint8_t RS485_TX_finish = 0;
uint8_t RS485_TX_finish_laohua = 0;
// static RS485_Tx_Data_Ctrl_st_t stRS485TxData[RS485_Tx_ID_Idx_Max]; // static RS485_Tx_Data_Ctrl_st_t stRS485TxData[RS485_Tx_ID_Idx_Max];
#define HEAD_LEN 2 #define HEAD_LEN 2
...@@ -35,7 +36,7 @@ uint8_t RS485_TX_finish = 0; ...@@ -35,7 +36,7 @@ uint8_t RS485_TX_finish = 0;
#define DATA_FRAME_TX_PERIOD_COUNT 10 #define DATA_FRAME_TX_PERIOD_COUNT 10
#define UDS485SendTime 10 #define UDS485SendTime 10
#define Dot485SendTime 1 #define Dot485SendTime 10
_ID0X40h_Data R485_ID40h; _ID0X40h_Data R485_ID40h;
_ID0X48h_Data R485_ID48h; _ID0X48h_Data R485_ID48h;
_ID0X41h_Data R485_ID41h; _ID0X41h_Data R485_ID41h;
...@@ -638,18 +639,17 @@ uint8_t RS485_User_Tx_Data(void) ...@@ -638,18 +639,17 @@ uint8_t RS485_User_Tx_Data(void)
uint8_t SendTime = 0; uint8_t SendTime = 0;
void backsend(void) void backsend(void)
{ {
if(zhenduanflag == Data_Mode_Write) SendTime = Dot485SendTime;
{
SendTime = UDS485SendTime; if(RS485_send_time<0xFFFFFFFF)
}
else
{ {
SendTime = Dot485SendTime; RS485_send_time++;
} }
if(RS485_send_time >= SendTime) if(RS485_send_time >= SendTime)
{ {
RS485_send_time = 0; RS485_send_time = 0;
RS485_TX_finish = 0; RS485_TX_finish_laohua = 0;
} }
} }
void TX_RX_485_service(void) void TX_RX_485_service(void)
...@@ -657,23 +657,24 @@ void TX_RX_485_service(void) ...@@ -657,23 +657,24 @@ void TX_RX_485_service(void)
uint32_t sendfinishflag; uint32_t sendfinishflag;
// if(clearOdoFlag == 0) // if(clearOdoFlag == 0)
// { // {
if(RS485_TX_finish == 0) if(RS485_TX_finish_laohua == 0)
{ {
LINE_OUT_NEG_09 = 1; LINE_OUT_NEG_09 = 1;
if(zhenduanflag == Data_Mode_Dot) if(zhenduanflag == Data_Mode_Dot)
{ {
RS485_User_Tx_Data(); RS485_User_Tx_Data();
} }
else if((zhenduanflag == Data_Mode_Write) || (zhenduanflag == Data_Mode_Read)) RS485_TX_finish_laohua = 1;
{ // else if((zhenduanflag == Data_Mode_Write) || (zhenduanflag == Data_Mode_Read))
R485_Send_0x04(); // {
R485_Send_0x80(); // R485_Send_0x04();
} // R485_Send_0x80();
} // }
else
{
Recv_Byte();
} }
// else
// {
// Recv_Byte();
// }
// } // }
// 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