diff --git a/configuration.yaml b/configuration.yaml index b65da99..cd68971 100644 --- a/configuration.yaml +++ b/configuration.yaml @@ -82,9 +82,13 @@ tts: - platform: google_translate +ourgroceries: + username: !secret our_groceries_username + password: !secret our_groceries_password + spotcast: - sp_dc: AQAhATYuWsLXQExlnAd9DxuJ7UJz2HTvnouTZ-8Ex__iRAnT2De697spQesUj0cC3BpAu_VEXloXyg3XP9WFyc-kyLylmqD4_GnaFBHaI2aNhw - sp_key: 009ec0de-b75e-4c62-aaad-c2a67074e1bb + sp_dc: !secret spotify_dc + sp_key: !secret spotify_key country: DK camera: !include_dir_merge_list camera/ @@ -121,57 +125,14 @@ lights_state: name: Wether lights have been turned off -utility_meter: - util_solar_generated_usage_daily: - source: sensor.energy_generated - cycle: daily +utility_meter: !include_dir_merge_named utility_meter/ - util_solar_generated_usage_monthly: - source: sensor.energy_generated - cycle: monthly - - util_water_usage_hourly: - source: sensor.water_total - cycle: hourly - util_water_usage_daily: - source: sensor.water_total - cycle: daily - util_water_usage_monthly: - source: sensor.water_total - cycle: monthly - util_water_usage_yearly: - source: sensor.water_total - cycle: yearly - - internet_usage_yearly_download: - source: sensor.total_download_data - name: Yearly Internet Download Usage - cycle: yearly - internet_usage_yearly_upload: - source: sensor.total_upload_data - name: Yearly Internet Upload Usage - cycle: yearly - internet_usage_monthly_download: - source: sensor.total_download_data - name: Monthly Internet Download Usage - cycle: monthly - internet_usage_monthly_upload: - source: sensor.total_upload_data - name: Monthly Internet Upload Usage - cycle: monthly - internet_usage_daily_download: - source: sensor.total_download_data - name: Daily Internet Download Usage - cycle: daily - internet_usage_daily_upload: - source: sensor.total_upload_data - name: Daily Internet Upload Usage - cycle: daily - internet_usage_hourly_download: - source: sensor.total_download_data - name: Hourly Internet Download Usage - cycle: hourly - internet_usage_hourly_upload: - source: sensor.total_upload_data - name: Hourly Internet Upload Usage - cycle: hourly +lovelace: + mode: storage + dashboards: + lovelace-yaml: + mode: yaml + filename: dashboards/minimal/dashboard.yaml + title: New + icon: mdi:view-dashboard-outline + show_in_sidebar: true diff --git a/dashboards/minimal/dashboard.yaml b/dashboards/minimal/dashboard.yaml new file mode 100644 index 0000000..f5717f5 --- /dev/null +++ b/dashboards/minimal/dashboard.yaml @@ -0,0 +1,6 @@ +decluttering_templates: !include declutter.yaml +title: Hjem +views: + - !include views/hjem.yaml + - !include views/varme.yaml + - !include views/lys.yaml diff --git a/dashboards/minimal/declutter.yaml b/dashboards/minimal/declutter.yaml new file mode 100644 index 0000000..fbfe534 --- /dev/null +++ b/dashboards/minimal/declutter.yaml @@ -0,0 +1,38 @@ +title_template: # This is the name of a template + default: + - font-size: "2rem" + - alignment: "center" + card: + type: custom:mod-card + card: + type: custom:mushroom-title-card + title: "[[title]]" + alignment: "[[alignment]]" + card_mod: + style: + "mushroom-title-card": + "$": | + h1 { + font-size: [[font-size]] !important; + } + +subpanel_title_template: + default: + - font-size: "2rem" + - alignment: "center" + card: + type: "custom:layout-card" + layout_type: custom:grid-layout + layout: + grid-template-columns: 50px auto + place-items: baseline stretch + cards: + - type: custom:mushroom-chips-card + chips: + - type: back + + - type: custom:decluttering-card + template: title_template + variables: + - title: "[[title]]" + - alignment: "[[alignment]]" diff --git a/dashboards/minimal/views/hjem.yaml b/dashboards/minimal/views/hjem.yaml new file mode 100644 index 0000000..5d34464 --- /dev/null +++ b/dashboards/minimal/views/hjem.yaml @@ -0,0 +1,64 @@ +title: Hjem +cards: + - type: custom:stack-in-card + cards: + - type: custom:decluttering-card + template: title_template + variables: + - title: Velkommen, {{user}} + - font-size: "1.5rem" + + - type: custom:mushroom-chips-card + chips: + - type: template + icon: mdi:lightbulb + content: Lys + icon_color: yellow + tap_action: + action: navigate + navigation_path: lys + - type: template + icon: mdi:heating-coil + content: Varme + icon_color: red + tap_action: + action: navigate + navigation_path: varme + alignment: center + style: | + :host { + padding-bottom: 1em; + } + + - type: custom:gap-card + + - type: custom:stack-in-card + mode: horizontal + cards: + - type: custom:mushroom-person-card + entity: person.rolf_bagge + - type: custom:mushroom-person-card + entity: person.berit_bagge + + - type: custom:gap-card + + - type: custom:stack-in-card + mode: horizontal + cards: + - type: custom:room-card + title: Køkken + entity: light.kokken_alle + icon: mdi:stove + show_icon: true + tap_action: + action: navigate + navigate_path: kokken + + - type: custom:room-card + title: Stue + entity: light.stue_gruppe + icon: mdi:sofa + show_icon: true + tap_action: + action: navigate + navigate_path: stue diff --git a/dashboards/minimal/views/lys.yaml b/dashboards/minimal/views/lys.yaml new file mode 100644 index 0000000..0a643a9 --- /dev/null +++ b/dashboards/minimal/views/lys.yaml @@ -0,0 +1,8 @@ +title: Lys +path: lys +cards: + - type: custom:decluttering-card + template: subpanel_title_template + variables: + - title: Lys + - alignment: start diff --git a/dashboards/minimal/views/varme.yaml b/dashboards/minimal/views/varme.yaml new file mode 100644 index 0000000..ab65020 --- /dev/null +++ b/dashboards/minimal/views/varme.yaml @@ -0,0 +1,8 @@ +title: Varme +path: varme +cards: + - type: custom:decluttering-card + template: subpanel_title_template + variables: + - title: Varme + - alignment: start diff --git a/known_devices.yaml b/known_devices.yaml index 337cb4d..aec40e9 100644 --- a/known_devices.yaml +++ b/known_devices.yaml @@ -223,3 +223,101 @@ icon: picture: track: false + +80_3f_5d_10_67_ad: + name: 80_3f_5d_10_67_ad + mac: 80:3F:5D:10:67:AD + icon: + picture: + track: true + +d0_49_7c_c9_32_e1: + name: d0_49_7c_c9_32_e1 + mac: D0:49:7C:C9:32:E1 + icon: + picture: + track: true + +e4_9a_79_08_9c_61: + name: e4_9a_79_08_9c_61 + mac: E4:9A:79:08:9C:61 + icon: + picture: + track: true + +0c_51_01_89_b8_3e: + name: 0c_51_01_89_b8_3e + mac: 0C:51:01:89:B8:3E + icon: + picture: + track: true + +cc_8c_bf_5a_90_69: + name: cc_8c_bf_5a_90_69 + mac: CC:8C:BF:5A:90:69 + icon: + picture: + track: true + +cc_8c_bf_64_5c_2c: + name: cc_8c_bf_64_5c_2c + mac: CC:8C:BF:64:5C:2C + icon: + picture: + track: true + +94_b5_55_2d_83_10: + name: 94_b5_55_2d_83_10 + mac: 94:B5:55:2D:83:10 + icon: + picture: + track: true + +e8_9f_6d_93_d5_ac: + name: e8_9f_6d_93_d5_ac + mac: E8:9F:6D:93:D5:AC + icon: + picture: + track: true + +0c_b8_15_c4_bc_d8: + name: 0c_b8_15_c4_bc_d8 + mac: 0C:B8:15:C4:BC:D8 + icon: + picture: + track: true + +e0_98_06_01_bc_b1: + name: e0_98_06_01_bc_b1 + mac: E0:98:06:01:BC:B1 + icon: + picture: + track: true + +c8_c9_a3_f9_e3_6c: + name: c8_c9_a3_f9_e3_6c + mac: C8:C9:A3:F9:E3:6C + icon: + picture: + track: true + +cc_8c_bf_63_e7_c6: + name: cc_8c_bf_63_e7_c6 + mac: CC:8C:BF:63:E7:C6 + icon: + picture: + track: true + +c4_4f_33_ee_5c_f1: + name: c4_4f_33_ee_5c_f1 + mac: C4:4F:33:EE:5C:F1 + icon: + picture: + track: true + +e4_5f_01_a4_18_98: + name: e4_5f_01_a4_18_98 + mac: E4:5F:01:A4:18:98 + icon: + picture: + track: true diff --git a/lights.yaml b/lights.yaml index 4261ccd..6f47110 100644 --- a/lights.yaml +++ b/lights.yaml @@ -18,6 +18,14 @@ - light.kokken_o_2 - platform: group + name: Køkken Alle + entities: + - light.kokken_gruppe + - light.kokken_o_gruppe + - light.flowerpot + - light.spisebord_gruppe + +- platform: group name: Spisebord Gruppe entities: - light.spisebord @@ -72,6 +80,11 @@ - light.bryggers_indhak - platform: group + name: Stue Gruppe + entities: + - light.sofabord + +- platform: group name: Alle entities: - light.gang_gruppe diff --git a/utility_meter/internet.yaml b/utility_meter/internet.yaml new file mode 100644 index 0000000..bb10dae --- /dev/null +++ b/utility_meter/internet.yaml @@ -0,0 +1,32 @@ +internet_usage_yearly_download: + source: sensor.total_download_data + name: Yearly Internet Download Usage + cycle: yearly +internet_usage_yearly_upload: + source: sensor.total_upload_data + name: Yearly Internet Upload Usage + cycle: yearly +internet_usage_monthly_download: + source: sensor.total_download_data + name: Monthly Internet Download Usage + cycle: monthly +internet_usage_monthly_upload: + source: sensor.total_upload_data + name: Monthly Internet Upload Usage + cycle: monthly +internet_usage_daily_download: + source: sensor.total_download_data + name: Daily Internet Download Usage + cycle: daily +internet_usage_daily_upload: + source: sensor.total_upload_data + name: Daily Internet Upload Usage + cycle: daily +internet_usage_hourly_download: + source: sensor.total_download_data + name: Hourly Internet Download Usage + cycle: hourly +internet_usage_hourly_upload: + source: sensor.total_upload_data + name: Hourly Internet Upload Usage + cycle: hourly diff --git a/utility_meter/solar.yaml b/utility_meter/solar.yaml new file mode 100644 index 0000000..0c7c605 --- /dev/null +++ b/utility_meter/solar.yaml @@ -0,0 +1,7 @@ +util_solar_generated_usage_daily: + source: sensor.energy_generated + cycle: daily + +util_solar_generated_usage_monthly: + source: sensor.energy_generated + cycle: monthly diff --git a/utility_meter/water.yaml b/utility_meter/water.yaml new file mode 100644 index 0000000..a8f7ea5 --- /dev/null +++ b/utility_meter/water.yaml @@ -0,0 +1,12 @@ +util_water_usage_hourly: + source: sensor.water_total + cycle: hourly +util_water_usage_daily: + source: sensor.water_total + cycle: daily +util_water_usage_monthly: + source: sensor.water_total + cycle: monthly +util_water_usage_yearly: + source: sensor.water_total + cycle: yearly diff --git a/zigbee2mqtt/coordinator_backup.json b/zigbee2mqtt/coordinator_backup.json index 52ff371..e999ea4 100644 --- a/zigbee2mqtt/coordinator_backup.json +++ b/zigbee2mqtt/coordinator_backup.json @@ -2,9 +2,9 @@ "metadata": { "format": "zigpy/open-coordinator-backup", "version": 1, - "source": "zigbee-herdsman@0.14.68", + "source": "zigbee-herdsman@0.14.76", "internal": { - "date": "2022-11-28T23:04:43.529Z", + "date": "2022-12-03T05:37:17.915Z", "znpVersion": 1 } }, @@ -25,7 +25,7 @@ "network_key": { "key": "01030507090b0d0f00020406080a0c0d", "sequence_number": 0, - "frame_counter": 1792964 + "frame_counter": 2235455 }, "devices": [ { diff --git a/zigbee2mqtt/state.json b/zigbee2mqtt/state.json index 936dc0c..e3b701a 100644 --- a/zigbee2mqtt/state.json +++ b/zigbee2mqtt/state.json @@ -1,52 +1,55 @@ { "0xa4c1387b259019f2": { - "energy": 0.81, + "energy": 0.99, "power": 0, "current": 0, - "voltage": 233, + "voltage": 232, "state": "ON", "power_outage_memory": "on", "indicator_mode": "off/on", "child_lock": "UNLOCK", "update": { - "state": "available" + "state": "idle", + "installed_version": "unknown" }, - "linkquality": 54 + "linkquality": 65 }, "0xf082c0fffe9be262": { "update": { - "state": "idle" + "state": "idle", + "installed_version": "2.3.086" }, - "linkquality": 193 + "linkquality": 189 }, "0x00000000e203d9a9": { - "voltage_phase_a": 235, - "voltage_phase_b": 235.3, - "voltage_phase_c": 234.9, - "voltage_phase_ab": 406.9, - "voltage_phase_bc": 406.6, - "voltage_phase_ca": 407.9, + "voltage_phase_a": 235.5, + "voltage_phase_b": 235.1, + "voltage_phase_c": 234.5, + "voltage_phase_ab": 407.6, + "voltage_phase_bc": 406.1, + "voltage_phase_ca": 407.5, "current_phase_a": 0, - "current_phase_b": 1.56, - "current_phase_c": 1.34, - "power": 484, - "power_apparent": 671, - "ac_frequency": 50, + "current_phase_b": 0.94, + "current_phase_c": 2.55, + "power": 715, + "power_apparent": 878, + "ac_frequency": 50.1, "power_phase_a": 0, - "power_phase_b": 309, - "power_phase_c": 175, - "energy": 220.276, - "energy_phase_a": 56.252, - "energy_phase_b": 73.903, - "energy_phase_c": 90.121, - "power_factor": 72, + "power_phase_b": 198, + "power_phase_c": 517, + "energy": 270.636, + "energy_phase_a": 65.425, + "energy_phase_b": 92.662, + "energy_phase_c": 112.549, + "power_factor": 78, "linkquality": 193 }, "0x84b4dbfffec3d1df": { "update": { - "state": "available" + "state": "idle", + "installed_version": "2.3.089" }, "state": "ON", - "linkquality": 193 + "linkquality": 47 } } \ No newline at end of file