diff --git a/MainModesArbiter.c b/MainModesArbiter.c index d1da166..85909b6 100644 --- a/MainModesArbiter.c +++ b/MainModesArbiter.c @@ -226,6 +226,7 @@ void LoadDataInFromModel(tMma *env) { GpioPinGet(&env->gpios->power.BTS4175SGAXUMA1_ShutOFFValveBatteryChiller.ST_BATTChiller); GpioPinGet(&env->gpios->EmergencyAirCleanSwitch); GpioPinGet(&env->gpios->FireExtinguishSwitch); + GpioPinGet(&env->gpios->Ign_Wakeup); rtDW.t_now = GetSystemTick(); memcpy(&rtDW.ADC_Data_Model, &env->ADC_Data_Model_local, sizeof(rtDW.ADC_Data_Model)); @@ -262,7 +263,7 @@ static _Noreturn void Mma_Thread(tMma *env) { LoadDataInFromModel(env); - ModelTask_StartThread(&env->ModelTask); +// ModelTask_StartThread(&env->ModelTask); /* @@ -282,7 +283,7 @@ static _Noreturn void Mma_Thread(tMma *env) { for (;;) { - +/* env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, 40); env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, 50); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, 60); @@ -303,7 +304,7 @@ static _Noreturn void Mma_Thread(tMma *env) { SystemDelayMs(10); uint8_t pwm4 = env->pwms->pwmRearCaptureIO.getPwm(env->pwms->pwmRearReservedCaptureIO.env); LoggerFormatInfo(LOGGER, LOG_TASK_ARB, "PWM (Rear Reserve) = %d", pwm4) - +*/ LoadDataInFromModel(env); LinActuatorWork(env, &env->linTaskActuator1, diff --git a/MainModesArbiter_InitStage.c b/MainModesArbiter_InitStage.c index 742aa68..009dc40 100644 --- a/MainModesArbiter_InitStage.c +++ b/MainModesArbiter_InitStage.c @@ -101,7 +101,7 @@ static void Mma_InitSubSystems(tMma *env) { CanSerialPortFrameXcpInit( &env->CanSerialPortFrameXCP, - &env->canPorts->Can0_IO, + &env->canPorts->Can1_IO, &env->rtcs->rtcI0, 0x00000000,