6 files changed, 93 insertions, 42 deletions

diff --git a/esphome/config/3dprinter-led.yaml b/esphome/config/3dprinter-led.yaml
index 16cc43d..16576a2 100644
--- a/esphome/config/3dprinter-led.yaml
+++ b/esphome/config/3dprinter-led.yaml
@@ -58,7 +58,7 @@ light:
     type: GRBW
     variant: SK6812
     num_leds: 35
-    pin: D4 # GPIO2
+    pin: GPIO2 # D4
     method:
       type: esp8266_uart
       bus: 1
@@ -68,7 +68,7 @@ output:
   - platform: gpio
     id: unused_gpio0
     pin:
-      number: D3 # GPIO0
+      number: GPIO0 # D3
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio1
@@ -83,35 +83,35 @@ output:
   - platform: gpio
     id: unused_gpio4
     pin:
-      number: D2 # GPIO4
+      number: GPIO4 # D2
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio5
     pin:
-      number: D1 # GPIO5
+      number: GPIO5 # D1
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio12
     pin:
-      number: D6 # GPIO12
+      number: GPIO12 # D6
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio13
     pin:
-      number: D7 # GPIO13
+      number: GPIO13 # D7
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio14
     pin:
-      number: D5 # GPIO14
+      number: GPIO14 # D5
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio15
     pin:
-      number: D8 # GPIO15
+      number: GPIO15 # D8
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio16
     pin:
-      number: D0 # GPIO16
+      number: GPIO16 # D0
       mode: INPUT_PULLDOWN
diff --git a/esphome/config/couchlight.yaml b/esphome/config/couchlight.yaml
index 4579dc9..ad6da9d 100644
--- a/esphome/config/couchlight.yaml
+++ b/esphome/config/couchlight.yaml
@@ -56,17 +56,17 @@ light:
 output:
   - platform: gpio
     id: relay_light1
-    pin: D1 # GPIO5
+    pin: GPIO5 # D1
 
   - platform: gpio
     id: relay_light2
-    pin: D2 # GPIO4
+    pin: GPIO4 # D2
 
   # UNUSED GPIO
   - platform: gpio
     id: unused_gpio0
     pin:
-      number: D3 # GPIO0
+      number: GPIO0 # D3
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio1
@@ -76,7 +76,7 @@ output:
   - platform: gpio
     id: unused_gpio2
     pin:
-      number: D4 # GPIO2
+      number: GPIO2 # D4
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio3
@@ -86,17 +86,17 @@ output:
   - platform: gpio
     id: unused_gpio14
     pin:
-      number: D5 # GPIO14
+      number: GPIO14 # D5
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio15
     pin:
-      number: D8 # GPIO15
+      number: GPIO15 # D8
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio16
     pin:
-      number: D0 # GPIO16
+      number: GPIO16 # D0
       mode: INPUT_PULLDOWN
 
 script:
@@ -113,7 +113,7 @@ binary_sensor:
     id: button_light1
     name: "Spot 1 PushButton"
     pin:
-      number: D7 # GPIO13
+      number: GPIO13 # D7
       mode: INPUT_PULLUP
     filters:
       - invert
@@ -131,7 +131,7 @@ binary_sensor:
     id: button_light2
     name: "Spot 2 PushButton"
     pin:
-      number: D6 # GPIO12
+      number: GPIO12 # D6
       mode: INPUT_PULLUP
     filters:
       - invert
diff --git a/esphome/config/office-pc-control.yaml b/esphome/config/office-pc-control.yaml
index 30033bb..f82d66c 100644
--- a/esphome/config/office-pc-control.yaml
+++ b/esphome/config/office-pc-control.yaml
@@ -55,13 +55,13 @@ output:
   - platform: gpio
     id: pc_reset
     pin:
-      number: D2 # GPIO4
+      number: GPIO4 # D2
       inverted: true # pc power/reset pins are GND activated
 
   - platform: gpio
     id: pc_power_onoff
     pin:
-      number: D3 # GPIO0
+      number: GPIO0 # D3
       inverted: true # pc power/reset pins are GND activated
 
   - platform: gpio
@@ -77,12 +77,12 @@ output:
   - platform: gpio
     id: unused_gpio13
     pin:
-      number: D7 # GPIO13
+      number: GPIO13 # D7
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio16
     pin:
-      number: D0 # GPIO16
+      number: GPIO16 # D0
       mode: INPUT_PULLDOWN
 
 button:
@@ -112,7 +112,7 @@ light:
     type: GRB
     variant: 800KBPS
     num_leds: 16
-    pin: D4 # GPIO2
+    pin: GPIO2 # D4
     method:
       type: esp8266_uart
       bus: 1
@@ -130,7 +130,7 @@ binary_sensor:
     name: "Touch button"
     id: touch_button
     pin:
-      number: D8 # GPIO15
+      number: GPIO15 # D8
       mode: INPUT
     internal: true
     filters:
@@ -143,7 +143,7 @@ binary_sensor:
     name: "Power button"
     id: power_button
     pin:
-      number: D5 # GPIO14
+      number: GPIO14 # D5
       mode: INPUT_PULLUP
       inverted: true
     internal: true
