updates

aneisch · Jan 2, 2023 · 25251f7 · 25251f7
1 parent 20aeae3
commit 25251f7
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 [![Build Status](https://github.com/aneisch/home-assistant-config/actions/workflows/check-ha-release-compatibility.yml/badge.svg)](https://github.com/aneisch/home-assistant-config/actions)
 [![GitHub last commit](https://img.shields.io/github/last-commit/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/commits/master)
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/aneisch/home-assistant-config)](https://github.com/aneisch/home-assistant-config/graphs/commit-activity)
-[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant%20-2023.1.0b3%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
+[![HA Version](https://img.shields.io/badge/Running%20Home%20Assistant%20-2023.1.0b4%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
 <br><a href="https://www.buymeacoffee.com/aneisch" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-black.png" width="150px" height="35px" alt="Buy Me A Coffee" style="height: 35px !important;width: 150px !important;" ></a>
 
 
@@ -57,8 +57,8 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC
 ## Some statistics about my installation:
 Description | value
 -- | --
-Lines of ESPHome YAML | 2281
-Lines of Home Assistant YAML | 6731
+Lines of ESPHome YAML | 2341
+Lines of Home Assistant YAML | 6740
 [Integrations](https://www.home-assistant.io/integrations/) in use | 46
 Zigbee devices in [`zha`](https://www.home-assistant.io/integrations/zha/) | 26
 Z-Wave devices in [`zwave_js`](https://www.home-assistant.io/integrations/zwave_js/) | 37
@@ -92,17 +92,17 @@ Entities in the [`remote`](https://www.home-assistant.io/components/remote) doma
 Entities in the [`scene`](https://www.home-assistant.io/components/scene) domain | 2
 Entities in the [`script`](https://www.home-assistant.io/components/script) domain | 46
 Entities in the [`select`](https://www.home-assistant.io/components/select) domain | 22
-Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 305
+Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 346
 Entities in the [`setter`](https://www.home-assistant.io/components/setter) domain | 1
 Entities in the [`siren`](https://www.home-assistant.io/components/siren) domain | 1
 Entities in the [`sun`](https://www.home-assistant.io/components/sun) domain | 1
-Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 153
+Entities in the [`switch`](https://www.home-assistant.io/components/switch) domain | 155
 Entities in the [`timer`](https://www.home-assistant.io/components/timer) domain | 1
 Entities in the [`update`](https://www.home-assistant.io/components/update) domain | 25
 Entities in the [`vacuum`](https://www.home-assistant.io/components/vacuum) domain | 1
 Entities in the [`weather`](https://www.home-assistant.io/components/weather) domain | 2
 Entities in the [`zone`](https://www.home-assistant.io/components/zone) domain | 6
-**Total state objects** | **1088**
+**Total state objects** | **1131**
 ## The HACS integrations/plugins that I use:
 **Appdaemon**:<br>
 [aneisch/follow_me_appdaemon](https://github.com/aneisch/follow_me_appdaemon)<br>

diff --git a/extras/99-usb-serial.rules b/extras/99-usb-serial.rules
@@ -16,4 +16,4 @@ SUBSYSTEM=="tty", ATTRS{idVendor}=="0658", ATTRS{idProduct}=="0200", SYMLINK+="z
 # GSM Modem
 SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", SYMLINK+="usb_modem_sim800c", MODE="0666"
 # 7080G Modem
-SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", SYMLINK+="usb_modem_sim7080g", MODE="0666"
+SUBSYSTEM=="tty", ATTRS{idVendor}=="1e0e", ATTRS{idProduct}=="9205", SYMLINK+="usb_modem_sim7080g", MODE="0666"
diff --git a/extras/docker-compose/other/docker-compose.yml b/extras/docker-compose/other/docker-compose.yml
@@ -132,9 +132,6 @@ services:
     vscode:
         container_name: vscode
         image: linuxserver/code-server:3.12.0
-        #image: lscr.io/linuxserver/code-server
-        #ports:
-        #  - '8443:8443'
         restart: always
         volumes:
           - '/opt/vscode:/config'
@@ -144,9 +141,7 @@ services:
           - '/opt/github:/ha_config/github_projects'
           - '/home/aneisch/.backup:/ha_config/homeassistant-git'
         environment:
-          #- 'DOCKER_MODS=ghcr.io/stecky/mods:code-server-home-assistant'
           - 'DOCKER_MODS=ghcr.io/aneisch/code-server-home-assistant'
-          #- 'DOCKER_MODS=ghcr.io/aneisch/code-server-home-assistant'
           - 'HOMEASSISTANT_URL=http://10.0.1.22:8123'
           - PUID=1000
           - PGID=1000
@@ -344,4 +339,4 @@ services:
             - PASSWORD=PASSWORD
             - TZ=America/Chicago
         volumes:
-            - /opt/vrs/config:/config
+            - /opt/vrs/config:/config
diff --git a/extras/docker-compose/unified/docker-compose.yml b/extras/docker-compose/unified/docker-compose.yml
@@ -319,9 +319,6 @@ services:
     vscode:
         container_name: vscode
         image: linuxserver/code-server:3.12.0
-        #image: lscr.io/linuxserver/code-server
-        #ports:
-        #  - '8443:8443'
         restart: always
         volumes:
           - '/opt/vscode:/config'
@@ -331,9 +328,7 @@ services:
           - '/opt/github:/ha_config/github_projects'
           - '/home/aneisch/.backup:/ha_config/homeassistant-git'
         environment:
-          #- 'DOCKER_MODS=ghcr.io/stecky/mods:code-server-home-assistant'
           - 'DOCKER_MODS=ghcr.io/aneisch/code-server-home-assistant'
-          #- 'DOCKER_MODS=ghcr.io/aneisch/code-server-home-assistant'
           - 'HOMEASSISTANT_URL=http://10.0.1.22:8123'
           - PUID=1000
           - PGID=1000
@@ -531,4 +526,4 @@ services:
             - PASSWORD=PASSWORD
             - TZ=America/Chicago
         volumes:
-            - /opt/vrs/config:/config
+            - /opt/vrs/config:/config
diff --git a/extras/esphome/cellular_modem.yaml b/extras/esphome/cellular_modem.yaml
@@ -0,0 +1,29 @@
+substitutions:
+  name: cellular_modem
+  friendly_name: "Cellular Modem"
+
+esphome:
+  name: ${name}
+  platform: ESP8266
+  board: d1_mini
+
+<<: !include common.yaml
+
+switch:
+  # GPIO output for relay
+  - platform: gpio
+    id: power_toggle
+    pin:
+      number: D7
+      inverted: False
+
+api:
+  reboot_timeout: 0s
+  encryption:
+    key: !secret encryption_key
+  services:
+    - service: power_toggle
+      then:
+        - switch.turn_on: power_toggle
+        - delay: 2000ms
+        - switch.turn_off: power_toggle
diff --git a/extras/esphome/emporia_view.yaml b/extras/esphome/emporia_view.yaml
@@ -1,6 +1,45 @@
 substitutions:
   name: emporia_view
   friendly_name: "Emporia View"
+  circuit_1: "Dryer"
+  circuit_2: "AC Compressor"
+  circuit_3: "Oven"
+  circuit_4: "Dishwasher"
+  circuit_5: "Kitchen Coffee"
+  circuit_6: "Refrigerator"
+  circuit_7: "Living Room"
+  circuit_8: "Master Bedroom"
+  circuit_9: "Bethany Office"
+  circuit_10: "Office and Guest Bedroom"
+  circuit_11: "Microwave"
+  circuit_12: "Washing Machine"
+  circuit_13: "Kitchen Lights, Garage Light, Backyard Flood"
+  circuit_14: "Garage Freezer"
+  circuit_15: "Master Bathroom"
+  circuit_16: "Attic HVAC"
+
+# phase a = left lug
+# phase b = right lug
+
+# black wire to breaker 33
+# red wire to breaker 35
+
+# Probe 1 = breaker 5+7 (2x mult) - phase a - dryer
+# Probe 2 = breaker 2+4 (2x mult) - phase a - HVAC
+# probe 3 = breaker 9+11 (2x mult) - phase a - Oven
+# probe 4 = breaker 10 - phase a - dishwasher
+# probe 5 = breaker 18 - phase a - kitchen coffee
+# probe 6 = breaker 14 - phase a - refrigerator
+# probe 7 = breaker 15 - phase b - livingroom
+# probe 8 = breaker 19 - phase b - master br
+# probe 9 = breaker 20 - phase b - bethany office
+# probe 10 = breaker 21 - phase a - office + guest bedroom
+# probe 11 = breaker 26 - phase a - microwave
+# probe 12 = breaker 27 - phase b - washing machine
+# probe 13 = breaker 28 - phase b - kitchen, garage lights, backyard flood
+# probe 14 = breaker 30 - phase a - garage outlet (freezer)
+# probe 15 = breaker 33 - phase a - master bath
+# probe 16 = breaker 35 - phase b - attic HVAC 
 
 esphome:
   name: ${name}
@@ -82,22 +121,22 @@ sensor:
           device_class: power
           filters: [*moving_avg, *pos]
       # Pay close attention to set the phase_id for each breaker by matching it to the phase/leg it connects to in the panel
-      - { phase_id: phase_a, input:  "1", power: { name:  "Circuit 1 Power", id:  cir1, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_b, input:  "2", power: { name:  "Circuit 2 Power", id:  cir2, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_a, input:  "3", power: { name:  "Circuit 3 Power", id:  cir3, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_a, input:  "4", power: { name:  "Circuit 4 Power", id:  cir4, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_a, input:  "5", power: { name:  "Circuit 5 Power", id:  cir5, filters: [ *moving_avg, *pos, multiply: 2 ] } }
-      - { phase_id: phase_a, input:  "6", power: { name:  "Circuit 6 Power", id:  cir6, filters: [ *moving_avg, *pos, multiply: 2 ] } }
-      - { phase_id: phase_a, input:  "7", power: { name:  "Circuit 7 Power", id:  cir7, filters: [ *moving_avg, *pos, multiply: 2 ] } }
-      - { phase_id: phase_b, input:  "8", power: { name:  "Circuit 8 Power", id:  cir8, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_b, input:  "9", power: { name:  "Circuit 9 Power", id:  cir9, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_b, input: "10", power: { name: "Circuit 10 Power", id: cir10, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_a, input: "11", power: { name: "Circuit 11 Power", id: cir11, filters: [ *moving_avg, *pos, multiply: 2 ] } }
-      - { phase_id: phase_a, input: "12", power: { name: "Circuit 12 Power", id: cir12, filters: [ *moving_avg, *pos, multiply: 2 ] } }
-      - { phase_id: phase_a, input: "13", power: { name: "Circuit 13 Power", id: cir13, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_a, input: "14", power: { name: "Circuit 14 Power", id: cir14, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_b, input: "15", power: { name: "Circuit 15 Power", id: cir15, filters: [ *moving_avg, *pos ] } }
-      - { phase_id: phase_a, input: "16", power: { name: "Circuit 16 Power", id: cir16, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input:  "1", power: { name:  "${circuit_1} Power", id:  cir1, filters: [ *moving_avg, *pos, multiply: 2 ] } }
+      - { phase_id: phase_a, input:  "2", power: { name:  "${circuit_2} Power", id:  cir2, filters: [ *moving_avg, *pos, multiply: 2 ] } }
+      - { phase_id: phase_a, input:  "3", power: { name:  "${circuit_3} Power", id:  cir3, filters: [ *moving_avg, *pos, multiply: 2 ] } }
+      - { phase_id: phase_a, input:  "4", power: { name:  "${circuit_4} Power", id:  cir4, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input:  "5", power: { name:  "${circuit_5} Power", id:  cir5, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input:  "6", power: { name:  "${circuit_6} Power", id:  cir6, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_b, input:  "7", power: { name:  "${circuit_7} Power", id:  cir7, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_b, input:  "8", power: { name:  "${circuit_8} Power", id:  cir8, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_b, input:  "9", power: { name:  "${circuit_9} Power", id:  cir9, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input: "10", power: { name: "${circuit_10} Power", id: cir10, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input: "11", power: { name: "${circuit_11} Power", id: cir11, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_b, input: "12", power: { name: "${circuit_12} Power", id: cir12, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_b, input: "13", power: { name: "${circuit_13} Power", id: cir13, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input: "14", power: { name: "${circuit_14} Power", id: cir14, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_a, input: "15", power: { name: "${circuit_15} Power", id: cir15, filters: [ *moving_avg, *pos ] } }
+      - { phase_id: phase_b, input: "16", power: { name: "${circuit_16} Power", id: cir16, filters: [ *moving_avg, *pos ] } }
   - platform: template
     name: "Total Power"
     lambda: return id(phase_a_power).state + id(phase_b_power).state;
@@ -108,19 +147,19 @@ sensor:
     name: "Total Daily Energy"
     power_id: total_power
     accuracy_decimals: 0
-  - { power_id:  cir1, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 1 Daily Energy" }
-  - { power_id:  cir2, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 2 Daily Energy" }
-  - { power_id:  cir3, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 3 Daily Energy" }
-  - { power_id:  cir4, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 4 Daily Energy" }
-  - { power_id:  cir5, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 5 Daily Energy" }
-  - { power_id:  cir6, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 6 Daily Energy" }
-  - { power_id:  cir7, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 7 Daily Energy" }
-  - { power_id:  cir8, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 8 Daily Energy" }
-  - { power_id:  cir9, platform: total_daily_energy, accuracy_decimals: 0, name:  "Circuit 9 Daily Energy" }
-  - { power_id: cir10, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 10 Daily Energy" }
-  - { power_id: cir11, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 11 Daily Energy" }
-  - { power_id: cir12, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 12 Daily Energy" }
-  - { power_id: cir13, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 13 Daily Energy" }
-  - { power_id: cir14, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 14 Daily Energy" }
-  - { power_id: cir15, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 15 Daily Energy" }
-  - { power_id: cir16, platform: total_daily_energy, accuracy_decimals: 0, name: "Circuit 16 Daily Energy" }
+  - { power_id:  cir1, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_1} Daily Energy" }
+  - { power_id:  cir2, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_2} Daily Energy" }
+  - { power_id:  cir3, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_3} Daily Energy" }
+  - { power_id:  cir4, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_4} Daily Energy" }
+  - { power_id:  cir5, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_5} Daily Energy" }
+  - { power_id:  cir6, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_6} Daily Energy" }
+  - { power_id:  cir7, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_7} Daily Energy" }
+  - { power_id:  cir8, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_8} Daily Energy" }
+  - { power_id:  cir9, platform: total_daily_energy, accuracy_decimals: 0, name:  "${circuit_9} Daily Energy" }
+  - { power_id: cir10, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_10} Daily Energy" }
+  - { power_id: cir11, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_11} Daily Energy" }
+  - { power_id: cir12, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_12} Daily Energy" }
+  - { power_id: cir13, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_13} Daily Energy" }
+  - { power_id: cir14, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_14} Daily Energy" }
+  - { power_id: cir15, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_15} Daily Energy" }
+  - { power_id: cir16, platform: total_daily_energy, accuracy_decimals: 0, name: "${circuit_16} Daily Energy" }
diff --git a/sensors.yaml b/sensors.yaml
@@ -230,3 +230,14 @@
         {% else %}
           {{ state_attr('weather.kcll_daynight', 'forecast')[1]['precipitation_probability'] }}
         {% endif %}
+
+    electricity_price:
+      friendly_name: "Electricity Price per kWH"
+      unit_of_measurement: "USD/kWh"
+      icon_template: mdi:currency-usd
+      value_template: >
+        {% if now().month >= 5 and now().month <= 10 %}
+        {{ 0.1187 + 0.0166 }}
+        {% else %}
+        {{ 0.1136 + 0.0166 }}
+        {% endif %}
diff --git a/www/community/lovelace-auto-entities/auto-entities.js b/www/community/lovelace-auto-entities/auto-entities.js
diff --git a/www/community/lovelace-auto-entities/auto-entities.js.gz b/www/community/lovelace-auto-entities/auto-entities.js.gz
diff --git a/www/community/lovelace-auto-entities/rollup.config.js.gz b/www/community/lovelace-auto-entities/rollup.config.js.gz