diff --git a/Adcs.c b/Adcs.c index 04469fd..ef758c0 100644 --- a/Adcs.c +++ b/Adcs.c @@ -16,15 +16,53 @@ void Bsp_ADC1_HandleResult(const uint32_t *const pBuffer) { Get_ADC_Result(ADCS.adc_1_IO.env); } -#define ADC0_CHN_NUM_EN 1 -#define ADC1_CHN_NUM_EN 1 +#define ADC0_CHN_NUM_EN 5 static uint32_t s_aAdc0ResultBuf[ADC0_CHN_NUM_EN] = {0U}; +static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = + { + { + .eChannel = ADC_CHANNEL_1, // IGN_ANS_PE5_ADC0_1 (Напряжение зажигание ДЕЛИТЕЛЬ) + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + { + .eChannel = ADC_CHANNEL_25, // Pressure_DIAG_PE6_ADC_0_25 (Напряжение датчика давления ДЕЛИТЕЛЬ) + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + + { + .eChannel = ADC_CHANNEL_28, // Вывод диагностики BTS5180_2EKA (2 штуки) (0 - Канал 0; 1 - Канал 1) + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + + { + .eChannel = ADC_CHANNEL_27, // Вывод диагностики BTS5180_2EKA_TwoWayValveAndReservePowerSupply (0 - Канал 0; 1 - Канал 1) + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + }, + + { + .eChannel = ADC_CHANNEL_30, // Вывод диагностики BTS5180_2EKA_2xChannelPTCPower (0 - Канал 0; 1 - Канал 1) + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + } + + }; + +#define ADC1_CHN_NUM_EN 1 static uint32_t s_aAdc1ResultBuf[ADC1_CHN_NUM_EN] = {0U}; +static const ADC_ChannelCfgType s_aChannelsAdc1[ADC1_CHN_NUM_EN] = + { + { + .eChannel = ADC_CHANNEL_2, // PBATT_CHECK_PE15_ADC1_2 (Напряжение сети ДЕЛИТЕЛЬ) + .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 + } + }; -static const ADC_ChannelCfgType s_aChannels0[ADC0_CHN_NUM_EN] = +/* +#define ADC0_CHN_NUM_EN 1 +static uint32_t s_aAdc0ResultBuf[ADC0_CHN_NUM_EN] = {0U}; +static const ADC_ChannelCfgType s_aChannelsAdc0[ADC0_CHN_NUM_EN] = { { .eChannel = ADC_CHANNEL_0, @@ -32,13 +70,16 @@ static const ADC_ChannelCfgType s_aChannels0[ADC0_CHN_NUM_EN] = } }; -static const ADC_ChannelCfgType s_aChannels1[ADC1_CHN_NUM_EN] = +#define ADC1_CHN_NUM_EN 1 +static uint32_t s_aAdc1ResultBuf[ADC1_CHN_NUM_EN] = {0U}; +static const ADC_ChannelCfgType s_aChannelsAdc1[ADC1_CHN_NUM_EN] = { { .eChannel = ADC_CHANNEL_25, .eSampleTimeOption = ADC_SAMPLE_TIME_OPTION_1 } }; +*/ void Adcs_Init() { tAdcs *env = &ADCS; @@ -72,7 +113,7 @@ void Adcs_Init() { s_aAdc0ResultBuf, ADC0_CHN_NUM_EN, - (ADC_ChannelCfgType *) s_aChannels0, + (ADC_ChannelCfgType *) s_aChannelsAdc0, 0, 0, @@ -103,7 +144,7 @@ void Adcs_Init() { s_aAdc1ResultBuf, ADC1_CHN_NUM_EN, - (ADC_ChannelCfgType *) s_aChannels1, + (ADC_ChannelCfgType *) s_aChannelsAdc1, 0, 0,