From 74cc0e0ada7fae10975e72438762e0532f373f66 Mon Sep 17 00:00:00 2001
From: cfif <cham-zod@mail.ru>
Date: Fri, 31 Oct 2025 15:02:18 +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           |  3 +++
 MainModesArbiter_InitStage.c | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/MainModesArbiter.h b/MainModesArbiter.h
index f6ceec3..b438179 100644
--- a/MainModesArbiter.h
+++ b/MainModesArbiter.h
@@ -19,6 +19,7 @@
 #include "CommandLines.h"
 #include "DeviceStorage.h"
 #include "SerialPortCan.h"
+#include "CanSerialPortFrameXCP.h"
 
 
 typedef struct {
@@ -41,6 +42,8 @@ typedef struct {
 
     tIndication Indication;
 
+    tCanSerialPortFrameXCP CanSerialPortFrameXCP;
+
     struct {
         osThreadId_t id;
         uint32_t stack[2048 * 1];
diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c
index ad625b0..34027d7 100644
--- a/MainModesArbiter_InitStage.c
+++ b/MainModesArbiter_InitStage.c
@@ -36,15 +36,14 @@ 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_calib, &env->flash->interface_param);
+    bool result = DeviceStorage_Init(&env->storage, &env->flash->interface_calib, &env->flash->interface_param, &env->slog.logger);
 
     Indication_Init(&env->Indication, HVAC_DEV_MODE_STARTUP);
 
-    tSerialPortIO *thisCanComPortIO = &env->serialPorts->serialPortCanIO;
 
     ComInt_Init(
             &env->comInt,
-            thisCanComPortIO,
+            &env->serialPorts->serialPortCanIO,
             &env->storage.publicVariablesTable,
             NULL,
             NULL,
@@ -57,6 +56,14 @@ static void Mma_InitSubSystems(tMma *env) {
     CommandLine_Init(&env->cli, &env->serialPorts->cliVirtualInIo);
     CommandLine_StartThread(&env->cli);
 
+    CanSerialPortFrameXcpInit(
+            &env->CanSerialPortFrameXCP,
+            &env->canPorts->Can0_IO,
+            &env->slog
+    );
+
+    CanSerialPortFrameTp_Start(&env->CanSerialPortFrameXCP);
+
     LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Конец инициализации подсистем")
 
 }