HVAC_DEV
/
HVAC_DEV_DebugTesting
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Начало

This commit is contained in:
cfif 2026-03-23 18:02:07 +03:00
parent 758c4e1cf1
commit c8225f2425
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MainModesArbiter.h
View File

@ -39,6 +39,10 @@ typedef struct {
tTaskSerial TaskSerialUSB; tTaskSerial TaskSerialUSB;
tTaskSerial TaskSerialUART; tTaskSerial TaskSerialUART;
tTaskSerialToCanCyclic TaskSerialToCanCyclic0;
tTaskSerialToCanCyclic TaskSerialToCanCyclic1;
tTaskSerialToCanSpontany TaskSerialToCanSpontany;
osMessageQueueId_t txDataQueue_Spontany; osMessageQueueId_t txDataQueue_Spontany;
osMessageQueueId_t txDataQueue_Cyclic0; osMessageQueueId_t txDataQueue_Cyclic0;
osMessageQueueId_t txDataQueue_Cyclic1; osMessageQueueId_t txDataQueue_Cyclic1;

32
MainModesArbiter_InitStage.c
View File

@ -56,9 +56,8 @@ static void Mma_InitSubSystems(tMma *env) {
env->txDataQueue_Spontany = osMessageQueueNew(5, sizeof(can_rx_message_Spontany), NULL); env->txDataQueue_Spontany = osMessageQueueNew(5, sizeof(can_rx_message_Spontany), NULL);
TaskSerialUSB_Init(&env->TaskSerialUSB, TaskSerialUSB_Init(&env->TaskSerialUSB,
SPONTANY_FROM_UART, FROM_UART_USB,
&env->serialPorts->SerialPortUsbIO, &env->serialPorts->SerialPortUsbIO,
&env->canPorts->Can1_IO,
env->txDataQueue_Cyclic0, env->txDataQueue_Cyclic0,
env->txDataQueue_Cyclic1, env->txDataQueue_Cyclic1,
env->txDataQueue_Spontany env->txDataQueue_Spontany
@ -67,9 +66,8 @@ static void Mma_InitSubSystems(tMma *env) {
TaskSerialUART_Init(&env->TaskSerialUART, TaskSerialUART_Init(&env->TaskSerialUART,
SPONTANY_FROM_UART_USB, FROM_UART,
&env->serialPorts->Rs232_IO, &env->serialPorts->Rs232_IO,
&env->canPorts->Can1_IO,
env->txDataQueue_Cyclic0, env->txDataQueue_Cyclic0,
env->txDataQueue_Cyclic1, env->txDataQueue_Cyclic1,
env->txDataQueue_Spontany env->txDataQueue_Spontany
@ -78,6 +76,32 @@ static void Mma_InitSubSystems(tMma *env) {
TaskSerialUART_StartThread(&env->TaskSerialUART); TaskSerialUART_StartThread(&env->TaskSerialUART);
TaskSerialToCanCyclic0_Init(&env->TaskSerialToCanCyclic0,
&env->canPorts->Can1_IO,
env->txDataQueue_Cyclic0);
TaskSerialToCanCyclic0_StartThread(&env->TaskSerialToCanCyclic0);
TaskSerialToCanCyclic1_Init(&env->TaskSerialToCanCyclic1,
&env->canPorts->Can1_IO,
env->txDataQueue_Cyclic1);
TaskSerialToCanCyclic1_StartThread(&env->TaskSerialToCanCyclic1);
TaskSerialToCanSpontany_Init(&env->TaskSerialToCanSpontany,
&env->canPorts->Can1_IO,
env->txDataQueue_Spontany,
&env->TaskSerialUART.At,
&env->TaskSerialUSB.At
);
TaskSerialToCanSpontany_StartThread(&env->TaskSerialToCanSpontany);
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Конец инициализации подсистем") LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Конец инициализации подсистем")
} }