From cde6f620635099b8a6b3c64a235cfaafeda68dae Mon Sep 17 00:00:00 2001 From: cfif Date: Tue, 24 Mar 2026 11:01:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArbiterCommand.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ArbiterCommand.c b/ArbiterCommand.c index fcb354b..94b9f3a 100644 --- a/ArbiterCommand.c +++ b/ArbiterCommand.c @@ -235,6 +235,8 @@ void TaskSerialToCanSpontany_StartThread(tTaskSerialToCanSpontany *env) { void SerialCommand_Scheduler(tTaskSerial *env) { + osStatus_t status; + while (AtCmdReceiveNextLine(&env->At, SystemWaitForever) == AT_OK) { if (AtCmdRxBeginWithStatic(&env->At, "T")) { @@ -270,16 +272,16 @@ void SerialCommand_Scheduler(tTaskSerial *env) { memcpy(dataCan.can_rx_message.data, data, size); if (opt) { - osMessageQueuePut(env->txDataQueue_Spontany, &dataCan, 0x0, 0U); + status = osMessageQueuePut(env->txDataQueue_Spontany, &dataCan, 0x0, 0U); } else { uint32_t count0 = osMessageQueueGetCount(env->txDataQueue_Cyclic0); uint32_t count1 = osMessageQueueGetCount(env->txDataQueue_Cyclic1); if (count0 <= count1) { - osMessageQueuePut(env->txDataQueue_Cyclic0, &dataCan.can_rx_message, 0x0, 0U); + status = osMessageQueuePut(env->txDataQueue_Cyclic0, &dataCan.can_rx_message, 0x0, 0U); } else { - osMessageQueuePut(env->txDataQueue_Cyclic1, &dataCan.can_rx_message, 0x0, 0U); + status = osMessageQueuePut(env->txDataQueue_Cyclic1, &dataCan.can_rx_message, 0x0, 0U); } } } @@ -318,16 +320,16 @@ void SerialCommand_Scheduler(tTaskSerial *env) { memcpy(dataCan.can_rx_message.data, data, size); if (opt) { - osMessageQueuePut(env->txDataQueue_Spontany, &dataCan, 0x0, 0U); + status = osMessageQueuePut(env->txDataQueue_Spontany, &dataCan, 0x0, 0U); } else { uint32_t count0 = osMessageQueueGetCount(env->txDataQueue_Cyclic0); uint32_t count1 = osMessageQueueGetCount(env->txDataQueue_Cyclic1); if (count0 <= count1) { - osMessageQueuePut(env->txDataQueue_Cyclic0, &dataCan.can_rx_message, 0x0, 0U); + status = osMessageQueuePut(env->txDataQueue_Cyclic0, &dataCan.can_rx_message, 0x0, 0U); } else { - osMessageQueuePut(env->txDataQueue_Cyclic1, &dataCan.can_rx_message, 0x0, 0U); + status = osMessageQueuePut(env->txDataQueue_Cyclic1, &dataCan.can_rx_message, 0x0, 0U); } } @@ -354,10 +356,9 @@ void SerialCommand_Scheduler(tTaskSerial *env) { void TaskSerialUART_Init(tTaskSerial *env, tFrom_uart from_uart, tSerialPortIO *ioUART, - osMessageQueueId_t txDataQueue_Spontany, osMessageQueueId_t txDataQueue_Cyclic0, - osMessageQueueId_t txDataQueue_Cyclic1 - + osMessageQueueId_t txDataQueue_Cyclic1, + osMessageQueueId_t txDataQueue_Spontany ) { @@ -366,9 +367,9 @@ void TaskSerialUART_Init(tTaskSerial *env, env->ioUART = ioUART; - env->txDataQueue_Spontany = txDataQueue_Spontany; env->txDataQueue_Cyclic0 = txDataQueue_Cyclic0; env->txDataQueue_Cyclic1 = txDataQueue_Cyclic1; + env->txDataQueue_Spontany = txDataQueue_Spontany; SerialPortClearRxBuffer(env->ioUART);