diff --git a/README.md b/README.md index 6ace9af2..a8556381 100644 --- 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.0b4%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.0b5%20(Out%20of%20Date)-Red)](https://github.com/home-assistant/home-assistant/releases/latest)
Buy Me A Coffee @@ -58,7 +58,7 @@ Also using Grafana/Influx for graphing, both running in Docker containers on NUC Description | value -- | -- Lines of ESPHome YAML | 2341 -Lines of Home Assistant YAML | 6740 +Lines of Home Assistant YAML | 6826 [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 @@ -68,12 +68,12 @@ Description | value Entities in the [`alarm_control_panel`](https://www.home-assistant.io/components/alarm_control_panel) domain | 3 Entities in the [`automation`](https://www.home-assistant.io/components/automation) domain | 101 Entities in the [`binary_sensor`](https://www.home-assistant.io/components/binary_sensor) domain | 105 -Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 62 +Entities in the [`button`](https://www.home-assistant.io/components/button) domain | 64 Entities in the [`calendar`](https://www.home-assistant.io/components/calendar) domain | 1 Entities in the [`camera`](https://www.home-assistant.io/components/camera) domain | 15 Entities in the [`climate`](https://www.home-assistant.io/components/climate) domain | 1 Entities in the [`counter`](https://www.home-assistant.io/components/counter) domain | 1 -Entities in the [`cover`](https://www.home-assistant.io/components/cover) domain | 3 +Entities in the [`cover`](https://www.home-assistant.io/components/cover) domain | 5 Entities in the [`device_tracker`](https://www.home-assistant.io/components/device_tracker) domain | 20 Entities in the [`fan`](https://www.home-assistant.io/components/fan) domain | 3 Entities in the [`group`](https://www.home-assistant.io/components/group) domain | 15 @@ -92,7 +92,7 @@ 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 | 346 +Entities in the [`sensor`](https://www.home-assistant.io/components/sensor) domain | 348 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 @@ -102,7 +102,7 @@ Entities in the [`update`](https://www.home-assistant.io/components/update) doma 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** | **1130** +**Total state objects** | **1136** ## The HACS integrations/plugins that I use: **Appdaemon**:
[aneisch/follow_me_appdaemon](https://github.com/aneisch/follow_me_appdaemon)
diff --git a/automations.yaml b/automations.yaml index da5e04f6..781ca38d 100644 --- a/automations.yaml +++ b/automations.yaml @@ -516,7 +516,7 @@ from: "off" to: "on" action: - - service: notify.gsm_message + - service: notify.cellular_message data: message: > {% if trigger.from_state.state == "on" %} diff --git a/extras/docker-compose/homeassistant/docker-compose.yml b/extras/docker-compose/homeassistant/docker-compose.yml index e9c94691..a359cfa9 100644 --- a/extras/docker-compose/homeassistant/docker-compose.yml +++ b/extras/docker-compose/homeassistant/docker-compose.yml @@ -183,6 +183,8 @@ services: - '127.0.0.1:9998:9999' environment: - SIM_KEY=SIM_KEY + - HOST=HOSTIP + - PORT=11111 devices: - /dev/usb_modem_sim7080g:/dev/cellular_modem restart: always diff --git a/extras/docker-compose/unified/docker-compose.yml b/extras/docker-compose/unified/docker-compose.yml index e55d9a10..cedaef53 100644 --- a/extras/docker-compose/unified/docker-compose.yml +++ b/extras/docker-compose/unified/docker-compose.yml @@ -184,6 +184,8 @@ services: - '127.0.0.1:9998:9999' environment: - SIM_KEY=SIM_KEY + - HOST=HOSTIP + - PORT=11111 devices: - /dev/usb_modem_sim7080g:/dev/cellular_modem restart: always diff --git a/extras/esphome/emporia_view.yaml b/extras/esphome/emporia_view.yaml index c93fb0c8..07627e78 100644 --- a/extras/esphome/emporia_view.yaml +++ b/extras/esphome/emporia_view.yaml @@ -9,7 +9,7 @@ substitutions: circuit_6: "Refrigerator" circuit_7: "Living Room" circuit_8: "Master Bedroom" - circuit_9: "Bethany Office" + circuit_9: "Server Rack" circuit_10: "Office and Guest Bedroom" circuit_11: "Microwave" circuit_12: "Washing Machine" @@ -31,8 +31,8 @@ substitutions: # 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 8 = breaker 19 - phase b - master bedroom and bethany office exterior wall outlets +# probe 9 = breaker 20 - phase b - bethany office room lights and interior wall outlets (server rack) # probe 10 = breaker 21 - phase a - office + guest bedroom # probe 11 = breaker 26 - phase a - microwave # probe 12 = breaker 27 - phase b - washing machine diff --git a/scripts.yaml b/scripts.yaml index 46620088..9e36fabd 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -83,11 +83,11 @@ security_arm: master_bedroom_wakeup: sequence: - - if: "{{ now().hour < 11 }}" - then: - - service: script.turn_on - entity_id: - - script.christmas_wakeup + #- if: "{{ now().hour < 11 }}" + # then: + # - service: script.turn_on + # entity_id: + # - script.christmas_wakeup - service: alarm_control_panel.alarm_disarm entity_id: !secret alarm_panel_2 - service: alarm_control_panel.alarm_arm_home @@ -107,13 +107,13 @@ master_bedroom_wakeup: {% endif %} - service: homeassistant.turn_off entity_id: input_boolean.goodnight - - service: homeassistant.turn_on - entity_id: group.christmas + #- service: homeassistant.turn_on + # entity_id: group.christmas master_bedroom_bedtime: sequence: - - service: script.turn_on # Calling this way allows the sequence to continue without blocking - entity_id: script.christmas_goodnight + #- service: script.turn_on # Calling this way allows the sequence to continue without blocking + # entity_id: script.christmas_goodnight - service: script.appdaemon_ac_night - service: switch.turn_on data: @@ -258,7 +258,7 @@ notify_wrapper: else: - if: '{{ "priority" in data }}' then: - - service: notify.gsm_message + - service: notify.cellular_message data: message: '{{ message }}' data: @@ -266,7 +266,7 @@ notify_wrapper: # 1 results in a notification that overrides DnD # 2 results in an emergency level notification (requires ack) else: - - service: notify.gsm_message + - service: notify.cellular_message data: message: '{{ message }}' diff --git a/ui-lovelace/04-master.yaml b/ui-lovelace/04-master.yaml index 09d3e3e0..53963fa5 100644 --- a/ui-lovelace/04-master.yaml +++ b/ui-lovelace/04-master.yaml @@ -8,6 +8,8 @@ cards: show_header_toggle: false title: Master Bedroom entities: + - cover.andrew_blind_cover + - cover.bethany_blind_cover - sensor.master_bedroom_temperature #- binary_sensor.master_bedroom_bed - light.master_bedroom_ceiling_fan diff --git a/ui-lovelace/13-tablet.yaml b/ui-lovelace/13-tablet.yaml index 5085de41..fc49a0fc 100644 --- a/ui-lovelace/13-tablet.yaml +++ b/ui-lovelace/13-tablet.yaml @@ -87,6 +87,12 @@ cards: tap_action: action: toggle + - type: sensor + entity: sensor.total_power + graph: line + detail: 2 + hours_to_show: 8 + # Column 3 - type: vertical-stack cards: diff --git a/ui-lovelace/14-electric.yaml b/ui-lovelace/14-electric.yaml new file mode 100644 index 00000000..a8c3a1b5 --- /dev/null +++ b/ui-lovelace/14-electric.yaml @@ -0,0 +1,99 @@ +icon: mdi:flash +cards: + + - type: sensor + entity: sensor.ac_compressor_power + graph: line + detail: 2 + - type: sensor + entity: sensor.attic_hvac_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.dishwasher_power + graph: line + detail: 2 + + + + - type: sensor + entity: sensor.dryer_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.garage_freezer_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.kitchen_coffee_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.kitchen_lights_garage_light_backyard_flood_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.living_room_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.master_bathroom_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.master_bedroom_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.microwave_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.office_and_guest_bedroom_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.oven_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.phase_a_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.phase_b_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.refrigerator_power + graph: line + detail: 2 + + - type: sensor + entity: sensor.server_rack_power + graph: line + detail: 2 + + - type: gauge + entity: sensor.total_power + graph: line + min: 500 + max: 8000 + + - type: sensor + entity: sensor.washing_machine_power + graph: line + detail: 2