HVAC_M7
/
HVAC_M7_DebugTesting
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Обновление

This commit is contained in:
cfif 2026-04-16 13:55:16 +03:00
parent 6e8766fa8a
commit 4b56312fc8
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
LinActuatorWork.c
View File

@ -21,27 +21,27 @@ static bool isBroadCastTriggered(tLinTaskActuator *env, ActuatorCmdBus *actuator
static void showLogCommand(tMma *env, char *LOG_SIGN, uint8_t BUS_ADR, uint8_t COM) { static void showLogCommand(tMma *env, char *LOG_SIGN, uint8_t BUS_ADR, uint8_t COM) {
switch (COM) { switch (COM) {
case LIN_ACT_CFR_NONE: { case LIN_ACT_CFR_NONE: {
LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - NO COMMAND", BUS_ADR) LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - NO COMMAND", BUS_ADR)
break; break;
} }
case LIN_ACT_CFR_MOD: { case LIN_ACT_CFR_MOD: {
LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - LIN_ACT_CFR_MOD", BUS_ADR) LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - LIN_ACT_CFR_MOD", BUS_ADR)
break; break;
} }
case LIN_ACT_CFR_INI: { case LIN_ACT_CFR_INI: {
LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - LIN_ACT_CFR_INI", BUS_ADR) LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - LIN_ACT_CFR_INI", BUS_ADR)
break; break;
} }
case LIN_ACT_CFR_SET: { case LIN_ACT_CFR_SET: {
LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - LIN_ACT_CFR_SET", BUS_ADR) LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - LIN_ACT_CFR_SET", BUS_ADR)
break; break;
} }
default: { default: {
LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - UNKNOWN COMMAND", BUS_ADR) LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - UNKNOWN COMMAND", BUS_ADR)
break; break;
} }
@ -125,11 +125,13 @@ void LinActuatorWork(tMma *env, tLinTaskActuator *linTaskActuator,
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (isBroadCastTriggered(linTaskActuator, actuator_Command_Model_trigger_local)) { if (isBroadCastTriggered(linTaskActuator, actuator_Command_Model_trigger_local)) {
LoggerInfoStatic(LOGGER, LOG_SIGN, "DETECT COMMAND (BROADCAST):") LoggerInfoStatic(LOGGER, LOG_SIGN, "DETECT COMMAND (BROADCAST):")
showLogCommand(env, LOG_SIGN, actuator_Command_Model_trigger_local->BUS_ADR[0], actuator_Command_Model_trigger_local->COM[0]); showLogCommand(env, LOG_SIGN, actuator_Command_Model_trigger_local->BUS_ADR[0],
actuator_Command_Model_trigger_local->COM[0]);
} else { } else {
LoggerInfoStatic(LOGGER, LOG_SIGN, "DETECT COMMAND (NO BROADCAST):") LoggerInfoStatic(LOGGER, LOG_SIGN, "DETECT COMMAND (NO BROADCAST):")
for (uint8_t i = 0; i < linTaskActuator->LIN_ISSR_ALL; ++i) { for (uint8_t i = 0; i < linTaskActuator->LIN_ISSR_ALL; ++i) {
showLogCommand(env, LOG_SIGN, actuator_Command_Model_trigger_local->BUS_ADR[i], actuator_Command_Model_trigger_local->COM[i]); showLogCommand(env, LOG_SIGN, actuator_Command_Model_trigger_local->BUS_ADR[i],
actuator_Command_Model_trigger_local->COM[i]);
} }
} }
#endif #endif
@ -144,8 +146,14 @@ void LinActuatorWork(tMma *env, tLinTaskActuator *linTaskActuator,
// ВЫХОД МОДЕЛИ // ВЫХОД МОДЕЛИ
memcpy(actuator_Command_Model_local, actuator_Command_Model_trigger_local, sizeof(ActuatorCmdBus)); memcpy(actuator_Command_Model_local, actuator_Command_Model_trigger_local, sizeof(ActuatorCmdBus));
// Сброс STALL в состоянии актуатор и локальном состоянии // Сброс STALL в состоянии актуатор (локальном состоянии)
resetStall(linTaskActuator, (uint8_t *) actuator_Output_Model_local->in_Act_Stall_Slave, LOG_SIGN);
#if (LOG_LIN_ACTUATOR == 1)
LoggerInfoStatic(LOGGER, linTaskActuator->SIGN_LOG, "Reset LOCAL STALL (DETECT STALL RESET)")
#endif
for (uint8_t i = 0; i < linTaskActuator->LIN_ISSR_ALL; ++i) {
actuator_Output_Model_local->in_Act_Stall_Slave[i] = LIN_STALL_STA_OFF;
}
// конец --- ВЫХОД МОДЕЛИ ---------- // конец --- ВЫХОД МОДЕЛИ ----------

1
MainModesArbiter.c
View File

@ -263,7 +263,6 @@ void LoadDataInFromModel(tMma *env) {
env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, PWM_Get.pwmPercentRearReserved); env->pwms->pwmRearReservedIo.setActivePercent(env->pwms->pwmRearReservedIo.env, PWM_Get.pwmPercentRearReserved);
*/ */
rtDW.t_now = GetSystemTick();
memcpy(&rtDW.ADC_Data_Model, &env->ADC_Data_Model_local, sizeof(rtDW.ADC_Data_Model)); memcpy(&rtDW.ADC_Data_Model, &env->ADC_Data_Model_local, sizeof(rtDW.ADC_Data_Model));
if (env->ModelTask.isUpdate) { if (env->ModelTask.isUpdate) {