From 80cfd57ec2e4d00f8377195e8b2e0dd5cd893dd4 Mon Sep 17 00:00:00 2001 From: cfif Date: Thu, 9 Oct 2025 10:58:41 +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.c | 4 ++++ MainModesArbiter.h | 4 ++++ PeripheralInterfaces.c | 2 ++ PeripheralInterfaces.h | 2 ++ 4 files changed, 12 insertions(+) diff --git a/MainModesArbiter.c b/MainModesArbiter.c index 1937584..3af192a 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -6,12 +6,16 @@ void Mma_Init( tMma *env, tGpios *gpios, + tAdcs *adcs, tSerialPorts *serialPorts, + tCanPorts *canPorts, tRtcs *rtcs ) { env->gpios = gpios; env->serialPorts = serialPorts; + env->canPorts = canPorts; env->rtcs = rtcs; + env->adcs = adcs; InitThreadAtrStatic(&env->thread.attr, "Mma", env->thread.controlBlock, env->thread.stack, osPriorityNormal); env->thread.id = 0; diff --git a/MainModesArbiter.h b/MainModesArbiter.h index add0abc..31366e5 100644 --- a/MainModesArbiter.h +++ b/MainModesArbiter.h @@ -22,10 +22,12 @@ typedef struct { // Преферийные интерфесы tGpios *gpios; tSerialPorts *serialPorts; + tCanPorts *canPorts; tLoggerToSerialPort slog; tComInt comInt; tRtcs *rtcs; + tAdcs *adcs; tPowerManagement power; @@ -48,7 +50,9 @@ typedef struct { void Mma_Init( tMma *env, tGpios *gpios, + tAdcs *adcs, tSerialPorts *serialPorts, + tCanPorts *canPorts, tRtcs *rtcs ); diff --git a/PeripheralInterfaces.c b/PeripheralInterfaces.c index fe34a1b..573d619 100644 --- a/PeripheralInterfaces.c +++ b/PeripheralInterfaces.c @@ -7,6 +7,8 @@ void InitPeripheralInterfaces() { Gpios_Init(); + Adcs_Init(); SerialPorts_Init(); + CanPorts_Init(); Rtcs_Init(); } \ No newline at end of file diff --git a/PeripheralInterfaces.h b/PeripheralInterfaces.h index 304e50d..d75a417 100644 --- a/PeripheralInterfaces.h +++ b/PeripheralInterfaces.h @@ -7,7 +7,9 @@ #include "Gpios.h" #include "SerialPorts.h" +#include "CanPorts.h" #include "Rtcs.h" +#include "Adcs.h" void InitPeripheralInterfaces();