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-04-03 16:16:12 +03:00
parent 220dc9ee45
commit 8455b5a264
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MainModesArbiter.h
View File

@ -36,8 +36,8 @@ typedef struct {
tIndication Indication; tIndication Indication;
tTaskSerial TaskSerialUSB; tTaskSerial TaskSerialUSB1;
tTaskSerial TaskSerialUART; tTaskSerial TaskSerialUSB2;
tTaskSerialToCanCyclic TaskSerialToCanCyclic0; tTaskSerialToCanCyclic TaskSerialToCanCyclic0;
tTaskSerialToCanCyclic TaskSerialToCanCyclic1; tTaskSerialToCanCyclic TaskSerialToCanCyclic1;

22
MainModesArbiter_InitStage.c
View File

@ -40,7 +40,7 @@ static void Mma_InitSubSystems(tMma *env) {
&env->comInt, &env->comInt,
&SERIAL_PORTS.Rs485_HalfDuplexIo, &SERIAL_PORTS.Rs485_HalfDuplexIo,
NULL, NULL,
&SERIAL_PORTS.SerialPortUsbSnifferIO, &SERIAL_PORTS.SerialPortUsb1SnifferIO,
NULL, NULL,
&SERIAL_PORTS.cliVirtualOutIo, &SERIAL_PORTS.cliVirtualOutIo,
&env->Indication.currentModeName &env->Indication.currentModeName
@ -66,33 +66,33 @@ static void Mma_InitSubSystems(tMma *env) {
TaskSerialToCanSpontany_Init(&env->TaskSerialToCanSpontany, TaskSerialToCanSpontany_Init(&env->TaskSerialToCanSpontany,
&env->canPorts->Can1_IO, &env->canPorts->Can1_IO,
&env->serialPorts->Rs232_IO, &env->serialPorts->SerialPortUsb1IO, //&env->serialPorts->Rs232_IO,
&env->serialPorts->SerialPortUsbIO &env->serialPorts->SerialPortUsb2IO
); );
TaskSerialToCanSpontany_StartThread(&env->TaskSerialToCanSpontany); TaskSerialToCanSpontany_StartThread(&env->TaskSerialToCanSpontany);
TaskSerialUSB_Init(&env->TaskSerialUSB, TaskSerialUSB1_Init(&env->TaskSerialUSB1,
FROM_UART_USB, FROM_UART_USB1,
&env->serialPorts->SerialPortUsbIO, &env->serialPorts->SerialPortUsb1IO,
&env->TaskSerialToCanCyclic0, &env->TaskSerialToCanCyclic0,
&env->TaskSerialToCanCyclic1, &env->TaskSerialToCanCyclic1,
&env->TaskSerialToCanSpontany &env->TaskSerialToCanSpontany
); );
TaskSerialUSB_StartThread(&env->TaskSerialUSB); TaskSerialUSB1_StartThread(&env->TaskSerialUSB1);
TaskSerialUART_Init(&env->TaskSerialUART, TaskSerialUSB2_Init(&env->TaskSerialUSB2,
FROM_UART, FROM_UART_USB2,
&env->serialPorts->Rs232_IO, &env->serialPorts->SerialPortUsb2IO, //&env->serialPorts->Rs232_IO,
&env->TaskSerialToCanCyclic0, &env->TaskSerialToCanCyclic0,
&env->TaskSerialToCanCyclic1, &env->TaskSerialToCanCyclic1,
&env->TaskSerialToCanSpontany &env->TaskSerialToCanSpontany
); );
TaskSerialUART_StartThread(&env->TaskSerialUART); TaskSerialUSB2_StartThread(&env->TaskSerialUSB2);