@@ -169,7 +169,7 @@ binary_sensor:
     name: "Reset button"
     id: reset_button
     pin:
-      number: D6 # GPIO12
+      number: GPIO12 # D6
       mode: INPUT_PULLUP
       inverted: true
     internal: true
@@ -201,7 +201,7 @@ binary_sensor:
     name: "Powered"
     icon: "mdi:desktop-tower"
     pin:
-      number: D1 # GPIO5
+      number: GPIO5 # D1
       mode: INPUT_PULLUP
     filters:
       - delayed_on: 100ms
diff --git a/esphome/config/powerplug_awp07l.yaml b/esphome/config/powerplug_awp07l.yaml
index 08a9e62..c8e3722 100644
--- a/esphome/config/powerplug_awp07l.yaml
+++ b/esphome/config/powerplug_awp07l.yaml
@@ -63,7 +63,7 @@ sensor:
     sel_pin:
       number: GPIO12
       inverted: true
-    cf_pin: GPIO05
+    cf_pin: GPIO5
     cf1_pin: GPIO14
     current_resistor: ${current_resistor}
     voltage_divider: ${voltage_divider}
@@ -124,5 +124,31 @@ switch:
 output:
   - platform: esp8266_pwm
     id: led
-    pin: GPIO00
+    pin: GPIO0
     inverted: true
+
+  - platform: gpio
+    id: unused_gpio1
+    pin:
+      number: GPIO1
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio2
+    pin:
+      number: GPIO2
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio3
+    pin:
+      number: GPIO3
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio4
+    pin:
+      number: GPIO4
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio16
+    pin:
+      number: GPIO16
+      mode: INPUT_PULLDOWN
diff --git a/esphome/config/printerswitch.yaml b/esphome/config/printerswitch.yaml
index 55ca307..9b31c94 100644
--- a/esphome/config/printerswitch.yaml
+++ b/esphome/config/printerswitch.yaml
@@ -17,7 +17,6 @@ esp8266:
 logger:
   # make RXD / TXD available
   baud_rate: 0
-  level: DEBUG
 
 # Enable Home Assistant API
 api:
@@ -49,7 +48,7 @@ binary_sensor:
     name: "Button"
     device_class: power
     pin:
-      number: GPIO01
+      number: GPIO1
       inverted: true
     on_press:
       - switch.toggle: relay
@@ -59,8 +58,8 @@ sensor:
   - platform: hlw8012
     model: BL0937
     sel_pin: GPIO12
-    cf_pin: GPIO04
-    cf1_pin: GPIO05
+    cf_pin: GPIO4
+    cf1_pin: GPIO5
     current_resistor: ${current_resistor}
     voltage_divider: ${voltage_divider}
     voltage:
@@ -159,6 +158,32 @@ output:
     id: led
     pin: GPIO13
 
+  - platform: gpio
+    id: unused_gpio0
+    pin:
+      number: GPIO0
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio2
+    pin:
+      number: GPIO2
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio3
+    pin:
+      number: GPIO3
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio15
+    pin:
+      number: GPIO15
+      mode: INPUT_PULLUP
+  - platform: gpio
+    id: unused_gpio16
+    pin:
+      number: GPIO16
+      mode: INPUT_PULLDOWN
+
 interval:
   - interval: 10s
     then:
diff --git a/esphome/config/tvlight.yaml b/esphome/config/tvlight.yaml
index 19e8c1c..e18e9ce 100644
--- a/esphome/config/tvlight.yaml
+++ b/esphome/config/tvlight.yaml
@@ -54,7 +54,7 @@ light:
 output:
   - platform: esp8266_pwm
     id: dimmer_tvlight
-    pin: D5 # GPIO14
+    pin: GPIO14 # D5
     frequency: 1000 Hz
     inverted: true
     # lower 22% are not useable. use max_power because of inverted
@@ -63,12 +63,12 @@ output:
 
   - platform: gpio
     id: relay_wled
-    pin: D1 # GPIO5
+    pin: GPIO5 # D1
 
   - platform: gpio
     id: unused_gpio0
     pin:
-      number: D3 # GPIO0
+      number: GPIO0 # D3
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio1
@@ -78,7 +78,7 @@ output:
   - platform: gpio
     id: unused_gpio2
     pin:
-      number: D4 # GPIO2
+      number: GPIO2 # D4
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio3
@@ -88,26 +88,26 @@ output:
   - platform: gpio
     id: unused_gpio12
     pin:
-      number: D6 # GPIO12
+      number: GPIO12 # D6
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio13
     pin:
-      number: D7 # GPIO13
+      number: GPIO13 # D7
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio15
     pin:
-      number: D8 # GPIO15
+      number: GPIO15 # D8
       mode: INPUT_PULLUP
   - platform: gpio
     id: unused_gpio16
     pin:
-      number: D0 # GPIO16
+      number: GPIO16 # D0
       mode: INPUT_PULLDOWN
 
 power_supply:
   - id: relay_tvlight
-    pin: D2 # GPIO4
+    pin: GPIO4 # D2
     #enable_time: 3s
     keep_on_time: 20ms