Commit eca1bf18 authored by 李冠华's avatar 李冠华

🐞 fix:修改上电时间过长的问题,将485接收和发送放到10ms任务中

parent f2e78d45
...@@ -28,14 +28,14 @@ void Power_Control_Count(void) ...@@ -28,14 +28,14 @@ void Power_Control_Count(void)
{ {
KL1530ON = 0U; KL1530ON = 0U;
PowerCountNum = 0U; PowerCountNum = 0U;
if(ShangDianOffset < 900U) if(ShangDianOffset < 300U)
{ {
/*上电总时长小于90s+25s*/ /*上电总时长小于90s+25s*/
ShangDianOffset = ((ShangDianOffset + 5) *100 / 7); ShangDianOffset = ((ShangDianOffset + 5) *10 / 7);
} }
else else
{ {
ShangDianOffset /= 100; ShangDianOffset /= 20u;
} }
} }
} }
......
...@@ -99,6 +99,20 @@ void Sys_Run_Mode_10ms_Tasks_Group(void) ...@@ -99,6 +99,20 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
// UART_Ch0_Send_Multiple_Byte(testdata,3); // UART_Ch0_Send_Multiple_Byte(testdata,3);
// RS485_User_Tx_Data(); // RS485_User_Tx_Data();
if(RS485_TX_finish == 0)
{
LINE_OUT_NEG_09 = 1;
if(LINE_OUT_NEG_09 == 1)
{
RS485_User_Tx_Data();
}
}
else
{
LINE_OUT_NEG_09 = 0;
// Recv_Byte();
RS485_Protocol_Service();
}
} }
/*============================================================================== /*==============================================================================
...@@ -130,21 +144,6 @@ void Sys_Run_Mode_20ms_Tasks_Group0(void) ...@@ -130,21 +144,6 @@ void Sys_Run_Mode_20ms_Tasks_Group0(void)
time100mssend = 0; time100mssend = 0;
} }
if(RS485_TX_finish == 0)
{
LINE_OUT_NEG_09 = 1;
if(LINE_OUT_NEG_09 == 1)
{
RS485_User_Tx_Data();
}
}
else
{
LINE_OUT_NEG_09 = 0;
// Recv_Byte();
RS485_Protocol_Service();
}
if (errNum == 0) if (errNum == 0)
{ {
......
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