Minor updates (#35)

* Update devices within range of  new wifi AP to use the ssid of that AP
* Use dashes in name of updated devices

devices/basement-bathroom-light-fan.yaml

@@ -1,11 +1,15 @@
 substitutions:
-  device_id: basement_bathroom_light_fan
+  device_id: basement-bathroom-light-fan
   device_name: Basement Bathroom Light and Fan
   board: esp01_1m
   ip_address: !secret basement-bathroom-light-fan-ip
   ota_pwd: !secret basement-bathroom-light-fan-ota-pwd
   api_pwd: !secret basement-bathroom-light-fan-api-pwd
   ap_wifi_pwd: !secret basement-bathroom-light-fan-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/device_base.yaml

devices/basement-bathroom-sensor.yaml

@@ -1,11 +1,15 @@
 substitutions:
-  device_id: basement_bathroom_sensor
+  device_id: basement-bathroom-sensor
   device_name: Basement Bathroom Sensor
   board: d1_mini
   ip_address: !secret basement-bathroom-sensor-ip
   ota_pwd: !secret basement-bathroom-sensor-ota-pwd
   api_pwd: !secret basement-bathroom-sensor-api-pwd
   ap_wifi_pwd: !secret basement-bathroom-sensor-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/device_base.yaml

devices/basement-bathroom-shower-light-heater.yaml

@@ -1,11 +1,15 @@
 substitutions:
-  device_id: basement_bath_shower_light_heat
+  device_id: basement-bath-shower-light-heat
   device_name: Basement Bathroom Shower Light and Heater
   board: esp01_1m
   ip_address: !secret basement-bathroom-shower-light-heater-ip
   ota_pwd: !secret basement-bathroom-shower-light-heater-ota-pwd
   api_pwd: !secret basement-bathroom-shower-light-heater-api-pwd
   ap_wifi_pwd: !secret basement-bathroom-shower-light-heater-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/device_base.yaml

devices/basement-fridge.yaml

@@ -5,6 +5,10 @@ substitutions:
   ota_pwd: !secret basement-fridge-ota-pwd
   api_pwd: !secret basement-fridge-api-pwd
   ap_wifi_pwd: !secret basement-fridge-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/topgreener_smart_plug.yaml

devices/basement-stair-lights-1.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: basement_stair_lights
+  device_id: basement-stair-lights
   device_name: Basement Stair Lights
   ip_address: !secret basement-stair-lights-ip
   ota_pwd: !secret basement-stair-lights-ota-pwd
   api_pwd: !secret basement-stair-lights-api-pwd
   ap_wifi_pwd: !secret basement-stair-lights-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 script:
   - id: double_click

devices/basement-stair-lights-2.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: basement_stair_lights_2
+  device_id: basement-stair-lights-2
   device_name: Basement Stair Lights 2
   ip_address: !secret basement-stair-lights-2-ip
   ota_pwd: !secret basement-stair-lights-2-ota-pwd
   api_pwd: !secret basement-stair-lights-2-api-pwd
   ap_wifi_pwd: !secret basement-stair-lights-2-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 script:
   - id: double_click

devices/basement-tv.yaml

@@ -5,6 +5,10 @@ substitutions:
   ota_pwd: !secret basement-tv-ota-pwd
   api_pwd: !secret basement-tv-api-pwd
   ap_wifi_pwd: !secret basement-tv-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/topgreener_smart_plug.yaml

devices/coffee-maker.yaml

@@ -1,11 +1,15 @@
 substitutions:
-  device_id: coffee_maker
+  device_id: coffee-maker
   device_name: Coffee Maker
   board: nodemcuv2
   ip_address: !secret coffee-maker-ip
   ota_pwd: !secret coffee-maker-ota-pwd
   api_pwd: !secret coffee-maker-api-pwd
   ap_wifi_pwd: !secret coffee-maker-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/device_base.yaml

devices/computer-light.yaml

@@ -1,10 +1,17 @@
 substitutions:
-  device_id: computer_light
+  device_id: computer-light
   device_name: Computer Light
   ip_address: !secret computer-light-ip
   ota_pwd: !secret computer-light-ota-pwd
   api_pwd: !secret computer-light-api-pwd
   ap_wifi_pwd: !secret computer-light-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
+
+wifi:
+  use_address: 192.168.128.22
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/dining-room-light.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: dining_room_light
+  device_id: dining-room-light
   device_name: Dining Room Light
   ip_address: !secret dining-room-light-ip
   ota_pwd: !secret dining-room-light-ota-pwd
   api_pwd: !secret dining-room-light-api-pwd
   ap_wifi_pwd: !secret dining-room-light-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/family-room-light.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: family_room_light
+  device_id: family-room-light
   device_name: Family Room Light
   ip_address: !secret family-room-light-ip
   ota_pwd: !secret family-room-light-ota-pwd
   api_pwd: !secret family-room-light-api-pwd
   ap_wifi_pwd: !secret family-room-light-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/fire-pit-fountain.yaml

@@ -1,11 +1,15 @@
 substitutions:
-  device_id: fire_pit_fountain
+  device_id: fire-pit-fountain
   device_name: Fire Pit and Fountain
   board: d1_mini
   ip_address: !secret fire-pit-fountain-ip
   ota_pwd: !secret fire-pit-fountain-ota-pwd
   api_pwd: !secret fire-pit-fountain-api-pwd
   ap_wifi_pwd: !secret fire-pit-fountain-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/device_base.yaml

devices/front-entry-lights-1.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: front_entry_lights
+  device_id: front-entry-lights
   device_name: Front Entry Lights
   ip_address: !secret front-entry-lights-ip
   ota_pwd: !secret front-entry-lights-ota-pwd
   api_pwd: !secret front-entry-lights-api-pwd
   ap_wifi_pwd: !secret front-entry-lights-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/front-entry-lights-2.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: front_entry_lights_2
+  device_id: front-entry-lights-2
   device_name: Front Entry Lights 2
   ip_address: !secret front-entry-lights-2-ip
   ota_pwd: !secret front-entry-lights-2-ota-pwd
   api_pwd: !secret front-entry-lights-2-api-pwd
   ap_wifi_pwd: !secret front-entry-lights-2-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer_without_power.yaml

devices/front-lights.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: front_lights
+  device_id: front-lights
   device_name: Front Lights
   ip_address: !secret front-lights-ip
   ota_pwd: !secret front-lights-ota-pwd
   api_pwd: !secret front-lights-api-pwd
   ap_wifi_pwd: !secret front-lights-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/garage-fridge.yaml

@@ -7,7 +7,10 @@ substitutions:
   ota_pwd: !secret garage-fridge-ota-pwd
   api_pwd: !secret garage-fridge-api-pwd
   ap_wifi_pwd: !secret garage-fridge-ap-pwd
-
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/esp32_device_base.yaml

devices/garage-lights.yaml

@@ -6,6 +6,10 @@ substitutions:
   api_pwd: !secret garage-lights-api-pwd
   ap_wifi_pwd: !secret garage-lights-ap-pwd
   light_wattage: '378'
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   shelly_1l: !include ../packages/shelly_1l.yaml

devices/kitchen-bar-lights.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: kitchen_bar_lights
+  device_id: kitchen-bar-lights
   device_name: Kitchen Bar Lights
   ip_address: !secret kitchen-bar-lights-ip
   ota_pwd: !secret kitchen-bar-lights-ota-pwd
   api_pwd: !secret kitchen-bar-lights-api-pwd
   ap_wifi_pwd: !secret kitchen-bar-lights-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/kitchen-fridge.yaml

@@ -5,6 +5,10 @@ substitutions:
   ota_pwd: !secret kitchen-fridge-ota-pwd
   api_pwd: !secret kitchen-fridge-api-pwd
   ap_wifi_pwd: !secret kitchen-fridge-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/topgreener_smart_plug.yaml

devices/kitchen-table-light.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: kitchen_table_light
+  device_id: kitchen-table-light
   device_name: Kitchen Table Light
   ip_address: !secret kitchen-table-light-ip
   ota_pwd: !secret kitchen-table-light-ota-pwd
   api_pwd: !secret kitchen-table-light-api-pwd
   ap_wifi_pwd: !secret kitchen-table-light-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/living-room-lights.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: living_room_lights
+  device_id: living-room-lights
   device_name: Living Room Lights
   ip_address: !secret living-room-lights-ip
   ota_pwd: !secret living-room-lights-ota-pwd
   api_pwd: !secret living-room-lights-api-pwd
   ap_wifi_pwd: !secret living-room-lights-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/feit_dimmer.yaml

devices/network-equipment.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: network_equipment
+  device_id: network-equipment
   device_name: Network Equipment
   ip_address: !secret network-equipment-ip
   ota_pwd: !secret network-equipment-ota-pwd
   api_pwd: !secret network-equipment-api-pwd
   ap_wifi_pwd: !secret network-equipment-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/topgreener_smart_plug.yaml

devices/pool-and-patio-lights.yaml

@@ -1,11 +1,15 @@
 substitutions:
-  device_id: pool_and_patio_lights
+  device_id: pool-and-patio-lights
   device_name: Pool and Patio Lights
   board: esp01_1m
   ip_address: !secret pool-and-patio-lights-ip
   ota_pwd: !secret pool-and-patio-lights-ota-pwd
   api_pwd: !secret pool-and-patio-lights-api-pwd
   ap_wifi_pwd: !secret pool-and-patio-lights-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   device_base: !include ../packages/device_base.yaml

devices/sump-pump.yaml

@@ -1,10 +1,14 @@
 substitutions:
-  device_id: sump_pump
+  device_id: sump-pump
   device_name: Sump Pump
   ip_address: !secret sump-pump-ip
   ota_pwd: !secret sump-pump-ota-pwd
   api_pwd: !secret sump-pump-api-pwd
   ap_wifi_pwd: !secret sump-pump-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/topgreener_smart_plug.yaml

devices/washing-machine.yaml

@@ -5,6 +5,10 @@ substitutions:
   ota_pwd: !secret washing-machine-ota-pwd
   api_pwd: !secret washing-machine-api-pwd
   ap_wifi_pwd: !secret washing-machine-ap-pwd
+  wifi_ssid: !secret new-wifi-ssid
+  wifi_password: !secret new-wifi-password
+  ip_subnet: !secret new-ip-subnet
+  ip_gateway: !secret new-ip-gateway
 
 packages:
   feit_dimmer: !include ../packages/topgreener_smart_plug.yaml