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();