diff --git a/.HA_VERSION b/.HA_VERSION index bb8fe705..7646412b 100644 --- a/.HA_VERSION +++ b/.HA_VERSION @@ -1 +1 @@ -2024.1.6 \ No newline at end of file +2024.2.1 \ No newline at end of file diff --git a/.github/workflows/home-assistant.yaml b/.github/workflows/home-assistant.yaml index 899b2b49..e66d46bb 100644 --- a/.github/workflows/home-assistant.yaml +++ b/.github/workflows/home-assistant.yaml @@ -96,10 +96,10 @@ jobs: steps: - name: 📥 Check out repository uses: actions/checkout@v4.1.1 - - name: Set up Python 3.11 + - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Install dependencies run: | python -m pip install --upgrade pip setuptools wheel diff --git a/README.md b/README.md index 2673e67f..b16719f8 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ If you want to back up your own Home Assistant configuration to GitHub, follow [ Description | Value -------------- | -- -All Entities | 2477 -Sensors | 1090 +All Entities | 2509 +Sensors | 1122 Binary Sensors | 207 Lights | 55 Switches | 115 @@ -346,7 +346,7 @@ Home Assistant integration providing day of package counts and USPS informed del Authors: [@moralmunky](https://github.com/moralmunky), [@firstof9](https://github.com/firstof9). -### [Spook 👻 Not Your Homie](https://github.com/frenck/spook) [v2.1.2] +### [Spook 👻 Not Your Homie](https://github.com/frenck/spook) [v2.2.0] Spook 👻 Not your homie @@ -394,7 +394,7 @@ Authors: [@AlexxIT](https://github.com/AlexxIT). Customizable Animated Bar card for Home Assistant Lovelace -### [Battery State Card / Entity Row](https://github.com/maxwroc/battery-state-card) [v3.1.5] +### [Battery State Card / Entity Row](https://github.com/maxwroc/battery-state-card) [v3.1.6] Battery state card for Home Assistant @@ -775,7 +775,7 @@ Readme generated by the [custom readme integration](https://github.com/custom-co [home-assistant]: https://home-assistant.io [ha-version]: https://www.home-assistant.io/blog/categories/release-notes/ -[ha-version-shield]: https://img.shields.io/badge/2024.1.6-555555?style=flat-square&logo=home-assistant +[ha-version-shield]: https://img.shields.io/badge/2024.2.1-555555?style=flat-square&logo=home-assistant [github-build-status-shield]: https://img.shields.io/github/actions/workflow/status/zanix/home-assistant-config/home-assistant.yaml?branch=master&style=flat-square&logo=github-actions&logoColor=838B95 [github-build-status]: https://github.com/zanix/home-assistant-config/actions/workflows/home-assistant.yaml diff --git a/configuration.yaml b/configuration.yaml index 50c8c0ca..941c8e9e 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -48,7 +48,6 @@ mqtt: binary_sensor: !include_dir_list entities/mqtt/binary_sensor sensor: !include_dir_list entities/mqtt/sensor notify: !include_dir_list entities/notify -proximity: !include_dir_merge_named entities/proximity rest_command: !include_dir_merge_named entities/rest_command sensor: !include_dir_list entities/sensor shell_command: !include_dir_merge_named entities/shell_command diff --git a/entities/proximity/amy_home.yaml b/entities/proximity/amy_home.yaml deleted file mode 100644 index 7d129a9e..00000000 --- a/entities/proximity/amy_home.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -amy_home: - zone: home - devices: - - device_tracker.pixel_8_amy - tolerance: 50 - unit_of_measurement: ft diff --git a/entities/proximity/joshua_home.yaml b/entities/proximity/joshua_home.yaml deleted file mode 100644 index 84280f49..00000000 --- a/entities/proximity/joshua_home.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -joshua_home: - zone: home - devices: - - device_tracker.pixel_8_joshua - tolerance: 50 - unit_of_measurement: ft diff --git a/entities/sensor/datetime/time_date.yaml b/entities/sensor/datetime/time_date.yaml deleted file mode 100644 index b470f9f2..00000000 --- a/entities/sensor/datetime/time_date.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# The time and date (time_date) sensor platform simple displays the time in -# various formats, the date, or both. -# -# https://www.home-assistant.io/integrations/time_date/ -# -platform: time_date -display_options: - - 'date_time' - - 'date_time_iso' diff --git a/entities/template/sensor/datetime/date.yaml b/entities/template/sensor/datetime/date.yaml index 018c3a5e..bf7513c6 100644 --- a/entities/template/sensor/datetime/date.yaml +++ b/entities/template/sensor/datetime/date.yaml @@ -9,4 +9,4 @@ sensor: - name: Date icon: mdi:calendar - state: '{{ as_timestamp(utcnow()) | timestamp_custom("%-m/%-d/%Y", True) }}' + state: '{{ as_timestamp(now()) | timestamp_custom("%-m/%-d/%Y") }}' diff --git a/entities/template/sensor/datetime/time.yaml b/entities/template/sensor/datetime/time.yaml index 1b0e884f..b4234c35 100644 --- a/entities/template/sensor/datetime/time.yaml +++ b/entities/template/sensor/datetime/time.yaml @@ -9,4 +9,4 @@ sensor: - name: Time icon: mdi:clock - state: '{{ as_timestamp(utcnow()) | timestamp_custom("%-I:%M %p", True) }}' + state: '{{ as_timestamp(now()) | timestamp_custom("%-I:%M %p") }}' diff --git a/entities/utility_meter/daily_energy.yaml b/entities/utility_meter/daily_energy.yaml index 80793dc3..365b8f10 100644 --- a/entities/utility_meter/daily_energy.yaml +++ b/entities/utility_meter/daily_energy.yaml @@ -8,23 +8,27 @@ sol_ark_load_daily: unique_id: sol_ark_load_daily name: Sol-Ark Load daily source: sensor.sol_ark_load_power_kwh + always_available: true cycle: daily sol_ark_pv_daily: unique_id: sol_ark_pv_daily name: Sol-Ark PV daily source: sensor.sol_ark_pv_power_kwh + always_available: true cycle: daily sol_ark_grid_net_daily: unique_id: sol_ark_grid_net_daily name: Sol-Ark Grid Net daily source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: daily net_consumption: true sol_ark_grid_net_tou_daily: unique_id: sol_ark_grid_net_tou_daily name: Sol-Ark Grid Net ToU Energy source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: daily net_consumption: true tariffs: @@ -37,57 +41,68 @@ sol_ark_grid_in_daily: unique_id: sol_ark_grid_in_daily name: Sol-Ark Grid In daily source: sensor.sol_ark_grid_power_in_kwh + always_available: true cycle: daily sol_ark_grid_out_daily: unique_id: sol_ark_grid_out_daily name: Sol-Ark Grid Out daily source: sensor.sol_ark_grid_power_out_kwh + always_available: true cycle: daily sol_ark_battery_net_daily: unique_id: sol_ark_battery_net_daily name: Sol-Ark Battery Net daily source: sensor.sol_ark_battery_power_kwh + always_available: true cycle: daily net_consumption: true sol_ark_battery_in_daily: unique_id: sol_ark_battery_in_daily name: Sol-Ark Battery In daily source: sensor.sol_ark_battery_power_in_kwh + always_available: true cycle: daily sol_ark_battery_out_daily: unique_id: sol_ark_battery_out_daily name: Sol-Ark Battery Out daily source: sensor.sol_ark_battery_power_out_kwh + always_available: true cycle: daily sol_ark_pv_surplus_daily: unique_id: sol_ark_pv_surplus_daily name: Sol-Ark PV Surplus daily source: sensor.sol_ark_pv_surplus_power_kwh + always_available: true cycle: daily sol_ark_battery_house_used_daily: unique_id: sol_ark_battery_house_used_daily name: Sol-Ark Battery House Used daily source: sensor.sol_ark_battery_house_used_power_kwh + always_available: true cycle: daily sol_ark_grid_battery_used_daily: unique_id: sol_ark_grid_battery_used_daily name: Sol-Ark Grid Battery Used daily source: sensor.sol_ark_grid_battery_used_power_kwh + always_available: true cycle: daily sol_ark_grid_house_used_daily: unique_id: sol_ark_grid_house_used_daily name: Sol-Ark Grid House Used daily source: sensor.sol_ark_grid_house_used_power_kwh + always_available: true cycle: daily sol_ark_pv_battery_used_daily: unique_id: sol_ark_pv_battery_used_daily name: Sol-Ark PV Battery Used daily source: sensor.sol_ark_pv_battery_used_power_kwh + always_available: true cycle: daily sol_ark_pv_house_used_daily: unique_id: sol_ark_pv_house_used_daily name: Sol-Ark PV House Used daily source: sensor.sol_ark_pv_house_used_power_kwh + always_available: true cycle: daily diff --git a/entities/utility_meter/lifetime_energy.yaml b/entities/utility_meter/lifetime_energy.yaml index 5511d3e8..ae3c2167 100644 --- a/entities/utility_meter/lifetime_energy.yaml +++ b/entities/utility_meter/lifetime_energy.yaml @@ -8,60 +8,74 @@ sol_ark_load_lifetime: unique_id: sol_ark_load_lifetime name: Sol-Ark Load lifetime source: sensor.sol_ark_load_power_kwh + always_available: true sol_ark_pv_lifetime: unique_id: sol_ark_pv_lifetime name: Sol-Ark PV lifetime source: sensor.sol_ark_pv_power_kwh + always_available: true sol_ark_grid_net_lifetime: unique_id: sol_ark_grid_net_lifetime name: Sol-Ark Grid net lifetime source: sensor.sol_ark_grid_power_kwh + always_available: true net_consumption: true sol_ark_grid_in_lifetime: unique_id: sol_ark_grid_in_lifetime name: Sol-Ark Grid in lifetime source: sensor.sol_ark_grid_power_in_kwh + always_available: true sol_ark_grid_out_lifetime: unique_id: sol_ark_grid_out_lifetime name: Sol-Ark Grid out lifetime source: sensor.sol_ark_grid_power_out_kwh + always_available: true sol_ark_battery_net_lifetime: unique_id: sol_ark_battery_net_lifetime name: Sol-Ark Battery net lifetime source: sensor.sol_ark_battery_power_kwh + always_available: true net_consumption: true sol_ark_battery_in_lifetime: unique_id: sol_ark_battery_in_lifetime name: Sol-Ark Battery in lifetime source: sensor.sol_ark_battery_power_in_kwh + always_available: true sol_ark_battery_out_lifetime: unique_id: sol_ark_battery_out_lifetime name: Sol-Ark Battery out lifetime source: sensor.sol_ark_battery_power_out_kwh + always_available: true sol_ark_pv_surplus_lifetime: unique_id: sol_ark_pv_surplus_lifetime name: Sol-Ark PV Surplus lifetime source: sensor.sol_ark_pv_surplus_power_kwh + always_available: true sol_ark_battery_house_used_lifetime: unique_id: sol_ark_battery_house_used_lifetime name: Sol-Ark Battery House Used lifetime source: sensor.sol_ark_battery_house_used_power_kwh + always_available: true sol_ark_grid_battery_used_lifetime: unique_id: sol_ark_grid_battery_used_lifetime name: Sol-Ark Grid Battery Used lifetime source: sensor.sol_ark_grid_battery_used_power_kwh + always_available: true sol_ark_grid_house_used_lifetime: unique_id: sol_ark_grid_house_used_lifetime name: Sol-Ark Grid House Used lifetime source: sensor.sol_ark_grid_house_used_power_kwh + always_available: true sol_ark_pv_battery_used_lifetime: unique_id: sol_ark_pv_battery_used_lifetime name: Sol-Ark PV Battery Used lifetime source: sensor.sol_ark_pv_battery_used_power_kwh + always_available: true sol_ark_pv_house_used_lifetime: unique_id: sol_ark_pv_house_used_lifetime name: Sol-Ark PV House Used lifetime source: sensor.sol_ark_pv_house_used_power_kwh + always_available: true diff --git a/entities/utility_meter/monthly_energy.yaml b/entities/utility_meter/monthly_energy.yaml index 58bfc75e..77436bdb 100644 --- a/entities/utility_meter/monthly_energy.yaml +++ b/entities/utility_meter/monthly_energy.yaml @@ -8,6 +8,7 @@ monthly_energy: unique_id: monthly_energy name: Sol-Ark Monthly Energy source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: monthly net_consumption: true offset: @@ -22,6 +23,7 @@ monthly_tou_energy: unique_id: monthly_tou_energy name: Sol-Ark Monthly ToU Energy source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: monthly net_consumption: true offset: @@ -36,6 +38,7 @@ sol_ark_load_monthly: unique_id: sol_ark_load_monthly name: Sol-Ark Load monthly source: sensor.sol_ark_load_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -43,6 +46,7 @@ sol_ark_pv_monthly: unique_id: sol_ark_pv_monthly name: Sol-Ark PV monthly source: sensor.sol_ark_pv_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -51,6 +55,7 @@ sol_ark_grid_net_monthly: unique_id: sol_ark_grid_net_monthly name: Sol-Ark Grid net monthly source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: monthly net_consumption: true offset: @@ -59,6 +64,7 @@ sol_ark_grid_in_monthly: unique_id: sol_ark_grid_in_monthly name: Sol-Ark Grid in monthly source: sensor.sol_ark_grid_power_in_kwh + always_available: true cycle: monthly offset: days: 10 @@ -66,6 +72,7 @@ sol_ark_grid_out_monthly: unique_id: sol_ark_grid_out_monthly name: Sol-Ark Grid out monthly source: sensor.sol_ark_grid_power_out_kwh + always_available: true cycle: monthly offset: days: 10 @@ -74,6 +81,7 @@ sol_ark_battery_net_monthly: unique_id: sol_ark_battery_net_monthly name: Sol-Ark Battery net monthly source: sensor.sol_ark_battery_power_kwh + always_available: true cycle: monthly net_consumption: true offset: @@ -82,6 +90,7 @@ sol_ark_battery_in_monthly: unique_id: sol_ark_battery_in_monthly name: Sol-Ark Battery in monthly source: sensor.sol_ark_battery_power_in_kwh + always_available: true cycle: monthly offset: days: 10 @@ -89,6 +98,7 @@ sol_ark_battery_out_monthly: unique_id: sol_ark_battery_out_monthly name: Sol-Ark Battery out monthly source: sensor.sol_ark_battery_power_out_kwh + always_available: true cycle: monthly offset: days: 10 @@ -97,6 +107,7 @@ sol_ark_pv_surplus_monthly: unique_id: sol_ark_pv_surplus_monthly name: Sol-Ark PV Surplus monthly source: sensor.sol_ark_pv_surplus_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -104,6 +115,7 @@ sol_ark_battery_house_used_monthly: unique_id: sol_ark_battery_house_used_monthly name: Sol-Ark Battery House Used monthly source: sensor.sol_ark_battery_house_used_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -111,6 +123,7 @@ sol_ark_grid_battery_used_monthly: unique_id: sol_ark_grid_battery_used_monthly name: Sol-Ark Grid Battery Used monthly source: sensor.sol_ark_grid_battery_used_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -118,6 +131,7 @@ sol_ark_grid_house_used_monthly: unique_id: sol_ark_grid_house_used_monthly name: Sol-Ark Grid House Used monthly source: sensor.sol_ark_grid_house_used_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -125,6 +139,7 @@ sol_ark_pv_battery_used_monthly: unique_id: sol_ark_pv_battery_used_monthly name: Sol-Ark PV Battery Used monthly source: sensor.sol_ark_pv_battery_used_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -132,6 +147,7 @@ sol_ark_pv_house_used_monthly: unique_id: sol_ark_pv_house_used_monthly name: Sol-Ark PV House Used monthly source: sensor.sol_ark_pv_house_used_power_kwh + always_available: true cycle: monthly offset: days: 10 @@ -140,6 +156,7 @@ emporiavue_total_monthly: unique_id: emporiavue_total_monthly name: EmporiaVue Total monthly source: sensor.emporiavue_total_daily + always_available: true cycle: monthly offset: days: 10 @@ -147,6 +164,7 @@ emporiavue_balance_monthly: unique_id: emporiavue_balance_monthly name: EmporiaVue Balance monthly source: sensor.emporiavue_balance_daily + always_available: true cycle: monthly offset: days: 10 @@ -155,6 +173,7 @@ emporiavue_air_conditioner_monthly: unique_id: emporiavue_air_conditioner_monthly name: EmporiaVue Air conditioner monthly source: sensor.emporiavue_air_conditioner_daily + always_available: true cycle: monthly offset: days: 10 @@ -162,6 +181,7 @@ emporiavue_basement_bedrooms_monthly: unique_id: emporiavue_basement_bedrooms_monthly name: EmporiaVue Basement bedrooms monthly source: sensor.emporiavue_basement_bedrooms_daily + always_available: true cycle: monthly offset: days: 10 @@ -169,6 +189,7 @@ emporiavue_bedrooms_monthly: unique_id: emporiavue_bedrooms_monthly name: EmporiaVue Bedrooms monthly source: sensor.emporiavue_bedrooms_daily + always_available: true cycle: monthly offset: days: 10 @@ -176,6 +197,7 @@ emporiavue_dishwasher_disposal_monthly: unique_id: emporiavue_dishwasher_disposal_monthly name: EmporiaVue Dishwasher, Disposal monthly source: sensor.emporiavue_dishwasher_disposal_daily + always_available: true cycle: monthly offset: days: 10 @@ -183,6 +205,7 @@ emporiavue_dryer_monthly: unique_id: emporiavue_dryer_monthly name: EmporiaVue Dryer monthly source: sensor.emporiavue_dryer_daily + always_available: true cycle: monthly offset: days: 10 @@ -190,6 +213,7 @@ emporiavue_entry_living_room_bath_lights_monthly: unique_id: emporiavue_entry_living_room_bath_lights_monthly name: EmporiaVue Entry, Living room, Bath lights monthly source: sensor.emporiavue_entry_living_room_bath_lights_daily + always_available: true cycle: monthly offset: days: 10 @@ -197,6 +221,7 @@ emporiavue_family_room_monthly: unique_id: emporiavue_family_room_monthly name: EmporiaVue Family room monthly source: sensor.emporiavue_family_room_daily + always_available: true cycle: monthly offset: days: 10 @@ -204,6 +229,7 @@ emporiavue_fridge_kitchen_outlets_monthly: unique_id: emporiavue_fridge_kitchen_outlets_monthly name: EmporiaVue Fridge, Kitchen outlets monthly source: sensor.emporiavue_fridge_kitchen_outlets_daily + always_available: true cycle: monthly offset: days: 10 @@ -211,6 +237,7 @@ emporiavue_furnace_monthly: unique_id: emporiavue_furnace_monthly name: EmporiaVue Furnace monthly source: sensor.emporiavue_furnace_daily + always_available: true cycle: monthly offset: days: 10 @@ -218,6 +245,7 @@ emporiavue_garage_outlets_monthly: unique_id: emporiavue_garage_outlets_monthly name: EmporiaVue Garage outlets monthly source: sensor.emporiavue_garage_outlets_daily + always_available: true cycle: monthly offset: days: 10 @@ -225,6 +253,7 @@ emporiavue_living_room_master_bedroom_monthly: unique_id: emporiavue_living_room_master_bedroom_monthly name: EmporiaVue Living room, Master bedroom monthly source: sensor.emporiavue_living_room_master_bedroom_daily + always_available: true cycle: monthly offset: days: 10 @@ -232,6 +261,7 @@ emporiavue_microwave_monthly: unique_id: emporiavue_microwave_monthly name: EmporiaVue Microwave monthly source: sensor.emporiavue_microwave_daily + always_available: true cycle: monthly offset: days: 10 @@ -239,6 +269,7 @@ emporiavue_range_monthly: unique_id: emporiavue_range_monthly name: EmporiaVue Range monthly source: sensor.emporiavue_range_daily + always_available: true cycle: monthly offset: days: 10 @@ -246,6 +277,7 @@ emporiavue_theater_room_monthly: unique_id: emporiavue_theater_room_monthly name: EmporiaVue Theater room monthly source: sensor.emporiavue_theater_room_daily + always_available: true cycle: monthly offset: days: 10 @@ -253,6 +285,7 @@ emporiavue_utility_room_monthly: unique_id: emporiavue_utility_room_monthly name: EmporiaVue Utility room monthly source: sensor.emporiavue_utility_room_daily + always_available: true cycle: monthly offset: days: 10 @@ -260,6 +293,7 @@ emporiavue_washer_monthly: unique_id: emporiavue_washer_monthly name: EmporiaVue Washer monthly source: sensor.emporiavue_washer_daily + always_available: true cycle: monthly offset: days: 10 diff --git a/entities/utility_meter/weekly_energy.yaml b/entities/utility_meter/weekly_energy.yaml index 758d1ae4..bb09e5e0 100644 --- a/entities/utility_meter/weekly_energy.yaml +++ b/entities/utility_meter/weekly_energy.yaml @@ -8,74 +8,88 @@ sol_ark_load_weekly: unique_id: sol_ark_load_weekly name: Sol-Ark Load weekly source: sensor.sol_ark_load_power_kwh + always_available: true cycle: weekly sol_ark_pv_weekly: unique_id: sol_ark_pv_weekly name: Sol-Ark PV weekly source: sensor.sol_ark_pv_power_kwh + always_available: true cycle: weekly sol_ark_grid_net_weekly: unique_id: sol_ark_grid_net_weekly name: Sol-Ark Grid Net weekly source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: weekly net_consumption: true sol_ark_grid_in_weekly: unique_id: sol_ark_grid_in_weekly name: Sol-Ark Grid In weekly source: sensor.sol_ark_grid_power_in_kwh + always_available: true cycle: weekly sol_ark_grid_out_weekly: unique_id: sol_ark_grid_out_weekly name: Sol-Ark Grid Out weekly source: sensor.sol_ark_grid_power_out_kwh + always_available: true cycle: weekly sol_ark_battery_net_weekly: unique_id: sol_ark_battery_net_weekly name: Sol-Ark Battery Net weekly source: sensor.sol_ark_battery_power_kwh + always_available: true cycle: weekly net_consumption: true sol_ark_battery_in_weekly: unique_id: sol_ark_battery_in_weekly name: Sol-Ark Battery In weekly source: sensor.sol_ark_battery_power_in_kwh + always_available: true cycle: weekly sol_ark_battery_out_weekly: unique_id: sol_ark_battery_out_weekly name: Sol-Ark Battery Out weekly source: sensor.sol_ark_battery_power_out_kwh + always_available: true cycle: weekly sol_ark_pv_surplus_weekly: unique_id: sol_ark_pv_surplus_weekly name: Sol-Ark PV Surplus weekly source: sensor.sol_ark_pv_surplus_power_kwh + always_available: true cycle: weekly sol_ark_battery_house_used_weekly: unique_id: sol_ark_battery_house_used_weekly name: Sol-Ark Battery House Used weekly source: sensor.sol_ark_battery_house_used_power_kwh + always_available: true cycle: weekly sol_ark_grid_battery_used_weekly: unique_id: sol_ark_grid_battery_used_weekly name: Sol-Ark Grid Battery Used weekly source: sensor.sol_ark_grid_battery_used_power_kwh + always_available: true cycle: weekly sol_ark_grid_house_used_weekly: unique_id: sol_ark_grid_house_used_weekly name: Sol-Ark Grid House Used weekly source: sensor.sol_ark_grid_house_used_power_kwh + always_available: true cycle: weekly sol_ark_pv_battery_used_weekly: unique_id: sol_ark_pv_battery_used_weekly name: Sol-Ark PV Battery Used weekly source: sensor.sol_ark_pv_battery_used_power_kwh + always_available: true cycle: weekly sol_ark_pv_house_used_weekly: unique_id: sol_ark_pv_house_used_weekly name: Sol-Ark PV House Used weekly source: sensor.sol_ark_pv_house_used_power_kwh + always_available: true cycle: weekly diff --git a/entities/utility_meter/yearly_energy.yaml b/entities/utility_meter/yearly_energy.yaml index 5a847ffd..b3e709c7 100644 --- a/entities/utility_meter/yearly_energy.yaml +++ b/entities/utility_meter/yearly_energy.yaml @@ -8,6 +8,7 @@ sol_ark_load_yearly: unique_id: sol_ark_load_yearly name: Sol-Ark Load yearly source: sensor.sol_ark_load_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -15,6 +16,7 @@ sol_ark_pv_yearly: unique_id: sol_ark_pv_yearly name: Sol-Ark PV yearly source: sensor.sol_ark_pv_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -23,6 +25,7 @@ sol_ark_grid_net_yearly: unique_id: sol_ark_grid_net_yearly name: Sol-Ark Grid net yearly source: sensor.sol_ark_grid_power_kwh + always_available: true cycle: yearly net_consumption: true offset: @@ -31,6 +34,7 @@ sol_ark_grid_in_yearly: unique_id: sol_ark_grid_in_yearly name: Sol-Ark Grid in yearly source: sensor.sol_ark_grid_power_in_kwh + always_available: true cycle: yearly offset: days: 10 @@ -38,6 +42,7 @@ sol_ark_grid_out_yearly: unique_id: sol_ark_grid_out_yearly name: Sol-Ark Grid out yearly source: sensor.sol_ark_grid_power_out_kwh + always_available: true cycle: yearly offset: days: 10 @@ -46,6 +51,7 @@ sol_ark_battery_net_yearly: unique_id: sol_ark_battery_net_yearly name: Sol-Ark Battery net yearly source: sensor.sol_ark_battery_power_kwh + always_available: true cycle: yearly net_consumption: true offset: @@ -54,6 +60,7 @@ sol_ark_battery_in_yearly: unique_id: sol_ark_battery_in_yearly name: Sol-Ark Battery in yearly source: sensor.sol_ark_battery_power_in_kwh + always_available: true cycle: yearly offset: days: 10 @@ -61,6 +68,7 @@ sol_ark_battery_out_yearly: unique_id: sol_ark_battery_out_yearly name: Sol-Ark Battery out yearly source: sensor.sol_ark_battery_power_out_kwh + always_available: true cycle: yearly offset: days: 10 @@ -69,6 +77,7 @@ sol_ark_pv_surplus_yearly: unique_id: sol_ark_pv_surplus_yearly name: Sol-Ark PV Surplus yearly source: sensor.sol_ark_pv_surplus_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -76,6 +85,7 @@ sol_ark_battery_house_used_yearly: unique_id: sol_ark_battery_house_used_yearly name: Sol-Ark Battery House Used yearly source: sensor.sol_ark_battery_house_used_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -83,6 +93,7 @@ sol_ark_grid_battery_used_yearly: unique_id: sol_ark_grid_battery_used_yearly name: Sol-Ark Grid Battery Used yearly source: sensor.sol_ark_grid_battery_used_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -90,6 +101,7 @@ sol_ark_grid_house_used_yearly: unique_id: sol_ark_grid_house_used_yearly name: Sol-Ark Grid House Used yearly source: sensor.sol_ark_grid_house_used_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -97,6 +109,7 @@ sol_ark_pv_battery_used_yearly: unique_id: sol_ark_pv_battery_used_yearly name: Sol-Ark PV Battery Used yearly source: sensor.sol_ark_pv_battery_used_power_kwh + always_available: true cycle: yearly offset: days: 10 @@ -104,6 +117,7 @@ sol_ark_pv_house_used_yearly: unique_id: sol_ark_pv_house_used_yearly name: Sol-Ark PV House Used yearly source: sensor.sol_ark_pv_house_used_power_kwh + always_available: true cycle: yearly offset: days: 10 diff --git a/packages/influxdb.yaml b/packages/influxdb.yaml index 4a43da74..34de8850 100644 --- a/packages/influxdb.yaml +++ b/packages/influxdb.yaml @@ -53,7 +53,6 @@ influxdb: # - media_player # - number # - person - # - proximity - remote # - schedule # - script diff --git a/packages/logbook.yaml b/packages/logbook.yaml index 699cdc83..58d375a8 100644 --- a/packages/logbook.yaml +++ b/packages/logbook.yaml @@ -14,8 +14,7 @@ logbook: - sensor.date - sensor.last_boot - sensor.time - - sensor.date_time - - sensor.date_time_iso + - sensor.stardate - sensor.sunset - sensor.sunrise diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index 81998d3f..369f2219 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -1257,24 +1257,22 @@ decluttering_templates: \ none;\n}\n" double_tap_action: action: none - entity: proximity.[[person]]_home + entity: sensor.home_[[person]]_direction_of_travel hold_action: action: none - icon: "{% if is_state_attr(entity, \"dir_of_travel\", \"towards\"\ - ) %}\n mdi:map-marker-left\n{% elif is_state_attr(entity, \"\ - dir_of_travel\", \"away_from\") %}\n mdi:map-marker-right\n\ + icon: "{% if is_state(entity, \"towards\") %}\n mdi:map-marker-left\n\ + {% elif is_state(entity, \"away_from\") %}\n mdi:map-marker-right\n\ {% else %}\n mdi:map-marker-path\n{% endif %}" - icon_color: "{% if is_state_attr(entity, \"dir_of_travel\", \"\ - towards\") %}\n green\n{% elif is_state_attr(entity, \"dir_of_travel\"\ - , \"away_from\") %}\n orange\n{% else %}\n grey\n{% endif\ - \ %}" + icon_color: "{% if is_state(entity, \"towards\") %}\n green\n\ + {% elif is_state(entity, \"away_from\") %}\n orange\n{% else\ + \ %}\n grey\n{% endif %}" layout: vertical primary: "{% if is_state(\"person.[[person]]\", \"home\") %}\n\ \ Home\n{% elif is_state(\"person.[[person]]\", \"not_home\"\ ) %}\n Away\n{% else %}\n {{ states(\"person.[[person]]\"\ ) }}\n{% endif %}" - secondary: '{{ ((states(entity) | float) / 5280) | round(1) }} - mi' + secondary: '{{ ((states("sensor.home_[[person]]_distance") | float) + / 5280) | round(1) }} mi' tap_action: action: none type: custom:mushroom-template-card @@ -1602,17 +1600,17 @@ decluttering_templates: - chip: double_tap_action: action: none - entity: proximity.[[person]]_home + entity: sensor.home_[[person]]_direction_of_travel hold_action: action: none - icon: "{% if int(states(entity), 0) >= 400 %}\n {% if is_state_attr(entity,\ - \ \"dir_of_travel\", \"towards\") %}\n mdi:map-marker-left\n {%\ - \ elif is_state_attr(entity, \"dir_of_travel\", \"away_from\") %}\n\ - \ mdi:map-marker-right\n {% else %}\n mdi:map-marker-distance\n\ - \ {% endif %}\n{% endif %}" - icon_color: "{% if is_state_attr(entity, \"dir_of_travel\", \"towards\"\ - ) %}\n green\n{% elif is_state_attr(entity, \"dir_of_travel\", \"away_from\"\ - ) %}\n orange\n{% else %}\n grey\n{% endif %}" + icon: "{% if int(states(\"sensor.home_[[person]]_distance\"), 0) >= 400\ + \ %}\n {% if is_state(entity, \"towards\") %}\n mdi:map-marker-left\n\ + \ {% elif is_state(entity, \"away_from\") %}\n mdi:map-marker-right\n\ + \ {% else %}\n mdi:map-marker-distance\n {% endif %}\n{% endif\ + \ %}" + icon_color: "{% if is_state(entity, \"towards\") %}\n green\n{% elif\ + \ is_state(entity, \"away_from\") %}\n orange\n{% else %}\n grey\n\ + {% endif %}" layout: vertical tap_action: action: none