diff --git a/lib/HwTools/src/HwTools.cpp b/lib/HwTools/src/HwTools.cpp
index b97215d9..d752c105 100644
--- a/lib/HwTools/src/HwTools.cpp
+++ b/lib/HwTools/src/HwTools.cpp
@@ -119,68 +119,96 @@ void HwTools::getAdcChannel(uint8_t pin, AdcConfig& config) {
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_4;
                 break;
+            #if defined(ADC1_CHANNEL_5)
             case ADC1_CHANNEL_5_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_5;
                 break;
+            #endif
+            #if defined(ADC1_CHANNEL_6)
             case ADC1_CHANNEL_6_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_6;
                 break;
+            #endif
+            #if defined(ADC1_CHANNEL_7)
             case ADC1_CHANNEL_7_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_7;
                 break;
-            #if defined(CONFIG_IDF_TARGET_ESP32S2)
+            #endif
+            #if defined(ADC1_CHANNEL_8)
             case ADC1_CHANNEL_8_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_8;
                 break;
+            #endif
+            #if defined(ADC1_CHANNEL_9)
             case ADC1_CHANNEL_9_GPIO_NUM:
                 config.unit = ADC_UNIT_1;
                 config.channel = ADC1_CHANNEL_9;
                 break;
             #endif
+            #if defined(ADC2_CHANNEL_0)
             case ADC2_CHANNEL_0_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_0;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_1)
             case ADC2_CHANNEL_1_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_1;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_2)
             case ADC2_CHANNEL_2_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_2;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_3)
             case ADC2_CHANNEL_3_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_3;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_4)
             case ADC2_CHANNEL_4_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_4;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_5)
             case ADC2_CHANNEL_5_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_5;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_6)
             case ADC2_CHANNEL_6_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_6;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_7)
             case ADC2_CHANNEL_7_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_7;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_8)
             case ADC2_CHANNEL_8_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_8;
                 break;
+            #endif
+            #if defined(ADC2_CHANNEL_9)
             case ADC2_CHANNEL_9_GPIO_NUM:
                 config.unit = ADC_UNIT_2;
                 config.channel = ADC2_CHANNEL_9;
                 break;
+            #endif
         }
     #endif
 }
diff --git a/platformio.ini b/platformio.ini
index 7b1fde3e..2e72c602 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -73,3 +73,15 @@ lib_compat_mode = off
 lib_deps = ${esp32.lib_deps}
 lib_ignore = ${common.lib_ignore}
 extra_scripts = ${common.extra_scripts}
+
+[env:esp32c3]
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.3/platform-espressif32-2.0.5.3.zip
+framework = arduino
+board = esp32-c3-devkitm-1
+board_build.mcu = esp32c3
+build_flags = ${common.build_flags} -DFRAMEWORK_ARDUINO_C3
+lib_ldf_mode = off
+lib_compat_mode = off
+lib_deps = ${esp32.lib_deps}
+lib_ignore = ${common.lib_ignore}
+extra_scripts = ${common.extra_scripts}
\ No newline at end of file