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

Обновление

This commit is contained in:
cfif 2026-04-28 10:10:51 +03:00
parent 81e5255f67
commit e975b9d9cf
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
LinActuatorTasks.c
View File

@ -594,7 +594,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Sending a command (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", "Sending a command (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].MODE) env->linCommandActuator[0].MODE)
@ -606,7 +606,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Command completed successfully (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", "Command completed successfully (BROADCAST): LIN_ACT_CFR_MOD (ADR = %d MODE = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].MODE) env->linCommandActuator[0].MODE)
@ -632,7 +632,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (env->linCommandActuator[0].COM == LIN_ACT_CFR_INI) { if (env->linCommandActuator[0].COM == LIN_ACT_CFR_INI) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Sending a command (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)", "Sending a command (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS) env->linCommandActuator[0].POS)
@ -645,7 +645,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Command completed successfully (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)", "Command completed successfully (BROADCAST): LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].POS) env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].POS)
} }
@ -671,7 +671,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (env->linCommandActuator[0].COM == LIN_ACT_CFR_SET) { if (env->linCommandActuator[0].COM == LIN_ACT_CFR_SET) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Sending a command (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Sending a command (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS, env->linCommandActuator[0].POS,
@ -695,7 +695,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Command completed successfully (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Command completed successfully (BROADCAST): LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[0].BUS_ADR, env->linCommandActuator[0].BUS_ADR,
env->linCommandActuator[0].POS, env->linCommandActuator[0].POS,
@ -743,7 +743,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (env->linCommandActuator[i].BUS_ADR == 0) { if (env->linCommandActuator[i].BUS_ADR == 0) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Let's skip the command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)", "Let's skip the command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)",
env->linCommandActuator[i].BUS_ADR, i + 1, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
@ -755,7 +755,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Sending a command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)", "Sending a command: LIN_ACT_CFR_MOD (ADR = %d (%d) MODE = %d)",
env->linCommandActuator[i].BUS_ADR, i, env->linCommandActuator[i].BUS_ADR, i,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
@ -767,7 +767,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Command completed successfully: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)", "Command completed successfully: LIN_ACT_CFR_MOD (ADR = %d MODE = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].MODE) env->linCommandActuator[i].MODE)
@ -800,7 +800,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (env->linCommandActuator[i].BUS_ADR == 0) { if (env->linCommandActuator[i].BUS_ADR == 0) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Let's skip the command: LIN_ACT_CFR_INI (ADR = %d (%d) POS = %d)", "Let's skip the command: LIN_ACT_CFR_INI (ADR = %d (%d) POS = %d)",
env->linCommandActuator[i].BUS_ADR, i + 1, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].POS) env->linCommandActuator[i].POS)
@ -812,7 +812,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Sending a command: LIN_ACT_CFR_INI (ADR = %d POS = %d)", LoggerFormatTrace(LOGGER, env->SIGN_LOG, "Sending a command: LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].POS) env->linCommandActuator[i].POS)
} }
@ -824,7 +824,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Command completed successfully: LIN_ACT_CFR_INI (ADR = %d POS = %d)", "Command completed successfully: LIN_ACT_CFR_INI (ADR = %d POS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].POS) env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].POS)
} }
@ -854,7 +854,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (env->linCommandActuator[i].BUS_ADR == 0) { if (env->linCommandActuator[i].BUS_ADR == 0) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Let's skip the command: LIN_ACT_CFR_SET (ADR = %d POS = %d (%d) STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Let's skip the command: LIN_ACT_CFR_SET (ADR = %d POS = %d (%d) STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[i].BUS_ADR, i + 1, env->linCommandActuator[i].BUS_ADR, i + 1,
env->linCommandActuator[i].POS, env->linCommandActuator[i].POS,
@ -871,7 +871,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Sending a command: LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Sending a command: LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].POS, env->linCommandActuator[i].POS,
@ -894,7 +894,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
if (ret == LIN_TX_COMPLETED) { if (ret == LIN_TX_COMPLETED) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, LoggerFormatTrace(LOGGER, env->SIGN_LOG,
"Command completed successfully: LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)", "Command completed successfully: LIN_ACT_CFR_SET (ADR = %d POS = %d STALL= %d LNOISE = %d AUTOS = %d SPEED = %d COILS = %d)",
env->linCommandActuator[i].BUS_ADR, env->linCommandActuator[i].BUS_ADR,
env->linCommandActuator[i].POS, env->linCommandActuator[i].POS,
@ -962,10 +962,10 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
&Reset_Slave); &Reset_Slave);
if (ret == LIN_RX_COMPLETED) { if (ret == LIN_RX_COMPLETED) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "OK: State = %d", i) LoggerFormatTrace(LOGGER, env->SIGN_LOG, "OK: State = %d", i)
} else { } else {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "ERROR: State = %d", i) LoggerFormatTrace(LOGGER, env->SIGN_LOG, "ERROR: State = %d", i)
} }
} }
@ -1089,7 +1089,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave; env->linStateActuator[BUS_ADR].Stall_Slave = Stall_Slave;
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, env->SIGN_LOG, "Detect STALL: (ADR = %d POS = %d)", LoggerFormatTrace(LOGGER, env->SIGN_LOG, "Detect STALL: (ADR = %d POS = %d)",
BUS_ADR + 1, BUS_ADR + 1,
CPOS_ALL) CPOS_ALL)
} }
@ -1099,7 +1099,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
env->linStateActuator[BUS_ADR].Reset_Slave = Reset_Slave; env->linStateActuator[BUS_ADR].Reset_Slave = Reset_Slave;
// LoggerFormatInfo(LOGGER, env->SIGN_LOG, "BUS_ADR = %d, CPOS_ALL = %d, Stall_Slave = %d", BUS_ADR, // LoggerFormatTrace(LOGGER, env->SIGN_LOG, "BUS_ADR = %d, CPOS_ALL = %d, Stall_Slave = %d", BUS_ADR,
// env->linStateActuator[BUS_ADR].CPOS_ALL, // env->linStateActuator[BUS_ADR].CPOS_ALL,
// env->linStateActuator[BUS_ADR].Stall_Slave) // env->linStateActuator[BUS_ADR].Stall_Slave)
@ -1111,7 +1111,7 @@ static lin_event_id_t Lin_Scheduler(tLinTaskActuator *env, uint8_t numAct) {
} else { } else {
//#if (LOG_LIN_ACTUATOR == 1) //#if (LOG_LIN_ACTUATOR == 1)
// LoggerFormatInfo(LOGGER, env->SIGN_LOG, // LoggerFormatTrace(LOGGER, env->SIGN_LOG,
// "Command READ - ERROR: ADR = %d ", // "Command READ - ERROR: ADR = %d ",
// i // i
// ) // )

16
LinActuatorWork.c
View File

@ -22,27 +22,27 @@ static bool isBroadCastTriggered(tLinTaskActuator *env, ActuatorCmdBus *actuator
static void showLogCommand(tLinTaskActuator *linTaskActuator, char *LOG_SIGN, uint8_t BUS_ADR, uint8_t COM) { static void showLogCommand(tLinTaskActuator *linTaskActuator, 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) LoggerFormatTrace(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) LoggerFormatTrace(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) LoggerFormatTrace(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) LoggerFormatTrace(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) LoggerFormatError(LOGGER, LOG_SIGN, "BUS_ADR: %d - UNKNOWN COMMAND", BUS_ADR)
break; break;
} }
@ -80,10 +80,10 @@ void LinActuatorWork(tLinTaskActuator *linTaskActuator, osMutexId_t modelTaskAcc
if (linTaskActuator->linCommandActuator[i].COM == LIN_ACT_CFR_SUCCESSFUL) { if (linTaskActuator->linCommandActuator[i].COM == LIN_ACT_CFR_SUCCESSFUL) {
#if (LOG_LIN_ACTUATOR == 1) #if (LOG_LIN_ACTUATOR == 1)
if (IS_LOGGING_ENABLED(numAct)) { if (IS_LOGGING_ENABLED(numAct)) {
LoggerFormatInfo(LOGGER, LOG_SIGN, "BUS_ADR: %d - SUCCESSFUL COMMAND (UNSET BUSY)", i + 1) LoggerFormatTrace(LOGGER, LOG_SIGN, "BUS_ADR: %d - SUCCESSFUL COMMAND (UNSET BUSY)", i + 1)
} }
#endif #endif
// LoggerFormatInfo(LOGGER, LOG_SIGN, "ACTUATOR %d - SUCCESSFUL COMMAND (UNSET BUSY)", numAct) // LoggerFormatTrace(LOGGER, LOG_SIGN, "ACTUATOR %d - SUCCESSFUL COMMAND (UNSET BUSY)", numAct)
actuator_Output_Model_local->Busy = 0; actuator_Output_Model_local->Busy = 0;
// Разрешение обработки новой команды // Разрешение обработки новой команды
@ -116,7 +116,7 @@ void LinActuatorWork(tLinTaskActuator *linTaskActuator, osMutexId_t modelTaskAcc
// Заполнение данных ВХОДЫ МОДЕЛИ // Заполнение данных ВХОДЫ МОДЕЛИ
actuator_Output_Model_local->Error_Connect = linTaskActuator->error_connect; actuator_Output_Model_local->Error_Connect = linTaskActuator->error_connect;
// LoggerFormatInfo(LOGGER, LOG_SIGN, "Busy = %d Error_Connect = %d", actuator_Output_Model_local->Busy, actuator_Output_Model_local->Error_Connect) // LoggerFormatTrace(LOGGER, LOG_SIGN, "Busy = %d Error_Connect = %d", actuator_Output_Model_local->Busy, actuator_Output_Model_local->Error_Connect)