From 03038192216b71b20a23318a32008feba97f62ae Mon Sep 17 00:00:00 2001
From: Tim Meneely <tim@meneelys.com>
Date: Fri, 30 Jul 2021 18:12:32 -0400
Subject: [PATCH] Updating Sonoff S31 plugs.

---
 sonoff_s31a.yaml | 18 ++++--------------
 sonoff_s31b.yaml | 15 ++-------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/sonoff_s31a.yaml b/sonoff_s31a.yaml
index 74df3a0..f22d651 100644
--- a/sonoff_s31a.yaml
+++ b/sonoff_s31a.yaml
@@ -6,20 +6,10 @@ esphome:
   name: ${device_name}
   platform: ESP8266
   board: esp01_1m
-  platformio_options:
-    upload_speed: 115200 #baud, tagging this so grep will find it later  
+  #  platformio_options:
+  #    upload_speed: 115200 #baud, tagging this so grep will find it later  
 
-wifi:
-  ssid: "Meneely"
-  password: "punxsutawney1"
-  manual_ip:
-    static_ip: ${device_ip}
-    gateway: 192.168.86.1
-    subnet: 255.255.255.0
-  # Enable fallback hotspot (captive portal) in case wifi connection fails
-  ap:
-    ssid: "ESPHOME"
-    password: "12345678"
+<<: !include standard_wifi.yaml
 
 logger:
   baud_rate: 0 # (UART logging interferes with cse7766)
@@ -68,4 +58,4 @@ switch:
     id: relay
 
 status_led:
-  pin: GPIO13
\ No newline at end of file
+  pin: GPIO13
diff --git a/sonoff_s31b.yaml b/sonoff_s31b.yaml
index 0424285..9e1b745 100644
--- a/sonoff_s31b.yaml
+++ b/sonoff_s31b.yaml
@@ -1,6 +1,6 @@
 substitutions:
   device_name: sonoff_s31b
-  #device_ip: 192.168.87.72
+  device_ip: 192.168.87.72
 
 esphome:
   name: ${device_name}
@@ -9,18 +9,7 @@ esphome:
   #  platformio_options:
   #    upload_speed: 115200 #baud, tagging this so grep will find it later  
 
-wifi:
-  ssid: "Meneely"
-  password: "punxsutawney1"
-  #  manual_ip:
-  #  use_address: 192.168.87.72
-    #static_ip: ${device_ip}
-    #  gateway: 192.168.86.1
-    # subnet: 255.255.255.0
-  # Enable fallback hotspot (captive portal) in case wifi connection fails
-  ap:
-    ssid: "ESPHOME"
-    password: "12345678"
+<<: !include standard_wifi.yaml
 
 logger:
   baud_rate: 0 # (UART logging interferes with cse7766)