From ff57a079028a9818f64378cd7b38b5c3ef9655f9 Mon Sep 17 00:00:00 2001
From: Dirk Alders <dirk@mount-mockery.de>
Date: Sun, 14 Sep 2025 12:44:33 +0200
Subject: [PATCH] Full devdi topic support

---
 .flows.json.backup | 78 ++++++++++++++++++----------------------------
 flows.json         | 64 ++++++++++++++++++-------------------
 2 files changed, 62 insertions(+), 80 deletions(-)

diff --git a/.flows.json.backup b/.flows.json.backup
index 30f44fb..01dc32f 100644
--- a/.flows.json.backup
+++ b/.flows.json.backup
@@ -1138,7 +1138,7 @@
         "type": "mqtt out",
         "z": "8e9c7f123e3fa72b",
         "name": "",
-        "topic": "videv/gfw/dirk/pc_dock/state/set",
+        "topic": "videv/gfw/dirk/dock/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -1147,7 +1147,7 @@
         "correl": "",
         "expiry": "",
         "broker": "f6f673e95e75873d",
-        "x": 950,
+        "x": 940,
         "y": 1400,
         "wires": []
     },
@@ -1156,7 +1156,7 @@
         "type": "mqtt in",
         "z": "8e9c7f123e3fa72b",
         "name": "",
-        "topic": "videv/gfw/dirk/pc_dock/state",
+        "topic": "videv/gfw/dirk/dock/state",
         "qos": "2",
         "datatype": "json",
         "broker": "f6f673e95e75873d",
@@ -1164,7 +1164,7 @@
         "rap": true,
         "rh": 0,
         "inputs": 0,
