diff --git a/Model_Task.c b/Model_Task.c index 5f68c64..5c5460a 100644 --- a/Model_Task.c +++ b/Model_Task.c @@ -243,6 +243,7 @@ static bool setActuatorBusy(tModelTask *env) { static _Noreturn void ModelTask_Thread(tModelTask *env) { for (;;) { if (osMutexAcquire(env->access, 1000) == osOK) { + rtDW.t_now = SystemGetMs(); // LoggerFormatError(LOGGER, LOG_SIGN, "Step 1 = %d", SystemGetMs()) @@ -285,7 +286,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.TwoWayValve_EN_Diag, true); GpioPinSet(&env->gpios->power.BTS5180_2EKA_TwoWayValveAndReservePowerSupply.ReservePower_EN, rtY.PowerEnable_Model.ReservePower_EN); - GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_ReservePowerOutput.EN_ReservePower, rtY.PowerEnable_Model.EN_ReservePower); +// GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_ReservePowerOutput.EN_ReservePower, rtY.PowerEnable_Model.EN_ReservePower); GpioPinSet(&env->gpios->power.BTS4175SGAXUMA1_PowerReserve.EN_PowerReserve, rtY.PowerEnable_Model.EN_PowerReserve); GpioPinSet(&env->gpios->power.BTS5180_2EKA_2xChannelPTCPower.PtcRelayDriver1_EN, rtY.PowerEnable_Model.PtcRelayDriver1_EN); @@ -309,12 +310,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV_EN_Diag, true); GpioPinSet(&env->gpios->power.BTS5120_2EKA_ShutoffValvePowerTXV.ShutOffTXV2_EN, rtY.PowerEnable_Model.ShutOffTXV2_EN); -/* - rtY.PWM_Get_f.pwmPercentFront = 1; - rtY.PWM_Get_f.pwmPercentRear = 2; - rtY.PWM_Get_f.pwmPercentFrontReserved = 3; - rtY.PWM_Get_f.pwmPercentRearReserved = 4; - */ + env->pwms->pwmFrontIo.setActivePercent(env->pwms->pwmFrontIo.env, rtY.PWM_Get_f.pwmPercentFront); env->pwms->pwmRearIo.setActivePercent(env->pwms->pwmRearIo.env, rtY.PWM_Get_f.pwmPercentRear); env->pwms->pwmFrontReservedIo.setActivePercent(env->pwms->pwmFrontReservedIo.env, rtY.PWM_Get_f.pwmPercentFrontReserved);