Update power unit names

diff --git a/base.yaml b/base.yaml
index 781af690d3db672d69d98c05d959788ab2b2b4ab..5c6211eddaf0f070e37fbba691c39cce8ded9f10 100644 (file)
--- 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 49fd7ca46c903233ee360907fa929af211caec95..dfbb1e60692de19c64d2eac84883d044b84a834a 100644 (file)
--- 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 d1f8d6707dda2ba5364a2a4a2bc74a09a6bafccb..97fcb021a1b35c7baf575b34b39a58a752eb1894 100644 (file)
--- 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 c3608c4551a1787277b0d4195088c94258827952..b29e091c4576497ab8dc3091c415b99454e537c9 100644 (file)
--- 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 e9ee13ab2aa4ff0610734da1004180d04b44ce9c..4f8427eae4d5e61aefe1ce5fcaef77a59d02d3ee 100644 (file)
--- 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 317fb5085bff5be0fe886b009bed8a507698c1d6..15fdf8d04ebbbdf928ca146133382f98f45173b5 100644 (file)
--- 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 babc1d248126ed096bf0fc8afb978484d795100c..8287bad2c843eafecc305c4edbb894d9fb2e1b17 100644 (file)
--- 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 6ccb32f2d7a8fb8dd5429ab51ff2decf0dbe6efa..4049371f0a92e851ccea08e6b43e71e092195255 100644 (file)
--- 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 (file)
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 3061b9d2fd5d1d51c97a1f8ce88ff8408b930649..4889c8215bcf23df22fccf0876e06e55dfdff996 100644 (file)
--- 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 (file)
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 f60bf1547cab470dd9e55658a89d0e901ef3378b..5d500a12b9e4b18f7b1b1061f68b6361ae91c2e4 100644 (file)
--- 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 17c21494a61695988a3827073b2dd0db5945aad2..3df902ccbe3768bc453ee6a751ef932652c24a64 100644 (file)
--- 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 5b24606d27188c985a5b976d74f9588ee952a175..9cd5d7b3dc027d3a212aaacd03ea53ad693e4c7d 100644 (file)
--- 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"