Обновление
This commit is contained in:
cfif
parent
f24c62f519
commit
eeee7dbcc0
|
|
@ -53,7 +53,7 @@ static void sendEventToCan(tCanSpamDebugTransmitter *env) {
|
|||
static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
||||
|
||||
#if (dbg_Act0_SEND == 1)
|
||||
if (env->time_dbg_Act0_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Act0_CYC <= env->timeMs) {
|
||||
env->time_dbg_Act0_CYC = env->timeMs + dbg_Act0_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Act0_candb_dbg(&ccu_candb_dbg_tx.dbg_Act0, env->canFrame.data, &env->canFrame.dlc,
|
||||
|
|
@ -64,7 +64,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Act1_SEND == 1)
|
||||
if (env->time_dbg_Act1_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Act1_CYC <= env->timeMs) {
|
||||
env->time_dbg_Act1_CYC = env->timeMs + dbg_Act1_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Act1_candb_dbg(&ccu_candb_dbg_tx.dbg_Act1, env->canFrame.data, &env->canFrame.dlc,
|
||||
|
|
@ -75,7 +75,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Act2_SEND == 1)
|
||||
if (env->time_dbg_Act2_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Act2_CYC <= env->timeMs) {
|
||||
env->time_dbg_Act2_CYC = env->timeMs + dbg_Act2_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Act2_candb_dbg(&ccu_candb_dbg_tx.dbg_Act2, env->canFrame.data, &env->canFrame.dlc,
|
||||
|
|
@ -87,7 +87,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
|
||||
|
||||
#if (dbg_Auto_AF_SEND == 1)
|
||||
if (env->time_dbg_Auto_AF_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Auto_AF_CYC <= env->timeMs) {
|
||||
env->time_dbg_Auto_AF_CYC = env->timeMs + dbg_Auto_AF_CYC;
|
||||
|
||||
ccu_candb_dbg_tx.dbg_Auto_AF.dbg_Auto_AF_MultMsg_Idx = env->dbg_Auto_AF_MultMsg_Idx;
|
||||
|
|
@ -105,7 +105,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Auto_Duct_SEND == 1)
|
||||
if (env->time_dbg_Auto_Duct_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Auto_Duct_CYC <= env->timeMs) {
|
||||
env->time_dbg_Auto_Duct_CYC = env->timeMs + dbg_Auto_Duct_CYC;
|
||||
|
||||
ccu_candb_dbg_tx.dbg_Auto_Duct.dbg_Auto_Duct_MultMsg_Idx = env->dbg_Auto_Duct_MultMsg_Idx;
|
||||
|
|
@ -123,7 +123,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Auto_Valve_Plus_SEND == 1)
|
||||
if (env->time_dbg_Auto_Valve_Plus_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Auto_Valve_Plus_CYC <= env->timeMs) {
|
||||
env->time_dbg_Auto_Valve_Plus_CYC = env->timeMs + dbg_Auto_Valve_Plus_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Auto_Valve_Plus_candb_dbg(&ccu_candb_dbg_tx.dbg_Auto_Valve_Plus, env->canFrame.data,
|
||||
|
|
@ -134,7 +134,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_CCU_Info_SEND == 1)
|
||||
if (env->time_dbg_CCU_Info_CYC < env->timeMs) {
|
||||
if (env->time_dbg_CCU_Info_CYC <= env->timeMs) {
|
||||
env->time_dbg_CCU_Info_CYC = env->timeMs + dbg_CCU_Info_CYC;
|
||||
|
||||
ccu_candb_dbg_tx.dbg_CCU_Info.dbg_Info_MultMsg_Idx = env->dbg_CCU_Info_MultMsg_Idx;
|
||||
|
|
@ -152,7 +152,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_CCU_IO_SEND == 1)
|
||||
if (env->time_dbg_CCU_IO_CYC < env->timeMs) {
|
||||
if (env->time_dbg_CCU_IO_CYC <= env->timeMs) {
|
||||
env->time_dbg_CCU_IO_CYC = env->timeMs + dbg_CCU_IO_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_CCU_IO_candb_dbg(&ccu_candb_dbg_tx.dbg_CCU_IO, env->canFrame.data,
|
||||
|
|
@ -163,7 +163,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_DiffBlr_ValveOpen_SEND == 1)
|
||||
if (env->time_dbg_DiffBlr_ValveOpen_CYC < env->timeMs) {
|
||||
if (env->time_dbg_DiffBlr_ValveOpen_CYC <= env->timeMs) {
|
||||
env->time_dbg_DiffBlr_ValveOpen_CYC = env->timeMs + dbg_DiffBlr_ValveOpen_CYC;
|
||||
|
||||
ccu_candb_dbg_tx.dbg_DiffBlr_ValveOpen.Logic_ValveOpen_MultMsg_Idx = env->dbg_DiffBlr_ValveOpen_MultMsg_Idx;
|
||||
|
|
@ -182,7 +182,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
|
||||
|
||||
#if (dbg_Drs_SEND == 1)
|
||||
if (env->time_dbg_Drs_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Drs_CYC <= env->timeMs) {
|
||||
env->time_dbg_Drs_CYC = env->timeMs + dbg_Drs_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Drs_candb_dbg(&ccu_candb_dbg_tx.dbg_Drs, env->canFrame.data,
|
||||
|
|
@ -193,7 +193,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Info_Act1_SEND == 1)
|
||||
if (env->time_dbg_Info_Act1_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Info_Act1_CYC <= env->timeMs) {
|
||||
env->time_dbg_Info_Act1_CYC = env->timeMs + dbg_Info_Act1_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Info_Act1_candb_dbg(&ccu_candb_dbg_tx.dbg_Info_Act1, env->canFrame.data,
|
||||
|
|
@ -204,7 +204,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Info_Act2_SEND == 1)
|
||||
if (env->time_dbg_Info_Act2_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Info_Act2_CYC <= env->timeMs) {
|
||||
env->time_dbg_Info_Act2_CYC = env->timeMs + dbg_Info_Act2_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Info_Act2_candb_dbg(&ccu_candb_dbg_tx.dbg_Info_Act2, env->canFrame.data,
|
||||
|
|
@ -215,7 +215,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_LIN_AirQS_Stat_SEND == 1)
|
||||
if (env->time_dbg_LIN_AirQS_Stat_CYC < env->timeMs) {
|
||||
if (env->time_dbg_LIN_AirQS_Stat_CYC <= env->timeMs) {
|
||||
env->time_dbg_LIN_AirQS_Stat_CYC = env->timeMs + dbg_LIN_AirQS_Stat_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_LIN_AirQS_Stat_candb_dbg(&ccu_candb_dbg_tx.dbg_LIN_AirQS_Stat, env->canFrame.data,
|
||||
|
|
@ -226,7 +226,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_LIN_Aroma_Stat_SEND == 1)
|
||||
if (env->time_dbg_LIN_Aroma_Stat_CYC < env->timeMs) {
|
||||
if (env->time_dbg_LIN_Aroma_Stat_CYC <= env->timeMs) {
|
||||
env->time_dbg_LIN_Aroma_Stat_CYC = env->timeMs + dbg_LIN_Aroma_Stat_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_LIN_Aroma_Stat_candb_dbg(&ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat, env->canFrame.data,
|
||||
|
|
@ -237,7 +237,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_LIN_DRS_Stat_SEND == 1)
|
||||
if (env->time_dbg_LIN_DRS_Stat_CYC < env->timeMs) {
|
||||
if (env->time_dbg_LIN_DRS_Stat_CYC <= env->timeMs) {
|
||||
env->time_dbg_LIN_DRS_Stat_CYC = env->timeMs + dbg_LIN_DRS_Stat_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_LIN_DRS_Stat_candb_dbg(&ccu_candb_dbg_tx.dbg_LIN_DRS_Stat, env->canFrame.data,
|
||||
|
|
@ -248,7 +248,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_LIN_eTXV_Stat_SEND == 1)
|
||||
if (env->time_dbg_LIN_eTXV_Stat_CYC < env->timeMs) {
|
||||
if (env->time_dbg_LIN_eTXV_Stat_CYC <= env->timeMs) {
|
||||
env->time_dbg_LIN_eTXV_Stat_CYC = env->timeMs + dbg_LIN_eTXV_Stat_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_LIN_eTXV_Stat_candb_dbg(&ccu_candb_dbg_tx.dbg_LIN_eTXV_Stat, env->canFrame.data,
|
||||
|
|
@ -259,7 +259,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_LIN_Ionizer_Stat_SEND == 1)
|
||||
if (env->time_dbg_LIN_Ionizer_Stat_CYC < env->timeMs) {
|
||||
if (env->time_dbg_LIN_Ionizer_Stat_CYC <= env->timeMs) {
|
||||
env->time_dbg_LIN_Ionizer_Stat_CYC = env->timeMs + dbg_LIN_Ionizer_Stat_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_LIN_Ionizer_Stat_candb_dbg(&ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat, env->canFrame.data,
|
||||
|
|
@ -270,7 +270,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Logic_Ac_SEND == 1)
|
||||
if (env->time_dbg_Logic_Ac_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Logic_Ac_CYC <= env->timeMs) {
|
||||
env->time_dbg_Logic_Ac_CYC = env->timeMs + dbg_Logic_Ac_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Logic_Ac_candb_dbg(&ccu_candb_dbg_tx.dbg_Logic_Ac, env->canFrame.data,
|
||||
|
|
@ -281,7 +281,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Logic_Blower_SEND == 1)
|
||||
if (env->time_dbg_Logic_Blower_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Logic_Blower_CYC <= env->timeMs) {
|
||||
env->time_dbg_Logic_Blower_CYC = env->timeMs + dbg_Logic_Blower_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Logic_Blower_candb_dbg(&ccu_candb_dbg_tx.dbg_Logic_Blower, env->canFrame.data,
|
||||
|
|
@ -292,7 +292,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Logic_KM_Status_SEND == 1)
|
||||
if (env->time_dbg_Logic_KM_Status_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Logic_KM_Status_CYC <= env->timeMs) {
|
||||
env->time_dbg_Logic_KM_Status_CYC = env->timeMs + dbg_Logic_KM_Status_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Logic_KM_Status_candb_dbg(&ccu_candb_dbg_tx.dbg_Logic_KM_Status, env->canFrame.data,
|
||||
|
|
@ -303,7 +303,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Logic_Rec_SEND == 1)
|
||||
if (env->time_dbg_Logic_Rec_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Logic_Rec_CYC <= env->timeMs) {
|
||||
env->time_dbg_Logic_Rec_CYC = env->timeMs + dbg_Logic_Rec_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Logic_Rec_candb_dbg(&ccu_candb_dbg_tx.dbg_Logic_Rec, env->canFrame.data,
|
||||
|
|
@ -314,7 +314,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Logic_State_SEND == 1)
|
||||
if (env->time_dbg_Logic_State_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Logic_State_CYC <= env->timeMs) {
|
||||
env->time_dbg_Logic_State_CYC = env->timeMs + dbg_Logic_State_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Logic_State_candb_dbg(&ccu_candb_dbg_tx.dbg_Logic_State, env->canFrame.data,
|
||||
|
|
@ -325,7 +325,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Logic_Valve_SEND == 1)
|
||||
if (env->time_dbg_Logic_Valve_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Logic_Valve_CYC <= env->timeMs) {
|
||||
env->time_dbg_Logic_Valve_CYC = env->timeMs + dbg_Logic_Valve_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Logic_Valve_candb_dbg(&ccu_candb_dbg_tx.dbg_Logic_Valve, env->canFrame.data,
|
||||
|
|
@ -336,7 +336,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Sen_0_SEND == 1)
|
||||
if (env->time_dbg_Sen_0_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Sen_0_CYC <= env->timeMs) {
|
||||
env->time_dbg_Sen_0_CYC = env->timeMs + dbg_Sen_0_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Sen_0_candb_dbg(&ccu_candb_dbg_tx.dbg_Sen_0, env->canFrame.data,
|
||||
|
|
@ -347,7 +347,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Sen_Amb_SEND == 1)
|
||||
if (env->time_dbg_Sen_Amb_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Sen_Amb_CYC <= env->timeMs) {
|
||||
env->time_dbg_Sen_Amb_CYC = env->timeMs + dbg_Sen_Amb_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Sen_Amb_candb_dbg(&ccu_candb_dbg_tx.dbg_Sen_Amb, env->canFrame.data,
|
||||
|
|
@ -358,7 +358,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Sen_Demist_SEND == 1)
|
||||
if (env->time_dbg_Sen_Demist_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Sen_Demist_CYC <= env->timeMs) {
|
||||
env->time_dbg_Sen_Demist_CYC = env->timeMs + dbg_Sen_Demist_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Sen_Demist_candb_dbg(&ccu_candb_dbg_tx.dbg_Sen_Demist, env->canFrame.data,
|
||||
|
|
@ -369,7 +369,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Sen_Duct_SEND == 1)
|
||||
if (env->time_dbg_Sen_Duct_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Sen_Duct_CYC <= env->timeMs) {
|
||||
env->time_dbg_Sen_Duct_CYC = env->timeMs + dbg_Sen_Duct_CYC;
|
||||
|
||||
if (env->dbg_Sen_Duct_MultMsg_Idx >= 3) {
|
||||
|
|
@ -388,7 +388,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Sen_Eva_SEND == 1)
|
||||
if (env->time_dbg_Sen_Eva_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Sen_Eva_CYC <= env->timeMs) {
|
||||
env->time_dbg_Sen_Eva_CYC = env->timeMs + dbg_Sen_Eva_CYC;
|
||||
|
||||
env->can_id = Pack_dbg_Sen_Eva_candb_dbg(&ccu_candb_dbg_tx.dbg_Sen_Eva, env->canFrame.data, &env->canFrame.dlc,
|
||||
|
|
@ -399,7 +399,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
#endif
|
||||
|
||||
#if (dbg_Sen_Incar_SEND == 1)
|
||||
if (env->time_dbg_Sen_Incar_CYC < env->timeMs) {
|
||||
if (env->time_dbg_Sen_Incar_CYC <= env->timeMs) {
|
||||
env->time_dbg_Sen_Incar_CYC = env->timeMs + dbg_Sen_Incar_CYC;
|
||||
|
||||
if (env->dbg_Sen_Incar_MultMsg_Idx >= 1) {
|
||||
|
|
@ -445,13 +445,14 @@ void set_CanDebugSpamTransmitter(tCanSpamDebugTransmitter *env) {
|
|||
|
||||
static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *env) {
|
||||
for (;;) {
|
||||
SystemDelayMs(50);
|
||||
|
||||
if (osMutexAcquire(env->access, 5000) == osOK) {
|
||||
|
||||
env->timeMs = GetSystemTick();
|
||||
env->timeMs += 50;
|
||||
|
||||
while (isEventTransmitter(env) != event_dbg_none) {
|
||||
sendEventToCan(env);
|
||||
env->timeMs = GetSystemTick();
|
||||
}
|
||||
|
||||
osMutexRelease(env->access);
|
||||
|
|
@ -459,7 +460,6 @@ static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *e
|
|||
LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error CanSpamDebugTransmitter_Thread");
|
||||
}
|
||||
|
||||
SystemDelayMs(1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue