This commit is contained in:
cfif 2026-03-30 14:33:05 +03:00
parent 77d453ed7d
commit dca03a918f
1 changed files with 18 additions and 19 deletions

View File

@ -38,23 +38,6 @@ static void Mma_InitSubSystems(tMma *env) {
Mma_InitComIntLog(env); Mma_InitComIntLog(env);
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Subsystem initialization") LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Subsystem initialization")
/*
ComInt_Init(
&env->comInt,
&SERIAL_PORTS.Rs485_HalfDuplexIo,
NULL,
&SERIAL_PORTS.SerialPortUsbSnifferIO,
NULL,
&SERIAL_PORTS.cliVirtualOutIo,
&env->Indication.currentModeName
);
ComInt_StartThread(&env->comInt);
CommandLine_Init(&env->cli, &env->serialPorts->cliVirtualInIo);
CommandLine_StartThread(&env->cli);
TaskSerialToCanCyclic0_Init(&env->TaskSerialToCanCyclic0, TaskSerialToCanCyclic0_Init(&env->TaskSerialToCanCyclic0,
&env->canPorts->Can1_IO); &env->canPorts->Can1_IO);
@ -69,7 +52,7 @@ 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->DEBUG_USART3_IO,
&env->serialPorts->SerialPortUsbIO &env->serialPorts->SerialPortUsbIO
); );
@ -89,7 +72,7 @@ static void Mma_InitSubSystems(tMma *env) {
TaskSerialUART_Init(&env->TaskSerialUART, TaskSerialUART_Init(&env->TaskSerialUART,
FROM_UART, FROM_UART,
&env->serialPorts->Rs232_IO, &env->serialPorts->DEBUG_USART3_IO,
&env->TaskSerialToCanCyclic0, &env->TaskSerialToCanCyclic0,
&env->TaskSerialToCanCyclic1, &env->TaskSerialToCanCyclic1,
&env->TaskSerialToCanSpontany &env->TaskSerialToCanSpontany
@ -97,6 +80,22 @@ static void Mma_InitSubSystems(tMma *env) {
TaskSerialUART_StartThread(&env->TaskSerialUART); TaskSerialUART_StartThread(&env->TaskSerialUART);
/*
ComInt_Init(
&env->comInt,
&SERIAL_PORTS.Rs485_HalfDuplexIo,
NULL,
&SERIAL_PORTS.SerialPortUsbSnifferIO,
NULL,
&SERIAL_PORTS.cliVirtualOutIo,
&env->Indication.currentModeName
);
ComInt_StartThread(&env->comInt);
CommandLine_Init(&env->cli, &env->serialPorts->cliVirtualInIo);
CommandLine_StartThread(&env->cli);
*/ */
LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "End of subsystem initialization") LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "End of subsystem initialization")