diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h index e30b01c..bb68d44 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h @@ -24,10 +24,10 @@ #define dbg_Info_Act1_SEND 0 #define dbg_Info_Act2_SEND 0 #define dbg_LIN_AirQS_Stat_SEND 1 -#define dbg_LIN_Aroma_Stat_SEND 0 +#define dbg_LIN_Aroma_Stat_SEND 1 #define dbg_LIN_DRS_Stat_SEND 0 #define dbg_LIN_eTXV_Stat_SEND 0 -#define dbg_LIN_Ionizer_Stat_SEND 0 +#define dbg_LIN_Ionizer_Stat_SEND 1 #define dbg_Logic_Ac_SEND 1 #define dbg_Logic_Blower_SEND 1 #define dbg_Logic_KM_Status_SEND 0 diff --git a/MODULES/HVAC_M7_MODEL/Model_Task.c b/MODULES/HVAC_M7_MODEL/Model_Task.c index cc9a753..9fea793 100644 --- a/MODULES/HVAC_M7_MODEL/Model_Task.c +++ b/MODULES/HVAC_M7_MODEL/Model_Task.c @@ -659,6 +659,8 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { getCmdBusADCData(env->adc0Task, &rtDW.ADC_Data_Model); 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); //конец--------------------------------------------------ВХОД МОДЕЛИ ADC------------------------------------------------ @@ -903,7 +905,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { //==============================================DTC=============================================================================================== //==============================================DTC=============================================================================================== - set_Dtc_state(env->diagnostic, isT15, &env->ccu_candb_tx.CCU_Errors, env->dtc_state_error, + set_Dtc_state(env->diagnostic, isT15, PBATT_CHECK_16, &env->ccu_candb_tx.CCU_Errors, env->dtc_state_error, env->GET_HVAC_VIN, &env->CAN_ERROR_MISSING, &env->CAN_TIME_MISSING, env->LIN1_ERROR_MISSING, env->LIN2_ERROR_MISSING, env->LIN3_ERROR_MISSING, env->LIN4_ERROR_MISSING, env->LIN5_ERROR_MISSING); @@ -994,6 +996,10 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { memcpy(&env->ccu_candb_dbg_tx.dbg_Drs, &rtY.dbg_Drs_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_Drs)); memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_AirQS_Stat, &rtY.dbg_LIN_AirQS_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_Logic_Valve)); + memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat, &rtY.dbg_LIN_Ionizer_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Ionizer_Stat)); + memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat, &rtY.dbg_LIN_Aroma_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat)); + + //конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ CAN------------------------------------------- //начало--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ Lin4----------------------------------------- diff --git a/MODULES/HVAC_M7_StatusData/DiagnosticTask.c b/MODULES/HVAC_M7_StatusData/DiagnosticTask.c index a9c3caf..27f0a63 100644 --- a/MODULES/HVAC_M7_StatusData/DiagnosticTask.c +++ b/MODULES/HVAC_M7_StatusData/DiagnosticTask.c @@ -358,12 +358,21 @@ extern volatile bool isCan0BusOff; extern volatile uint32_t timeCan0BusOff; static void -setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint8_t *dtc_state_error_model, ccu_candb_error_missing_rx_t *CAN_ERROR_MISSING, char *VIN, +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) { // uint32_t timeCanSpamReceiver = getCanTimeReceived(env->canSpamReceiver, isCan0BusOff, isT15) + 3000; uint32_t time = SystemGetMs(); + if (env->tDiagStart > time) { + return; + } + + if ((P_BATT < 9) || (P_BATT > 16)) { + env->tDiagStart = SystemGetMs() + TDiagStart; + return; + } + if (isCan0BusOff) { if (time < timeCan0BusOff) { dtc_state_error_model[DTC_BODY_CAN_BUS_OFF] = DTC_TEST_FAILED_CONFIRMED; @@ -371,23 +380,16 @@ setErrorDTC_CAN(tDiagnostic *env, bool isT15, uint8_t *dtc_state_error_model, cc dtc_state_error_model[DTC_BODY_CAN_BUS_OFF] = dtc_state_error[DTC_BODY_CAN_BUS_OFF] & (~(DTC_TEST_FAILED)); } - env->tDiagStart = 0; + env->tDiagStart = SystemGetMs() + TDiagStart; return; } if (isT15 == false) { - env->tDiagStart = 0; - return; - } - - if (env->tDiagStart == 0) { env->tDiagStart = SystemGetMs() + TDiagStart; - } - - if (env->tDiagStart > time) { return; } + setErrorDTC_CAN_VIN(dtc_state_error_model, CAN_ERROR_MISSING, VIN, CCU_Errors); // U010087 (EMS/VCU) - 0x298 OR 0x150 OR 0x153 - OK @@ -523,7 +525,7 @@ setErrorDTC_LIN(uint8_t *dtc_state_error_model, const uint8_t *LIN1_ERROR_MISSIN } -void set_Dtc_state(tDiagnostic *env, bool isT15, CCU_Errors_t *CCU_Errors, +void set_Dtc_state(tDiagnostic *env, bool isT15, uint16_t P_BATT, CCU_Errors_t *CCU_Errors, uint8_t *dtc_state_error_model, char *VIN, ccu_candb_error_missing_rx_t *CAN_ERROR_MISSING, ccu_candb_time_missing_rx_t *CAN_TIME_MISSING, uint8_t *LIN1_ERROR_MISSING, uint8_t *LIN2_ERROR_MISSING, uint8_t *LIN3_ERROR_MISSING, @@ -554,7 +556,7 @@ void set_Dtc_state(tDiagnostic *env, bool isT15, CCU_Errors_t *CCU_Errors, LIN4_ERROR_MISSING, LIN5_ERROR_MISSING); // Если не было изначально сообщений - setErrorDTC_CAN(env, isT15, dtc_state_error_model, CAN_ERROR_MISSING, VIN, CCU_Errors); + setErrorDTC_CAN(env, isT15, P_BATT, dtc_state_error_model, CAN_ERROR_MISSING, VIN, CCU_Errors); // if () { // dtc_state_error_model[DTC_REAR_HVAC_AROMA_CONFIG_INVALID] = DTC_TEST_FAILED_CONFIRMED; diff --git a/MODULES/HVAC_M7_StatusData/DiagnosticTask.h b/MODULES/HVAC_M7_StatusData/DiagnosticTask.h index 405a443..ed34a29 100644 --- a/MODULES/HVAC_M7_StatusData/DiagnosticTask.h +++ b/MODULES/HVAC_M7_StatusData/DiagnosticTask.h @@ -11,13 +11,13 @@ #include "CanSpamReceiver.h" #include "lfs.h" -#define LOG_DTC 1 +#define LOG_DTC 0 #define DTC_TEST_FAILED 1 #define DTC_TEST_CONFIRMED 8 #define DTC_TEST_FAILED_CONFIRMED (DTC_TEST_FAILED | DTC_TEST_CONFIRMED) -#define TDiagStart 500 +#define TDiagStart 750 typedef struct { uint8_t mask; @@ -40,7 +40,7 @@ typedef struct { void Diagnostic_Init(tDiagnostic *env, tCanSpamReceiver *canSpamReceiver, tLoggerInterface *logger); void set_NoBitsDTC(tDiagnostic *env, bool noBitsDTC); -void set_Dtc_state(tDiagnostic *env, bool isT15, CCU_Errors_t *CCU_Errors, +void set_Dtc_state(tDiagnostic *env, bool isT15, uint16_t P_BATT, CCU_Errors_t *CCU_Errors, uint8_t *dtc_state_error_model, char *VIN, ccu_candb_error_missing_rx_t *CAN_ERROR_MISSLE, ccu_candb_time_missing_rx_t *CAN_TIME_MISSLE, uint8_t *LIN1_ERROR_MISSING, uint8_t *LIN2_ERROR_MISSING, uint8_t *LIN3_ERROR_MISSING, diff --git a/WORK/HVAC_CALIB.bin b/WORK/HVAC_CALIB.bin index ca30cb2..c23ce97 100644 Binary files a/WORK/HVAC_CALIB.bin and b/WORK/HVAC_CALIB.bin differ diff --git a/WORK/HVAC_M7.bin b/WORK/HVAC_M7.bin index ac66700..f57c85e 100755 Binary files a/WORK/HVAC_M7.bin and b/WORK/HVAC_M7.bin differ diff --git a/WORK/HVAC_MAIN.bin b/WORK/HVAC_MAIN.bin index 433a031..6319d85 100644 Binary files a/WORK/HVAC_MAIN.bin and b/WORK/HVAC_MAIN.bin differ