diff --git a/MainModesArbiter.c b/MainModesArbiter.c index ae9d2fa..c011cb3 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -42,8 +42,6 @@ void LoadDataInFromModel(tMma *env) { if (osMutexAcquire(env->ModelTask.access, 5000) == osOK) { - - // Включение 5V (0 - ВКЛ) GpioPinSet(&env->gpios->power.SW5V_EN, rtY.PowerEnable_Model.SW5V_EN); // GpioPinSet(&env->gpios->power.SW5V_EN, true); @@ -109,11 +107,6 @@ void LoadDataInFromModel(tMma *env) { // LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "============================================== %d", 0) set_Dtc_state(&env->Diagnostic); - set_CanSpamTransmitter(&env->canSpamTransmitter); - get_CanSpamReceiver(&env->canSpamReceiver); - - set_CanDebugSpamTransmitter(&env->canSpamDebugTransmitter); - osMutexRelease(env->ModelTask.access); } @@ -136,6 +129,8 @@ static _Noreturn void Mma_Thread(tMma *env) { LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Model running...") + LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Version 0") + // SMC_SetSystemMode(SMC_MODE_STANBY_3); for (;;) { diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 8dd5926..cd73794 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -59,7 +59,7 @@ static void Mma_InitSubSystems(tMma *env) { } - LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Initialization of subsystems") + LoggerInfoStatic(&env->slog.logger, LOG_TASK_MAIN, "Initialization of subsystems !!!!!!!!!!!!!!!!!!!!!!!!!!!") // Инициализация периферийных интерфейсов InitPeripheralInterfaces(&env->slog.logger); @@ -144,16 +144,16 @@ static void Mma_InitSubSystems(tMma *env) { CanXcpProcessing_Listener_Start(&env->CanSerialPortFrameXCP); - CanSpamReceiver_Init(&env->canSpamReceiver, &env->canPorts->Can0_IO, &env->slog.logger); + CanSpamReceiver_Init(&env->canSpamReceiver, &env->canPorts->Can0_IO, env->ModelTask.access, &env->slog.logger); CanSpamReceiver_StartThread(&env->canSpamReceiver); - CanSpamTransmitter_Init(&env->canSpamTransmitter, &env->canPorts->Can0_IO, &env->slog.logger); + CanSpamTransmitter_Init(&env->canSpamTransmitter, &env->canPorts->Can0_IO, env->ModelTask.access, &env->slog.logger); CanSpamTransmitter_StartThread(&env->canSpamTransmitter); - CanSpamDebugReceiver_Init(&env->canSpamDebugReceiver, &env->canPorts->Can1_IO, &env->slog.logger); + CanSpamDebugReceiver_Init(&env->canSpamDebugReceiver, &env->canPorts->Can1_IO, env->ModelTask.access, &env->slog.logger); CanSpamDebugReceiver_StartThread(&env->canSpamDebugReceiver); - CanSpamDebugTransmitter_Init(&env->canSpamDebugTransmitter, &env->canPorts->Can1_IO, &env->canSpamDebugReceiver, + CanSpamDebugTransmitter_Init(&env->canSpamDebugTransmitter, &env->canPorts->Can1_IO, &env->canSpamDebugReceiver, env->ModelTask.access, &env->slog.logger); CanSpamDebugTransmitter_StartThread(&env->canSpamDebugTransmitter);