-        "x": 160,
+        "x": 150,
         "y": 1400,
         "wires": [
             [
@@ -2811,8 +2811,7 @@
                 "9e8359b1ca5e794c"
             ],
             [
-                "fa0a223ba05e771a",
-                "9a65295b93ac3155"
+                "fa0a223ba05e771a"
             ],
             [
                 "a7ee780fe5879b1a"
@@ -3073,23 +3072,6 @@
         "y": 2800,
         "wires": []
     },
-    {
-        "id": "9a65295b93ac3155",
-        "type": "debug",
-        "z": "8e9c7f123e3fa72b",
-        "name": "debug 2",
-        "active": true,
-        "tosidebar": true,
-        "console": false,
-        "tostatus": false,
-        "complete": "payload",
-        "targetType": "msg",
-        "statusVal": "",
-        "statusType": "auto",
-        "x": 1120,
-        "y": 2860,
-        "wires": []
-    },
     {
         "id": "3261d3bb95b50d09",
         "type": "comment",
@@ -3700,7 +3682,7 @@
         "type": "mqtt out",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/state/set",
+        "topic": "videv/stw/firstfloor/main_light/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -3718,7 +3700,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/state",
+        "topic": "videv/stw/firstfloor/main_light/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -3766,7 +3748,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/timer",
+        "topic": "videv/stw/firstfloor/main_light/timer",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -3818,7 +3800,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/motion_1",
+        "topic": "videv/stw/firstfloor/main_light/motion_1",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -3870,7 +3852,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/motion_0",
+        "topic": "videv/stw/firstfloor/main_light/motion_0",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -5558,7 +5540,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/state",
+        "topic": "videv/ffe/livingroom/floor_light/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -5580,7 +5562,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/state/set",
+        "topic": "videv/ffe/livingroom/floor_light/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -5715,7 +5697,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/diningroom/floorlamp/state/set",
+        "topic": "videv/ffe/diningroom/floor_light/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -5724,7 +5706,7 @@
         "correl": "",
         "expiry": "",
         "broker": "f6f673e95e75873d",
-        "x": 990,
+        "x": 1000,
         "y": 680,
         "wires": []
     },
@@ -5733,7 +5715,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/diningroom/floorlamp/state",
+        "topic": "videv/ffe/diningroom/floor_light/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -6072,7 +6054,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/brightness",
+        "topic": "videv/ffe/livingroom/floor_light/brightness",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -6080,7 +6062,7 @@
         "rap": true,
         "rh": 0,
         "inputs": 0,
-        "x": 190,
+        "x": 200,
         "y": 2320,
         "wires": [
             [
@@ -6121,7 +6103,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/color_temp",
+        "topic": "videv/ffe/livingroom/floor_light/color_temp",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -6142,7 +6124,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/brightness/set",
+        "topic": "videv/ffe/livingroom/floor_light/brightness/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -6160,7 +6142,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/color_temp/set",
+        "topic": "videv/ffe/livingroom/floor_light/color_temp/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -9988,7 +9970,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10413,7 +10395,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10441,7 +10423,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10469,7 +10451,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10497,7 +10479,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10525,7 +10507,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10553,7 +10535,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10581,7 +10563,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10609,7 +10591,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -11034,7 +11016,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 710,
diff --git a/flows.json b/flows.json
index 5ae0deb..d9a3cce 100644
--- a/flows.json
+++ b/flows.json
@@ -1138,7 +1138,7 @@
         "type": "mqtt out",
         "z": "8e9c7f123e3fa72b",
         "name": "",
-        "topic": "videv/gfw/dirk/pc_dock/state/set",
+        "topic": "videv/gfw/dirk/dock/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -1147,7 +1147,7 @@
         "correl": "",
         "expiry": "",
         "broker": "f6f673e95e75873d",
-        "x": 950,
+        "x": 940,
         "y": 1400,
         "wires": []
     },
@@ -1156,7 +1156,7 @@
         "type": "mqtt in",
         "z": "8e9c7f123e3fa72b",
         "name": "",
-        "topic": "videv/gfw/dirk/pc_dock/state",
+        "topic": "videv/gfw/dirk/dock/state",
         "qos": "2",
         "datatype": "json",
         "broker": "f6f673e95e75873d",
@@ -1164,7 +1164,7 @@
         "rap": true,
         "rh": 0,
         "inputs": 0,
-        "x": 160,
+        "x": 150,
         "y": 1400,
         "wires": [
             [
@@ -3682,7 +3682,7 @@
         "type": "mqtt out",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/state/set",
+        "topic": "videv/stw/firstfloor/main_light/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -3700,7 +3700,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/state",
+        "topic": "videv/stw/firstfloor/main_light/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -3748,7 +3748,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/timer",
+        "topic": "videv/stw/firstfloor/main_light/timer",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -3800,7 +3800,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/motion_1",
+        "topic": "videv/stw/firstfloor/main_light/motion_1",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -3852,7 +3852,7 @@
         "type": "mqtt in",
         "z": "3cb18b4eb3eb24a7",
         "name": "",
-        "topic": "videv/stw/stairway/main_light/motion_0",
+        "topic": "videv/stw/firstfloor/main_light/motion_0",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -5540,7 +5540,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/state",
+        "topic": "videv/ffe/livingroom/floor_light/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -5562,7 +5562,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/state/set",
+        "topic": "videv/ffe/livingroom/floor_light/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -5697,7 +5697,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/diningroom/floorlamp/state/set",
+        "topic": "videv/ffe/diningroom/floor_light/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -5706,7 +5706,7 @@
         "correl": "",
         "expiry": "",
         "broker": "f6f673e95e75873d",
-        "x": 990,
+        "x": 1000,
         "y": 680,
         "wires": []
     },
@@ -5715,7 +5715,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/diningroom/floorlamp/state",
+        "topic": "videv/ffe/diningroom/floor_light/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -6054,7 +6054,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/brightness",
+        "topic": "videv/ffe/livingroom/floor_light/brightness",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -6062,7 +6062,7 @@
         "rap": true,
         "rh": 0,
         "inputs": 0,
-        "x": 190,
+        "x": 200,
         "y": 2320,
         "wires": [
             [
@@ -6103,7 +6103,7 @@
         "type": "mqtt in",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/color_temp",
+        "topic": "videv/ffe/livingroom/floor_light/color_temp",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -6124,7 +6124,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/brightness/set",
+        "topic": "videv/ffe/livingroom/floor_light/brightness/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -6142,7 +6142,7 @@
         "type": "mqtt out",
         "z": "bfed4666d7406ae3",
         "name": "",
-        "topic": "videv/ffe/livingroom/floorlamp/color_temp/set",
+        "topic": "videv/ffe/livingroom/floor_light/color_temp/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -9970,7 +9970,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10395,7 +10395,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10423,7 +10423,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10451,7 +10451,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10479,7 +10479,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10507,7 +10507,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10535,7 +10535,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10563,7 +10563,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -10591,7 +10591,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 700,
@@ -11016,7 +11016,7 @@
         "topicType": "msg",
         "format": "{{value}}",
         "min": "15",
-        "max": "25",
+        "max": "30",
         "step": ".5",
         "className": "",
         "x": 710,
@@ -12832,7 +12832,7 @@
         "type": "mqtt in",
         "z": "5319c06f2c436feb",
         "name": "",
-        "topic": "videv/ffe/livingroom/xmas_tree/state",
+        "topic": "videv/ffe/livingroom/xmas-tree/state",
         "qos": "2",
         "datatype": "auto-detect",
         "broker": "f6f673e95e75873d",
@@ -12853,7 +12853,7 @@
         "type": "mqtt out",
         "z": "5319c06f2c436feb",
         "name": "",
-        "topic": "videv/ffe/livingroom/xmas_tree/state/set",
+        "topic": "videv/ffe/livingroom/xmas-tree/state/set",
         "qos": "",
         "retain": "",
         "respTopic": "",
@@ -12862,7 +12862,7 @@
         "correl": "",
         "expiry": "",
         "broker": "f6f673e95e75873d",
-        "x": 1000,
+        "x": 990,
         "y": 300,
         "wires": []
     },