From a8e98ad1599af58b290406e016bed7cfc819f0d7 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 6 Sep 2024 16:18:38 +0100 Subject: [PATCH] Update power unit names --- base.yaml | 2 ++ heat-pump-1.yaml => power-ashp1.yaml | 6 ++++-- heat-pump-2.yaml => power-ashp2.yaml | 6 ++++-- power-ring2.yaml => power-cooker.yaml | 4 +++- power-sockets1.yaml => power-immersion.yaml | 4 +++- power-light-spare2.yaml => power-light-spare1.yaml | 7 ++++--- power-light2.yaml | 3 ++- power-light3.yaml | 1 + power-lights-downstairs.yaml | 12 ++++++++++++ power-light1.yaml => power-lights-ext.yaml | 6 ++++-- power-lights-upstairs.yaml | 12 ++++++++++++ power-ring3.yaml => power-ring-ext.yaml | 4 +++- power-ring4.yaml => power-ring-house.yaml | 4 +++- power-ring1.yaml => power-ring-shed.yaml | 4 +++- 14 files changed, 60 insertions(+), 15 deletions(-) rename heat-pump-1.yaml => power-ashp1.yaml (56%) rename heat-pump-2.yaml => power-ashp2.yaml (56%) rename power-ring2.yaml => power-cooker.yaml (70%) rename power-sockets1.yaml => power-immersion.yaml (68%) rename power-light-spare2.yaml => power-light-spare1.yaml (53%) create mode 100644 power-lights-downstairs.yaml rename power-light1.yaml => power-lights-ext.yaml (54%) create mode 100644 power-lights-upstairs.yaml rename power-ring3.yaml => power-ring-ext.yaml (69%) rename power-ring4.yaml => power-ring-house.yaml (68%) rename power-ring1.yaml => power-ring-shed.yaml (69%) diff --git a/base.yaml b/base.yaml index 781af69..5c6211e 100644 --- a/base.yaml +++ b/base.yaml @@ -88,3 +88,5 @@ mqtt: username: "pool" password: !secret pool_mqtt_pw id: mqtt_client + +mdns: diff --git a/heat-pump-1.yaml b/power-ashp1.yaml similarity index 56% rename from heat-pump-1.yaml rename to power-ashp1.yaml index 49fd7ca..dfbb1e6 100644 --- a/heat-pump-1.yaml +++ b/power-ashp1.yaml @@ -1,6 +1,8 @@ substitutions: - name: "heat-pump-1" - tongou_name: "Heat pump feed 1" + mac: "50:8b:b9:a8:32:09" + old_name: "heat-pump-1" + name: "power-ashp1" + tongou_name: "Heat pump 1 circuit" voltage_ref: "15928" current_ref: "126130" power_ref: "313.6" diff --git a/heat-pump-2.yaml b/power-ashp2.yaml similarity index 56% rename from heat-pump-2.yaml rename to power-ashp2.yaml index d1f8d67..97fcb02 100644 --- a/heat-pump-2.yaml +++ b/power-ashp2.yaml @@ -1,6 +1,8 @@ substitutions: - name: "heat-pump-2" - tongou_name: "Heat pump feed 2" + mac: "50:8b:b9:a8:41:8f" + old_name: "heat-pump-2" + name: "power-ashp2" + tongou_name: "Heat pump 2 circuit" voltage_ref: "15929" current_ref: "125910" power_ref: "313.0" diff --git a/power-ring2.yaml b/power-cooker.yaml similarity index 70% rename from power-ring2.yaml rename to power-cooker.yaml index c3608c4..b29e091 100644 --- a/power-ring2.yaml +++ b/power-cooker.yaml @@ -1,5 +1,7 @@ substitutions: - name: "power-ring2" + mac: "a8:80:55:08:cd:43" + old_name: "power-ring2" + name: "power-cooker" tongou_name: "Cooker circuit" voltage_ref: "15935" current_ref: "125730" diff --git a/power-sockets1.yaml b/power-immersion.yaml similarity index 68% rename from power-sockets1.yaml rename to power-immersion.yaml index e9ee13a..4f8427e 100644 --- a/power-sockets1.yaml +++ b/power-immersion.yaml @@ -1,5 +1,7 @@ substitutions: - name: "power-sockets1" + mac: "a8:80:55:08:b2:b2" + old_name: "power-sockets1" + name: "power-immersion" tongou_name: "Immersion circuit" voltage_ref: "15964" current_ref: "127220" diff --git a/power-light-spare2.yaml b/power-light-spare1.yaml similarity index 53% rename from power-light-spare2.yaml rename to power-light-spare1.yaml index 317fb50..15fdf8d 100644 --- a/power-light-spare2.yaml +++ b/power-light-spare1.yaml @@ -1,7 +1,8 @@ substitutions: - name: "power-light-spare2" - tongou_name: "10A spare 2" - voltage_ref: "15968" + mac: "a0:92:08:23:d8:00" + name: "power-light-spare1" + tongou_name: "10A spare 1" + voltage_ref: "15859" current_ref: "124180" power_ref: "309.1" energy_ref: "2653" diff --git a/power-light2.yaml b/power-light2.yaml index babc1d2..8287bad 100644 --- a/power-light2.yaml +++ b/power-light2.yaml @@ -1,6 +1,7 @@ substitutions: + mac: "a0:92:08:23:b6:0a" name: "power-light2" - tongou_name: "Upstairs Light circuit" + tongou_name: "10A circuit 2" voltage_ref: "15883" current_ref: "125600" power_ref: "311.6" diff --git a/power-light3.yaml b/power-light3.yaml index 6ccb32f..4049371 100644 --- a/power-light3.yaml +++ b/power-light3.yaml @@ -1,4 +1,5 @@ substitutions: + mac: "a0:92:08:23:d9:b6" name: "power-light3" tongou_name: "Downstairs Light circuit" voltage_ref: "15830" diff --git a/power-lights-downstairs.yaml b/power-lights-downstairs.yaml new file mode 100644 index 0000000..58affa1 --- /dev/null +++ b/power-lights-downstairs.yaml @@ -0,0 +1,12 @@ +substitutions: + mac: "18:de:50:e0:4e:a3" + old_name: "power-light-spare2" + name: "power-lights-downstairs" + tongou_name: "Downstairs light circuit" + voltage_ref: "15968" + current_ref: "124180" + power_ref: "309.1" + energy_ref: "2653" + +packages: + tongou: !include tongou.yaml diff --git a/power-light1.yaml b/power-lights-ext.yaml similarity index 54% rename from power-light1.yaml rename to power-lights-ext.yaml index 3061b9d..4889c82 100644 --- a/power-light1.yaml +++ b/power-lights-ext.yaml @@ -1,6 +1,8 @@ substitutions: - name: "power-light1" - tongou_name: "Extension Light circuit" + mac: 50:8b:b9:a8:51:db + old_name: "power-light1" + name: "power-lights-ext" + tongou_name: "Extension light circuit" voltage_ref: "15990" current_ref: "124380" power_ref: "309.8" diff --git a/power-lights-upstairs.yaml b/power-lights-upstairs.yaml new file mode 100644 index 0000000..f4fe761 --- /dev/null +++ b/power-lights-upstairs.yaml @@ -0,0 +1,12 @@ +substitutions: + mac: "18:de:50:e1:44:33" + old_name: "power-light-spare3" + name: "power-lights-upstairs" + tongou_name: "Upstairs light circuit" + voltage_ref: "16054" + current_ref: "126140" + power_ref: "309.0" + energy_ref: "2652" + +packages: + tongou: !include tongou.yaml diff --git a/power-ring3.yaml b/power-ring-ext.yaml similarity index 69% rename from power-ring3.yaml rename to power-ring-ext.yaml index f60bf15..5d500a1 100644 --- a/power-ring3.yaml +++ b/power-ring-ext.yaml @@ -1,5 +1,7 @@ substitutions: - name: "power-ring3" + mac: "a8:80:55:08:b1:af" + old_name: "power-ring3" + name: "power-ring-ext" tongou_name: "Extension Ring" voltage_ref: "15932" current_ref: "127000" diff --git a/power-ring4.yaml b/power-ring-house.yaml similarity index 68% rename from power-ring4.yaml rename to power-ring-house.yaml index 17c2149..3df902c 100644 --- a/power-ring4.yaml +++ b/power-ring-house.yaml @@ -1,5 +1,7 @@ substitutions: - name: "power-ring4" + mac: "a8:80:55:08:bb:9b" + old_name: "power-ring4" + name: "power-ring-house" tongou_name: "House Ring" voltage_ref: "15886" current_ref: "128010" diff --git a/power-ring1.yaml b/power-ring-shed.yaml similarity index 69% rename from power-ring1.yaml rename to power-ring-shed.yaml index 5b24606..9cd5d7b 100644 --- a/power-ring1.yaml +++ b/power-ring-shed.yaml @@ -1,5 +1,7 @@ substitutions: - name: "power-ring1" + mac: "a8:80:55:08:b0:ac" + old_name: "power-ring1" + name: "power-ring-shed" tongou_name: "Shed circuit" voltage_ref: "15925" current_ref: "126230" -- 2.49.0