diff --git a/Model_Task.c b/Model_Task.c index 90154f3..55efdaa 100644 --- a/Model_Task.c +++ b/Model_Task.c @@ -48,21 +48,21 @@ static bool setActuatorBusy(tModelTask *env) { for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) { switch (Actuator_Ch0_Command_Model.COM[j]) { case LIN_ACT_CFR_MOD: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_INI: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_SET: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j]) break; } default: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) + LoggerFormatError(LOGGER, LOG_SIGN, "LIN1 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch0_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) } } } @@ -93,21 +93,21 @@ static bool setActuatorBusy(tModelTask *env) { for (uint8_t j = 0; j < env->linTaskActuator2->LIN_ISSR_ALL; ++j) { switch (Actuator_Ch1_Command_Model.COM[j]) { case LIN_ACT_CFR_MOD: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_INI: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_SET: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j]) break; } default: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) + LoggerFormatError(LOGGER, LOG_SIGN, "LIN2 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch1_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) } } } @@ -134,24 +134,24 @@ static bool setActuatorBusy(tModelTask *env) { #if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN3_ACTUATOR == 1) - for (uint8_t j = 0; j < env->linTaskActuator1->LIN_ISSR_ALL; ++j) { + for (uint8_t j = 0; j < env->linTaskActuator3->LIN_ISSR_ALL; ++j) { switch (Actuator_Ch2_Command_Model.COM[j]) { case LIN_ACT_CFR_MOD: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_MOD (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_INI: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_INI (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) break; } case LIN_ACT_CFR_SET: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) + LoggerFormatTrace(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND LIN_ACT_CFR_SET (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j]) break; } default: { - LoggerFormatInfo(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) + LoggerFormatError(LOGGER, LOG_SIGN, "LIN3 (ADR[%d] = %d): TRIGGERED COMMAND = %d UNKNOWN !!! (SET BUSY)", j, Actuator_Ch2_Command_Model.BUS_ADR[j], Actuator_Ch2_Command_Model.COM[i]) } } } @@ -176,8 +176,9 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { rtDW.t_now = SystemGetMs(); HVAC_model_step(); - env->isUpdate = true; + setActuatorBusy(env); + osMutexRelease(env->access); } SystemDelayMs(100); diff --git a/Model_Task.h b/Model_Task.h index 4ec63fd..81fa966 100644 --- a/Model_Task.h +++ b/Model_Task.h @@ -27,9 +27,6 @@ typedef struct { ActuatorCmdBus triggerActuatorCmdBus_1; ActuatorCmdBus triggerActuatorCmdBus_2; ActuatorCmdBus triggerActuatorCmdBus_3; - //uint8_t numCommand[9]; - - bool isUpdate; struct { osThreadId_t id;