From ee63a606e81ceb6a0f92581a5e84a0f80bdb6772 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Fri, 10 Feb 2023 18:55:55 +0100 Subject: [PATCH] Fixed voltage read issue --- lib/HwTools/src/HwTools.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/HwTools/src/HwTools.cpp b/lib/HwTools/src/HwTools.cpp index d752c105..eae2a1d7 100644 --- a/lib/HwTools/src/HwTools.cpp +++ b/lib/HwTools/src/HwTools.cpp @@ -119,91 +119,91 @@ void HwTools::getAdcChannel(uint8_t pin, AdcConfig& config) { config.unit = ADC_UNIT_1; config.channel = ADC1_CHANNEL_4; break; - #if defined(ADC1_CHANNEL_5) + #if defined(ADC1_CHANNEL_5_GPIO_NUM) case ADC1_CHANNEL_5_GPIO_NUM: config.unit = ADC_UNIT_1; config.channel = ADC1_CHANNEL_5; break; #endif - #if defined(ADC1_CHANNEL_6) + #if defined(ADC1_CHANNEL_6_GPIO_NUM) case ADC1_CHANNEL_6_GPIO_NUM: config.unit = ADC_UNIT_1; config.channel = ADC1_CHANNEL_6; break; #endif - #if defined(ADC1_CHANNEL_7) + #if defined(ADC1_CHANNEL_7_GPIO_NUM) case ADC1_CHANNEL_7_GPIO_NUM: config.unit = ADC_UNIT_1; config.channel = ADC1_CHANNEL_7; break; #endif - #if defined(ADC1_CHANNEL_8) + #if defined(ADC1_CHANNEL_8_GPIO_NUM) case ADC1_CHANNEL_8_GPIO_NUM: config.unit = ADC_UNIT_1; config.channel = ADC1_CHANNEL_8; break; #endif - #if defined(ADC1_CHANNEL_9) + #if defined(ADC1_CHANNEL_9_GPIO_NUM) case ADC1_CHANNEL_9_GPIO_NUM: config.unit = ADC_UNIT_1; config.channel = ADC1_CHANNEL_9; break; #endif - #if defined(ADC2_CHANNEL_0) + #if defined(ADC2_CHANNEL_0_GPIO_NUM) case ADC2_CHANNEL_0_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_0; break; #endif - #if defined(ADC2_CHANNEL_1) + #if defined(ADC2_CHANNEL_1_GPIO_NUM) case ADC2_CHANNEL_1_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_1; break; #endif - #if defined(ADC2_CHANNEL_2) + #if defined(ADC2_CHANNEL_2_GPIO_NUM) case ADC2_CHANNEL_2_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_2; break; #endif - #if defined(ADC2_CHANNEL_3) + #if defined(ADC2_CHANNEL_3_GPIO_NUM) case ADC2_CHANNEL_3_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_3; break; #endif - #if defined(ADC2_CHANNEL_4) + #if defined(ADC2_CHANNEL_4_GPIO_NUM) case ADC2_CHANNEL_4_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_4; break; #endif - #if defined(ADC2_CHANNEL_5) + #if defined(ADC2_CHANNEL_5_GPIO_NUM) case ADC2_CHANNEL_5_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_5; break; #endif - #if defined(ADC2_CHANNEL_6) + #if defined(ADC2_CHANNEL_6_GPIO_NUM) case ADC2_CHANNEL_6_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_6; break; #endif - #if defined(ADC2_CHANNEL_7) + #if defined(ADC2_CHANNEL_7_GPIO_NUM) case ADC2_CHANNEL_7_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_7; break; #endif - #if defined(ADC2_CHANNEL_8) + #if defined(ADC2_CHANNEL_8_GPIO_NUM) case ADC2_CHANNEL_8_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_8; break; #endif - #if defined(ADC2_CHANNEL_9) + #if defined(ADC2_CHANNEL_9_GPIO_NUM) case ADC2_CHANNEL_9_GPIO_NUM: config.unit = ADC_UNIT_2; config.channel = ADC2_CHANNEL_9;