diff --git a/Adcs.c b/Adcs.c index 7a3acf4..fbfcca2 100644 --- a/Adcs.c +++ b/Adcs.c @@ -17,7 +17,7 @@ void Bsp_ADC1_HandleResult(const uint32_t *const pBuffer) { } -#define ADC0_CHN_NUM_EN 27 +#define ADC0_CHN_NUM_EN 30 static uint32_t s_aAdc0ResultBuf[ADC0_CHN_NUM_EN] = {0U}; static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = { @@ -91,6 +91,11 @@ static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 }, + { + .eChannel = ADC_CHANNEL_14, //PB20: Sensor_Rear_Duct4 + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + { .eChannel = ADC_CHANNEL_15, //PB21: Sensor_Incar_Temp_FR .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 @@ -101,10 +106,6 @@ static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 }, - { - .eChannel = ADC_CHANNEL_14, //PB20: Sensor_Rear_Duct4 - .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 - }, { .eChannel = ADC_CHANNEL_17, //PE1: Sensor_Rear_Duct5 @@ -131,11 +132,21 @@ static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 }, + { + .eChannel = ADC_CHANNEL_23, //PE19: BTS5120_2EKA_ShutoffValvePowerTXV + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + { .eChannel = ADC_CHANNEL_25, //PE6: Pressure_DIAG_PE6_ADC_0_25 (Напряжение датчика давления ДЕЛИТЕЛЬ) .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 }, + { + .eChannel = ADC_CHANNEL_26, //PA15: BTS5180_2EKA_ShutOFFValveFrontRear + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + // -------------------------------------- 2 УСТРОЙСТВА ---------------------------------------- { .eChannel = ADC_CHANNEL_28, //PA16: Вывод диагностики BTS5180_2EKA_FrontRearIncarMotor и BTS5180_2EKA_ShutOFFValveFrontRear (0 - Канал 0; 1 - Канал 1) @@ -147,6 +158,11 @@ static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 }, + { + .eChannel = ADC_CHANNEL_28, //PA16: BTS5180_2EKA_FrontRearIncarMotor + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + { .eChannel = ADC_CHANNEL_30, //PC7: Вывод диагностики BTS5180_2EKA_2xChannelPTCPower (0 - Канал 0; 1 - Канал 1) .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 @@ -160,7 +176,7 @@ static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = }; -#define ADC1_CHN_NUM_EN 6 +#define ADC1_CHN_NUM_EN 5 static uint32_t s_aAdc1ResultBuf[ADC1_CHN_NUM_EN] = {0U}; static const ADC_ChannelCfgType s_aChannelsAdc1[ADC1_CHN_NUM_EN] = { @@ -188,11 +204,6 @@ static const ADC_ChannelCfgType s_aChannelsAdc1[ADC1_CHN_NUM_EN] = { .eChannel = ADC_CHANNEL_4, //PE11: tVN7008AJ_RearLINActuatorPowerDriverC .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 - }, - - { - .eChannel = ADC_CHANNEL_23, //PE19: BTS5120_2EKA_ShutoffValvePowerTXV - .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 }