Исправлено ожидание ADC

This commit is contained in:
cfif 2026-11-02 16:11:52 +03:00
parent 405570d784
commit a051402567
2 changed files with 65 additions and 27 deletions

View File

@ -190,7 +190,7 @@ float calculate_ntc_resistance(uint16_t adc_value,
void ANALOG_SENSOR(tAdc0Task *env, char *desc, uint16_t adc_value, eNtcTable NtcTable, float R) {
float ERROR_THRESHOLD_HIGH_V = 4.9f;
float ERROR_THRESHOLD_LOW_V = 0.1f;
float ERROR_THRESHOLD_LOW_V = 0.01f;
uint16_t ERROR_THRESHOLD_HIGH_CODE = (uint16_t) (ERROR_THRESHOLD_HIGH_V * 4095.0f / 4.96f);
uint16_t ERROR_THRESHOLD_LOW_CODE = (uint16_t) (ERROR_THRESHOLD_LOW_V * 4095.0f / 4.96f);
@ -455,8 +455,9 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
ANALOG_SENSOR(env, "Sensor_Ambient_Temp", rtDW.ADC_Data_Model.Sensor_Ambient_Temp, TABLE_AMBIENT, 20000);
ANALOG_SENSOR(env, "Sensor_AC_Pressure", rtDW.ADC_Data_Model.Sensor_AC_Pressure, TABLE_NONE, 0);
LoggerErrorStatic(LOGGER, LOG_SIGN, "======================================================================");
*/
/*
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_RL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RL, TABLE_INCAR, 20000);
@ -482,7 +483,7 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
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, "======================================================================");
LoggerErrorStatic(LOGGER, LOG_SIGN, "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
*/
@ -560,28 +561,52 @@ static _Noreturn void Adc0_Thread(tAdc0Task *env) {
// osMutexRelease(env->modelTaskAccess);
// } else {
// LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error Adc0_Thread");
// }
++env->step;
if (env->step > MAX_ADC_FILTER_SIZE * 5) {
/*
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_RL", rtDW.ADC_Data_Model.Sensor_Incar_Temp_RL, TABLE_INCAR, 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, "======================================================================");
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);
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_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_Duct6", rtDW.ADC_Data_Model.Sensor_Rear_Duct6, TABLE_DUCT, 3000);
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_Duct3 (dbg_Sen_Duct_FL_Lower_Fb)", 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);
if (countQueueCmdBusADCData) {
osStatus_t status = osMessageQueuePut(env->queueCmdBusADCData, &env->cmdBusADCData, 0, 0U);
}
// osMutexRelease(env->modelTaskAccess);
// } else {
// LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error Adc0_Thread");
// }
// ++env->step;
if (env->step > MAX_ADC_FILTER_SIZE * 2) {
SystemDelayMs(10);
// SystemDelayMs(10);
}
}
}
@ -671,11 +696,7 @@ static _Noreturn void Adc1_Thread(tAdc1Task *env) {
env->cmdBusADC2Data.VN7008AJ_FrontLINActuatorPowerDriverAB = ADC_Filter_Update(&env->ADC1_Filter_data.VN7008AJ_FrontLINActuatorPowerDriverAB,ADC1_data->VN7008AJ_FrontLINActuatorPowerDriverAB);
env->cmdBusADC2Data.VN7008AJ_RearLINActuatorPowerDriverC = ADC_Filter_Update(&env->ADC1_Filter_data.VN7008AJ_RearLINActuatorPowerDriverC,ADC1_data->VN7008AJ_RearLINActuatorPowerDriverC);
uint32_t countQueueCmdBusADC2Data = osMessageQueueGetSpace(env->queueCmdBusADC2Data);
if (countQueueCmdBusADC2Data) {
osStatus_t status = osMessageQueuePut(env->queueCmdBusADC2Data, &env->cmdBusADC2Data, 0, 0U);
}
/*
rtDW.ADC_Data_Model.VN7008AJ_DIAG_FrontLINActuatorPowerDriverAB = pData[0];
rtDW.ADC_Data_Model.VN7008AJ_DIAG_RearLINActuatorPowerDriverC = pData[1];
@ -752,10 +773,16 @@ static _Noreturn void Adc1_Thread(tAdc1Task *env) {
// LoggerErrorStatic(LOGGER, LOG_SIGN, "Access error Adc1_Thread");
// }
// ++env->step;
++env->step;
if (env->step > MAX_ADC_FILTER_SIZE * 2) {
SystemDelayMs(10);
if (env->step > MAX_ADC_FILTER_SIZE * 5) {
uint32_t countQueueCmdBusADC2Data = osMessageQueueGetSpace(env->queueCmdBusADC2Data);
if (countQueueCmdBusADC2Data) {
osStatus_t status = osMessageQueuePut(env->queueCmdBusADC2Data, &env->cmdBusADC2Data, 0, 0U);
}
// SystemDelayMs(10);
}
}
}

View File

@ -90,6 +90,17 @@ static _Noreturn void Mma_Thread(tMma *env) {
InitWakeupModel(&env->ModelTask);
getVehicleTypeArmoredFromVin(&env->ModelTask, env->storage.dataParam->device.identification.Vehicle_Identification);
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the adc to run...")
uint32_t countQueue_space = osMessageQueueGetSpace(env->adcTask0.queueCmdBusADCData);
while (countQueue_space) {
SystemDelayMs(1);
countQueue_space = osMessageQueueGetSpace(env->adcTask0.queueCmdBusADCData);
}
SystemDelayMs(50);
ModelTask_StartThread(&env->ModelTask);
LoggerInfoStatic(LOGGER, LOG_TASK_ARB, "Waiting for the model to run...")