diff --git a/MainModesArbiter.c b/MainModesArbiter.c index 5145273..d388dda 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -126,12 +126,14 @@ void Mma_Init( tMma *env, tGpios *gpios, tSerialPorts *serialPorts, + tSerialLinPorts *serialLinPorts, tCanPorts *canPorts, tSpiPorts *spiPorts, tRtcs *rtcs ) { env->gpios = gpios; env->serialPorts = serialPorts; + env->serialLinPorts = serialLinPorts; env->canPorts = canPorts; env->spiPorts = spiPorts; env->rtcs = rtcs; diff --git a/MainModesArbiter.h b/MainModesArbiter.h index f3ca49b..865cc9d 100644 --- a/MainModesArbiter.h +++ b/MainModesArbiter.h @@ -26,6 +26,7 @@ typedef struct { // Преферийные интерфесы tGpios *gpios; tSerialPorts *serialPorts; + tSerialLinPorts *serialLinPorts; tSpiPorts *spiPorts; tCanPorts *canPorts; tLoggerToSerialPortV2 slog; @@ -74,6 +75,7 @@ void Mma_Init( tMma *env, tGpios *gpios, tSerialPorts *serialPorts, + tSerialLinPorts *serialLinPorts, tCanPorts *canPorts, tSpiPorts *spiPorts, tRtcs *rtcs diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 9283315..8d91c53 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -97,9 +97,8 @@ static void Mma_InitSubSystems(tMma *env) { Task_RECEIVED_SerialUSB2_StartThread(&env->TaskReceivedSerialUSB2); - -// Lin_5_Init(&env->lin5TaskSensor, &env->serialPorts->LIN1_UART4_IO, &env->slog.logger); -// Lin5_StartThread(&env->lin5TaskSensor); + Lin_5_Init(&env->lin5TaskSensor, &env->serialLinPorts->LIN1_UART4_IO, &env->slog.logger); + Lin5_StartThread(&env->lin5TaskSensor); SensorSpi_Init(&env->sensorSPI, env->spiPorts, &env->gpios->conns); diff --git a/PeripheralInterfaces.c b/PeripheralInterfaces.c index d17802c..0398aab 100644 --- a/PeripheralInterfaces.c +++ b/PeripheralInterfaces.c @@ -8,6 +8,7 @@ void InitPeripheralInterfaces() { Gpios_Init(); SerialPorts_Init(&GPIOS.comIntDir); + SerialLinPorts_Init(); CanPorts_Init(); SpiPorts_Init(&GPIOS.SpiChipSelectPins); Rtcs_Init(); diff --git a/PeripheralInterfaces.h b/PeripheralInterfaces.h index 16d0d42..5766bb9 100644 --- a/PeripheralInterfaces.h +++ b/PeripheralInterfaces.h @@ -10,6 +10,7 @@ #include "CanPorts.h" #include "SpiPorts.h" #include "Rtcs.h" +#include "SerialLinPorts.h" void InitPeripheralInterfaces();