From 731c0d4f3f915b7fb1e982309f22bc45829c4d72 Mon Sep 17 00:00:00 2001 From: cfif Date: Wed, 29 Oct 2025 11:17:05 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModesArbiter.h | 1 + MainModesArbiter_InitStage.c | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MainModesArbiter.h b/MainModesArbiter.h index 934c046..f6ceec3 100644 --- a/MainModesArbiter.h +++ b/MainModesArbiter.h @@ -18,6 +18,7 @@ #include "Indication.h" #include "CommandLines.h" #include "DeviceStorage.h" +#include "SerialPortCan.h" typedef struct { diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 741c4b1..ad625b0 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -36,16 +36,17 @@ static void Mma_InitSubSystems(tMma *env) { Mma_InitComIntLog(env); LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Инициализация подсистем") - bool result = DeviceStorage_Init(&env->storage, &env->flash->interface); + bool result = DeviceStorage_Init(&env->storage, &env->flash->interface_calib, &env->flash->interface_param); Indication_Init(&env->Indication, HVAC_DEV_MODE_STARTUP); -/* + tSerialPortIO *thisCanComPortIO = &env->serialPorts->serialPortCanIO; + ComInt_Init( &env->comInt, - &SERIAL_PORTS.Rs485_HalfDuplexIo, + thisCanComPortIO, + &env->storage.publicVariablesTable, NULL, - &SERIAL_PORTS.SerialPortUsbIO, NULL, &SERIAL_PORTS.cliVirtualOutIo, &env->Indication.currentModeName @@ -55,7 +56,7 @@ static void Mma_InitSubSystems(tMma *env) { CommandLine_Init(&env->cli, &env->serialPorts->cliVirtualInIo); CommandLine_StartThread(&env->cli); -*/ + LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Конец инициализации подсистем") }