From 23ac9565138029ce9b3b6c4ce6291b37b154faba Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 24 Feb 2025 11:01:24 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B8=20CAN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainModesArbiter.h | 4 ++++ MainModesArbiter_InitStage.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/MainModesArbiter.h b/MainModesArbiter.h index 4c31130..3ecce61 100644 --- a/MainModesArbiter.h +++ b/MainModesArbiter.h @@ -42,6 +42,8 @@ #include #include +#include "CanMain.h" + typedef struct { // Преферийные интерфесы @@ -89,6 +91,8 @@ typedef struct { volatile bool kzModeBloc; // tSignPack signature; + tCanMain canMain; + #ifdef UVEOS_ADD_TELEMATICA tEgtsProcessing egtsProcessing; #endif diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index ae49936..1067c03 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -300,6 +300,13 @@ static void Mma_InitSubSystems(tMma *env) { ); */ Mma_InitComInt(env, &env->storage.nvm.device.serialNumber.value, &env->storage.publicVariablesTable); + + CanMain_Init( + &env->canMain, + &env->serialPorts->SerialPortFrameCan2IO, + &env->slog + ); + LoggerInfoStatic(LOGGER, LOG_SIGN, "Инициализация подсистем завершена") } @@ -317,6 +324,8 @@ static void Mma_RunSubThreads(tMma *env) { ComInt_StartThread(&env->comInt); + CanMain_Start(&env->canMain); + LoggerInfoStatic(LOGGER, LOG_SIGN, "Субпотоки запущены") }