Fixed GPIO HAN select for ESP8266

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;

lib/SvelteUi/app/src/lib/UartSelectOptions.svelte

@@ -19,14 +19,12 @@
 <option value={18}>UART1</option>
 {/if}
 
-{#if chip.startsWith('esp32')}
+{#each {length: gpioMax+1} as _, i}
-    {#each {length: gpioMax+1} as _, i}
+    {#if i > 3
-        {#if i > 3
+        && !(chip == 'esp32' && (i == 9 || i == 16))
-          && !(chip == 'esp32' && (i == 9 || i == 16))
+        && !(chip == 'esp32s2' && i == 18)
-          && !(chip == 'esp32s2' && i == 18)
+        && !(chip == 'esp8266' && (i == 3 || i == 113))
-          && !(chip == 'esp8266' && (i == 3 || i == 113))
+    }
-        }
+        <option value={i}>GPIO{i}</option>
-            <option value={i}>GPIO{i}</option>
+    {/if}
-        {/if}
+{/each}
-    {/each}
-{/if}