Добавлена новая диагностика
This commit is contained in:
parent
6a2a377a73
commit
067e329ef2
|
|
@ -308,7 +308,7 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
|
||||||
env->cmdBusADCData.Reserve_Sensor_Duct_Temp_2 = ADC_Filter_Update(&env->ADC0_Filter_data.Reserve_Sensor_Duct_Temp_2, ADC0_data->Reserve_Sensor_Duct_Temp_2);
|
env->cmdBusADCData.Reserve_Sensor_Duct_Temp_2 = ADC_Filter_Update(&env->ADC0_Filter_data.Reserve_Sensor_Duct_Temp_2, ADC0_data->Reserve_Sensor_Duct_Temp_2);
|
||||||
|
|
||||||
|
|
||||||
|
float ERROR_THRESHOLD_LOW_CODE = ((float)ADC0_data->Sensor_Front_Duct2 * 5.00f / 4095.0f);
|
||||||
|
|
||||||
uint16_t IGN_CHECK_16 = (uint16_t) (((float)env->cmdBusADCData.IGN_ANS * 27.75f / 4095.0f) * 10.0);
|
uint16_t IGN_CHECK_16 = (uint16_t) (((float)env->cmdBusADCData.IGN_ANS * 27.75f / 4095.0f) * 10.0);
|
||||||
|
|
||||||
|
|
@ -570,35 +570,56 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
|
||||||
|
|
||||||
if (env->step > MAX_ADC_FILTER_SIZE * 5) {
|
if (env->step > MAX_ADC_FILTER_SIZE * 5) {
|
||||||
/*
|
/*
|
||||||
LoggerErrorStatic(LOGGER, LOG_SIGN, "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
if ((env->step % 100) == 0) {
|
||||||
|
LoggerErrorStatic(LOGGER, LOG_SIGN,
|
||||||
|
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
|
||||||
|
|
||||||
ANALOG_SENSOR(env, "Sensor_Incar_Temp_FL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_FL, TABLE_INCAR, 20000);
|
ANALOG_SENSOR(env, "Sensor_Incar_Temp_FL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_FL, TABLE_INCAR,
|
||||||
ANALOG_SENSOR(env, "Sensor_Incar_Temp_RL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RL, TABLE_INCAR, 20000);
|
20000);
|
||||||
ANALOG_SENSOR(env, "Sensor_Incar_Temp_FR", rtDW.ADC_Data_Model.Sensor_Incar_Temp_FR, TABLE_INCAR, 20000);
|
ANALOG_SENSOR(env, "Sensor_Incar_Temp_RL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RL, TABLE_INCAR,
|
||||||
ANALOG_SENSOR(env, "Sensor_Incar_Temp_RR", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RR, TABLE_INCAR, 20000);
|
20000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Incar_Temp_FR", rtDW.ADC_Data_Model.Sensor_Incar_Temp_FR, TABLE_INCAR,
|
||||||
|
20000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Incar_Temp_RR", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RR, TABLE_INCAR,
|
||||||
|
20000);
|
||||||
|
|
||||||
LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
|
LoggerErrorStatic(LOGGER, LOG_SIGN,
|
||||||
|
"======================================================================");
|
||||||
|
|
||||||
ANALOG_SENSOR(env, "Sensor_Rear_Evap_Temp", rtDW.ADC_Data_Model.Sensor_Rear_Evap_Temp, TABLE_DUCT, 20000);
|
ANALOG_SENSOR(env, "Sensor_Rear_Evap_Temp", rtDW.ADC_Data_Model.Sensor_Rear_Evap_Temp, TABLE_DUCT,
|
||||||
|
20000);
|
||||||
ANALOG_SENSOR(env, "Sensor_Evap_Temp", rtDW.ADC_Data_Model.Sensor_Evap_Temp, TABLE_DUCT, 20000);
|
ANALOG_SENSOR(env, "Sensor_Evap_Temp", rtDW.ADC_Data_Model.Sensor_Evap_Temp, TABLE_DUCT, 20000);
|
||||||
|
|
||||||
LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
|
LoggerErrorStatic(LOGGER, LOG_SIGN,
|
||||||
ANALOG_SENSOR(env, "Sensor_Rear_Duct1 (dbg_Sen_Duct_RL_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct1, TABLE_DUCT, 3000);
|
"======================================================================");
|
||||||
ANALOG_SENSOR(env, "Sensor_Rear_Duct2 (dbg_Sen_Duct_RR_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct2, TABLE_DUCT, 3000);
|
ANALOG_SENSOR(env, "Sensor_Rear_Duct1 (dbg_Sen_Duct_RL_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct1,
|
||||||
ANALOG_SENSOR(env, "Sensor_Rear_Duct3 (dbg_Sen_Duct_RL_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct3, TABLE_DUCT, 3000);
|
TABLE_DUCT, 3000);
|
||||||
ANALOG_SENSOR(env, "Sensor_Rear_Duct4 (dbg_Sen_Duct_RR_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct4, TABLE_DUCT, 3000);
|
ANALOG_SENSOR(env, "Sensor_Rear_Duct2 (dbg_Sen_Duct_RR_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct2,
|
||||||
|
TABLE_DUCT, 3000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Rear_Duct3 (dbg_Sen_Duct_RL_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct3,
|
||||||
|
TABLE_DUCT, 3000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Rear_Duct4 (dbg_Sen_Duct_RR_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Rear_Duct4,
|
||||||
|
TABLE_DUCT, 3000);
|
||||||
// ANALOG_SENSOR(env, "Sensor_Rear_Duct5", rtDW.ADC_Data_Model.Sensor_Rear_Duct5, TABLE_DUCT, 3000);
|
// ANALOG_SENSOR(env, "Sensor_Rear_Duct5", rtDW.ADC_Data_Model.Sensor_Rear_Duct5, TABLE_DUCT, 3000);
|
||||||
// ANALOG_SENSOR(env, "Sensor_Rear_Duct6", rtDW.ADC_Data_Model.Sensor_Rear_Duct6, TABLE_DUCT, 3000);
|
// ANALOG_SENSOR(env, "Sensor_Rear_Duct6", rtDW.ADC_Data_Model.Sensor_Rear_Duct6, TABLE_DUCT, 3000);
|
||||||
LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
|
LoggerErrorStatic(LOGGER, LOG_SIGN,
|
||||||
ANALOG_SENSOR(env, "Sensor_Front_Duct1 (dbg_Sen_Duct_FL_Upper_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct1, TABLE_DUCT, 3000);
|
"======================================================================");
|
||||||
ANALOG_SENSOR(env, "Sensor_Front_Duct2 (dbg_Sen_Duct_FR_Upper_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct2, TABLE_DUCT, 3000);
|
ANALOG_SENSOR(env, "Sensor_Front_Duct1 (dbg_Sen_Duct_FL_Upper_Fb)",
|
||||||
ANALOG_SENSOR(env, "Sensor_Front_Duct3 (dbg_Sen_Duct_FL_Lower_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct3, TABLE_DUCT, 3000);
|
rtDW.ADC_Data_Model.Sensor_Front_Duct1, TABLE_DUCT, 3000);
|
||||||
ANALOG_SENSOR(env, "Sensor_Front_Duct4 (dbg_Sen_Duct_FR_Lower_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct4, TABLE_DUCT, 3000);
|
ANALOG_SENSOR(env, "Sensor_Front_Duct2 (dbg_Sen_Duct_FR_Upper_Fb)",
|
||||||
ANALOG_SENSOR(env, "Sensor_Front_Duct5 (dbg_Sen_Duct_FL_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct5, TABLE_DUCT, 3000);
|
rtDW.ADC_Data_Model.Sensor_Front_Duct2, TABLE_DUCT, 3000);
|
||||||
ANALOG_SENSOR(env, "Sensor_Front_Duct6 (dbg_Sen_Duct_FR_Side_Fb)", rtDW.ADC_Data_Model.Sensor_Front_Duct6, TABLE_DUCT, 3000);
|
ANALOG_SENSOR(env, "Sensor_Front_Duct3 (dbg_Sen_Duct_FL_Lower_Fb)",
|
||||||
LoggerErrorStatic(LOGGER, LOG_SIGN, "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
|
rtDW.ADC_Data_Model.Sensor_Front_Duct3, TABLE_DUCT, 3000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Front_Duct4 (dbg_Sen_Duct_FR_Lower_Fb)",
|
||||||
|
rtDW.ADC_Data_Model.Sensor_Front_Duct4, TABLE_DUCT, 3000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Front_Duct5 (dbg_Sen_Duct_FL_Side_Fb)",
|
||||||
|
rtDW.ADC_Data_Model.Sensor_Front_Duct5, TABLE_DUCT, 3000);
|
||||||
|
ANALOG_SENSOR(env, "Sensor_Front_Duct6 (dbg_Sen_Duct_FR_Side_Fb)",
|
||||||
|
rtDW.ADC_Data_Model.Sensor_Front_Duct6, TABLE_DUCT, 3000);
|
||||||
|
LoggerErrorStatic(LOGGER, LOG_SIGN,
|
||||||
|
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
|
||||||
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
uint32_t countQueueCmdBusADCData = osMessageQueueGetSpace(env->queueCmdBusADCData);
|
uint32_t countQueueCmdBusADCData = osMessageQueueGetSpace(env->queueCmdBusADCData);
|
||||||
|
|
||||||
if (countQueueCmdBusADCData) {
|
if (countQueueCmdBusADCData) {
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,8 @@ void Mma_Init(
|
||||||
env->pwms = pwms;
|
env->pwms = pwms;
|
||||||
|
|
||||||
env->thread.stack = tMma_stack;
|
env->thread.stack = tMma_stack;
|
||||||
InitThreadAtr(&env->thread.attr,"Mma",&env->thread.controlBlock,sizeof(env->thread.controlBlock),env->thread.stack,tMma_stack_size,osPriorityNormal);
|
InitThreadAtr(&env->thread.attr, "Mma", &env->thread.controlBlock, sizeof(env->thread.controlBlock),
|
||||||
|
env->thread.stack, tMma_stack_size, osPriorityNormal);
|
||||||
env->thread.id = 0;
|
env->thread.id = 0;
|
||||||
|
|
||||||
// InitThreadAtrStatic(&env->thread.attr, "Mma", env->thread.controlBlock, env->thread.stack, osPriorityNormal);
|
// InitThreadAtrStatic(&env->thread.attr, "Mma", env->thread.controlBlock, env->thread.stack, osPriorityNormal);
|
||||||
|
|
@ -42,7 +43,6 @@ void Mma_Init(
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void GetCanErrors(tMma *env, uint8_t canIndex) {
|
void GetCanErrors(tMma *env, uint8_t canIndex) {
|
||||||
FLEXCAN_ErrorInfoType errorInfo;
|
FLEXCAN_ErrorInfoType errorInfo;
|
||||||
|
|
||||||
|
|
@ -99,6 +99,18 @@ static _Noreturn void Mma_Thread(tMma *env) {
|
||||||
countQueue_space = osMessageQueueGetSpace(env->adcTask0.queueCmdBusADCData);
|
countQueue_space = osMessageQueueGetSpace(env->adcTask0.queueCmdBusADCData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Diagnostic_Init(&env->Diagnostic, &env->ModelTask.ccu_candb_tx.CCU_Errors,
|
||||||
|
env->ModelTask.dtc_state_error,
|
||||||
|
env->ModelTask.GET_HVAC_VIN,
|
||||||
|
&env->ModelTask.CAN_ERROR_MISSING,
|
||||||
|
&env->ModelTask.CAN_TIME_MISSING,
|
||||||
|
env->ModelTask.LIN1_ERROR_MISSING,
|
||||||
|
env->ModelTask.LIN2_ERROR_MISSING,
|
||||||
|
env->ModelTask.LIN3_ERROR_MISSING,
|
||||||
|
env->ModelTask.LIN4_ERROR_MISSING,
|
||||||
|
env->ModelTask.LIN5_ERROR_MISSING, &env->canSpamReceiver, &env->slog.logger);
|
||||||
|
|
||||||
ModelTask_StartThread(&env->ModelTask);
|
ModelTask_StartThread(&env->ModelTask);
|
||||||
|
|
||||||
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the model to run...")
|
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the model to run...")
|
||||||
|
|
|
||||||
|
|
@ -265,8 +265,6 @@ static void Mma_InitSubSystems(tMma *env) {
|
||||||
&env->slog.logger);
|
&env->slog.logger);
|
||||||
CanSpamDebugTransmitter_StartThread(&env->canSpamDebugTransmitter);
|
CanSpamDebugTransmitter_StartThread(&env->canSpamDebugTransmitter);
|
||||||
|
|
||||||
Diagnostic_Init(&env->Diagnostic, &env->canSpamReceiver, &env->slog.logger);
|
|
||||||
|
|
||||||
tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler);
|
tLinData *linData4 = Lin4_Init(GetLin123CallbackHandler);
|
||||||
Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger);
|
Lin_4_Init(&env->linTaskSensor4, linData4, &env->linPorts->lin4_Io, &env->slog.logger);
|
||||||
Lin4_StartThread(&env->linTaskSensor4);
|
Lin4_StartThread(&env->linTaskSensor4);
|
||||||
|
|
|
||||||
|
|
@ -1046,9 +1046,11 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
|
||||||
if (env->is_Global_Soft_T15) {
|
if (env->is_Global_Soft_T15) {
|
||||||
memcpy(env->dtc_state_error, rtY.dtc_state_error_model, sizeof(env->dtc_state_error));
|
memcpy(env->dtc_state_error, rtY.dtc_state_error_model, sizeof(env->dtc_state_error));
|
||||||
|
|
||||||
|
env->diagnostic->state.now_ms = SystemGetMs();
|
||||||
env->diagnostic->state.isT15 = env->is_Global_Soft_T15;
|
env->diagnostic->state.isT15 = env->is_Global_Soft_T15;
|
||||||
env->diagnostic->state.isT30d = env->is_Global_Soft_T30d;
|
env->diagnostic->state.isT30d = env->is_Global_Soft_T30d;
|
||||||
env->diagnostic->state.P_BATT = PBATT_CHECK_16;
|
env->diagnostic->state.P_BATT = PBATT_CHECK_16;
|
||||||
|
|
||||||
env->diagnostic->state.CCU_Errors = &env->ccu_candb_tx.CCU_Errors;
|
env->diagnostic->state.CCU_Errors = &env->ccu_candb_tx.CCU_Errors;
|
||||||
env->diagnostic->state.dtc_state_error_model = env->dtc_state_error;
|
env->diagnostic->state.dtc_state_error_model = env->dtc_state_error;
|
||||||
env->diagnostic->state.VIN = env->GET_HVAC_VIN;
|
env->diagnostic->state.VIN = env->GET_HVAC_VIN;
|
||||||
|
|
|
||||||
|
|
@ -146,7 +146,17 @@ const char *DTC_Error_Code_Strings[COUNT_DTC_CODE_ERROR] = {
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void Diagnostic_Init(tDiagnostic *env, tCanSpamReceiver *canSpamReceiver, tLoggerInterface *logger) {
|
void Diagnostic_Init(tDiagnostic *env,
|
||||||
|
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,
|
||||||
|
uint8_t *LIN4_ERROR_MISSING,
|
||||||
|
uint8_t *LIN5_ERROR_MISSING, tCanSpamReceiver *canSpamReceiver, tLoggerInterface *logger) {
|
||||||
|
|
||||||
env->logger = logger;
|
env->logger = logger;
|
||||||
env->canSpamReceiver = canSpamReceiver;
|
env->canSpamReceiver = canSpamReceiver;
|
||||||
|
|
@ -154,6 +164,18 @@ void Diagnostic_Init(tDiagnostic *env, tCanSpamReceiver *canSpamReceiver, tLogge
|
||||||
env->tDiagStart = TDiagStart;
|
env->tDiagStart = TDiagStart;
|
||||||
|
|
||||||
|
|
||||||
|
env->state.CCU_Errors = CCU_Errors;
|
||||||
|
env->state.dtc_state_error_model = dtc_state_error;
|
||||||
|
env->state.VIN = VIN;
|
||||||
|
env->state.CAN_ERROR_MISSING = CAN_ERROR_MISSING;
|
||||||
|
env->state.CAN_TIME_MISSING = CAN_TIME_MISSING;
|
||||||
|
env->state.LIN1_ERROR_MISSING = LIN1_ERROR_MISSING;
|
||||||
|
env->state.LIN2_ERROR_MISSING = LIN2_ERROR_MISSING;
|
||||||
|
env->state.LIN3_ERROR_MISSING = LIN3_ERROR_MISSING;
|
||||||
|
env->state.LIN4_ERROR_MISSING = LIN4_ERROR_MISSING;
|
||||||
|
env->state.LIN5_ERROR_MISSING = LIN5_ERROR_MISSING;
|
||||||
|
|
||||||
|
|
||||||
// for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
// for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
||||||
|
|
||||||
// Тест DTC не был выполнен в текущем цикле работы
|
// Тест DTC не был выполнен в текущем цикле работы
|
||||||
|
|
@ -474,6 +496,38 @@ setErrorDTC_CAN(tDiagnostic *env) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static bool dtcDebounce(DtcDebounce *d, bool cond, uint32_t now_ms)
|
||||||
|
{
|
||||||
|
if (!cond) {
|
||||||
|
d->active = false;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (!d->active) {
|
||||||
|
d->active = true;
|
||||||
|
d->since_ms = now_ms;
|
||||||
|
return false; // в этом цикле 0 мс
|
||||||
|
}
|
||||||
|
return (uint32_t)(now_ms - d->since_ms) >= DTC_CONFIRM_DELAY_MS;
|
||||||
|
}
|
||||||
|
|
||||||
|
// raw == 0 -> ошибки нет, пишем 0, таймер сбрасывается
|
||||||
|
// raw != 0, <4 c -> пишем raw (pending, как раньше)
|
||||||
|
// raw != 0, >=4 c непрерыв -> пишем DTC_TEST_FAILED_CONFIRMED
|
||||||
|
|
||||||
|
static void setDtcWithDebounce(tDiagnostic *env, uint8_t index, uint8_t raw,
|
||||||
|
DtcDebounce *d, uint32_t now_ms) {
|
||||||
|
if (raw > 0) {
|
||||||
|
env->state.dtc_state_error_model[index] = dtc_state_error[index] | DTC_TEST_FAILED;
|
||||||
|
} else {
|
||||||
|
env->state.dtc_state_error_model[index] = dtc_state_error[index] & (~(DTC_TEST_FAILED));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dtcDebounce(d, raw != 0, now_ms)) {
|
||||||
|
env->state.dtc_state_error_model[index] = DTC_TEST_FAILED_CONFIRMED;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
setErrorDTC_LIN(tDiagnostic *env) {
|
setErrorDTC_LIN(tDiagnostic *env) {
|
||||||
|
|
||||||
|
|
@ -536,21 +590,56 @@ setErrorDTC_LIN(tDiagnostic *env) {
|
||||||
} else {
|
} else {
|
||||||
env->state.dtc_state_error_model[DTC_AROMA_CONFIG_INVALID] = dtc_state_error[DTC_AROMA_CONFIG_INVALID] & (~(DTC_TEST_FAILED));
|
env->state.dtc_state_error_model[DTC_AROMA_CONFIG_INVALID] = dtc_state_error[DTC_AROMA_CONFIG_INVALID] & (~(DTC_TEST_FAILED));
|
||||||
|
|
||||||
env->state.dtc_state_error_model[DTC_AROMATIZATION_OPEN] = env->state.d_DTC_AROMATIZATION_OPEN;
|
setDtcWithDebounce(env, DTC_AROMATIZATION_OPEN,
|
||||||
env->state.dtc_state_error_model[DTC_AROMATIZATION_SHORT_GND] = env->state.d_DTC_AROMATIZATION_SHORT_GND;
|
env->state.d_DTC_AROMATIZATION_OPEN,
|
||||||
env->state.dtc_state_error_model[DTC_AROMATIZATION_MALFUNCTION] = env->state.d_DTC_AROMATIZATION_MALFUNCTION;
|
&env->state.dtc_aux_debounce[DEB_AROMA_OPEN], env->state.now_ms);
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_AROMATIZATION_SHORT_GND,
|
||||||
|
env->state.d_DTC_AROMATIZATION_SHORT_GND,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_AROMA_SHORT_GND], env->state.now_ms);
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_AROMATIZATION_MALFUNCTION,
|
||||||
|
env->state.d_DTC_AROMATIZATION_MALFUNCTION,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_AROMA_MALFUNCTION], env->state.now_ms);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
env->state.dtc_state_error_model[DTC_IONIZER_OPEN] = env->state.d_DTC_IONIZER_OPEN;
|
|
||||||
env->state.dtc_state_error_model[DTC_IONIZER_SHORT_GND] = env->state.d_DTC_IONIZER_SHORT_GND;
|
|
||||||
env->state.dtc_state_error_model[DTC_IONIZER_MALFUNCTION] = env->state.d_DTC_IONIZER_MALFUNCTION;
|
|
||||||
|
|
||||||
env->state.dtc_state_error_model[DTC_AIR_QUALITY_SENSOR_OPEN] = env->state.d_DTC_AIR_QUALITY_SENSOR_OPEN;
|
setDtcWithDebounce(env, DTC_IONIZER_OPEN,
|
||||||
env->state.dtc_state_error_model[DTC_AIR_QUALITY_SENSOR_SHORT_GND] = env->state.d_DTC_AIR_QUALITY_SENSOR_SHORT_GND;
|
env->state.d_DTC_IONIZER_OPEN,
|
||||||
env->state.dtc_state_error_model[DTC_AIR_QUALITY_SENSOR_MALFUNCTION] = env->state.d_DTC_AIR_QUALITY_SENSOR_MALFUNCTION;
|
&env->state.dtc_aux_debounce[DEB_IONIZER_OPEN], env->state.now_ms);
|
||||||
|
|
||||||
env->state.dtc_state_error_model[DTC_DRS_FRONT_ZONE_MALFUNCTION] = env->state.d_DTC_DRS_FRONT_ZONE_MALFUNCTION;
|
setDtcWithDebounce(env, DTC_IONIZER_SHORT_GND,
|
||||||
env->state.dtc_state_error_model[DTC_DRS_REAR_ZONE_MALFUNCTION] = env->state.d_DTC_DRS_REAR_ZONE_MALFUNCTION;
|
env->state.d_DTC_IONIZER_SHORT_GND,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_IONIZER_SHORT_GND], env->state.now_ms);
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_IONIZER_MALFUNCTION,
|
||||||
|
env->state.d_DTC_IONIZER_MALFUNCTION,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_IONIZER_MALFUNCTION], env->state.now_ms);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_AIR_QUALITY_SENSOR_OPEN,
|
||||||
|
env->state.d_DTC_AIR_QUALITY_SENSOR_OPEN,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_AQS_OPEN], env->state.now_ms);
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_AIR_QUALITY_SENSOR_SHORT_GND,
|
||||||
|
env->state.d_DTC_AIR_QUALITY_SENSOR_SHORT_GND,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_AQS_SHORT_GND], env->state.now_ms);
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_AIR_QUALITY_SENSOR_MALFUNCTION,
|
||||||
|
env->state.d_DTC_AIR_QUALITY_SENSOR_MALFUNCTION,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_AQS_MALFUNCTION], env->state.now_ms);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_DRS_FRONT_ZONE_MALFUNCTION,
|
||||||
|
env->state.d_DTC_DRS_FRONT_ZONE_MALFUNCTION,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_DRS_FRONT_ZONE], env->state.now_ms);
|
||||||
|
|
||||||
|
setDtcWithDebounce(env, DTC_DRS_REAR_ZONE_MALFUNCTION,
|
||||||
|
env->state.d_DTC_DRS_REAR_ZONE_MALFUNCTION,
|
||||||
|
&env->state.dtc_aux_debounce[DEB_DRS_REAR_ZONE], env->state.now_ms);
|
||||||
|
|
||||||
// Только в электричке
|
// Только в электричке
|
||||||
env->state.dtc_state_error_model[DTC_LOST_COMM_FRONT_TXV] = 0;
|
env->state.dtc_state_error_model[DTC_LOST_COMM_FRONT_TXV] = 0;
|
||||||
|
|
@ -574,7 +663,7 @@ void set_Dtc_state(tDiagnostic *env) {
|
||||||
osMutexRelease(env->access);
|
osMutexRelease(env->access);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
||||||
if (env->state.dtc_state_error_model[i]) {
|
if (env->state.dtc_state_error_model[i]) {
|
||||||
env->state.dtc_state_error_model[i] = DTC_TEST_FAILED_CONFIRMED;
|
env->state.dtc_state_error_model[i] = DTC_TEST_FAILED_CONFIRMED;
|
||||||
|
|
@ -582,12 +671,16 @@ void set_Dtc_state(tDiagnostic *env) {
|
||||||
env->state.dtc_state_error_model[i] = dtc_state_error[i] & (~(DTC_TEST_FAILED));
|
env->state.dtc_state_error_model[i] = dtc_state_error[i] & (~(DTC_TEST_FAILED));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
setErrorDTC_LIN(env);
|
setErrorDTC_LIN(env);
|
||||||
|
|
||||||
// Если не было изначально сообщений
|
|
||||||
setErrorDTC_CAN(env);
|
setErrorDTC_CAN(env);
|
||||||
|
/*
|
||||||
|
for (uint8_t i = 0; i < COUNT_DTC_CODE_ERROR; ++i) {
|
||||||
|
if (env->state.dtc_state_error_model[i] & DTC_TEST_CONFIRMED) {
|
||||||
|
env->state.dtc_state_error_model[i] = dtc_state_error[i] & (~(DTC_TEST_FAILED));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
if (memcmp(dtc_state_error, env->state.dtc_state_error_model, sizeof(dtc_state_error)) != 0) {
|
if (memcmp(dtc_state_error, env->state.dtc_state_error_model, sizeof(dtc_state_error)) != 0) {
|
||||||
|
|
||||||
bool isDTC_FileWrite = false;
|
bool isDTC_FileWrite = false;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
#include "CanSpamReceiver.h"
|
#include "CanSpamReceiver.h"
|
||||||
#include "lfs.h"
|
#include "lfs.h"
|
||||||
|
|
||||||
#define LOG_DTC 0
|
#define LOG_DTC 1
|
||||||
|
|
||||||
#define V_DIAG_LOW 95
|
#define V_DIAG_LOW 95
|
||||||
#define V_DIAG_HIGH 155
|
#define V_DIAG_HIGH 155
|
||||||
|
|
@ -25,6 +25,29 @@
|
||||||
|
|
||||||
#define TDiagStart 500
|
#define TDiagStart 500
|
||||||
|
|
||||||
|
|
||||||
|
#define DTC_CONFIRM_DELAY_MS 4000u
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
uint32_t since_ms; /* момент первого срабатывания */
|
||||||
|
bool active; /* условие активно */
|
||||||
|
} DtcDebounce;
|
||||||
|
|
||||||
|
enum {
|
||||||
|
DEB_IONIZER_OPEN = 0,
|
||||||
|
DEB_IONIZER_SHORT_GND,
|
||||||
|
DEB_IONIZER_MALFUNCTION,
|
||||||
|
DEB_AQS_OPEN,
|
||||||
|
DEB_AQS_SHORT_GND,
|
||||||
|
DEB_AQS_MALFUNCTION,
|
||||||
|
DEB_DRS_FRONT_ZONE,
|
||||||
|
DEB_DRS_REAR_ZONE,
|
||||||
|
DEB_AROMA_OPEN,
|
||||||
|
DEB_AROMA_SHORT_GND,
|
||||||
|
DEB_AROMA_MALFUNCTION,
|
||||||
|
DEB_COUNT
|
||||||
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint8_t mask;
|
uint8_t mask;
|
||||||
uint8_t *dataResponse;
|
uint8_t *dataResponse;
|
||||||
|
|
@ -39,9 +62,12 @@ typedef struct {
|
||||||
bool isCleanDTC;
|
bool isCleanDTC;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
uint32_t now_ms;
|
||||||
|
|
||||||
bool isT15;
|
bool isT15;
|
||||||
bool isT30d;
|
bool isT30d;
|
||||||
uint16_t P_BATT;
|
volatile uint16_t P_BATT;
|
||||||
|
|
||||||
CCU_Errors_t *CCU_Errors;
|
CCU_Errors_t *CCU_Errors;
|
||||||
uint8_t *dtc_state_error_model;
|
uint8_t *dtc_state_error_model;
|
||||||
char *VIN;
|
char *VIN;
|
||||||
|
|
@ -53,31 +79,49 @@ typedef struct {
|
||||||
uint8_t *LIN4_ERROR_MISSING;
|
uint8_t *LIN4_ERROR_MISSING;
|
||||||
uint8_t *LIN5_ERROR_MISSING;
|
uint8_t *LIN5_ERROR_MISSING;
|
||||||
|
|
||||||
uint8_t d_DTC_AROMATIZATION_OPEN;
|
DtcDebounce dtc_aux_debounce[DEB_COUNT];
|
||||||
uint8_t d_DTC_AROMATIZATION_SHORT_GND;
|
|
||||||
uint8_t d_DTC_AROMATIZATION_MALFUNCTION;
|
|
||||||
|
|
||||||
uint8_t d_DTC_AIR_QUALITY_SENSOR_OPEN;
|
volatile uint8_t d_DTC_AROMATIZATION_OPEN;
|
||||||
uint8_t d_DTC_AIR_QUALITY_SENSOR_SHORT_GND;
|
volatile uint8_t d_DTC_AROMATIZATION_SHORT_GND;
|
||||||
uint8_t d_DTC_AIR_QUALITY_SENSOR_MALFUNCTION;
|
volatile uint8_t d_DTC_AROMATIZATION_MALFUNCTION;
|
||||||
|
|
||||||
uint8_t d_DTC_IONIZER_OPEN;
|
volatile uint8_t d_DTC_AIR_QUALITY_SENSOR_OPEN;
|
||||||
uint8_t d_DTC_IONIZER_SHORT_GND;
|
volatile uint8_t d_DTC_AIR_QUALITY_SENSOR_SHORT_GND;
|
||||||
uint8_t d_DTC_IONIZER_MALFUNCTION;
|
volatile uint8_t d_DTC_AIR_QUALITY_SENSOR_MALFUNCTION;
|
||||||
|
|
||||||
uint8_t d_DTC_DRS_FRONT_ZONE_MALFUNCTION;
|
volatile uint8_t d_DTC_IONIZER_OPEN;
|
||||||
uint8_t d_DTC_DRS_REAR_ZONE_MALFUNCTION;
|
volatile uint8_t d_DTC_IONIZER_SHORT_GND;
|
||||||
|
volatile uint8_t d_DTC_IONIZER_MALFUNCTION;
|
||||||
|
|
||||||
|
volatile uint8_t d_DTC_DRS_FRONT_ZONE_MALFUNCTION;
|
||||||
|
volatile uint8_t d_DTC_DRS_REAR_ZONE_MALFUNCTION;
|
||||||
|
|
||||||
} state;
|
} state;
|
||||||
|
|
||||||
} tDiagnostic;
|
} tDiagnostic;
|
||||||
|
|
||||||
void Diagnostic_Init(tDiagnostic *env, tCanSpamReceiver *canSpamReceiver, tLoggerInterface *logger);
|
void Diagnostic_Init(tDiagnostic *env,
|
||||||
|
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,
|
||||||
|
uint8_t *LIN4_ERROR_MISSING,
|
||||||
|
uint8_t *LIN5_ERROR_MISSING, tCanSpamReceiver *canSpamReceiver, tLoggerInterface *logger);
|
||||||
|
|
||||||
void set_NoBitsDTC(tDiagnostic *env, bool noBitsDTC);
|
void set_NoBitsDTC(tDiagnostic *env, bool noBitsDTC);
|
||||||
|
|
||||||
void set_Dtc_state(tDiagnostic *env);
|
void set_Dtc_state(tDiagnostic *env);
|
||||||
|
|
||||||
uint32_t diagnostic_ClearDiagnosticInformation_14(tDiagnostic *env);
|
uint32_t diagnostic_ClearDiagnosticInformation_14(tDiagnostic *env);
|
||||||
|
|
||||||
uint32_t diagnostic_UDS_ReadDTCInformation_19_count(tDiagnostic *env, tDiagnosticDTC *diagnosticDTC);
|
uint32_t diagnostic_UDS_ReadDTCInformation_19_count(tDiagnostic *env, tDiagnosticDTC *diagnosticDTC);
|
||||||
|
|
||||||
uint32_t diagnostic_UDS_ReadDTCInformation_19_dtc(tDiagnostic *env, tDiagnosticDTC *diagnosticDTC);
|
uint32_t diagnostic_UDS_ReadDTCInformation_19_dtc(tDiagnostic *env, tDiagnosticDTC *diagnosticDTC);
|
||||||
|
|
||||||
uint32_t diagnostic_UDS_ReadDTCSupportDTC_19_dtc(tDiagnostic *env, tDiagnosticDTC *diagnosticDTC);
|
uint32_t diagnostic_UDS_ReadDTCSupportDTC_19_dtc(tDiagnostic *env, tDiagnosticDTC *diagnosticDTC);
|
||||||
|
|
||||||
#endif //HVAC_M7_DIAGNOSTICTASK_H
|
#endif //HVAC_M7_DIAGNOSTICTASK_H
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue