diff --git a/CanSpamDebugTransmitter.c b/CanSpamDebugTransmitter.c index 746fb01..6362ae5 100644 --- a/CanSpamDebugTransmitter.c +++ b/CanSpamDebugTransmitter.c @@ -36,6 +36,7 @@ void CanSpamDebugTransmitter_Init(tCanSpamDebugTransmitter *env, static void sendEventToCan(tCanSpamDebugTransmitter *env) { + if (env->ide) { env->canFrame.id_type = FLEXCAN_ID_EXT; env->canFrame.extended_id = env->can_id; @@ -421,7 +422,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) { } void set_CanDebugSpamTransmitter(tCanSpamDebugTransmitter *env) { - if (osMutexAcquire(env->modelTaskAccess, 5000) == osOK) { + if (osMutexAcquire(env->access, 5000) == osOK) { memcpy(&ccu_candb_dbg_tx.dbg_Act0, &rtY.dbgCAN_dbg_Act0_model, sizeof(ccu_candb_dbg_tx.dbg_Act0)); memcpy(&ccu_candb_dbg_tx.dbg_Act1, &rtY.dbgCAN_dbg_Act1_model, sizeof(ccu_candb_dbg_tx.dbg_Act1)); memcpy(&ccu_candb_dbg_tx.dbg_Act2, &rtY.dbgCAN_dbg_Act2_model, sizeof(ccu_candb_dbg_tx.dbg_Act2)); @@ -435,7 +436,7 @@ void set_CanDebugSpamTransmitter(tCanSpamDebugTransmitter *env) { memcpy(&ccu_candb_dbg_tx.dbg_Logic_Ac, &rtY.dbg_Logic_Ac_model, sizeof(ccu_candb_dbg_tx.dbg_Logic_Ac)); memcpy(&ccu_candb_dbg_tx.dbg_CCU_IO, &rtY.dbgCAN_CCU_IO_model, sizeof(ccu_candb_dbg_tx.dbg_CCU_IO)); - osMutexRelease(env->modelTaskAccess); + osMutexRelease(env->access); } else { LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error set_CanDebugSpamTransmitter"); } @@ -444,14 +445,13 @@ void set_CanDebugSpamTransmitter(tCanSpamDebugTransmitter *env) { static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *env) { for (;;) { - set_CanDebugSpamTransmitter(env); - if (osMutexAcquire(env->access, 5000) == osOK) { env->timeMs = GetSystemTick(); while (isEventTransmitter(env) != event_dbg_none) { sendEventToCan(env); + env->timeMs = GetSystemTick(); } osMutexRelease(env->access); @@ -459,7 +459,7 @@ static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *e LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error CanSpamDebugTransmitter_Thread"); } - SystemDelayMs(1); + SystemDelayMs(50); } } diff --git a/CanSpamDebugTransmitter.h b/CanSpamDebugTransmitter.h index 9425684..a1e07a3 100644 --- a/CanSpamDebugTransmitter.h +++ b/CanSpamDebugTransmitter.h @@ -41,16 +41,15 @@ #define dbg_Sen_Eva_SEND 1 #define dbg_Sen_Incar_SEND 1 - #define dbg_Act0_CYC 100 #define dbg_Act1_CYC 100 #define dbg_Act2_CYC 100 -#define dbg_Auto_AF_CYC 100 -#define dbg_Auto_Duct_CYC 100 +#define dbg_Auto_AF_CYC_ 100 +#define dbg_Auto_Duct_CYC_ 100 #define dbg_Auto_Valve_Plus_CYC 100 -#define dbg_CCU_Info_CYC 100 +#define dbg_CCU_Info_CYC_ 100 #define dbg_CCU_IO_CYC 100 -#define dbg_DiffBlr_ValveOpen_CYC 100 +#define dbg_DiffBlr_ValveOpen_CYC_ 100 #define dbg_Drs_CYC 100 #define dbg_Info_Act1_CYC 100 #define dbg_Info_Act2_CYC 100 @@ -65,12 +64,12 @@ #define dbg_Logic_Rec_CYC 100 #define dbg_Logic_State_CYC 100 #define dbg_Logic_Valve_CYC 100 -#define dbg_Sen_0_CYC 100 +#define dbg_Sen_0_CYC_ 100 #define dbg_Sen_Amb_CYC 100 #define dbg_Sen_Demist_CYC 100 -#define dbg_Sen_Duct_CYC 100 +#define dbg_Sen_Duct_CYC_ 100 #define dbg_Sen_Eva_CYC 100 -#define dbg_Sen_Incar_CYC 100 +#define dbg_Sen_Incar_CYC_ 100 typedef enum { event_dbg_none = 0x00,