diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c index 9e0267e..03f896c 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c @@ -37,7 +37,8 @@ void CanSpamDebugTransmitter_Init(tCanSpamDebugTransmitter *env, env->thread.stack = tCanSpamDebugTransmitter_stack; - InitThreadAtr(&env->thread.attr,"CanSpamDebugTrans",&env->thread.controlBlock,sizeof(env->thread.controlBlock),env->thread.stack,tCanSpamDebugTransmitter_stack_size,osPriorityNormal); + InitThreadAtr(&env->thread.attr, "CanSpamDebugTrans", &env->thread.controlBlock, sizeof(env->thread.controlBlock), + env->thread.stack, tCanSpamDebugTransmitter_stack_size, osPriorityNormal); env->thread.id = 0; @@ -445,8 +446,9 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) { ++env->dbg_PID_MultMsg_Idx; } - env->can_id = Pack_dbg_Stat_PID_candb_dbg2(&ccu_candb_dbg_tx.dbg_stat_PID, env->dbg_PID_MultMsg_Idx, env->canFrame.data, - &env->canFrame.dlc, &env->ide); + env->can_id = Pack_dbg_Stat_PID_candb_dbg2(&ccu_candb_dbg_tx.dbg_stat_PID, env->dbg_PID_MultMsg_Idx, + env->canFrame.data, + &env->canFrame.dlc, &env->ide); return event_dbg_Stat_PID_CYC; } @@ -474,6 +476,7 @@ void set_CanDebugSpamTransmitter(tCanSpamDebugTransmitter *env, ccu_candb_dbg_tx } +extern volatile bool isSendingCAN; static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *env) { for (;;) { @@ -488,6 +491,11 @@ static _Noreturn void CanSpamDebugTransmitter_Thread(tCanSpamDebugTransmitter *e env->timeMs += 50; while (isEventTransmitter(env) != event_dbg_none) { + + if (!isSendingCAN) { + break; + } + sendEventToCan(env); } diff --git a/MODULES/HVAC_M7_CAN_SPAM/CanSpamTransmitter.c b/MODULES/HVAC_M7_CAN_SPAM/CanSpamTransmitter.c index 4315d44..254031f 100644 --- a/MODULES/HVAC_M7_CAN_SPAM/CanSpamTransmitter.c +++ b/MODULES/HVAC_M7_CAN_SPAM/CanSpamTransmitter.c @@ -299,6 +299,8 @@ void set_CCU_Mute(tCanSpamTransmitter *env, bool mute) { } } +extern volatile bool isSendingCAN; + static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) { for (;;) { @@ -313,6 +315,11 @@ static _Noreturn void CanSpamTransmitter_Thread(tCanSpamTransmitter *env) { env->timeMs += 100; while (isEventTransmitter(env) != event_CCU_none) { + + if (!isSendingCAN) { + break; + } + sendEventToCan(env); } diff --git a/MODULES/HVAC_M7_MODEL/Model_Task.c b/MODULES/HVAC_M7_MODEL/Model_Task.c index 9fea793..7f1d11e 100644 --- a/MODULES/HVAC_M7_MODEL/Model_Task.c +++ b/MODULES/HVAC_M7_MODEL/Model_Task.c @@ -660,7 +660,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { getCmdBusADC2Data(env->adc1Task, (CmdBusADC2Data *) &rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB); - uint16_t PBATT_CHECK_16 = (uint16_t) (rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f); + uint16_t PBATT_CHECK_16 = (uint16_t) ((rtDW.ADC_Data_Model.PBATT_CHECK * 33.4375f / 4095.0f) * 10.0); + //конец--------------------------------------------------ВХОД МОДЕЛИ ADC------------------------------------------------ diff --git a/MODULES/HVAC_M7_StatusData/DiagnosticTask.c b/MODULES/HVAC_M7_StatusData/DiagnosticTask.c index 27f0a63..fd09257 100644 --- a/MODULES/HVAC_M7_StatusData/DiagnosticTask.c +++ b/MODULES/HVAC_M7_StatusData/DiagnosticTask.c @@ -151,6 +151,7 @@ void Diagnostic_Init(tDiagnostic *env, tCanSpamReceiver *canSpamReceiver, tLogge env->logger = logger; env->canSpamReceiver = canSpamReceiver; env->access = osMutexNew(NULL); + env->tDiagStart = TDiagStart; // for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) { @@ -357,10 +358,18 @@ setErrorDTC_CAN_VIN(uint8_t *dtc_state_error_model, ccu_candb_error_missing_rx_t extern volatile bool isCan0BusOff; extern volatile uint32_t timeCan0BusOff; +volatile bool isSendingCAN = 0; + static void setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint16_t P_BATT, uint8_t *dtc_state_error_model, ccu_candb_error_missing_rx_t *CAN_ERROR_MISSING, char *VIN, CCU_Errors_t *CCU_Errors) { + if ((P_BATT >= V_SEND_LOW) && (P_BATT <= V_SEND_HIGH)) { + isSendingCAN = true; + } else { + isSendingCAN = false; + } + // uint32_t timeCanSpamReceiver = getCanTimeReceived(env->canSpamReceiver, isCan0BusOff, isT15) + 3000; uint32_t time = SystemGetMs(); @@ -368,7 +377,7 @@ setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint16_t P_BATT, uint8_t *dtc_stat return; } - if ((P_BATT < 9) || (P_BATT > 16)) { + if ((P_BATT < V_DIAG_LOW) || (P_BATT > V_DIAG_HIGH)) { env->tDiagStart = SystemGetMs() + TDiagStart; return; } diff --git a/MODULES/HVAC_M7_StatusData/DiagnosticTask.h b/MODULES/HVAC_M7_StatusData/DiagnosticTask.h index ed34a29..13178d1 100644 --- a/MODULES/HVAC_M7_StatusData/DiagnosticTask.h +++ b/MODULES/HVAC_M7_StatusData/DiagnosticTask.h @@ -13,6 +13,12 @@ #define LOG_DTC 0 +#define V_DIAG_LOW 95 +#define V_DIAG_HIGH 155 + +#define V_SEND_LOW 90 +#define V_SEND_HIGH 150 + #define DTC_TEST_FAILED 1 #define DTC_TEST_CONFIRMED 8 #define DTC_TEST_FAILED_CONFIRMED (DTC_TEST_FAILED | DTC_TEST_CONFIRMED)