fix SimpleTopic and remove homekit and openhab stuff

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 *.map
 mylogfile.log
-dispatcher_ng.log
+dispatcher_ng.log*

dispatcher.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=dispatcher_ng
+Wants=network-online.target
+After=network-online.target
+
+
+[Service]
+Type=simple
+GuessMainPID=yes
+ExecStart=/usr/bin/npm start -- -c dispatcher_ng.conf 
+ExecStop=kill -SIGINT $mainpid
+Restart=on-failure
+WorkingDirectory=/opt/services/dispatcher_ng
+
+[Install]
+Alias=dispatcher
+WantedBy=multi-user.target
+

dispatcher_ng.conf

@@ -9,11 +9,9 @@
     "smtpReceiver": "woho@hottis.de",
     "homekitFile": "homekit.json",
     "openhabItemFile": "openhab.items",
-    "geofencesPort": 8000,
+    "heartbeatTopic": "dispatcher_ng/i/am/alive",
-    "occupants": {
+    "heartbeatInterval": 10000,
-        "386D105B-80D0-4708-95AB-77B4D1E36D0E": "Wolfgang",
+    "watchdogTopic": "IoT/Watchdog",
-        "E24E910A-ED0A-444E-8290-794339BC887C": "Matthias",
+    "watchdogInterval": 1000,
-        "D7352171-FCF5-4E21-8FD3-8C34FF0F2F15": "Anna",
+    "watchdogMessage": "WauWau!"
-        "219117FF-B721-43E3-BE56-F77E8239705E": "Patty"
-    }
 }

dist/AItem.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const MqttDispatcher_1 = require("./MqttDispatcher");
-class AItem {
+const Events = require("events");
+class AItem extends Events.EventEmitter {
     constructor(floor, room, item, label = '') {
+        super();
         this.floor = floor;
         this.room = room;
         this.item = item;

dist/Forwarder.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AItem_1 = require("./AItem");
 const MqttDispatcher_1 = require("./MqttDispatcher");
 class Forwarder extends AItem_1.AItem {
+    getInTopic() {
+        return this.inTopic;
+    }
     constructor(floor, room, item, topicLastPart, label, targetTopics) {
         super(floor, room, item, label);
         this.inTopic = `${this.topicFirstPart}/${topicLastPart}`;

dist/GeoFences.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const express = require("express");
-const logger = require("./log");
-const bodyParser = require("body-parser");
-const config = require("./config");
-const MqttDispatcher_1 = require("./MqttDispatcher");
-const events_1 = require("events");
-class GeoFences extends events_1.EventEmitter {
-    constructor() {
-        super();
-        this.app = express();
-        this.app.use(bodyParser.urlencoded({ extended: false }));
-        this.app.use(bodyParser.json());
-        this.attendanceSheet = {};
-    }
-    exec() {
-        this.app.post('/', (req, res) => {
-            const reqData = req.body;
-            const deviceId = reqData.device;
-            let occupantName = 'unknown';
-            const location = reqData.name;
-            if (deviceId in config.dict.occupants) {
-                occupantName = config.dict.occupants[deviceId];
-            }
-            const presence = reqData.entry == '1';
-            const direction = presence ? 'arrives at' : 'leaves from';
-            logger.info(`${deviceId} (${occupantName}) ${direction} ${location}`);
-            logger.info(JSON.stringify(reqData));
-            res.send('OK');
-            const state = presence ? 'present' : 'absent';
-            MqttDispatcher_1.mqttHandler.send(`${GeoFences.geoFencesTopicPre}/${occupantName}`, state);
-            this.attendanceSheet[occupantName] = presence;
-            logger.info(`attendanceSheet is now ${JSON.stringify(this.attendanceSheet)}`);
-            this.emit('change', this.attendanceSheet);
-        });
-        let port = parseInt(config.dict.geofencesPort);
-        this.server = this.app.listen(port, '', () => {
-            logger.info(`geofences server listening on ${port}`);
-        });
-    }
-}
-GeoFences.geoFencesTopicPre = "dispatcher_ng/geofences";
-exports.GeoFences = GeoFences;
-//# sourceMappingURL=GeoFences.js.map

dist/HeatingScene.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Forwarder_1 = require("./Forwarder");
+class HeatingScene extends Forwarder_1.Forwarder {
+    constructor(floor, room, item, label, targetItems) {
+        let inTopics = [];
+        targetItems.forEach((item) => {
+            inTopics.push(item.getInTopic());
+        });
+        super(floor, room, item, "command", label, inTopics);
+    }
+}
+exports.HeatingScene = HeatingScene;
+//# sourceMappingURL=HeatingScene.js.map

dist/HomematicSwitchItem.js

@@ -4,18 +4,28 @@ const MqttDispatcher_1 = require("./MqttDispatcher");
 const AHomegearItem_1 = require("./AHomegearItem");
 const Export_1 = require("./Export");
 class HomematicSwitchItem extends AHomegearItem_1.AHomegearItem {
+    getLabel() {
+        return this.label;
+    }
+    getRoom() {
+        return this.room;
+    }
     getStateTopic() {
         return this.stateTopic;
     }
     getStateFeedbackTopic() {
         return this.stateFeedbackTopic;
     }
-    constructor(floor, room, item, label, hmId, type = 'bulb') {
+    getState() {
+        return this.state;
+    }
+    constructor(floor, room, item, label, hmId, partId = 1, type = 'bulb') {
         super(floor, room, item, label, hmId);
+        this.partId = partId;
         this.stateTopic = `${this.topicFirstPart}/state`;
         this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`;
-        this.deviceFeedbackTopic = `${this.deviceTopicPre}/1/STATE`;
+        this.deviceFeedbackTopic = `${this.deviceTopicPre}/${this.partId}/STATE`;
-        this.actionTopic = `${this.actionTopicPre}/1/STATE`;
+        this.actionTopic = `${this.actionTopicPre}/${this.partId}/STATE`;
         this.subscribeTopics = [
             this.stateTopic,
             this.deviceFeedbackTopic
@@ -53,6 +63,7 @@ class HomematicSwitchItem extends AHomegearItem_1.AHomegearItem {
                 MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
                 break;
         }
+        this.emit('somethingChanged');
     }
 }
 exports.HomematicSwitchItem = HomematicSwitchItem;

dist/HueColorBulbItem.js

@@ -47,6 +47,12 @@ class HueColorBulbItem extends AHomegearItem_1.AHomegearItem {
         this.hue = 0;
         this.saturation = 0;
     }
+    getLabel() {
+        return this.label;
+    }
+    getRoom() {
+        return this.room;
+    }
     getStateTopic() {
         return this.stateTopic;
     }

dist/M433SwitchItem.js

@@ -4,6 +4,12 @@ const MqttDispatcher_1 = require("./MqttDispatcher");
 const AItem_1 = require("./AItem");
 const Export_1 = require("./Export");
 class M433SwitchItem extends AItem_1.AItem {
+    getLabel() {
+        return this.label;
+    }
+    getRoom() {
+        return this.room;
+    }
     getStateTopic() {
         return this.stateTopic;
     }

dist/MaxThermostat.js

@@ -54,13 +54,16 @@ class MaxThermostat extends AHomegearItem_1.AHomegearItem {
             setTemperature = true;
         }
         else if (topic == this.commandTopic) {
-            if (this.heatingMainFlag) {
+            if ((payload == 'ON') && this.heatingMainFlag) {
-                if (payload == 'ON') {
+                this.temperature = this.presetTemperature;
-                    this.temperature = this.presetTemperature;
+                setTemperature = true;
-                }
+            }
-                else if (payload == 'OFF') {
+            else if (payload == 'OFF') {
-                    this.temperature = DISABLED_TEMPERATURE;
+                this.temperature = DISABLED_TEMPERATURE;
-                }
+                setTemperature = true;
+            }
+            else if (payload == 'FORCE_ON') {
+                this.temperature = this.presetTemperature;
                 setTemperature = true;
             }
         }
@@ -68,8 +71,9 @@ class MaxThermostat extends AHomegearItem_1.AHomegearItem {
             this.heatingMainFlag = (payload == 'ON');
             logger.info(`${this.itemId} heating main: ${this.heatingMainFlag}`);
             if (!this.heatingMainFlag) {
-                MqttDispatcher_1.mqttHandler.send(this.temperatureFeedbackTopic, `${DISABLED_TEMPERATURE}`);
+                this.temperature = DISABLED_TEMPERATURE;
-                MqttDispatcher_1.mqttHandler.send(this.actionTopic, `${DISABLED_TEMPERATURE}`);
+                MqttDispatcher_1.mqttHandler.send(this.temperatureFeedbackTopic, `${this.temperature}`);
+                MqttDispatcher_1.mqttHandler.send(this.actionTopic, `${this.temperature}`);
             }
         }
         else if (topic == this.presetTemperatureTopic) {

dist/MaxWindowContact.js

@@ -7,6 +7,9 @@ class MaxWindowContact extends AHomegearItem_1.AHomegearItem {
     getStateFeedbackTopic() {
         return this.stateFeedbackTopic;
     }
+    getLabel() {
+        return this.label;
+    }
     transform(payload) {
         let res;
         if (payload == 'OPEN') {

dist/MqttDispatcher.js

@@ -8,6 +8,7 @@ class MqttHandler {
     constructor() {
         this.mqttOptions = {};
         this.mqttBrokerUrl = config.dict.brokerUrl;
+        this.mqttOptions.clientId = 'dispatcher';
         if (config.dict.brokerUser && config.dict.brokerPass) {
             this.mqttOptions.username = config.dict.brokerUser;
             this.mqttOptions.password = config.dict.brokerPass;

dist/MySwitchThing.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger = require("./log");
+const MqttDispatcher_1 = require("./MqttDispatcher");
+const AItem_1 = require("./AItem");
+class MySwitchSingleItem {
+    constructor(actionTopic) {
+        this.actionTopic = actionTopic;
+    }
+    processMessage(topic, payload) {
+        switch (payload) {
+            case 'PRESS_SHORT':
+                MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'SHORT', true);
+                break;
+            case 'PRESS_LONG_START':
+            case 'PRESS_LONG_CONT':
+                MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'LONG_HOLD', true);
+                break;
+            case 'PRESS_LONG_END':
+                MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'LONG_END', true);
+                break;
+            default:
+                logger.warn(`HM4BSI: no handling available for ${topic}`);
+                break;
+        }
+    }
+}
+exports.MySwitchSingleItem = MySwitchSingleItem;
+class MySwitchThing extends AItem_1.AItem {
+    constructor(floor, room, item, itemObjs) {
+        super(floor, room, item, '');
+        this.itemObjs = itemObjs;
+        if (this.itemObjs.length != 3) {
+            throw new Error('itemObjs for MySwitchThing must have three elements');
+        }
+        this.subscribeTopics = [
+            `${this.topicFirstPart}/#`
+        ];
+    }
+    processMessage(topic, payload) {
+        logger.info(`MyT: ${topic}, ${payload}`);
+        let buttonIdx = parseInt(topic.substring(this.topicFirstPart.length + 1));
+        if (buttonIdx >= 1 && buttonIdx <= 3) {
+            this.itemObjs[buttonIdx - 1].processMessage('', payload);
+        }
+        else {
+            logger.warn(`MyT: no handling available for ${topic}, ${buttonIdx}`);
+        }
+    }
+}
+exports.MySwitchThing = MySwitchThing;
+//# sourceMappingURL=MySwitchThing.js.map

dist/Scene.js

@@ -4,6 +4,12 @@ const AItem_1 = require("./AItem");
 const MqttDispatcher_1 = require("./MqttDispatcher");
 const Export_1 = require("./Export");
 class LightScene extends AItem_1.AItem {
+    getLabel() {
+        return this.label;
+    }
+    getRoom() {
+        return this.room;
+    }
     getStateTopic() {
         return this.stateTopic;
     }

dist/SimpleTopicSwitchItem.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const MqttDispatcher_1 = require("./MqttDispatcher");
+const AItem_1 = require("./AItem");
+const Export_1 = require("./Export");
+class SimpleTopicSwitchItem extends AItem_1.AItem {
+    getLabel() {
+        return this.label;
+    }
+    getRoom() {
+        return this.room;
+    }
+    getStateTopic() {
+        return this.stateTopic;
+    }
+    getStateFeedbackTopic() {
+        return this.stateFeedbackTopic;
+    }
+    getState() {
+        return this.state;
+    }
+    constructor(floor, room, item, label, actionTopic) {
+        super(floor, room, item, label);
+        this.stateTopic = `${this.topicFirstPart}/state`;
+        this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`;
+        this.actionTopic = actionTopic;
+        this.subscribeTopics = [
+            this.stateTopic
+        ];
+        this.state = 'OFF';
+        this.oldState = undefined;
+    }
+    exportItem() {
+        return Export_1.SwitchExport(this.itemId, this.label, this.stateTopic, this.stateFeedbackTopic, this.type);
+    }
+    processMessage(topic, payload) {
+        switch (topic) {
+            case this.stateTopic:
+                this.state = payload;
+                MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
+                if (this.state != this.oldState) {
+                    if (this.state == 'ON') {
+                        MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'ON');
+                    }
+                    else {
+                        MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'OFF');
+                    }
+                    this.oldState = this.state;
+                }
+                break;
+        }
+        this.emit('somethingChanged');
+    }
+}
+exports.SimpleTopicSwitchItem = SimpleTopicSwitchItem;
+//# sourceMappingURL=SimpleTopicSwitchItem.js.map

dist/SwitchAdaptor.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AItem_1 = require("./AItem");
+const MqttDispatcher_1 = require("./MqttDispatcher");
+class SwitchAdaptor extends AItem_1.AItem {
+    constructor(floor, room, item) {
+        super(floor, room, item);
+        this.actionStateTopic = `${this.topicFirstPart}/state`;
+        this.inTopic = `${this.topicFirstPart}/in`;
+        this.subscribeTopics = [this.inTopic];
+        this.state = 'OFF';
+    }
+    getInTopic() {
+        return this.inTopic;
+    }
+    processMessage(topic, payload) {
+        switch (topic) {
+            case this.inTopic:
+                switch (payload) {
+                    case 'SHORT':
+                        if (this.state == 'OFF') {
+                            this.state = 'ON';
+                        }
+                        else {
+                            this.state = 'OFF';
+                        }
+                        MqttDispatcher_1.mqttHandler.send(this.actionStateTopic, this.state, true);
+                        break;
+                }
+                break;
+        }
+    }
+}
+exports.SwitchAdaptor = SwitchAdaptor;
+//# sourceMappingURL=SwitchAdaptor.js.map

dist/SwitchOffAdaptor.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AItem_1 = require("./AItem");
+const MqttDispatcher_1 = require("./MqttDispatcher");
+class SwitchOffAdaptor extends AItem_1.AItem {
+    constructor(floor, room, item) {
+        super(floor, room, item);
+        this.actionStateTopic = `${this.topicFirstPart}/state`;
+        this.inTopic = `${this.topicFirstPart}/in`;
+        this.subscribeTopics = [this.inTopic];
+    }
+    getInTopic() {
+        return this.inTopic;
+    }
+    processMessage(topic, payload) {
+        if ((topic == this.inTopic) && (payload == 'SHORT')) {
+            MqttDispatcher_1.mqttHandler.send(this.actionStateTopic, 'OFF', true);
+        }
+    }
+}
+exports.SwitchOffAdaptor = SwitchOffAdaptor;
+//# sourceMappingURL=SwitchOffAdaptor.js.map

dist/TwoLedSignal.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const AItem_1 = require("./AItem");
+const MqttDispatcher_1 = require("./MqttDispatcher");
+const logger = require("./log");
+var SignalState;
+(function (SignalState) {
+    SignalState[SignalState["SIGNAL_RED"] = 0] = "SIGNAL_RED";
+    SignalState[SignalState["SIGNAL_GREEN"] = 1] = "SIGNAL_GREEN";
+    SignalState[SignalState["SIGNAL_UNKNOWN"] = 2] = "SIGNAL_UNKNOWN";
+})(SignalState || (SignalState = {}));
+class SignalItem {
+    constructor(item, redToken, greenToken) {
+        this.item = item;
+        this.signalState = SignalState.SIGNAL_UNKNOWN;
+        this.redToken = redToken;
+        this.greenToken = greenToken;
+    }
+    getSignalState() {
+        return this.signalState;
+    }
+    processMessage(topic, payload) {
+        if (topic == this.item.getStateFeedbackTopic()) {
+            logger.info(`${topic}, ${payload}`);
+            if (payload == this.greenToken) {
+                this.signalState = SignalState.SIGNAL_GREEN;
+            }
+            else if (payload == this.redToken) {
+                this.signalState = SignalState.SIGNAL_RED;
+            }
+            else {
+                this.signalState = SignalState.SIGNAL_UNKNOWN;
+            }
+            // logger.info(`DBG: SignalItem: ${topic}, ${payload}, ${this.signalState}`)
+        }
+    }
+}
+class TwoLedSignal extends AItem_1.AItem {
+    constructor(floor, room, item, label, led1Items, led1GreenToken, led1RedToken, led2Items, led2GreenToken, led2RedToken) {
+        super(floor, room, item, label);
+        this.led1Items = [];
+        this.led2Items = [];
+        this.subscribeTopics = [];
+        led1Items.forEach((item) => {
+            this.led1Items.push(new SignalItem(item, led1RedToken, led1GreenToken));
+            this.subscribeTopics.push(item.getStateFeedbackTopic());
+        });
+        led2Items.forEach((item) => {
+            this.led2Items.push(new SignalItem(item, led2RedToken, led2GreenToken));
+            this.subscribeTopics.push(item.getStateFeedbackTopic());
+        });
+    }
+    processMessage(topic, payload) {
+        let reds = 0;
+        const RED_VALUES = [SignalState.SIGNAL_RED, SignalState.SIGNAL_UNKNOWN];
+        this.led1Items.forEach((item) => {
+            item.processMessage(topic, payload);
+            if (RED_VALUES.indexOf(item.getSignalState()) != -1) {
+                reds++;
+            }
+            // logger.info(`DBG: TwoLedSignal ${item.getSignalState()}, ${reds}`)
+        });
+        let msg = (reds > 0) ? "red" : "green";
+        MqttDispatcher_1.mqttHandler.send(`${this.topicFirstPart}/led1`, msg);
+        reds = 0;
+        this.led2Items.forEach((item) => {
+            item.processMessage(topic, payload);
+            if (RED_VALUES.indexOf(item.getSignalState()) != -1) {
+                reds++;
+            }
+            // logger.info(`DBG: TwoLedSignal ${item.getSignalState()}, ${reds}`)
+        });
+        msg = (reds > 0) ? "red" : "green";
+        MqttDispatcher_1.mqttHandler.send(`${this.topicFirstPart}/led2`, msg);
+    }
+}
+exports.TwoLedSignal = TwoLedSignal;
+//# sourceMappingURL=TwoLedSignal.js.map

dist/UrlSwitchItem.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const logger = require("./log");
 const MqttDispatcher_1 = require("./MqttDispatcher");
 const AItem_1 = require("./AItem");
 const Export_1 = require("./Export");
@@ -30,13 +31,18 @@ class UrlSwitchItem extends AItem_1.AItem {
         this.state = payload;
         MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
         if (this.state != this.oldState) {
-            if (this.state == 'ON') {
+            try {
-                http.get(this.onUrl);
+                if (this.state == 'ON') {
+                    http.get(this.onUrl);
+                }
+                else {
+                    http.get(this.offUrl);
+                }
+                this.oldState = this.state;
             }
-            else {
+            catch (_a) {
-                http.get(this.offUrl);
+                logger.error(`Failed to handle ${this.onUrl} or ${this.offUrl}`);
             }
-            this.oldState = this.state;
         }
     }
 }

dist/main.js

@@ -8,6 +8,7 @@ const M433SwitchItem_1 = require("./M433SwitchItem");
 const HomematicFourButtonThing_1 = require("./HomematicFourButtonThing");
 const DimmerAdaptor_1 = require("./DimmerAdaptor");
 const TimerAdaptor_1 = require("./TimerAdaptor");
+const SwitchOffAdaptor_1 = require("./SwitchOffAdaptor");
 const HomematicDimmerItem_1 = require("./HomematicDimmerItem");
 const HomematicSwitchItem_1 = require("./HomematicSwitchItem");
 const Forwarder_1 = require("./Forwarder");
@@ -15,17 +16,24 @@ const Scene_1 = require("./Scene");
 const MaxEcoSwitch_1 = require("./MaxEcoSwitch");
 const MaxThermostat_1 = require("./MaxThermostat");
 const MaxWindowContact_1 = require("./MaxWindowContact");
-const UrlSwitchItem_1 = require("./UrlSwitchItem");
 const Cron_1 = require("./Cron");
 const HueColorBulbItem_1 = require("./HueColorBulbItem");
 const TouchSwitchMultiButtonThing_1 = require("./TouchSwitchMultiButtonThing");
 const RelayBox_1 = require("./RelayBox");
-const GeoFences_1 = require("./GeoFences");
+const HeatingScene_1 = require("./HeatingScene");
+const TwoLedSignal_1 = require("./TwoLedSignal");
+const MySwitchThing_1 = require("./MySwitchThing");
+const SimpleTopicSwitchItem_1 = require("./SimpleTopicSwitchItem");
 logger.info("Dispatcher starting");
 let allLabeledItems = new Array();
+let allThermostatItems = new Array();
+let allWindows = new Array();
+let allRelevantLights = new Array();
+let allLights = new Array();
+let allLightScenes = new Array();
 // Anna -----------------------------------------------------------------------------------------------------
 // Anna Aquarium                 14665044 24 1         14665041 24 1
-let aquariumLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Anna', 'AquariumLight', 'Aquariumlicht', '14665044 24 1', '14665041 24 1');
+let aquariumLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Anna', 'AquariumLight', 'Aquarium', '14665044 24 1', '14665041 24 1');
 aquariumLight.start();
 allLabeledItems.push(aquariumLight);
 let aquariumLightCron = new Cron_1.Cron('aquariumLightCron', aquariumLight, [
@@ -37,16 +45,20 @@ let aquariumLightCron = new Cron_1.Cron('aquariumLightCron', aquariumLight, [
 ]);
 aquariumLightCron.start();
 // Anna Bett                     14668116 24 1         14668113 24 1
-let annaBedLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Anna', 'BedLight', 'Bettlicht Anna', '14668116 24 1', '14668113 24 1');
+let annaBedLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Anna', 'BedLight', 'Bettlicht', '14668116 24 1', '14668113 24 1');
 annaBedLight.start();
 allLabeledItems.push(annaBedLight);
-let windowContactAnna1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Anna', 'WindowContact', 'Fenster Anna', 20);
+allRelevantLights.push(annaBedLight);
+allLights.push(annaBedLight);
+let windowContactAnna1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Anna', 'WindowContact', 'Anna', 20);
 windowContactAnna1st.start();
 allLabeledItems.push(windowContactAnna1st);
+allWindows.push(windowContactAnna1st);
 let thermostatAnna1st = new MaxThermostat_1.MaxThermostat('1st', 'Anna', 'Thermostat', 'Thermostat Anna', 21, [windowContactAnna1st]);
 thermostatAnna1st.start();
 thermostatAnna1st.setPresetTemperature(21.0);
 allLabeledItems.push(thermostatAnna1st);
+allThermostatItems.push(thermostatAnna1st);
 let thermostatAnna1stCron = new Cron_1.Cron('thermostatAnna1stCron', thermostatAnna1st, [
     { cronTime: '00 05 06 * * *', output: 'ON' },
     { cronTime: '00 05 08 * * 1-5', output: 'OFF' },
@@ -60,109 +72,199 @@ let thermostatAnna1stCron = new Cron_1.Cron('thermostatAnna1stCron', thermostatA
 thermostatAnna1stCron.start();
 // Matthias -------------------------------------------------------------------------------------------------
 // Matthias Stehlampen           7 24 1                6 24 1
-let matthiasStandLights = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'StandLight', 'Stehlampen Matthias', '7 24 1', '6 24 1');
+let matthiasStandLights = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'StandLight', 'Stehlampen', '7 24 1', '6 24 1');
 matthiasStandLights.start();
 allLabeledItems.push(matthiasStandLights);
+allRelevantLights.push(matthiasStandLights);
+allLights.push(matthiasStandLights);
 // Matthias Bett                 15 24 1               14 24 1
-let matthiasBedLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'BedLight', 'Bettlicht Matthias', '15 24 1', '14 24 1');
+let matthiasBedLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'BedLight', 'Bettlicht', '15 24 1', '14 24 1');
 matthiasBedLight.start();
 allLabeledItems.push(matthiasBedLight);
+allRelevantLights.push(matthiasBedLight);
+allLights.push(matthiasBedLight);
 // Matthias Lautsprecher         11 24 1               10 24 1
-let matthiasSpeaker = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'Speaker', 'Lautsprecher Matthias', '11 24 1', '10 24 1', 'outlet');
+let matthiasSpeaker = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'Speaker', 'Lautsprecher', '11 24 1', '10 24 1', 'outlet');
 matthiasSpeaker.start();
 allLabeledItems.push(matthiasSpeaker);
+allRelevantLights.push(matthiasSpeaker);
+allLights.push(matthiasSpeaker);
+let windowContactMatthias = new MaxWindowContact_1.MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Matthias', 24);
+windowContactMatthias.start();
+allLabeledItems.push(windowContactMatthias);
+allWindows.push(windowContactMatthias);
 // Esszimmer ------------------------------------------------------------------------------------------------
 // Esszimmer kleine Lampe        69653 24 1            69652 24 1
-let diningRoomSmallLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'DiningRoom', 'SmallLight', 'kleine Lampe Esszimmer', '69653 24 1', '69652 24 1');
+let diningRoomSmallLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Esszimmer', 'SmallLight', 'kleine Lampe', '69653 24 1', '69652 24 1');
 diningRoomSmallLight.start();
 allLabeledItems.push(diningRoomSmallLight);
+allRelevantLights.push(diningRoomSmallLight);
+allLights.push(diningRoomSmallLight);
 // Esszimmer Stehlampe           86037 24 1            86036 24 1
-let diningRoomStandLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'DiningRoom', 'StandLight', 'Stehlampe Esszimmer', '86037 24 1', '86036 24 1');
+let diningRoomStandLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Esszimmer', 'StandLight', 'Stehlampe', '86037 24 1', '86036 24 1');
 diningRoomStandLight.start();
 allLabeledItems.push(diningRoomStandLight);
+allRelevantLights.push(diningRoomStandLight);
+allLights.push(diningRoomStandLight);
 // Esszimmer Schranklicht        65813 24 1            65812 24 1
-let diningRoomCupboardLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'DiningRoom', 'CupboardLight', 'Schranklicht Esszimmer', '65813 24 1', '65812 24 1');
+let diningRoomCupboardLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Esszimmer', 'CupboardLight', 'Schranklicht', '65813 24 1', '65812 24 1');
 diningRoomCupboardLight.start();
 allLabeledItems.push(diningRoomCupboardLight);
+allRelevantLights.push(diningRoomCupboardLight);
+allLights.push(diningRoomCupboardLight);
 // Esszimmer Regallicht
-let diningRoomShelfLight = new UrlSwitchItem_1.UrlSwitchItem('Gnd', 'DiningRoom', 'ShelfLight', 'Regallicht Esszimmer', 'http://regallampe/dv?dv=1023', 'http://regallampe/dv?dv=0');
+let diningRoomShelfLight = new SimpleTopicSwitchItem_1.SimpleTopicSwitchItem('Gnd', 'Esszimmer', 'ShelfLight', 'Regallicht', 'IoT/WifiRelay1/State');
 diningRoomShelfLight.start();
 allLabeledItems.push(diningRoomShelfLight);
-let diningRoomNaehkaestchenLight = new HueColorBulbItem_1.HueColorBulbItem('Gnd', 'DiningRoom', 'NaehkaestchenLight', 'Lampe Naehkaestchen', 15);
+allRelevantLights.push(diningRoomShelfLight);
+allLights.push(diningRoomShelfLight);
+let diningRoomNaehkaestchenLight = new HueColorBulbItem_1.HueColorBulbItem('Gnd', 'Esszimmer', 'NaehkaestchenLight', 'Nähkästchen', 15);
 diningRoomNaehkaestchenLight.start();
 allLabeledItems.push(diningRoomNaehkaestchenLight);
+allRelevantLights.push(diningRoomNaehkaestchenLight);
+allLights.push(diningRoomNaehkaestchenLight);
+let windowContactDiningRoom1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Esszimmer', 'WindowContact1', 'Essz. links', 26);
+windowContactDiningRoom1.start();
+allLabeledItems.push(windowContactDiningRoom1);
+allWindows.push(windowContactDiningRoom1);
+let windowContactDiningRoom2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Esszimmer', 'WindowContact2', 'Essz. rechts', 27);
+windowContactDiningRoom2.start();
+allLabeledItems.push(windowContactDiningRoom2);
+allWindows.push(windowContactDiningRoom2);
+let thermostatDiningRoom = new MaxThermostat_1.MaxThermostat('Gnd', 'Esszimmer', 'Thermostat', 'Thermostat Esszimmer', 31, [windowContactDiningRoom1, windowContactDiningRoom2]);
+thermostatDiningRoom.start();
+thermostatDiningRoom.setPresetTemperature(21.0);
+allLabeledItems.push(thermostatDiningRoom);
+allThermostatItems.push(thermostatDiningRoom);
 // Wohnzimmer -----------------------------------------------------------------------------------------------
 // Wohnzimmer grosse Lampe       65557 24 1            65556 24 1
-let livingRoomLargeLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'LivingRoom', 'LargeLight', 'große Lampe Wohnzimmer', '65557 24 1', '65556 24 1');
+let livingRoomLargeLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Wohnzimmer', 'LargeLight', 'große Lampe', '65557 24 1', '65556 24 1');
 livingRoomLargeLight.start();
 allLabeledItems.push(livingRoomLargeLight);
+allRelevantLights.push(livingRoomLargeLight);
+allLights.push(livingRoomLargeLight);
 // Wohnzimmer kleine Lampe       87061 24 1            87060 24 1
-let livingRoomSmallLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'LivingRoom', 'SmallLight', 'kleine Lampe Wohnzimmer', '87061 24 1', '87060 24 1');
+let livingRoomSmallLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Wohnzimmer', 'SmallLight', 'kleine Lampe', '87061 24 1', '87060 24 1');
 livingRoomSmallLight.start();
 allLabeledItems.push(livingRoomSmallLight);
+allRelevantLights.push(livingRoomSmallLight);
+allLights.push(livingRoomSmallLight);
 // Wohnzimmer Sterne             69909 24 1            69908 24 1
-let livingRoomStars = new M433SwitchItem_1.M433SwitchItem('Gnd', 'LivingRoom', 'Stars', 'Sterne Wohnzimmer', '69909 24 1', '69908 24 1');
+let livingRoomStars = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Wohnzimmer', 'Stars', 'Sterne', '69909 24 1', '69908 24 1');
 livingRoomStars.start();
 allLabeledItems.push(livingRoomStars);
+allRelevantLights.push(livingRoomStars);
+allLights.push(livingRoomStars);
 // Wohnzimmer kleine Stehlampe   81941 24 1            81940 24 1
-let livingRoomStandLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'LivingRoom', 'StandLight', 'Stehlampe Wohnzimmer', '81941 24 1', '81940 24 1');
+let livingRoomStandLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Wohnzimmer', 'StandLight', 'Stehlampe', '81941 24 1', '81940 24 1');
 livingRoomStandLight.start();
 allLabeledItems.push(livingRoomStandLight);
+allRelevantLights.push(livingRoomStandLight);
+allLights.push(livingRoomStandLight);
+let windowContactLivingRoom1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Wohnzimmer', 'WindowContact1', 'Wohnz. rechts', 28);
+windowContactLivingRoom1.start();
+allLabeledItems.push(windowContactLivingRoom1);
+allWindows.push(windowContactLivingRoom1);
+let windowContactLivingRoom2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Wohnzimmer', 'WindowContact2', 'Wohnz. links', 29);
+windowContactLivingRoom2.start();
+allLabeledItems.push(windowContactLivingRoom2);
+allWindows.push(windowContactLivingRoom2);
+let thermostatLivingRoom = new MaxThermostat_1.MaxThermostat('Gnd', 'Wohnzimmer', 'Thermostat', 'Thermostat Wohnzimmer', 30, [windowContactLivingRoom1, windowContactLivingRoom2]);
+thermostatLivingRoom.start();
+thermostatLivingRoom.setPresetTemperature(21.0);
+allLabeledItems.push(thermostatLivingRoom);
+allThermostatItems.push(thermostatLivingRoom);
 // Flur -----------------------------------------------------------------------------------------------------
 // Flur Schreibtisch             83221 24 1            83220 24 1
-let hallwayDeskLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Hallway', 'DeskLight', 'Schreibtischlampe Flur', '83221 24 1', '83220 24 1');
+let hallwayDeskLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Flur', 'DeskLight', 'Schreibtischlampe', '83221 24 1', '83220 24 1');
 hallwayDeskLight.start();
 allLabeledItems.push(hallwayDeskLight);
+allRelevantLights.push(hallwayDeskLight);
+allLights.push(hallwayDeskLight);
 // Flur Stehlampe                8704914 24 5          8793154 24 5
-let hallwayStandLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Hallway', 'StandLight', 'Stehlampe Flur', '8704914 24 5', '8793154 24 5');
+let hallwayStandLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Flur', 'StandLight', 'Stehlampe', '8704914 24 5', '8793154 24 5');
 hallwayStandLight.start();
 allLabeledItems.push(hallwayStandLight);
+allRelevantLights.push(hallwayStandLight);
+allLights.push(hallwayStandLight);
 // Flur Schranklicht             66581 24 1            66580 24 1
-let hallwayWardrobeLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Hallway', 'WardrobeLight', 'Schranklicht Flur', '66581 24 1', '66580 24 1');
+let hallwayWardrobeLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Flur', 'WardrobeLight', 'Schranklicht', '66581 24 1', '66580 24 1');
 hallwayWardrobeLight.start();
 allLabeledItems.push(hallwayWardrobeLight);
+allRelevantLights.push(hallwayWardrobeLight);
+allLights.push(hallwayWardrobeLight);
+let windowContactHallway = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Flur', 'WindowContact', 'Flur', 25);
+windowContactHallway.start();
+allLabeledItems.push(windowContactHallway);
+allWindows.push(windowContactHallway);
+let thermostatHallway1 = new MaxThermostat_1.MaxThermostat('Gnd', 'Flur', 'Thermostat1', 'Thermostat Flur vorne', 32, []);
+thermostatHallway1.start();
+thermostatHallway1.setPresetTemperature(19.0);
+allLabeledItems.push(thermostatHallway1);
+allThermostatItems.push(thermostatHallway1);
+let thermostatHallway2 = new MaxThermostat_1.MaxThermostat('Gnd', 'Flur', 'Thermostat2', 'Thermostat Flur hinten', 33, []);
+thermostatHallway2.start();
+thermostatHallway2.setPresetTemperature(5.0);
+allLabeledItems.push(thermostatHallway2);
+allThermostatItems.push(thermostatHallway2);
 // Küche ----------------------------------------------------------------------------------------------------
 // Küche Fensterbank             66837 24 1            66836 24 1
-let kitchenWindowLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Kitchen', 'WindowLight', 'Fensterbanklicht Küche', '66837 24 1', '66836 24 1');
+let kitchenWindowLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Kueche', 'WindowLight', 'Fensterbanklicht', '66837 24 1', '66836 24 1');
 kitchenWindowLight.start();
 allLabeledItems.push(kitchenWindowLight);
+allRelevantLights.push(kitchenWindowLight);
+allLights.push(kitchenWindowLight);
 // Küche Deckenlampe             82197 24 1            82196 24 1
-let kitchenCeilingLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Kitchen', 'CeilingLight', 'Deckenlampe Küche', '82197 24 1', '82196 24 1');
+let kitchenCeilingLight = new M433SwitchItem_1.M433SwitchItem('Gnd', 'Kueche', 'CeilingLight', 'Deckenlampe', '82197 24 1', '82196 24 1');
 kitchenCeilingLight.start();
 allLabeledItems.push(kitchenCeilingLight);
+allRelevantLights.push(kitchenCeilingLight);
+allLights.push(kitchenCeilingLight);
 // Schlafzimmer ---------------------------------------------------------------------------------------------
 // Schlafzimmer Wolfgangs Seite  13976916 24 1         13976913 24 1
-let bedRoomWolfgangsSide = new M433SwitchItem_1.M433SwitchItem('1st', 'BedRoom', 'WolfgangsSide', 'Wolfgangs Seite Schlafzimmer', '13976916 24 1', '13976913 24 1');
+let bedRoomWolfgangsSide = new M433SwitchItem_1.M433SwitchItem('1st', 'Schlafzimmer', 'WolfgangsSide', 'Wolfgangs Seite', '13976916 24 1', '13976913 24 1');
 bedRoomWolfgangsSide.start();
 allLabeledItems.push(bedRoomWolfgangsSide);
-let bedRoomWolfgangBedLight = new HueColorBulbItem_1.HueColorBulbItem('1st', 'BedRoom', 'WolfgangBedLight', 'Bettlicht', 16);
+allRelevantLights.push(bedRoomWolfgangsSide);
+allLights.push(bedRoomWolfgangsSide);
+let bedRoomWolfgangBedLight = new HueColorBulbItem_1.HueColorBulbItem('1st', 'Schlafzimmer', 'WolfgangBedLight', 'Wolfgangs Bettlicht', 16);
 bedRoomWolfgangBedLight.start();
 allLabeledItems.push(bedRoomWolfgangBedLight);
-let bedRoomWolfgangBedLightDimmerAdaptor = new DimmerAdaptor_1.DimmerAdaptor('1st', 'BedRoom', 'WolfgangBedLight');
+allRelevantLights.push(bedRoomWolfgangBedLight);
+allLights.push(bedRoomWolfgangBedLight);
+let bedRoomWolfgangBedLightDimmerAdaptor = new DimmerAdaptor_1.DimmerAdaptor('1st', 'Schlafzimmer', 'WolfgangBedLight');
 bedRoomWolfgangBedLightDimmerAdaptor.start();
 let touchSwitchMultiButtonThing = new TouchSwitchMultiButtonThing_1.TouchSwitchMultiButtonThing('1st', 'Bedroom', 'Wolfgang', [new TouchSwitchMultiButtonThing_1.TouchSwitchButtonSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic())]);
 touchSwitchMultiButtonThing.start();
 // Schlafzimmer Pattys Seite     13980756 24 1         13980753 24 1
-let bedRoomPattysSide = new M433SwitchItem_1.M433SwitchItem('1st', 'BedRoom', 'PattysSide', 'Pattys Seite Schlafzimmer', '13980756 24 1', '13980753 24 1');
+let bedRoomPattysSide = new M433SwitchItem_1.M433SwitchItem('1st', 'Schlafzimmer', 'PattysSide', 'Pattys Seite', '13980756 24 1', '13980753 24 1');
 bedRoomPattysSide.start();
 allLabeledItems.push(bedRoomPattysSide);
+allRelevantLights.push(bedRoomPattysSide);
+allLights.push(bedRoomPattysSide);
 // Schlafzimmer Fensterbank      13979988 24 1         13979985 24 1
-let bedRoomWindowLight = new M433SwitchItem_1.M433SwitchItem('1st', 'BedRoom', 'WindowLight', 'Fensterbanklicht Schlafzimmer', '13979988 24 1', '13979985 24 1');
+let bedRoomWindowLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Schlafzimmer', 'WindowLight', 'Fensterbanklicht', '13979988 24 1', '13979985 24 1');
 bedRoomWindowLight.start();
 allLabeledItems.push(bedRoomWindowLight);
-let windowContactBedroomStreet1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17);
+allRelevantLights.push(bedRoomWindowLight);
+allLights.push(bedRoomWindowLight);
+let windowContactBedroomStreet1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Schlafz. Strasse', 17);
 windowContactBedroomStreet1st.start();
 allLabeledItems.push(windowContactBedroomStreet1st);
-let windowContact1BedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContact1Garden', 'Fenster Schlafzimmer 1 Garten', 18);
+allWindows.push(windowContactBedroomStreet1st);
+let windowContact1BedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContact1Garden', 'Schlafz. Garten 1', 18);
 windowContact1BedroomGarden1st.start();
 allLabeledItems.push(windowContact1BedroomGarden1st);
-let windowContact2BedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContact2Garden', 'Fenster Schlafzimmer 2 Garten', 22);
+allWindows.push(windowContact1BedroomGarden1st);
+let windowContact2BedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContact2Garden', 'Schlafz. Garten 2', 22);
 windowContact2BedroomGarden1st.start();
 allLabeledItems.push(windowContact2BedroomGarden1st);
+allWindows.push(windowContact2BedroomGarden1st);
 let thermostatBedroom1st = new MaxThermostat_1.MaxThermostat('1st', 'Bedroom', 'Thermostat', 'Thermostat Schlafzimmer', 19, [windowContact1BedroomGarden1st, windowContact2BedroomGarden1st, windowContactBedroomStreet1st]);
 thermostatBedroom1st.start();
 thermostatBedroom1st.setPresetTemperature(20.0);
 allLabeledItems.push(thermostatBedroom1st);
+allThermostatItems.push(thermostatBedroom1st);
 let thermostatBedroom1stCron = new Cron_1.Cron('thermostatBedroom1stCron', thermostatBedroom1st, [
     { cronTime: '00 01 06 * * 1-5', output: 'ON' },
     { cronTime: '00 01 09 * * 1-5', output: 'OFF' },
@@ -173,42 +275,15 @@ let thermostatBedroom1stCron = new Cron_1.Cron('thermostatBedroom1stCron', therm
 ]);
 thermostatBedroom1stCron.start();
 // ---------------------------------------------------------------------------------------------------------
-let dayLightScene = new Scene_1.LightScene('Gnd', 'Hallway', 'DayLight', 'DayLight', [
+let windowContactBathroomGnd = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Bad unten', 7);
-    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight,
-    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-    livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
-], []);
-dayLightScene.start();
-allLabeledItems.push(dayLightScene);
-let ecoLightScene = new Scene_1.LightScene('Gnd', 'Hallway', 'EcoLight', 'EcoLight', [
-    kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight,
-    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-    livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
-], [
-    kitchenCeilingLight, hallwayStandLight,
-    livingRoomLargeLight, livingRoomSmallLight
-]);
-ecoLightScene.start();
-allLabeledItems.push(ecoLightScene);
-let ecoSwitch = new MaxEcoSwitch_1.MaxEcoSwitch('Gnd', 'Hallway', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene);
-ecoSwitch.start();
-let morningLightScene = new Scene_1.LightScene('Gnd', 'Hallway', 'MorningLight', 'MorningLight', [
-    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight,
-    hallwayStandLight
-], [
-    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-    livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
-]);
-morningLightScene.start();
-allLabeledItems.push(morningLightScene);
-// ----------------------------------------------------------------------------------------------------------
-let windowContactBathroomGnd = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Fenster Bad unten', 7);
 windowContactBathroomGnd.start();
 allLabeledItems.push(windowContactBathroomGnd);
+allWindows.push(windowContactBathroomGnd);
 let thermostatBathroomGnd = new MaxThermostat_1.MaxThermostat('Gnd', 'Bathroom', 'Thermostat', 'Thermostat Bad unten', 4, [windowContactBathroomGnd]);
 thermostatBathroomGnd.start();
 thermostatBathroomGnd.setPresetTemperature(20.0);
 allLabeledItems.push(thermostatBathroomGnd);
+allThermostatItems.push(thermostatBathroomGnd);
 let thermostatBathroomGndCron = new Cron_1.Cron('thermostatBathroomGndCron', thermostatBathroomGnd, [
     { cronTime: '00 02 06 * * 1-5', output: 'ON' },
     { cronTime: '00 02 08 * * 6,0', output: 'ON' },
@@ -217,13 +292,15 @@ let thermostatBathroomGndCron = new Cron_1.Cron('thermostatBathroomGndCron', the
     { cronTime: '00 00 23 * * *', output: 'OFF' }
 ]);
 thermostatBathroomGndCron.start();
-let windowContactBathroom1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bathroom', 'WindowContact', 'Fenster Bad oben', 2);
+let windowContactBathroom1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bathroom', 'WindowContact', 'Bad oben', 2);
 windowContactBathroom1st.start();
 allLabeledItems.push(windowContactBathroom1st);
+allWindows.push(windowContactBathroom1st);
 let thermostatBathroom1st = new MaxThermostat_1.MaxThermostat('1st', 'Bathroom', 'Thermostat', 'Thermostat Bad oben', 3, [windowContactBathroom1st]);
 thermostatBathroom1st.start();
 thermostatBathroom1st.setPresetTemperature(20.0);
 allLabeledItems.push(thermostatBathroom1st);
+allThermostatItems.push(thermostatBathroom1st);
 let thermostatBathroom1stCron = new Cron_1.Cron('thermostatBathroom1stCron', thermostatBathroom1st, [
     { cronTime: '00 00 06 * * 1-5', output: 'ON' },
     { cronTime: '00 00 08 * * 6,0', output: 'ON' },
@@ -232,24 +309,29 @@ let thermostatBathroom1stCron = new Cron_1.Cron('thermostatBathroom1stCron', the
     { cronTime: '00 00 23 * * *', output: 'OFF' }
 ]);
 thermostatBathroom1stCron.start();
-let windowContactKitchen1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact1', 'Fenster Küche Garten', 11);
+let windowContactKitchen1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kueche', 'WindowContact1', 'Küche Garten', 11);
 windowContactKitchen1.start();
 allLabeledItems.push(windowContactKitchen1);
-let windowContactKitchen2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact2', 'Fenster Küche Terassentür Garten', 10);
+allWindows.push(windowContactKitchen1);
+let windowContactKitchen2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kueche', 'WindowContact2', 'Küche Terassentür', 10);
 windowContactKitchen2.start();
 allLabeledItems.push(windowContactKitchen2);
-let windowContactKitchen3 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact3', 'Fenster Küche Straße 1', 12);
+allWindows.push(windowContactKitchen2);
+let windowContactKitchen3 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kueche', 'WindowContact3', 'Küche Straße 1', 12);
 windowContactKitchen3.start();
 allLabeledItems.push(windowContactKitchen3);
-let windowContactKitchen4 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact4', 'Fenster Küche Straße 2', 13);
+allWindows.push(windowContactKitchen3);
+let windowContactKitchen4 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kueche', 'WindowContact4', 'Küche Straße 2', 13);
 windowContactKitchen4.start();
 allLabeledItems.push(windowContactKitchen4);
-let thermostatKitchen = new MaxThermostat_1.MaxThermostat('Gnd', 'Kitchen', 'Thermostat', 'Thermostat Küche', 14, [
+allWindows.push(windowContactKitchen4);
+let thermostatKitchen = new MaxThermostat_1.MaxThermostat('Gnd', 'Kueche', 'Thermostat', 'Thermostat Küche', 14, [
     windowContactKitchen1, windowContactKitchen2, windowContactKitchen3, windowContactKitchen4
 ]);
 thermostatKitchen.start();
 thermostatKitchen.setPresetTemperature(20.0);
 allLabeledItems.push(thermostatKitchen);
+allThermostatItems.push(thermostatKitchen);
 let thermostatKitchenCron = new Cron_1.Cron('thermostatKitchenCron', thermostatKitchen, [
     { cronTime: '00 00 06 * * 1-5', output: 'ON' },
     { cronTime: '00 00 08 * * 6,0', output: 'ON' },
@@ -259,7 +341,7 @@ let thermostatKitchenCron = new Cron_1.Cron('thermostatKitchenCron', thermostatK
 ]);
 thermostatKitchenCron.start();
 // ----------------------------------------------------------------------------------------------------------
-let windowContactFrontdoor = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Hallway', 'FrontdoorContact', 'Haustür', 23);
+let windowContactFrontdoor = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Flur', 'FrontdoorContact', 'Haustür', 23);
 windowContactFrontdoor.start();
 allLabeledItems.push(windowContactFrontdoor);
 // ----------------------------------------------------------------------------------------------------------
@@ -269,66 +351,162 @@ let relayBox = new RelayBox_1.RelayBoxThing('base', 'labor', 'relaybox', 'IoT/Co
 relayBox.start();
 allLabeledItems.push(relayBox);
 // ----------------------------------------------------------------------------------------------------------
-let geoFences = new GeoFences_1.GeoFences();
+let heatingSceneAll = new HeatingScene_1.HeatingScene('Gnd', 'House', 'Heatings', 'Alle Heizungen', allThermostatItems);
-geoFences.exec();
+heatingSceneAll.start();
-geoFences.on('change', (attendanceSheet) => {
-    logger.info(`geoFences change event: ${JSON.stringify(attendanceSheet)}`);
-});
 // ----------------------------------------------------------------------------------------------------------
-let testFourButton = new HomematicFourButtonThing_1.HomematicFourButtonThing('Gnd', 'Hallway', 'TestButton', 9, [
+// Basement
-    new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/Testlight/dimmerIn'),
+let workshopLight = new HomematicSwitchItem_1.HomematicSwitchItem('Base', 'Keller', 'Light', 'Werkstatt', 5);
-    new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/DeskLight/timerIn'),
+workshopLight.start();
+allLabeledItems.push(workshopLight);
+allRelevantLights.push(workshopLight);
+allLights.push(workshopLight);
+let basementSmallLight = new HomematicSwitchItem_1.HomematicSwitchItem('Base', 'Keller', 'SmallLight', 'Licht einfach', 35, 1);
+basementSmallLight.start();
+allLabeledItems.push(basementSmallLight);
+allRelevantLights.push(basementSmallLight);
+allLights.push(basementSmallLight);
+basementSmallLight.on('somethingChanged', () => {
+    if (basementSmallLight.getState() == 'ON') {
+        setTimeout(() => {
+            if (basementLargeLight.getState() == 'OFF') {
+                MqttDispatcher_1.mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF');
+            }
+        }, (3 * 60 * 1000));
+    }
+    if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
+        MqttDispatcher_1.mqttHandler.send(basementLargeLight.getStateTopic(), 'OFF');
+    }
+});
+let basementLargeLight = new HomematicSwitchItem_1.HomematicSwitchItem('Base', 'Keller', 'LargeLight', 'Licht hell', 35, 2);
+basementLargeLight.start();
+allLabeledItems.push(basementLargeLight);
+allRelevantLights.push(basementLargeLight);
+allLights.push(basementLargeLight);
+basementLargeLight.on('somethingChanged', () => {
+    if (basementLargeLight.getState() == 'ON') {
+        MqttDispatcher_1.mqttHandler.send(basementSmallLight.getStateTopic(), 'ON');
+    }
+    else if (basementLargeLight.getState() == 'OFF') {
+        MqttDispatcher_1.mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF');
+    }
+});
+let basementForwarder = new Forwarder_1.Forwarder('Base', 'All', 'Forwarder', 'state', 'BasementForwarder', [
+    basementLargeLight.getStateTopic(),
+    basementSmallLight.getStateTopic(),
+    workshopLight.getStateTopic()
+]);
+basementForwarder.start();
+let basementForwarderSwitchOffAdaptor = new SwitchOffAdaptor_1.SwitchOffAdaptor('Base', 'All', 'Forwarder');
+basementForwarderSwitchOffAdaptor.start();
+// ----------------------------------------------------------------------------------------------------------
+let twoLedSignal1 = new TwoLedSignal_1.TwoLedSignal('Gnd', 'Flur', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger', allRelevantLights, "OFF", "ON", allWindows, "CLOSED", "OPEN");
+twoLedSignal1.start();
+// MySwitchTHing
+let mySwitchThingWolfgang = new MySwitchThing_1.MySwitchThing('1st', 'Schlafzimmer', 'WolfgangsSwitch', [
+    new MySwitchThing_1.MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
+    new MySwitchThing_1.MySwitchSingleItem(basementForwarderSwitchOffAdaptor.getInTopic()),
+    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/2'),
+]);
+mySwitchThingWolfgang.start();
+// ----------------------------------------------------------------------------------------------------------
+let testFourButton = new HomematicFourButtonThing_1.HomematicFourButtonThing('Gnd', 'Flur', 'TestButton', 9, [
+    new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Flur/Testlight/dimmerIn'),
+    new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Flur/DeskLight/timerIn'),
     new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('test/button/3'),
     new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('test/button/4')
 ]);
 testFourButton.start();
-let testDimmerAdaptor = new DimmerAdaptor_1.DimmerAdaptor('Gnd', 'Hallway', 'Testlight');
+let testDimmerAdaptor = new DimmerAdaptor_1.DimmerAdaptor('Gnd', 'Flur', 'Testlight');
 testDimmerAdaptor.start();
-let testTimerAdaptor = new TimerAdaptor_1.TimerAdaptor('Gnd', 'Hallway', 'DeskLight', 10);
+let testTimerAdaptor = new TimerAdaptor_1.TimerAdaptor('Gnd', 'Flur', 'DeskLight', 10);
 testTimerAdaptor.start();
-let testLight = new HomematicDimmerItem_1.HomematicDimmerItem('Gnd', 'Hallway', 'Testlight', 'Testlampe mit Dimmer', 8);
+let testLight = new HomematicDimmerItem_1.HomematicDimmerItem('Gnd', 'Flur', 'Testlight', 'Testlampe mit Dimmer', 8);
 testLight.start();
-let testLight2 = new HomematicSwitchItem_1.HomematicSwitchItem('Gnd', 'Hallway', 'Testlight2', 'Testlampe ohne Dimmer', 5);
+let testForwarder = new Forwarder_1.Forwarder('Gnd', 'Flur', 'TestForwarder', 'state', 'TestForwarder', [
-testLight2.start();
+    'dispatcher_ng/items/Gnd/Flur/Testlight2/state',
-let testForwarder = new Forwarder_1.Forwarder('Gnd', 'Hallway', 'TestForwarder', 'state', 'TestForwarder', [
+    'dispatcher_ng/items/Gnd/Flur/DeskLight/state'
-    'dispatcher_ng/items/Gnd/Hallway/Testlight2/state',
-    'dispatcher_ng/items/Gnd/Hallway/DeskLight/state'
 ]);
 testForwarder.start();
-let testScene = new Scene_1.LightScene('Gnd', 'Hallway', 'TestScene', 'TestScene', [aquariumLight, annaBedLight], [matthiasStandLights, matthiasBedLight]);
+let testScene = new Scene_1.LightScene('Gnd', 'Flur', 'TestScene', 'TestScene', [aquariumLight, annaBedLight], [matthiasStandLights, matthiasBedLight]);
 testScene.start();
 // ----------------------------------------------------------------------------------------------------------
-// Homekit export
+let dayLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'DayLight', 'DayLight', [
-let homekitObject = {};
+    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight,
-let openhabList = [];
+    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-// logger.info("allLabeledItems")
+    livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
-// logger.info(JSON.stringify(allLabeledItems))
+], []);
-allLabeledItems.forEach((item) => {
+dayLightScene.start();
-    let exportData = item.exportItem();
+allLabeledItems.push(dayLightScene);
-    if (exportData != null) {
+allLightScenes.push(dayLightScene);
-        if ('id' in exportData['homekit']) {
+let ecoLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'EcoLight', 'EcoLight', [
-            homekitObject[exportData['homekit']['id']] = exportData['homekit']['object'];
+    kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight,
-        }
+    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-        if (exportData['openhab'] instanceof Array) {
+    livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
-            let da = exportData['openhab'];
+], [
-            da.forEach((o) => openhabList.push(o));
+    kitchenCeilingLight, hallwayStandLight,
-        }
+    livingRoomLargeLight, livingRoomSmallLight
-        else {
+]);
-            let da = exportData['openhab'];
+ecoLightScene.start();
-            openhabList.push(da);
+allLabeledItems.push(ecoLightScene);
-        }
+allLightScenes.push(ecoLightScene);
-        // logger.info("openHabList")
+let ecoSwitch = new MaxEcoSwitch_1.MaxEcoSwitch('Gnd', 'Szenen', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene);
-        // logger.info(JSON.stringify(openhabList))
+ecoSwitch.start();
+let morningLightScene = new Scene_1.LightScene('Gnd', 'Szenen', 'MorningLight', 'MorningLight', [
+    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight,
+    hallwayStandLight
+], [
+    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
+    livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
+]);
+morningLightScene.start();
+allLabeledItems.push(morningLightScene);
+allLightScenes.push(morningLightScene);
+let sceneOfAllLights = new Scene_1.LightScene('Gnd', 'Szenen', 'AllLights', 'Alle Lampen', allLights, []);
+sceneOfAllLights.start();
+allLightScenes.push(sceneOfAllLights);
+// ----------------------------------------------------------------------------------------------------------
+// heartbeat
+let heartbeatCounter = 0;
+let heartbeatTimer = setInterval(() => {
+    heartbeatCounter += 1;
+    MqttDispatcher_1.mqttHandler.send(config.dict.heartbeatTopic, `${heartbeatCounter}`);
+}, config.dict.heartbeatInterval);
+// watchdog
+let watchdogCounter = 0;
+let watchdogTimer = setInterval(() => {
+    watchdogCounter += 1;
+    MqttDispatcher_1.mqttHandler.send(config.dict.watchdogTopic, `${config.dict.watchdogMessage} ${watchdogCounter}`);
+}, config.dict.watchdogInterval);
+// ----------------------------------------------------------------------------------------------------------
+let roomSwitches = {};
+allLights.forEach((item) => {
+    let switchItem = { 'label': item.getLabel(), 'actionTopic': item.getStateTopic(), 'feedbackTopic': item.getStateFeedbackTopic() };
+    if (item.getRoom() in roomSwitches) {
+        roomSwitches[item.getRoom()].push(switchItem);
+    }
+    else {
+        roomSwitches[item.getRoom()] = [switchItem];
     }
 });
-let heatingMainSwitchExport = MaxThermostat_1.MaxThermostat.exportHeatingMainSwitchItem();
+let smartClientConfiguration = {};
-if (heatingMainSwitchExport != null) {
+smartClientConfiguration['switches'] = [];
-    let da = heatingMainSwitchExport['openhab'];
+for (let key in roomSwitches) {
-    openhabList.push(da);
+    let item = { 'room': key, 'switches': roomSwitches[key] };
+    smartClientConfiguration['switches'].push(item);
 }
-fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4));
+smartClientConfiguration['scenes'] = [];
-fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'));
+allLightScenes.forEach((scene) => {
+    let item = { 'label': scene.getLabel(), 'actionTopic': scene.getStateTopic() };
+    smartClientConfiguration['scenes'].push(item);
+});
+smartClientConfiguration['windows'] = [];
+allWindows.forEach((window) => {
+    let item = { 'label': window.getLabel(), 'topic': window.getStateFeedbackTopic() };
+    smartClientConfiguration['windows'].push(item);
+});
+fs.writeFileSync('smartclient.json', JSON.stringify(smartClientConfiguration, null, 4));
 // ----------------------------------------------------------------------------------------------------------
 MqttDispatcher_1.mqttHandler.exec();
 logger.info("Dispatcher running");
+MqttDispatcher_1.mqttHandler.send('smartclient/configuration', JSON.stringify(smartClientConfiguration, null, 4));
 //# sourceMappingURL=main.js.map

homekit.json

@@ -1,7 +1,7 @@
 {
     "1st_Anna_AquariumLight": {
         "id": "1st_Anna_AquariumLight",
-        "name": "Aquariumlicht",
+        "name": "Aquarium",
         "service": "Lightbulb",
         "topic": {
             "setOn": "dispatcher_ng/items/1st/Anna/AquariumLight/state",
@@ -18,7 +18,7 @@
     },
     "1st_Anna_BedLight": {
         "id": "1st_Anna_BedLight",
-        "name": "Bettlicht Anna",
+        "name": "Bettlicht",
         "service": "Lightbulb",
         "topic": {
             "setOn": "dispatcher_ng/items/1st/Anna/BedLight/state",
@@ -35,7 +35,7 @@
     },
     "1st_Anna_WindowContact": {
         "id": "1st_Anna_WindowContact",
-        "name": "Fenster Anna",
+        "name": "Anna",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/1st/Anna/WindowContact/state/feedback"
@@ -57,7 +57,7 @@
     },
     "1st_Matthias_StandLight": {
         "id": "1st_Matthias_StandLight",
-        "name": "Stehlampen Matthias",
+        "name": "Stehlampen",
         "service": "Lightbulb",
         "topic": {
             "setOn": "dispatcher_ng/items/1st/Matthias/StandLight/state",
@@ -74,7 +74,7 @@
     },
     "1st_Matthias_BedLight": {
         "id": "1st_Matthias_BedLight",
-        "name": "Bettlicht Matthias",
+        "name": "Bettlicht",
         "service": "Lightbulb",
         "topic": {
             "setOn": "dispatcher_ng/items/1st/Matthias/BedLight/state",
@@ -91,7 +91,7 @@
     },
     "1st_Matthias_Speaker": {
         "id": "1st_Matthias_Speaker",
-        "name": "Lautsprecher Matthias",
+        "name": "Lautsprecher",
         "service": "Outlet",
         "topic": {
             "setOn": "dispatcher_ng/items/1st/Matthias/Speaker/state",
@@ -103,13 +103,24 @@
         },
         "config": {}
     },
-    "Gnd_DiningRoom_SmallLight": {
+    "1st_Matthias_WindowContact": {
-        "id": "Gnd_DiningRoom_SmallLight",
+        "id": "1st_Matthias_WindowContact",
-        "name": "kleine Lampe Esszimmer",
+        "name": "Matthias",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/1st/Matthias/WindowContact/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Esszimmer_SmallLight": {
+        "id": "Gnd_Esszimmer_SmallLight",
+        "name": "kleine Lampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/DiningRoom/SmallLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Esszimmer/SmallLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/DiningRoom/SmallLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Esszimmer/SmallLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -120,13 +131,13 @@
         },
         "config": {}
     },
-    "Gnd_DiningRoom_StandLight": {
+    "Gnd_Esszimmer_StandLight": {
-        "id": "Gnd_DiningRoom_StandLight",
+        "id": "Gnd_Esszimmer_StandLight",
-        "name": "Stehlampe Esszimmer",
+        "name": "Stehlampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/DiningRoom/StandLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Esszimmer/StandLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/DiningRoom/StandLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Esszimmer/StandLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -137,13 +148,13 @@
         },
         "config": {}
     },
-    "Gnd_DiningRoom_CupboardLight": {
+    "Gnd_Esszimmer_CupboardLight": {
-        "id": "Gnd_DiningRoom_CupboardLight",
+        "id": "Gnd_Esszimmer_CupboardLight",
-        "name": "Schranklicht Esszimmer",
+        "name": "Schranklicht",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/DiningRoom/CupboardLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/DiningRoom/CupboardLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -154,40 +165,23 @@
         },
         "config": {}
     },
-    "Gnd_DiningRoom_ShelfLight": {
+    "Gnd_Esszimmer_NaehkaestchenLight": {
-        "id": "Gnd_DiningRoom_ShelfLight",
+        "id": "Gnd_Esszimmer_NaehkaestchenLight",
-        "name": "Regallicht Esszimmer",
+        "name": "Nähkästchen",
-        "service": "Lightbulb",
-        "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/DiningRoom/ShelfLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/DiningRoom/ShelfLight/state/feedback"
-        },
-        "payload": {
-            "onTrue": "ON",
-            "onFalse": "OFF",
-            "brightnessFactor": "",
-            "hueFactor": "",
-            "saturationFactor": ""
-        },
-        "config": {}
-    },
-    "Gnd_DiningRoom_NaehkaestchenLight": {
-        "id": "Gnd_DiningRoom_NaehkaestchenLight",
-        "name": "Lampe Naehkaestchen",
         "service": "Lightbulb",
         "manufacturer": "hue2mqtt - Hue",
         "model": "color light",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/state/feedback",
+            "statusOn": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state/feedback",
-            "setBrightness": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/bright",
+            "setBrightness": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/bright",
-            "statusBrightness": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/bright/feedback",
+            "statusBrightness": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/bright/feedback",
-            "setHue": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/hue",
+            "setHue": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/hue",
-            "statusHue": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/bright/hue",
+            "statusHue": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/bright/hue",
-            "setSaturation": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/saturation",
+            "setSaturation": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/saturation",
-            "statusSaturation": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/bright/saturation",
+            "statusSaturation": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/bright/saturation",
-            "setColorTemperature": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/colorTemperature",
+            "setColorTemperature": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/colorTemperature",
-            "statusColorTemperature": "dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight/colorTemperature/feedback"
+            "statusColorTemperature": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/colorTemperature/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -197,13 +191,46 @@
             "saturationFactor": 1
         }
     },
-    "Gnd_LivingRoom_LargeLight": {
+    "Gnd_Esszimmer_WindowContact1": {
-        "id": "Gnd_LivingRoom_LargeLight",
+        "id": "Gnd_Esszimmer_WindowContact1",
-        "name": "große Lampe Wohnzimmer",
+        "name": "Essz. links",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Esszimmer/WindowContact1/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Esszimmer_WindowContact2": {
+        "id": "Gnd_Esszimmer_WindowContact2",
+        "name": "Essz. rechts",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Esszimmer/WindowContact2/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Esszimmer_Thermostat": {
+        "id": "Gnd_Esszimmer_Thermostat",
+        "name": "Thermostat Esszimmer",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Esszimmer/Thermostat/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Esszimmer/Thermostat/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Esszimmer/Thermostat/temperature/feedback"
+        },
+        "payload": {}
+    },
+    "Gnd_Wohnzimmer_LargeLight": {
+        "id": "Gnd_Wohnzimmer_LargeLight",
+        "name": "große Lampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Wohnzimmer/LargeLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Wohnzimmer/LargeLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -214,13 +241,13 @@
         },
         "config": {}
     },
-    "Gnd_LivingRoom_SmallLight": {
+    "Gnd_Wohnzimmer_SmallLight": {
-        "id": "Gnd_LivingRoom_SmallLight",
+        "id": "Gnd_Wohnzimmer_SmallLight",
-        "name": "kleine Lampe Wohnzimmer",
+        "name": "kleine Lampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Wohnzimmer/SmallLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Wohnzimmer/SmallLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -231,13 +258,13 @@
         },
         "config": {}
     },
-    "Gnd_LivingRoom_Stars": {
+    "Gnd_Wohnzimmer_Stars": {
-        "id": "Gnd_LivingRoom_Stars",
+        "id": "Gnd_Wohnzimmer_Stars",
-        "name": "Sterne Wohnzimmer",
+        "name": "Sterne",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/LivingRoom/Stars/state",
+            "setOn": "dispatcher_ng/items/Gnd/Wohnzimmer/Stars/state",
-            "statusOn": "dispatcher_ng/items/Gnd/LivingRoom/Stars/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Wohnzimmer/Stars/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -248,13 +275,13 @@
         },
         "config": {}
     },
-    "Gnd_LivingRoom_StandLight": {
+    "Gnd_Wohnzimmer_StandLight": {
-        "id": "Gnd_LivingRoom_StandLight",
+        "id": "Gnd_Wohnzimmer_StandLight",
-        "name": "Stehlampe Wohnzimmer",
+        "name": "Stehlampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/LivingRoom/StandLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Wohnzimmer/StandLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/LivingRoom/StandLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Wohnzimmer/StandLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -265,13 +292,46 @@
         },
         "config": {}
     },
-    "Gnd_Hallway_DeskLight": {
+    "Gnd_Wohnzimmer_WindowContact1": {
-        "id": "Gnd_Hallway_DeskLight",
+        "id": "Gnd_Wohnzimmer_WindowContact1",
-        "name": "Schreibtischlampe Flur",
+        "name": "Wohnz. rechts",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Wohnzimmer/WindowContact1/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Wohnzimmer_WindowContact2": {
+        "id": "Gnd_Wohnzimmer_WindowContact2",
+        "name": "Wohnz. links",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Wohnzimmer/WindowContact2/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Wohnzimmer_Thermostat": {
+        "id": "Gnd_Wohnzimmer_Thermostat",
+        "name": "Thermostat Wohnzimmer",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/temperature/feedback"
+        },
+        "payload": {}
+    },
+    "Gnd_Flur_DeskLight": {
+        "id": "Gnd_Flur_DeskLight",
+        "name": "Schreibtischlampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Hallway/DeskLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Flur/DeskLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Hallway/DeskLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Flur/DeskLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -282,13 +342,13 @@
         },
         "config": {}
     },
-    "Gnd_Hallway_StandLight": {
+    "Gnd_Flur_StandLight": {
-        "id": "Gnd_Hallway_StandLight",
+        "id": "Gnd_Flur_StandLight",
-        "name": "Stehlampe Flur",
+        "name": "Stehlampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Hallway/StandLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Flur/StandLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Hallway/StandLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Flur/StandLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -299,13 +359,13 @@
         },
         "config": {}
     },
-    "Gnd_Hallway_WardrobeLight": {
+    "Gnd_Flur_WardrobeLight": {
-        "id": "Gnd_Hallway_WardrobeLight",
+        "id": "Gnd_Flur_WardrobeLight",
-        "name": "Schranklicht Flur",
+        "name": "Schranklicht",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Hallway/WardrobeLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Flur/WardrobeLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Hallway/WardrobeLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Flur/WardrobeLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -316,13 +376,46 @@
         },
         "config": {}
     },
-    "Gnd_Kitchen_WindowLight": {
+    "Gnd_Flur_WindowContact": {
-        "id": "Gnd_Kitchen_WindowLight",
+        "id": "Gnd_Flur_WindowContact",
-        "name": "Fensterbanklicht Küche",
+        "name": "Flur",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Flur/WindowContact/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Flur_Thermostat1": {
+        "id": "Gnd_Flur_Thermostat1",
+        "name": "Thermostat Flur vorne",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Flur/Thermostat1/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Flur/Thermostat1/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Flur/Thermostat1/temperature/feedback"
+        },
+        "payload": {}
+    },
+    "Gnd_Flur_Thermostat2": {
+        "id": "Gnd_Flur_Thermostat2",
+        "name": "Thermostat Flur hinten",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Flur/Thermostat2/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Flur/Thermostat2/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Flur/Thermostat2/temperature/feedback"
+        },
+        "payload": {}
+    },
+    "Gnd_Kueche_WindowLight": {
+        "id": "Gnd_Kueche_WindowLight",
+        "name": "Fensterbanklicht",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Kitchen/WindowLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Kueche/WindowLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Kitchen/WindowLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Kueche/WindowLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -333,13 +426,13 @@
         },
         "config": {}
     },
-    "Gnd_Kitchen_CeilingLight": {
+    "Gnd_Kueche_CeilingLight": {
-        "id": "Gnd_Kitchen_CeilingLight",
+        "id": "Gnd_Kueche_CeilingLight",
-        "name": "Deckenlampe Küche",
+        "name": "Deckenlampe",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Kitchen/CeilingLight/state",
+            "setOn": "dispatcher_ng/items/Gnd/Kueche/CeilingLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Kitchen/CeilingLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/Gnd/Kueche/CeilingLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -350,13 +443,13 @@
         },
         "config": {}
     },
-    "1st_BedRoom_WolfgangsSide": {
+    "1st_Schlafzimmer_WolfgangsSide": {
-        "id": "1st_BedRoom_WolfgangsSide",
+        "id": "1st_Schlafzimmer_WolfgangsSide",
-        "name": "Wolfgangs Seite Schlafzimmer",
+        "name": "Wolfgangs Seite",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/1st/BedRoom/WolfgangsSide/state",
+            "setOn": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangsSide/state",
-            "statusOn": "dispatcher_ng/items/1st/BedRoom/WolfgangsSide/state/feedback"
+            "statusOn": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangsSide/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -367,23 +460,23 @@
         },
         "config": {}
     },
-    "1st_BedRoom_WolfgangBedLight": {
+    "1st_Schlafzimmer_WolfgangBedLight": {
-        "id": "1st_BedRoom_WolfgangBedLight",
+        "id": "1st_Schlafzimmer_WolfgangBedLight",
-        "name": "Bettlicht",
+        "name": "Wolfgangs Bettlicht",
         "service": "Lightbulb",
         "manufacturer": "hue2mqtt - Hue",
         "model": "color light",
         "topic": {
-            "setOn": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/state",
+            "setOn": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/state",
-            "statusOn": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/state/feedback",
+            "statusOn": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/state/feedback",
-            "setBrightness": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/bright",
+            "setBrightness": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/bright",
-            "statusBrightness": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/bright/feedback",
+            "statusBrightness": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/bright/feedback",
-            "setHue": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/hue",
+            "setHue": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/hue",
-            "statusHue": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/bright/hue",
+            "statusHue": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/bright/hue",
-            "setSaturation": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/saturation",
+            "setSaturation": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/saturation",
-            "statusSaturation": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/bright/saturation",
+            "statusSaturation": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/bright/saturation",
-            "setColorTemperature": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/colorTemperature",
+            "setColorTemperature": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/colorTemperature",
-            "statusColorTemperature": "dispatcher_ng/items/1st/BedRoom/WolfgangBedLight/colorTemperature/feedback"
+            "statusColorTemperature": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/colorTemperature/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -393,13 +486,13 @@
             "saturationFactor": 1
         }
     },
-    "1st_BedRoom_PattysSide": {
+    "1st_Schlafzimmer_PattysSide": {
-        "id": "1st_BedRoom_PattysSide",
+        "id": "1st_Schlafzimmer_PattysSide",
-        "name": "Pattys Seite Schlafzimmer",
+        "name": "Pattys Seite",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/1st/BedRoom/PattysSide/state",
+            "setOn": "dispatcher_ng/items/1st/Schlafzimmer/PattysSide/state",
-            "statusOn": "dispatcher_ng/items/1st/BedRoom/PattysSide/state/feedback"
+            "statusOn": "dispatcher_ng/items/1st/Schlafzimmer/PattysSide/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -410,13 +503,13 @@
         },
         "config": {}
     },
-    "1st_BedRoom_WindowLight": {
+    "1st_Schlafzimmer_WindowLight": {
-        "id": "1st_BedRoom_WindowLight",
+        "id": "1st_Schlafzimmer_WindowLight",
-        "name": "Fensterbanklicht Schlafzimmer",
+        "name": "Fensterbanklicht",
         "service": "Lightbulb",
         "topic": {
-            "setOn": "dispatcher_ng/items/1st/BedRoom/WindowLight/state",
+            "setOn": "dispatcher_ng/items/1st/Schlafzimmer/WindowLight/state",
-            "statusOn": "dispatcher_ng/items/1st/BedRoom/WindowLight/state/feedback"
+            "statusOn": "dispatcher_ng/items/1st/Schlafzimmer/WindowLight/state/feedback"
         },
         "payload": {
             "onTrue": "ON",
@@ -429,7 +522,7 @@
     },
     "1st_Bedroom_WindowContactStreet": {
         "id": "1st_Bedroom_WindowContactStreet",
-        "name": "Fenster Schlafzimmer Strasse",
+        "name": "Schlafz. Strasse",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/1st/Bedroom/WindowContactStreet/state/feedback"
@@ -440,7 +533,7 @@
     },
     "1st_Bedroom_WindowContact1Garden": {
         "id": "1st_Bedroom_WindowContact1Garden",
-        "name": "Fenster Schlafzimmer 1 Garten",
+        "name": "Schlafz. Garten 1",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/1st/Bedroom/WindowContact1Garden/state/feedback"
@@ -451,7 +544,7 @@
     },
     "1st_Bedroom_WindowContact2Garden": {
         "id": "1st_Bedroom_WindowContact2Garden",
-        "name": "Fenster Schlafzimmer 2 Garten",
+        "name": "Schlafz. Garten 2",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/1st/Bedroom/WindowContact2Garden/state/feedback"
@@ -471,60 +564,9 @@
         },
         "payload": {}
     },
-    "Gnd_Hallway_DayLight": {
-        "id": "Gnd_Hallway_DayLight",
-        "name": "DayLight",
-        "service": "Lightbulb",
-        "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Hallway/DayLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Hallway/DayLight/state/feedback"
-        },
-        "payload": {
-            "onTrue": "ON",
-            "onFalse": "OFF",
-            "brightnessFactor": "",
-            "hueFactor": "",
-            "saturationFactor": ""
-        },
-        "config": {}
-    },
-    "Gnd_Hallway_EcoLight": {
-        "id": "Gnd_Hallway_EcoLight",
-        "name": "EcoLight",
-        "service": "Lightbulb",
-        "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Hallway/EcoLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Hallway/EcoLight/state/feedback"
-        },
-        "payload": {
-            "onTrue": "ON",
-            "onFalse": "OFF",
-            "brightnessFactor": "",
-            "hueFactor": "",
-            "saturationFactor": ""
-        },
-        "config": {}
-    },
-    "Gnd_Hallway_MorningLight": {
-        "id": "Gnd_Hallway_MorningLight",
-        "name": "MorningLight",
-        "service": "Lightbulb",
-        "topic": {
-            "setOn": "dispatcher_ng/items/Gnd/Hallway/MorningLight/state",
-            "statusOn": "dispatcher_ng/items/Gnd/Hallway/MorningLight/state/feedback"
-        },
-        "payload": {
-            "onTrue": "ON",
-            "onFalse": "OFF",
-            "brightnessFactor": "",
-            "hueFactor": "",
-            "saturationFactor": ""
-        },
-        "config": {}
-    },
     "Gnd_Bathroom_WindowContact": {
         "id": "Gnd_Bathroom_WindowContact",
-        "name": "Fenster Bad unten",
+        "name": "Bad unten",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/Gnd/Bathroom/WindowContact/state/feedback"
@@ -546,7 +588,7 @@
     },
     "1st_Bathroom_WindowContact": {
         "id": "1st_Bathroom_WindowContact",
-        "name": "Fenster Bad oben",
+        "name": "Bad oben",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/1st/Bathroom/WindowContact/state/feedback"
@@ -566,71 +608,173 @@
         },
         "payload": {}
     },
-    "Gnd_Kitchen_WindowContact1": {
+    "Gnd_Kueche_WindowContact1": {
-        "id": "Gnd_Kitchen_WindowContact1",
+        "id": "Gnd_Kueche_WindowContact1",
-        "name": "Fenster Küche Garten",
+        "name": "Küche Garten",
         "service": "ContactSensor",
         "topic": {
-            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kitchen/WindowContact1/state/feedback"
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kueche/WindowContact1/state/feedback"
         },
         "payload": {
             "onContactDetected": "CLOSED"
         }
     },
-    "Gnd_Kitchen_WindowContact2": {
+    "Gnd_Kueche_WindowContact2": {
-        "id": "Gnd_Kitchen_WindowContact2",
+        "id": "Gnd_Kueche_WindowContact2",
-        "name": "Fenster Küche Terassentür Garten",
+        "name": "Küche Terassentür",
         "service": "ContactSensor",
         "topic": {
-            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kitchen/WindowContact2/state/feedback"
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kueche/WindowContact2/state/feedback"
         },
         "payload": {
             "onContactDetected": "CLOSED"
         }
     },
-    "Gnd_Kitchen_WindowContact3": {
+    "Gnd_Kueche_WindowContact3": {
-        "id": "Gnd_Kitchen_WindowContact3",
+        "id": "Gnd_Kueche_WindowContact3",
-        "name": "Fenster Küche Straße 1",
+        "name": "Küche Straße 1",
         "service": "ContactSensor",
         "topic": {
-            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kitchen/WindowContact3/state/feedback"
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kueche/WindowContact3/state/feedback"
         },
         "payload": {
             "onContactDetected": "CLOSED"
         }
     },
-    "Gnd_Kitchen_WindowContact4": {
+    "Gnd_Kueche_WindowContact4": {
-        "id": "Gnd_Kitchen_WindowContact4",
+        "id": "Gnd_Kueche_WindowContact4",
-        "name": "Fenster Küche Straße 2",
+        "name": "Küche Straße 2",
         "service": "ContactSensor",
         "topic": {
-            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kitchen/WindowContact4/state/feedback"
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Kueche/WindowContact4/state/feedback"
         },
         "payload": {
             "onContactDetected": "CLOSED"
         }
     },
-    "Gnd_Kitchen_Thermostat": {
+    "Gnd_Kueche_Thermostat": {
-        "id": "Gnd_Kitchen_Thermostat",
+        "id": "Gnd_Kueche_Thermostat",
         "name": "Thermostat Küche",
         "service": "Thermostat",
         "topic": {
-            "setTargetTemperature": "dispatcher_ng/items/Gnd/Kitchen/Thermostat/temperature",
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Kueche/Thermostat/temperature",
-            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Kitchen/Thermostat/temperature/feedback",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Kueche/Thermostat/temperature/feedback",
-            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Kitchen/Thermostat/temperature/feedback"
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Kueche/Thermostat/temperature/feedback"
         },
         "payload": {}
     },
-    "Gnd_Hallway_FrontdoorContact": {
+    "Gnd_Flur_FrontdoorContact": {
-        "id": "Gnd_Hallway_FrontdoorContact",
+        "id": "Gnd_Flur_FrontdoorContact",
         "name": "Haustür",
         "service": "ContactSensor",
         "topic": {
-            "statusContactSensorState": "dispatcher_ng/items/Gnd/Hallway/FrontdoorContact/state/feedback"
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Flur/FrontdoorContact/state/feedback"
         },
         "payload": {
             "onContactDetected": "CLOSED"
         }
     },
-    "": {}
+    "": {},
+    "Base_Keller_Light": {
+        "id": "Base_Keller_Light",
+        "name": "Werkstatt",
+        "service": "Lightbulb",
+        "topic": {
+            "setOn": "dispatcher_ng/items/Base/Keller/Light/state",
+            "statusOn": "dispatcher_ng/items/Base/Keller/Light/state/feedback"
+        },
+        "payload": {
+            "onTrue": "ON",
+            "onFalse": "OFF",
+            "brightnessFactor": "",
+            "hueFactor": "",
+            "saturationFactor": ""
+        },
+        "config": {}
+    },
+    "Base_Keller_SmallLight": {
+        "id": "Base_Keller_SmallLight",
+        "name": "Licht einfach",
+        "service": "Lightbulb",
+        "topic": {
+            "setOn": "dispatcher_ng/items/Base/Keller/SmallLight/state",
+            "statusOn": "dispatcher_ng/items/Base/Keller/SmallLight/state/feedback"
+        },
+        "payload": {
+            "onTrue": "ON",
+            "onFalse": "OFF",
+            "brightnessFactor": "",
+            "hueFactor": "",
+            "saturationFactor": ""
+        },
+        "config": {}
+    },
+    "Base_Keller_LargeLight": {
+        "id": "Base_Keller_LargeLight",
+        "name": "Licht hell",
+        "service": "Lightbulb",
+        "topic": {
+            "setOn": "dispatcher_ng/items/Base/Keller/LargeLight/state",
+            "statusOn": "dispatcher_ng/items/Base/Keller/LargeLight/state/feedback"
+        },
+        "payload": {
+            "onTrue": "ON",
+            "onFalse": "OFF",
+            "brightnessFactor": "",
+            "hueFactor": "",
+            "saturationFactor": ""
+        },
+        "config": {}
+    },
+    "Gnd_Szenen_DayLight": {
+        "id": "Gnd_Szenen_DayLight",
+        "name": "DayLight",
+        "service": "Lightbulb",
+        "topic": {
+            "setOn": "dispatcher_ng/items/Gnd/Szenen/DayLight/state",
+            "statusOn": "dispatcher_ng/items/Gnd/Szenen/DayLight/state/feedback"
+        },
+        "payload": {
+            "onTrue": "ON",
+            "onFalse": "OFF",
+            "brightnessFactor": "",
+            "hueFactor": "",
+            "saturationFactor": ""
+        },
+        "config": {}
+    },
+    "Gnd_Szenen_EcoLight": {
+        "id": "Gnd_Szenen_EcoLight",
+        "name": "EcoLight",
+        "service": "Lightbulb",
+        "topic": {
+            "setOn": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state",
+            "statusOn": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state/feedback"
+        },
+        "payload": {
+            "onTrue": "ON",
+            "onFalse": "OFF",
+            "brightnessFactor": "",
+            "hueFactor": "",
+            "saturationFactor": ""
+        },
+        "config": {}
+    },
+    "Gnd_Szenen_MorningLight": {
+        "id": "Gnd_Szenen_MorningLight",
+        "name": "MorningLight",
+        "service": "Lightbulb",
+        "topic": {
+            "setOn": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state",
+            "statusOn": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state/feedback"
+        },
+        "payload": {
+            "onTrue": "ON",
+            "onFalse": "OFF",
+            "brightnessFactor": "",
+            "hueFactor": "",
+            "saturationFactor": ""
+        },
+        "config": {}
+    }
 }

openhab.items

@@ -1,54 +1,70 @@
-Switch 1st_Anna_AquariumLight "Aquariumlicht"{mqtt=">[localbroker:dispatcher_ng/items/1st/Anna/AquariumLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Anna/AquariumLight/state/feedback:state:default]"}
+Switch 1st_Anna_AquariumLight "Aquarium"{mqtt=">[localbroker:dispatcher_ng/items/1st/Anna/AquariumLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Anna/AquariumLight/state/feedback:state:default]"}
-Switch 1st_Anna_BedLight "Bettlicht Anna"{mqtt=">[localbroker:dispatcher_ng/items/1st/Anna/BedLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Anna/BedLight/state/feedback:state:default]"}
+Switch 1st_Anna_BedLight "Bettlicht"{mqtt=">[localbroker:dispatcher_ng/items/1st/Anna/BedLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Anna/BedLight/state/feedback:state:default]"}
-Contact 1st_Anna_WindowContact "Fenster Anna" {mqtt="<[localbroker:dispatcher_ng/items/1st/Anna/WindowContact/state/feedback:state:default]"}
+Contact 1st_Anna_WindowContact "Anna" {mqtt="<[localbroker:dispatcher_ng/items/1st/Anna/WindowContact/state/feedback:state:default]"}
 Number 1st_Anna_Thermostat "Thermostat Anna [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Anna/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Anna/Thermostat/temperature/feedback:state:default]"}
 Number Preset_1st_Anna_Thermostat "Preset_Thermostat Anna [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Anna/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Anna/Thermostat/presetTemperature/feedback:state:default]"}
-Switch 1st_Matthias_StandLight "Stehlampen Matthias"{mqtt=">[localbroker:dispatcher_ng/items/1st/Matthias/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Matthias/StandLight/state/feedback:state:default]"}
+Switch 1st_Matthias_StandLight "Stehlampen"{mqtt=">[localbroker:dispatcher_ng/items/1st/Matthias/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Matthias/StandLight/state/feedback:state:default]"}
-Switch 1st_Matthias_BedLight "Bettlicht Matthias"{mqtt=">[localbroker:dispatcher_ng/items/1st/Matthias/BedLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Matthias/BedLight/state/feedback:state:default]"}
+Switch 1st_Matthias_BedLight "Bettlicht"{mqtt=">[localbroker:dispatcher_ng/items/1st/Matthias/BedLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Matthias/BedLight/state/feedback:state:default]"}
-Switch 1st_Matthias_Speaker "Lautsprecher Matthias"{mqtt=">[localbroker:dispatcher_ng/items/1st/Matthias/Speaker/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Matthias/Speaker/state/feedback:state:default]"}
+Switch 1st_Matthias_Speaker "Lautsprecher"{mqtt=">[localbroker:dispatcher_ng/items/1st/Matthias/Speaker/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Matthias/Speaker/state/feedback:state:default]"}
-Switch Gnd_DiningRoom_SmallLight "kleine Lampe Esszimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/SmallLight/state/feedback:state:default]"}
+Contact 1st_Matthias_WindowContact "Matthias" {mqtt="<[localbroker:dispatcher_ng/items/1st/Matthias/WindowContact/state/feedback:state:default]"}
-Switch Gnd_DiningRoom_StandLight "Stehlampe Esszimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/StandLight/state/feedback:state:default]"}
+Switch Gnd_Esszimmer_SmallLight "kleine Lampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Esszimmer/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/SmallLight/state/feedback:state:default]"}
-Switch Gnd_DiningRoom_CupboardLight "Schranklicht Esszimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/CupboardLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/CupboardLight/state/feedback:state:default]"}
+Switch Gnd_Esszimmer_StandLight "Stehlampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Esszimmer/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/StandLight/state/feedback:state:default]"}
-Switch Gnd_DiningRoom_ShelfLight "Regallicht Esszimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/ShelfLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/ShelfLight/state/feedback:state:default]"}
+Switch Gnd_Esszimmer_CupboardLight "Schranklicht"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state/feedback:state:default]"}
 
-Switch Gnd_LivingRoom_LargeLight "große Lampe Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/LargeLight/state/feedback:state:default]"}
+Contact Gnd_Esszimmer_WindowContact1 "Essz. links" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/WindowContact1/state/feedback:state:default]"}
-Switch Gnd_LivingRoom_SmallLight "kleine Lampe Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/SmallLight/state/feedback:state:default]"}
+Contact Gnd_Esszimmer_WindowContact2 "Essz. rechts" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/WindowContact2/state/feedback:state:default]"}
-Switch Gnd_LivingRoom_Stars "Sterne Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Stars/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Stars/state/feedback:state:default]"}
+Number Gnd_Esszimmer_Thermostat "Thermostat Esszimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Esszimmer/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/Thermostat/temperature/feedback:state:default]"}
-Switch Gnd_LivingRoom_StandLight "Stehlampe Wohnzimmer"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/StandLight/state/feedback:state:default]"}
+Number Preset_Gnd_Esszimmer_Thermostat "Preset_Thermostat Esszimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Esszimmer/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Esszimmer/Thermostat/presetTemperature/feedback:state:default]"}
-Switch Gnd_Hallway_DeskLight "Schreibtischlampe Flur"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/DeskLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/DeskLight/state/feedback:state:default]"}
+Switch Gnd_Wohnzimmer_LargeLight "große Lampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/LargeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/LargeLight/state/feedback:state:default]"}
-Switch Gnd_Hallway_StandLight "Stehlampe Flur"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/StandLight/state/feedback:state:default]"}
+Switch Gnd_Wohnzimmer_SmallLight "kleine Lampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/SmallLight/state/feedback:state:default]"}
-Switch Gnd_Hallway_WardrobeLight "Schranklicht Flur"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/WardrobeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/WardrobeLight/state/feedback:state:default]"}
+Switch Gnd_Wohnzimmer_Stars "Sterne"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/Stars/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/Stars/state/feedback:state:default]"}
-Switch Gnd_Kitchen_WindowLight "Fensterbanklicht Küche"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowLight/state/feedback:state:default]"}
+Switch Gnd_Wohnzimmer_StandLight "Stehlampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/StandLight/state/feedback:state:default]"}
-Switch Gnd_Kitchen_CeilingLight "Deckenlampe Küche"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kitchen/CeilingLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kitchen/CeilingLight/state/feedback:state:default]"}
+Contact Gnd_Wohnzimmer_WindowContact1 "Wohnz. rechts" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/WindowContact1/state/feedback:state:default]"}
-Switch 1st_BedRoom_WolfgangsSide "Wolfgangs Seite Schlafzimmer"{mqtt=">[localbroker:dispatcher_ng/items/1st/BedRoom/WolfgangsSide/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/BedRoom/WolfgangsSide/state/feedback:state:default]"}
+Contact Gnd_Wohnzimmer_WindowContact2 "Wohnz. links" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/WindowContact2/state/feedback:state:default]"}
+Number Gnd_Wohnzimmer_Thermostat "Thermostat Wohnzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/temperature/feedback:state:default]"}
+Number Preset_Gnd_Wohnzimmer_Thermostat "Preset_Thermostat Wohnzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Wohnzimmer/Thermostat/presetTemperature/feedback:state:default]"}
+Switch Gnd_Flur_DeskLight "Schreibtischlampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/DeskLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/DeskLight/state/feedback:state:default]"}
+Switch Gnd_Flur_StandLight "Stehlampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/StandLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/StandLight/state/feedback:state:default]"}
+Switch Gnd_Flur_WardrobeLight "Schranklicht"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/WardrobeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/WardrobeLight/state/feedback:state:default]"}
+Contact Gnd_Flur_WindowContact "Flur" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Flur/WindowContact/state/feedback:state:default]"}
+Number Gnd_Flur_Thermostat1 "Thermostat Flur vorne [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat1/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat1/temperature/feedback:state:default]"}
+Number Preset_Gnd_Flur_Thermostat1 "Preset_Thermostat Flur vorne [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat1/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat1/presetTemperature/feedback:state:default]"}
+Number Gnd_Flur_Thermostat2 "Thermostat Flur hinten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat2/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat2/temperature/feedback:state:default]"}
+Number Preset_Gnd_Flur_Thermostat2 "Preset_Thermostat Flur hinten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat2/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Flur/Thermostat2/presetTemperature/feedback:state:default]"}
+Switch Gnd_Kueche_WindowLight "Fensterbanklicht"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kueche/WindowLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kueche/WindowLight/state/feedback:state:default]"}
+Switch Gnd_Kueche_CeilingLight "Deckenlampe"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kueche/CeilingLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kueche/CeilingLight/state/feedback:state:default]"}
+Switch 1st_Schlafzimmer_WolfgangsSide "Wolfgangs Seite"{mqtt=">[localbroker:dispatcher_ng/items/1st/Schlafzimmer/WolfgangsSide/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Schlafzimmer/WolfgangsSide/state/feedback:state:default]"}
 
-Switch 1st_BedRoom_PattysSide "Pattys Seite Schlafzimmer"{mqtt=">[localbroker:dispatcher_ng/items/1st/BedRoom/PattysSide/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/BedRoom/PattysSide/state/feedback:state:default]"}
+Switch 1st_Schlafzimmer_PattysSide "Pattys Seite"{mqtt=">[localbroker:dispatcher_ng/items/1st/Schlafzimmer/PattysSide/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Schlafzimmer/PattysSide/state/feedback:state:default]"}
-Switch 1st_BedRoom_WindowLight "Fensterbanklicht Schlafzimmer"{mqtt=">[localbroker:dispatcher_ng/items/1st/BedRoom/WindowLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/BedRoom/WindowLight/state/feedback:state:default]"}
+Switch 1st_Schlafzimmer_WindowLight "Fensterbanklicht"{mqtt=">[localbroker:dispatcher_ng/items/1st/Schlafzimmer/WindowLight/state:command:*:default],<[localbroker:dispatcher_ng/items/1st/Schlafzimmer/WindowLight/state/feedback:state:default]"}
-Contact 1st_Bedroom_WindowContactStreet "Fenster Schlafzimmer Strasse" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContactStreet/state/feedback:state:default]"}
+Contact 1st_Bedroom_WindowContactStreet "Schlafz. Strasse" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContactStreet/state/feedback:state:default]"}
-Contact 1st_Bedroom_WindowContact1Garden "Fenster Schlafzimmer 1 Garten" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContact1Garden/state/feedback:state:default]"}
+Contact 1st_Bedroom_WindowContact1Garden "Schlafz. Garten 1" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContact1Garden/state/feedback:state:default]"}
-Contact 1st_Bedroom_WindowContact2Garden "Fenster Schlafzimmer 2 Garten" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContact2Garden/state/feedback:state:default]"}
+Contact 1st_Bedroom_WindowContact2Garden "Schlafz. Garten 2" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bedroom/WindowContact2Garden/state/feedback:state:default]"}
 Number 1st_Bedroom_Thermostat "Thermostat Schlafzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/temperature/feedback:state:default]"}
 Number Preset_1st_Bedroom_Thermostat "Preset_Thermostat Schlafzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bedroom/Thermostat/presetTemperature/feedback:state:default]"}
-Switch Gnd_Hallway_DayLight "DayLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/DayLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/DayLight/state/feedback:state:default]"}
+Contact Gnd_Bathroom_WindowContact "Bad unten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Bathroom/WindowContact/state/feedback:state:default]"}
-Switch Gnd_Hallway_EcoLight "EcoLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/EcoLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/EcoLight/state/feedback:state:default]"}
-Switch Gnd_Hallway_MorningLight "MorningLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/MorningLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/MorningLight/state/feedback:state:default]"}
-Contact Gnd_Bathroom_WindowContact "Fenster Bad unten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Bathroom/WindowContact/state/feedback:state:default]"}
 Number Gnd_Bathroom_Thermostat "Thermostat Bad unten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/temperature/feedback:state:default]"}
 Number Preset_Gnd_Bathroom_Thermostat "Preset_Thermostat Bad unten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Bathroom/Thermostat/presetTemperature/feedback:state:default]"}
-Contact 1st_Bathroom_WindowContact "Fenster Bad oben" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bathroom/WindowContact/state/feedback:state:default]"}
+Contact 1st_Bathroom_WindowContact "Bad oben" {mqtt="<[localbroker:dispatcher_ng/items/1st/Bathroom/WindowContact/state/feedback:state:default]"}
 Number 1st_Bathroom_Thermostat "Thermostat Bad oben [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bathroom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bathroom/Thermostat/temperature/feedback:state:default]"}
 Number Preset_1st_Bathroom_Thermostat "Preset_Thermostat Bad oben [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/1st/Bathroom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/1st/Bathroom/Thermostat/presetTemperature/feedback:state:default]"}
-Contact Gnd_Kitchen_WindowContact1 "Fenster Küche Garten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowContact1/state/feedback:state:default]"}
+Contact Gnd_Kueche_WindowContact1 "Küche Garten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kueche/WindowContact1/state/feedback:state:default]"}
-Contact Gnd_Kitchen_WindowContact2 "Fenster Küche Terassentür Garten" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowContact2/state/feedback:state:default]"}
+Contact Gnd_Kueche_WindowContact2 "Küche Terassentür" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kueche/WindowContact2/state/feedback:state:default]"}
-Contact Gnd_Kitchen_WindowContact3 "Fenster Küche Straße 1" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowContact3/state/feedback:state:default]"}
+Contact Gnd_Kueche_WindowContact3 "Küche Straße 1" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kueche/WindowContact3/state/feedback:state:default]"}
-Contact Gnd_Kitchen_WindowContact4 "Fenster Küche Straße 2" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kitchen/WindowContact4/state/feedback:state:default]"}
+Contact Gnd_Kueche_WindowContact4 "Küche Straße 2" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kueche/WindowContact4/state/feedback:state:default]"}
-Number Gnd_Kitchen_Thermostat "Thermostat Küche [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kitchen/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kitchen/Thermostat/temperature/feedback:state:default]"}
+Number Gnd_Kueche_Thermostat "Thermostat Küche [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kueche/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kueche/Thermostat/temperature/feedback:state:default]"}
-Number Preset_Gnd_Kitchen_Thermostat "Preset_Thermostat Küche [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kitchen/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kitchen/Thermostat/presetTemperature/feedback:state:default]"}
+Number Preset_Gnd_Kueche_Thermostat "Preset_Thermostat Küche [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Kueche/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Kueche/Thermostat/presetTemperature/feedback:state:default]"}
-Contact Gnd_Hallway_FrontdoorContact "Haustür" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Hallway/FrontdoorContact/state/feedback:state:default]"}
+Contact Gnd_Flur_FrontdoorContact "Haustür" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Flur/FrontdoorContact/state/feedback:state:default]"}
 Switch base_labor_relaybox0 "Küche" {mqtt=">[localbroker:dispatcher_ng/items/base/labor/relaybox/state/0:command:*:default],<[localbroker:dispatcher_ng/items/base/labor/relaybox/feedback/0:state:default]"}
 String base_labor_relaybox0Conflict "Küche [%s]" {mqtt="<[localbroker:dispatcher_ng/items/base/labor/relaybox/conflict/0:state:default]"}
 Switch base_labor_relaybox1 "Herd" {mqtt=">[localbroker:dispatcher_ng/items/base/labor/relaybox/state/1:command:*:default],<[localbroker:dispatcher_ng/items/base/labor/relaybox/feedback/1:state:default]"}
 String base_labor_relaybox1Conflict "Herd [%s]" {mqtt="<[localbroker:dispatcher_ng/items/base/labor/relaybox/conflict/1:state:default]"}
 Switch base_labor_relaybox2 "Waschküche" {mqtt=">[localbroker:dispatcher_ng/items/base/labor/relaybox/state/2:command:*:default],<[localbroker:dispatcher_ng/items/base/labor/relaybox/feedback/2:state:default]"}
 String base_labor_relaybox2Conflict "Waschküche [%s]" {mqtt="<[localbroker:dispatcher_ng/items/base/labor/relaybox/conflict/2:state:default]"}
+Switch Base_Keller_Light "Werkstatt"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/Light/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/Light/state/feedback:state:default]"}
+Switch Base_Keller_SmallLight "Licht einfach"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/SmallLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/SmallLight/state/feedback:state:default]"}
+Switch Base_Keller_LargeLight "Licht hell"{mqtt=">[localbroker:dispatcher_ng/items/Base/Keller/LargeLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Base/Keller/LargeLight/state/feedback:state:default]"}
+Switch Gnd_Szenen_DayLight "DayLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/DayLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/DayLight/state/feedback:state:default]"}
+Switch Gnd_Szenen_EcoLight "EcoLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/EcoLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/EcoLight/state/feedback:state:default]"}
+Switch Gnd_Szenen_MorningLight "MorningLight"{mqtt=">[localbroker:dispatcher_ng/items/Gnd/Szenen/MorningLight/state:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Szenen/MorningLight/state/feedback:state:default]"}
 Switch HeatingMainSwitch "Heizung Hauptschalter" {mqtt=">[localbroker:dispatcher_ng/items/heatingMainSwitch:command:*:default],<[localbroker:dispatcher_ng/items/heatingMainSwitch:state:default]"}

package-lock.json

@@ -4,16 +4,6 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@types/body-parser": {
-      "version": "1.16.8",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz",
-      "integrity": "sha512-BdN2PXxOFnTXFcyONPW6t0fHjz2fvRZHVMFpaS0wYr+Y8fWEaNOs4V8LEu/fpzQlMx+ahdndgTaGTwPC+J/EeA==",
-      "dev": true,
-      "requires": {
-        "@types/express": "4.11.1",
-        "@types/node": "8.5.8"
-      }
-    },
     "@types/chalk": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@types/chalk/-/chalk-2.2.0.tgz",
@@ -35,39 +25,6 @@
       "integrity": "sha1-lcHkMtYQbKNMkvB0Nji8eGwHP6o=",
       "dev": true
     },
-    "@types/events": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@types/events/-/events-1.2.0.tgz",
-      "integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA==",
-      "dev": true
-    },
-    "@types/express": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.11.1.tgz",
-      "integrity": "sha512-ttWle8cnPA5rAelauSWeWJimtY2RsUf2aspYZs7xPHiWgOlPn6nnUfBMtrkcnjFJuIHJF4gNOdVvpLK2Zmvh6g==",
-      "dev": true,
-      "requires": {
-        "@types/body-parser": "1.16.8",
-        "@types/express-serve-static-core": "4.11.1",
-        "@types/serve-static": "1.13.1"
-      }
-    },
-    "@types/express-serve-static-core": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.11.1.tgz",
-      "integrity": "sha512-EehCl3tpuqiM8RUb+0255M8PhhSwTtLfmO7zBBdv0ay/VTd/zmrqDfQdZFsa5z/PVMbH2yCMZPXsnrImpATyIw==",
-      "dev": true,
-      "requires": {
-        "@types/events": "1.2.0",
-        "@types/node": "8.5.8"
-      }
-    },
-    "@types/mime": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.0.tgz",
-      "integrity": "sha512-A2TAGbTFdBw9azHbpVd+/FkdW2T6msN1uct1O9bH3vTerEHKZhTXJUQXy+hNq1B0RagfU8U+KBdqiZpxjhOUQA==",
-      "dev": true
-    },
     "@types/moment": {
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/@types/moment/-/moment-2.13.0.tgz",
@@ -101,25 +58,6 @@
         "@types/node": "8.5.8"
       }
     },
-    "@types/serve-static": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.1.tgz",
-      "integrity": "sha512-jDMH+3BQPtvqZVIcsH700Dfi8Q3MIcEx16g/VdxjoqiGR/NntekB10xdBpirMKnPe9z2C5cBmL0vte0YttOr3Q==",
-      "dev": true,
-      "requires": {
-        "@types/express-serve-static-core": "4.11.1",
-        "@types/mime": "2.0.0"
-      }
-    },
-    "accepts": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
-      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
-      "requires": {
-        "mime-types": "2.1.18",
-        "negotiator": "0.6.1"
-      }
-    },
     "ansi-styles": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
@@ -136,11 +74,6 @@
         "typical": "2.6.1"
       }
     },
-    "array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI="
-    },
     "async-limiter": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
@@ -159,23 +92,6 @@
         "readable-stream": "2.3.3"
       }
     },
-    "body-parser": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz",
-      "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
-      "requires": {
-        "bytes": "3.0.0",
-        "content-type": "1.0.4",
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "http-errors": "1.6.3",
-        "iconv-lite": "0.4.19",
-        "on-finished": "2.3.0",
-        "qs": "6.5.1",
-        "raw-body": "2.3.2",
-        "type-is": "1.6.16"
-      }
-    },
     "brace-expansion": {
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -185,11 +101,6 @@
         "concat-map": "0.0.1"
       }
     },
-    "bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
-    },
     "callback-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/callback-stream/-/callback-stream-1.1.0.tgz",
@@ -256,26 +167,6 @@
         "typedarray": "0.0.6"
       }
     },
-    "content-disposition": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
-      "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ="
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-    },
-    "cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw="
-    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -289,24 +180,6 @@
         "moment-timezone": "0.5.14"
       }
     },
-    "debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "requires": {
-        "ms": "2.0.0"
-      }
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
-    },
-    "destroy": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
-    },
     "duplexify": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.1.tgz",
@@ -318,16 +191,6 @@
         "stream-shift": "1.0.0"
       }
     },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
-    },
     "end-of-stream": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz",
@@ -336,77 +199,16 @@
         "once": "1.4.0"
       }
     },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
-    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
-    "etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
-    },
-    "express": {
-      "version": "4.16.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz",
-      "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=",
-      "requires": {
-        "accepts": "1.3.5",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.18.2",
-        "content-disposition": "0.5.2",
-        "content-type": "1.0.4",
-        "cookie": "0.3.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "finalhandler": "1.1.1",
-        "fresh": "0.5.2",
-        "merge-descriptors": "1.0.1",
-        "methods": "1.1.2",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "2.0.3",
-        "qs": "6.5.1",
-        "range-parser": "1.2.0",
-        "safe-buffer": "5.1.1",
-        "send": "0.16.2",
-        "serve-static": "1.13.2",
-        "setprototypeof": "1.1.0",
-        "statuses": "1.4.0",
-        "type-is": "1.6.16",
-        "utils-merge": "1.0.1",
-        "vary": "1.1.2"
-      }
-    },
     "extend": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
       "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ="
     },
-    "finalhandler": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz",
-      "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==",
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "on-finished": "2.3.0",
-        "parseurl": "1.3.2",
-        "statuses": "1.4.0",
-        "unpipe": "1.0.0"
-      }
-    },
     "find-replace": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-1.0.3.tgz",
@@ -426,16 +228,6 @@
         }
       }
     },
-    "forwarded": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-      "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
-    },
-    "fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac="
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -496,22 +288,6 @@
         "xtend": "4.0.1"
       }
     },
-    "http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
-      "requires": {
-        "depd": "1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": "1.4.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
-      "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -526,11 +302,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
-    "ipaddr.js": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz",
-      "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs="
-    },
     "is-absolute": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
@@ -607,39 +378,6 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
       "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
     },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g="
-    },
-    "merge-descriptors": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
-      "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E="
-    },
-    "methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
-    },
-    "mime": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz",
-      "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
-    },
-    "mime-db": {
-      "version": "1.33.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="
-    },
-    "mime-types": {
-      "version": "2.1.18",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-      "requires": {
-        "mime-db": "1.33.0"
-      }
-    },
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
@@ -697,29 +435,11 @@
         "safe-buffer": "5.1.1"
       }
     },
-    "ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-    },
-    "negotiator": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
-      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk="
-    },
     "nodemailer": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.4.1.tgz",
       "integrity": "sha512-1bnszJJXatcHJhLpxQ1XMkLDjCjPKvGKMtRQ73FOsoNln3UQjddEQmz6fAwM3aj0GtQ3dQX9qtMHPelz63GU7A=="
     },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -736,11 +456,6 @@
         "readable-stream": "2.3.3"
       }
     },
-    "parseurl": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
-      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
-    },
     "path-dirname": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
@@ -751,25 +466,11 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
     },
-    "path-to-regexp": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
-      "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
-    },
     "process-nextick-args": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
       "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
     },
-    "proxy-addr": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
-      "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==",
-      "requires": {
-        "forwarded": "0.1.2",
-        "ipaddr.js": "1.6.0"
-      }
-    },
     "pump": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.0.tgz",
@@ -800,50 +501,6 @@
         }
       }
     },
-    "qs": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
-      "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
-    },
-    "range-parser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
-      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4="
-    },
-    "raw-body": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz",
-      "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=",
-      "requires": {
-        "bytes": "3.0.0",
-        "http-errors": "1.6.2",
-        "iconv-lite": "0.4.19",
-        "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "depd": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
-          "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
-        },
-        "http-errors": {
-          "version": "1.6.2",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
-          "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
-          "requires": {
-            "depd": "1.1.1",
-            "inherits": "2.0.3",
-            "setprototypeof": "1.0.3",
-            "statuses": "1.4.0"
-          }
-        },
-        "setprototypeof": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz",
-          "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ="
-        }
-      }
-    },
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
@@ -873,42 +530,6 @@
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
       "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
     },
-    "send": {
-      "version": "0.16.2",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz",
-      "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==",
-      "requires": {
-        "debug": "2.6.9",
-        "depd": "1.1.2",
-        "destroy": "1.0.4",
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "etag": "1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "1.6.3",
-        "mime": "1.4.1",
-        "ms": "2.0.0",
-        "on-finished": "2.3.0",
-        "range-parser": "1.2.0",
-        "statuses": "1.4.0"
-      }
-    },
-    "serve-static": {
-      "version": "1.13.2",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz",
-      "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==",
-      "requires": {
-        "encodeurl": "1.0.2",
-        "escape-html": "1.0.3",
-        "parseurl": "1.3.2",
-        "send": "0.16.2"
-      }
-    },
-    "setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
     "simple-node-logger": {
       "version": "0.93.33",
       "resolved": "https://registry.npmjs.org/simple-node-logger/-/simple-node-logger-0.93.33.tgz",
@@ -926,11 +547,6 @@
         "through2": "2.0.3"
       }
     },
-    "statuses": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz",
-      "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
-    },
     "stream-shift": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
@@ -998,15 +614,6 @@
         "is-negated-glob": "1.0.0"
       }
     },
-    "type-is": {
-      "version": "1.6.16",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
-      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "2.1.18"
-      }
-    },
     "typedarray": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
@@ -1042,26 +649,11 @@
         "through2-filter": "2.0.0"
       }
     },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw="
-    },
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
-    },
-    "vary": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
-    },
     "websocket-stream": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/websocket-stream/-/websocket-stream-5.1.1.tgz",

package.json

@@ -19,19 +19,15 @@
   },
   "homepage": "https://gitlab.com/wolutator/dispatcher_ng#README",
   "dependencies": {
-    "body-parser": "^1.18.2",
     "chalk": "^2.3.0",
     "command-line-args": "^4.0.7",
     "cron": "^1.3.0",
-    "express": "^4.16.3",
     "moment": "^2.20.1",
     "mqtt": "^2.15.0",
     "nodemailer": "^4.4.1",
     "simple-node-logger": "^0.93.33"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.16.8",
-    "@types/express": "^4.11.1",
     "@types/chalk": "^2.2.0",
     "@types/command-line-args": "^4.0.2",
     "@types/cron": "^1.2.1",

smartclient.json

@@ -0,0 +1,253 @@
+{
+    "switches": [
+        {
+            "room": "Anna",
+            "switches": [
+                {
+                    "label": "Bettlicht",
+                    "actionTopic": "dispatcher_ng/items/1st/Anna/BedLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Anna/BedLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Matthias",
+            "switches": [
+                {
+                    "label": "Stehlampen",
+                    "actionTopic": "dispatcher_ng/items/1st/Matthias/StandLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Matthias/StandLight/state/feedback"
+                },
+                {
+                    "label": "Bettlicht",
+                    "actionTopic": "dispatcher_ng/items/1st/Matthias/BedLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Matthias/BedLight/state/feedback"
+                },
+                {
+                    "label": "Lautsprecher",
+                    "actionTopic": "dispatcher_ng/items/1st/Matthias/Speaker/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Matthias/Speaker/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Esszimmer",
+            "switches": [
+                {
+                    "label": "kleine Lampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/SmallLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/SmallLight/state/feedback"
+                },
+                {
+                    "label": "Stehlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/StandLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/StandLight/state/feedback"
+                },
+                {
+                    "label": "Schranklicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state/feedback"
+                },
+                {
+                    "label": "Regallicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/ShelfLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/ShelfLight/state/feedback"
+                },
+                {
+                    "label": "Nähkästchen",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Wohnzimmer",
+            "switches": [
+                {
+                    "label": "große Lampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/LargeLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/LargeLight/state/feedback"
+                },
+                {
+                    "label": "kleine Lampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/SmallLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/SmallLight/state/feedback"
+                },
+                {
+                    "label": "Sterne",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/Stars/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/Stars/state/feedback"
+                },
+                {
+                    "label": "Stehlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/StandLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Wohnzimmer/StandLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Flur",
+            "switches": [
+                {
+                    "label": "Schreibtischlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Flur/DeskLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Flur/DeskLight/state/feedback"
+                },
+                {
+                    "label": "Stehlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Flur/StandLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Flur/StandLight/state/feedback"
+                },
+                {
+                    "label": "Schranklicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Flur/WardrobeLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Flur/WardrobeLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Kueche",
+            "switches": [
+                {
+                    "label": "Fensterbanklicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Kueche/WindowLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Kueche/WindowLight/state/feedback"
+                },
+                {
+                    "label": "Deckenlampe",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Kueche/CeilingLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Kueche/CeilingLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Schlafzimmer",
+            "switches": [
+                {
+                    "label": "Wolfgangs Seite",
+                    "actionTopic": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangsSide/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangsSide/state/feedback"
+                },
+                {
+                    "label": "Wolfgangs Bettlicht",
+                    "actionTopic": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Schlafzimmer/WolfgangBedLight/state/feedback"
+                },
+                {
+                    "label": "Pattys Seite",
+                    "actionTopic": "dispatcher_ng/items/1st/Schlafzimmer/PattysSide/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Schlafzimmer/PattysSide/state/feedback"
+                },
+                {
+                    "label": "Fensterbanklicht",
+                    "actionTopic": "dispatcher_ng/items/1st/Schlafzimmer/WindowLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/1st/Schlafzimmer/WindowLight/state/feedback"
+                }
+            ]
+        },
+        {
+            "room": "Keller",
+            "switches": [
+                {
+                    "label": "Werkstatt",
+                    "actionTopic": "dispatcher_ng/items/Base/Keller/Light/state",
+                    "feedbackTopic": "dispatcher_ng/items/Base/Keller/Light/state/feedback"
+                },
+                {
+                    "label": "Licht einfach",
+                    "actionTopic": "dispatcher_ng/items/Base/Keller/SmallLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Base/Keller/SmallLight/state/feedback"
+                },
+                {
+                    "label": "Licht hell",
+                    "actionTopic": "dispatcher_ng/items/Base/Keller/LargeLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Base/Keller/LargeLight/state/feedback"
+                }
+            ]
+        }
+    ],
+    "scenes": [
+        {
+            "label": "DayLight",
+            "actionTopic": "dispatcher_ng/items/Gnd/Szenen/DayLight/state"
+        },
+        {
+            "label": "EcoLight",
+            "actionTopic": "dispatcher_ng/items/Gnd/Szenen/EcoLight/state"
+        },
+        {
+            "label": "MorningLight",
+            "actionTopic": "dispatcher_ng/items/Gnd/Szenen/MorningLight/state"
+        },
+        {
+            "label": "Alle Lampen",
+            "actionTopic": "dispatcher_ng/items/Gnd/Szenen/AllLights/state"
+        }
+    ],
+    "windows": [
+        {
+            "label": "Anna",
+            "topic": "dispatcher_ng/items/1st/Anna/WindowContact/state/feedback"
+        },
+        {
+            "label": "Matthias",
+            "topic": "dispatcher_ng/items/1st/Matthias/WindowContact/state/feedback"
+        },
+        {
+            "label": "Essz. links",
+            "topic": "dispatcher_ng/items/Gnd/Esszimmer/WindowContact1/state/feedback"
+        },
+        {
+            "label": "Essz. rechts",
+            "topic": "dispatcher_ng/items/Gnd/Esszimmer/WindowContact2/state/feedback"
+        },
+        {
+            "label": "Wohnz. rechts",
+            "topic": "dispatcher_ng/items/Gnd/Wohnzimmer/WindowContact1/state/feedback"
+        },
+        {
+            "label": "Wohnz. links",
+            "topic": "dispatcher_ng/items/Gnd/Wohnzimmer/WindowContact2/state/feedback"
+        },
+        {
+            "label": "Flur",
+            "topic": "dispatcher_ng/items/Gnd/Flur/WindowContact/state/feedback"
+        },
+        {
+            "label": "Schlafz. Strasse",
+            "topic": "dispatcher_ng/items/1st/Bedroom/WindowContactStreet/state/feedback"
+        },
+        {
+            "label": "Schlafz. Garten 1",
+            "topic": "dispatcher_ng/items/1st/Bedroom/WindowContact1Garden/state/feedback"
+        },
+        {
+            "label": "Schlafz. Garten 2",
+            "topic": "dispatcher_ng/items/1st/Bedroom/WindowContact2Garden/state/feedback"
+        },
+        {
+            "label": "Bad unten",
+            "topic": "dispatcher_ng/items/Gnd/Bathroom/WindowContact/state/feedback"
+        },
+        {
+            "label": "Bad oben",
+            "topic": "dispatcher_ng/items/1st/Bathroom/WindowContact/state/feedback"
+        },
+        {
+            "label": "Küche Garten",
+            "topic": "dispatcher_ng/items/Gnd/Kueche/WindowContact1/state/feedback"
+        },
+        {
+            "label": "Küche Terassentür",
+            "topic": "dispatcher_ng/items/Gnd/Kueche/WindowContact2/state/feedback"
+        },
+        {
+            "label": "Küche Straße 1",
+            "topic": "dispatcher_ng/items/Gnd/Kueche/WindowContact3/state/feedback"
+        },
+        {
+            "label": "Küche Straße 2",
+            "topic": "dispatcher_ng/items/Gnd/Kueche/WindowContact4/state/feedback"
+        }
+    ]
+}

src/AItem.ts

@@ -1,6 +1,7 @@
 import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
 import { ExportType } from './Export'
+import * as Events from 'events'
 
 
 
@@ -12,11 +13,24 @@ export interface HasStateAndFeedbackTopic extends HasStateTopic {
     getStateFeedbackTopic() : string
 }
 
+export interface HasStateAndFeedbackTopicAndLabel extends HasFeedbackTopic {
+    getLabel() : string
+}
+
+export interface HasStateAndFeedbackTopicAndLabelAndRoom extends HasStateAndFeedbackTopic {
+    getLabel() : string
+    getRoom() : string
+}
+
+export interface HasFeedbackTopic {
+    getStateFeedbackTopic() : string
+}
+
 export interface HasInTopic {
     getInTopic() : string
 }
 
-export abstract class AItem {
+export abstract class AItem extends Events.EventEmitter {
     protected topicFirstPart: string
     protected itemId: string
     protected label: string
@@ -27,6 +41,7 @@ export abstract class AItem {
 
 
     constructor(floor: string, room: string, item: string, label: string = '') {
+        super()
         this.floor = floor
         this.room = room    
         this.item = item

src/Forwarder.ts

@@ -1,12 +1,18 @@
 import { AItem } from './AItem'
 import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
+import { HasInTopic } from './AItem';
 
 
-export class Forwarder extends AItem {
+export class Forwarder extends AItem implements HasInTopic {
     private targetTopics: string[]
     private inTopic: string
 
+    getInTopic() : string {
+        return this.inTopic
+    }
+
+
     constructor(floor: string, room: string, item: string, topicLastPart: string, label: string, targetTopics: string[]) {
         super(floor, room, item, label)
         this.inTopic = `${this.topicFirstPart}/${topicLastPart}`

src/GeoFences.ts

@@ -1,64 +0,0 @@
-import * as http from 'http'
-import * as express from 'express'
-import * as logger from './log'
-import * as bodyParser from 'body-parser'
-import * as config from './config'
-import { mqttHandler } from './MqttDispatcher'
-import { EventEmitter } from 'events';
-
-
-
-export type AttendanceSheetType = { [index: string]: boolean }
-
-export class GeoFences extends EventEmitter {
-    private app: express.Express
-    private server: http.Server
-    public attendanceSheet : AttendanceSheetType
-
-    static geoFencesTopicPre : string = "dispatcher_ng/geofences"
-
-
-    constructor() {
-        super()
-        this.app = express()
-        this.app.use(bodyParser.urlencoded({ extended: false }));
-        this.app.use(bodyParser.json());
-        
-        this.attendanceSheet = {}
-    }
-
-    exec() : void {
-        this.app.post('/', (req: express.Request , res: express.Response) => {
-            const reqData = req.body
-            const deviceId = reqData.device
-            let occupantName : string = 'unknown'
-            const location = reqData.name
-            if (deviceId in config.dict.occupants) {
-                occupantName = config.dict.occupants[deviceId]
-            }
-            const presence : boolean = reqData.entry == '1'
-            const direction : string = presence ? 'arrives at' : 'leaves from'
-            logger.info(`${deviceId} (${occupantName}) ${direction} ${location}`)
-            logger.info(JSON.stringify(reqData))
-            res.send('OK')
-
-            const state : string = presence ? 'present' : 'absent'
-            mqttHandler.send(`${GeoFences.geoFencesTopicPre}/${occupantName}`, state)
-
-            this.attendanceSheet[occupantName] = presence
-            //logger.info(`attendanceSheet is now ${JSON.stringify(this.attendanceSheet)}`)
-
-            this.emit('change', this.attendanceSheet)
-        })
-        
-        let port = parseInt(config.dict.geofencesPort)
-        this.server = this.app.listen(port, '', () => {
-            logger.info(`geofences server listening on ${port}`)
-        })
-    }
-}
-
-
-
-
-

src/HeatingScene.ts

@@ -0,0 +1,16 @@
+import { Forwarder } from './Forwarder'
+import { HasInTopic } from './AItem'
+
+export class HeatingScene extends Forwarder {
+    constructor(floor: string, room: string, item: string, label: string, 
+        targetItems: HasInTopic[]) {
+
+        let inTopics: string[] = []
+        targetItems.forEach((item: HasInTopic) => {
+            inTopics.push(item.getInTopic())
+        })
+    
+        super(floor, room, item, "command", label, inTopics)
+    }
+
+}

src/HomematicSwitchItem.ts

@@ -2,9 +2,9 @@ import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
 import { AHomegearItem } from './AHomegearItem'
 import { SwitchExport, ExportType } from './Export'
-import { HasStateAndFeedbackTopic } from './AItem';
+import { HasStateAndFeedbackTopicAndLabelAndRoom } from './AItem';
 
-export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFeedbackTopic {
+export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFeedbackTopicAndLabelAndRoom {
     private oldState: string|undefined
     private state: string
     private actionTopic: string
@@ -12,6 +12,15 @@ export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFee
     private stateFeedbackTopic: string
     private stateTopic: string
     private type: string
+    private partId: number
+
+    getLabel(): string {
+        return this.label
+    }
+
+    getRoom() : string {
+        return this.room
+    }
 
     getStateTopic() : string {
         return this.stateTopic
@@ -21,12 +30,17 @@ export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFee
         return this.stateFeedbackTopic
     }
 
-    constructor(floor: string, room: string, item: string, label: string, hmId: number, type: string = 'bulb') {
+    getState() : string {
+        return this.state
+    }
+
+    constructor(floor: string, room: string, item: string, label: string, hmId: number, partId: number = 1, type: string = 'bulb') {
         super(floor, room, item, label, hmId)
+        this.partId = partId
         this.stateTopic = `${this.topicFirstPart}/state`
         this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`
-        this.deviceFeedbackTopic = `${this.deviceTopicPre}/1/STATE`
+        this.deviceFeedbackTopic = `${this.deviceTopicPre}/${this.partId}/STATE`
-        this.actionTopic = `${this.actionTopicPre}/1/STATE`
+        this.actionTopic = `${this.actionTopicPre}/${this.partId}/STATE`
         this.subscribeTopics = [
             this.stateTopic,
             this.deviceFeedbackTopic
@@ -64,5 +78,6 @@ export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFee
                 mqttHandler.send(this.stateFeedbackTopic, this.state)
                 break
         }
+        this.emit('somethingChanged')
     }
 }

src/HueColorBulbItem.ts

@@ -2,9 +2,9 @@ import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
 import { AHomegearItem } from './AHomegearItem'
 import { HueColorLightExport, ExportType } from './Export'
-import { HasStateAndFeedbackTopic, HasInTopic } from './AItem'
+import { HasStateAndFeedbackTopic, HasInTopic, HasStateAndFeedbackTopicAndLabelAndRoom } from './AItem'
 
-export class HueColorBulbItem extends AHomegearItem implements HasStateAndFeedbackTopic{
+export class HueColorBulbItem extends AHomegearItem implements HasStateAndFeedbackTopicAndLabelAndRoom {
     private readonly BRIGHT_FACTOR: number = 2.54
     private readonly HUE_FACTOR: number = (65535 / 360)
     private readonly SATURATION_FACTOR: number = 2.54
@@ -34,6 +34,14 @@ export class HueColorBulbItem extends AHomegearItem implements HasStateAndFeedba
     private hueDeviceTopic: string
     private saturationDeviceTopic: string
 
+    getLabel() : string {
+        return this.label
+    }
+
+    getRoom() : string {
+        return this.room
+    }
+
     getStateTopic() : string {
         return this.stateTopic
     }

src/M433SwitchItem.ts

@@ -1,10 +1,10 @@
 import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
-import { AItem, HasStateAndFeedbackTopic, HasInTopic } from './AItem'
+import { AItem, HasStateAndFeedbackTopicAndLabelAndRoom, HasInTopic, HasStateAndFeedbackTopic } from './AItem'
 import { SwitchExport, ExportType } from './Export'
 
 
-export class M433SwitchItem extends AItem implements HasStateAndFeedbackTopic {
+export class M433SwitchItem extends AItem implements HasStateAndFeedbackTopicAndLabelAndRoom {
     private offCode: string
     private onCode: string
     private oldState: string|undefined
@@ -14,6 +14,14 @@ export class M433SwitchItem extends AItem implements HasStateAndFeedbackTopic {
     private stateTopic: string
     private type: string
 
+    getLabel() : string {
+        return this.label
+    }
+
+    getRoom() : string {
+        return this.room
+    }
+
     getStateTopic() : string {
         return this.stateTopic
     }

src/MaxThermostat.ts

@@ -81,20 +81,23 @@ export class MaxThermostat extends AHomegearItem implements HasInTopic {
             this.temperature = parseFloat(payload)
             setTemperature = true
         } else if (topic == this.commandTopic) {
-            if (this.heatingMainFlag) {
+            if ((payload == 'ON') && this.heatingMainFlag) {
-                if (payload == 'ON') {
+                this.temperature = this.presetTemperature
-                    this.temperature = this.presetTemperature
+                setTemperature = true
-                } else if (payload == 'OFF') {
+            } else if (payload == 'OFF') {
-                    this.temperature = DISABLED_TEMPERATURE
+                this.temperature = DISABLED_TEMPERATURE
-                }
+                setTemperature = true
+            } else if (payload == 'FORCE_ON') {
+                this.temperature = this.presetTemperature
                 setTemperature = true
             }
         } else if (topic == MaxThermostat.heatingMainSwitchTopic) {
             this.heatingMainFlag = (payload == 'ON')
             logger.info(`${this.itemId} heating main: ${this.heatingMainFlag}`)
             if (! this.heatingMainFlag) {
-                mqttHandler.send(this.temperatureFeedbackTopic, `${DISABLED_TEMPERATURE}`)
+		this.temperature = DISABLED_TEMPERATURE
-                mqttHandler.send(this.actionTopic, `${DISABLED_TEMPERATURE}`)
+                mqttHandler.send(this.temperatureFeedbackTopic, `${this.temperature}`)
+                mqttHandler.send(this.actionTopic, `${this.temperature}`)
             }
         } else if (topic == this.presetTemperatureTopic) {
                 this.presetTemperature = parseFloat(payload)

src/MaxWindowContact.ts

@@ -3,8 +3,9 @@ import { mqttHandler } from './MqttDispatcher'
 import { AHomegearItem } from './AHomegearItem'
 import { ContactExport, ExportType } from './Export'
 import { Disabler } from './Disabler'
+import { HasFeedbackTopic, HasStateAndFeedbackTopicAndLabel } from './AItem'
 
-export class MaxWindowContact extends AHomegearItem implements Disabler {
+export class MaxWindowContact extends AHomegearItem implements Disabler, HasStateAndFeedbackTopicAndLabel {
     private deviceFeedbackTopic: string
     private stateFeedbackTopic: string
     private stateTopic: string
@@ -14,6 +15,10 @@ export class MaxWindowContact extends AHomegearItem implements Disabler {
         return this.stateFeedbackTopic
     }
 
+    getLabel() {
+        return this.label
+    }
+
     transform(payload: string) : string {
         let res: string
         if (payload == 'OPEN') {

src/MqttDispatcher.ts

@@ -25,6 +25,7 @@ class MqttHandler {
 
     constructor() {
         this.mqttBrokerUrl = config.dict.brokerUrl
+        this.mqttOptions.clientId = 'dispatcher'
         if (config.dict.brokerUser && config.dict.brokerPass) {
             this.mqttOptions.username = config.dict.brokerUser
             this.mqttOptions.password = config.dict.brokerPass

src/MySwitchThing.ts

@@ -0,0 +1,56 @@
+import * as logger from './log'
+import { mqttHandler } from './MqttDispatcher'
+import { AItem } from './AItem'
+
+export class MySwitchSingleItem {
+    private actionTopic: string
+
+    constructor(actionTopic: string) {
+        this.actionTopic = actionTopic
+    }
+
+    processMessage(topic: string, payload: string) {
+        switch(payload) {
+            case 'PRESS_SHORT':
+                mqttHandler.send(this.actionTopic, 'SHORT', true)
+                break
+            case 'PRESS_LONG_START':
+            case 'PRESS_LONG_CONT':
+                mqttHandler.send(this.actionTopic, 'LONG_HOLD', true)
+                break
+            case 'PRESS_LONG_END':
+                mqttHandler.send(this.actionTopic, 'LONG_END', true)
+                break
+            default:
+                logger.warn(`HM4BSI: no handling available for ${topic}`)
+                break
+        }
+    }
+}
+
+export class MySwitchThing extends AItem {
+    private itemObjs: MySwitchSingleItem[]
+
+    constructor(floor: string, room: string, item: string, itemObjs: MySwitchSingleItem[]) {
+        super(floor, room, item, '')
+        this.itemObjs = itemObjs
+        if (this.itemObjs.length != 3) {
+            throw new Error('itemObjs for MySwitchThing must have three elements')
+        }
+        this.subscribeTopics = [
+            `${this.topicFirstPart}/#` 
+        ]
+    }
+
+    processMessage(topic: string, payload: string) {
+        logger.info(`MyT: ${topic}, ${payload}`)
+        let buttonIdx = parseInt(topic.substring(this.topicFirstPart.length+1))
+        if (buttonIdx >= 1 && buttonIdx <= 3) {
+            this.itemObjs[buttonIdx-1].processMessage('', payload)
+        } else {
+            logger.warn(`MyT: no handling available for ${topic}, ${buttonIdx}`)
+        }
+    }
+}
+
+

src/Scene.ts

@@ -1,9 +1,9 @@
-import { AItem, HasStateAndFeedbackTopic } from './AItem'
+import { AItem, HasStateAndFeedbackTopic, HasStateAndFeedbackTopicAndLabelAndRoom } from './AItem'
 import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
 import { ExportType, SwitchExport } from './Export'
 
-export class LightScene extends AItem implements HasStateAndFeedbackTopic {
+export class LightScene extends AItem implements HasStateAndFeedbackTopicAndLabelAndRoom {
     private onFeedbackTopics: string[]
     private offFeedbackTopics: string[]
     private onTopics: string[]
@@ -17,6 +17,14 @@ export class LightScene extends AItem implements HasStateAndFeedbackTopic {
     private onItems: HasStateAndFeedbackTopic[]
     private myLastFeedbackState: string
 
+    getLabel() {
+        return this.label
+    }
+
+    getRoom() {
+        return this.room
+    }
+
     getStateTopic() {
         return this.stateTopic
     }

src/SimpleTopicSwitchItem.ts

@@ -0,0 +1,70 @@
+import * as logger from './log'
+import { mqttHandler } from './MqttDispatcher'
+import { AItem } from './AItem'
+import { SwitchExport, ExportType } from './Export'
+import { HasStateAndFeedbackTopicAndLabelAndRoom } from './AItem';
+
+export class SimpleTopicSwitchItem extends AItem implements HasStateAndFeedbackTopicAndLabelAndRoom {
+    private oldState: string|undefined
+    private state: string
+    private actionTopic: string
+    private deviceFeedbackTopic: string
+    private stateFeedbackTopic: string
+    private stateTopic: string
+    private type: string
+    private partId: number
+
+    getLabel(): string {
+        return this.label
+    }
+
+    getRoom() : string {
+        return this.room
+    }
+
+    getStateTopic() : string {
+        return this.stateTopic
+    }
+
+    getStateFeedbackTopic() : string {
+        return this.stateFeedbackTopic
+    }
+
+    getState() : string {
+        return this.state
+    }
+
+    constructor(floor: string, room: string, item: string, label: string, actionTopic: string) {
+        super(floor, room, item, label)
+        this.stateTopic = `${this.topicFirstPart}/state`
+        this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`
+        this.actionTopic = actionTopic
+        this.subscribeTopics = [
+            this.stateTopic
+        ]
+        this.state = 'OFF'
+        this.oldState = undefined
+    }
+
+    exportItem() : ExportType|null {
+        return SwitchExport(this.itemId, this.label, this.stateTopic, this.stateFeedbackTopic, this.type)
+    }
+
+    processMessage(topic: string, payload: string) : void {
+        switch (topic) {
+            case this.stateTopic:
+                this.state = payload
+                mqttHandler.send(this.stateFeedbackTopic, this.state)
+                if (this.state != this.oldState) {                
+                    if (this.state == 'ON') {
+                        mqttHandler.send(this.actionTopic, 'ON')
+                    } else {
+                        mqttHandler.send(this.actionTopic, 'OFF')
+                    }
+                    this.oldState = this.state
+                }
+                break
+        }
+        this.emit('somethingChanged')
+    }
+}

src/SwitchOffAdaptor.ts

@@ -0,0 +1,28 @@
+import { AItem, HasInTopic } from './AItem'
+import * as logger from './log'
+import { mqttHandler } from './MqttDispatcher'
+
+export class SwitchOffAdaptor extends AItem implements HasInTopic {
+    private inTopic: string
+    private actionStateTopic: string
+    
+    constructor(floor: string, room: string, item: string) {
+        super(floor, room, item)
+        this.actionStateTopic = `${this.topicFirstPart}/state`
+        this.inTopic = `${this.topicFirstPart}/in`
+        this.subscribeTopics = [ this.inTopic ]
+    }
+
+    getInTopic() : string {
+        return this.inTopic
+    }
+
+
+    processMessage(topic: string, payload: string) : void {
+        if ((topic == this.inTopic) && (payload == 'SHORT')) {
+            mqttHandler.send(this.actionStateTopic, 'OFF', true)
+        }
+    }
+}
+
+

src/TwoLedSignal.ts

@@ -0,0 +1,90 @@
+import { AItem, HasFeedbackTopic } from './AItem'
+import { mqttHandler } from './MqttDispatcher'
+import * as logger from './log'
+
+enum SignalState {
+    SIGNAL_RED,
+    SIGNAL_GREEN,
+    SIGNAL_UNKNOWN,
+}
+
+class SignalItem {
+    private item: HasFeedbackTopic
+    private signalState: SignalState
+    private redToken: string
+    private greenToken: string
+
+    constructor(item: HasFeedbackTopic, redToken: string, greenToken: string) {
+        this.item = item
+        this.signalState = SignalState.SIGNAL_UNKNOWN
+        this.redToken = redToken
+        this.greenToken = greenToken
+    }
+
+    getSignalState() : SignalState {
+        return this.signalState
+    }
+
+    processMessage(topic: string, payload: string): void {
+        if (topic == this.item.getStateFeedbackTopic()) {
+            logger.info(`${topic}, ${payload}`)
+            if (payload == this.greenToken) {
+                this.signalState = SignalState.SIGNAL_GREEN
+            } else if (payload == this.redToken) {
+                this.signalState = SignalState.SIGNAL_RED
+            } else {
+                this.signalState = SignalState.SIGNAL_UNKNOWN
+            }
+            // logger.info(`DBG: SignalItem: ${topic}, ${payload}, ${this.signalState}`)
+        }
+    }
+}
+
+export class TwoLedSignal extends AItem  {
+    private led1Items: SignalItem[] = []
+    private led2Items: SignalItem[] = []
+
+    constructor(floor: string, room: string, item: string, label: string, 
+        led1Items: HasFeedbackTopic[], led1GreenToken: string, led1RedToken: string,
+        led2Items: HasFeedbackTopic[], led2GreenToken: string, led2RedToken: string) {
+
+        super(floor, room, item, label)
+
+        this.subscribeTopics = []
+        led1Items.forEach((item: HasFeedbackTopic) => {
+            this.led1Items.push(new SignalItem(item, led1RedToken, led1GreenToken))
+            this.subscribeTopics.push(item.getStateFeedbackTopic())
+        })
+        led2Items.forEach((item: HasFeedbackTopic) => {
+            this.led2Items.push(new SignalItem(item, led2RedToken, led2GreenToken))
+            this.subscribeTopics.push(item.getStateFeedbackTopic())
+        })
+    }
+
+
+    processMessage(topic: string, payload: string) : void {
+        let reds : number = 0
+        const RED_VALUES : SignalState[] = [SignalState.SIGNAL_RED, SignalState.SIGNAL_UNKNOWN]
+
+        this.led1Items.forEach((item: SignalItem) => {
+            item.processMessage(topic, payload)
+            if (RED_VALUES.indexOf(item.getSignalState()) != -1) {
+                reds++
+            }
+            // logger.info(`DBG: TwoLedSignal ${item.getSignalState()}, ${reds}`)
+        })
+        let msg = (reds > 0) ? "red" : "green"
+        mqttHandler.send(`${this.topicFirstPart}/led1`, msg)
+
+        reds = 0
+        this.led2Items.forEach((item: SignalItem) => {
+            item.processMessage(topic, payload)
+            if (RED_VALUES.indexOf(item.getSignalState()) != -1) {
+                reds++
+            }
+            // logger.info(`DBG: TwoLedSignal ${item.getSignalState()}, ${reds}`)
+        })
+        msg = (reds > 0) ? "red" : "green"
+        mqttHandler.send(`${this.topicFirstPart}/led2`, msg)
+    }
+}

src/UrlSwitchItem.ts

@@ -44,12 +44,16 @@ export class UrlSwitchItem extends AItem implements HasStateAndFeedbackTopic {
         this.state = payload;
         mqttHandler.send(this.stateFeedbackTopic, this.state);
         if (this.state != this.oldState) {                
+            try {
             if (this.state == 'ON') {
-                http.get(this.onUrl)
+                http.get(this.onUrl,)
             } else {
                 http.get(this.offUrl)
             }
             this.oldState = this.state;
+            } catch {
+                logger.error(`Failed to handle ${this.onUrl} or ${this.offUrl}`)
+            }
         }
     }
 }

src/main.ts

@@ -4,12 +4,13 @@ import * as config from './config'
 import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
 
-import { AItem } from './AItem'
+import { AItem, HasInTopic, HasFeedbackTopic, HasStateAndFeedbackTopic, HasStateAndFeedbackTopicAndLabelAndRoom, HasStateAndFeedbackTopicAndLabel } from './AItem'
 import { HomekitExportType, ExportType } from './Export'
 import { M433SwitchItem } from './M433SwitchItem'
 import { HomematicFourButtonThing, HomematicFourButtonSingleItem } from './HomematicFourButtonThing'
 import { DimmerAdaptor } from './DimmerAdaptor'
 import { TimerAdaptor } from './TimerAdaptor'
+import { SwitchOffAdaptor } from './SwitchOffAdaptor'
 import { HomematicDimmerItem } from './HomematicDimmerItem'
 import { HomematicSwitchItem } from './HomematicSwitchItem'
 import { Forwarder } from './Forwarder'
@@ -22,17 +23,24 @@ import { Cron } from './Cron'
 import { HueColorBulbItem } from './HueColorBulbItem'
 import { TouchSwitchMultiButtonThing, TouchSwitchButtonSingleItem } from './TouchSwitchMultiButtonThing'
 import { RelayBoxThing } from './RelayBox'
-import { GeoFences, AttendanceSheetType } from './GeoFences'
+import { HeatingScene } from './HeatingScene'
+import { TwoLedSignal } from './TwoLedSignal'
+import { MySwitchThing, MySwitchSingleItem } from './MySwitchThing'
+import { SimpleTopicSwitchItem } from './SimpleTopicSwitchItem'
+
 
 
 logger.info("Dispatcher starting")
 
 let allLabeledItems : Array<AItem> = new Array()
-
+let allThermostatItems : Array<HasInTopic> = new Array()
-
+let allWindows : Array<HasFeedbackTopic> = new Array()
+let allRelevantLights: Array<HasFeedbackTopic> = new Array()
+let allLights: Array<HasStateAndFeedbackTopicAndLabelAndRoom> = new Array();
+let allLightScenes: Array<HasStateAndFeedbackTopicAndLabelAndRoom> = new Array();
 // Anna -----------------------------------------------------------------------------------------------------
 // Anna Aquarium                 14665044 24 1         14665041 24 1
-let aquariumLight = new M433SwitchItem('1st', 'Anna', 'AquariumLight', 'Aquariumlicht', '14665044 24 1', '14665041 24 1')
+let aquariumLight = new M433SwitchItem('1st', 'Anna', 'AquariumLight', 'Aquarium', '14665044 24 1', '14665041 24 1')
 aquariumLight.start()
 allLabeledItems.push(aquariumLight)
 
@@ -48,19 +56,23 @@ aquariumLightCron.start()
 
 
 // Anna Bett                     14668116 24 1         14668113 24 1
-let annaBedLight = new M433SwitchItem('1st', 'Anna', 'BedLight', 'Bettlicht Anna', '14668116 24 1', '14668113 24 1')
+let annaBedLight = new M433SwitchItem('1st', 'Anna', 'BedLight', 'Bettlicht', '14668116 24 1', '14668113 24 1')
 annaBedLight.start()
 allLabeledItems.push(annaBedLight)
+allRelevantLights.push(annaBedLight)
+allLights.push(annaBedLight)
 
-
+let windowContactAnna1st = new MaxWindowContact('1st', 'Anna', 'WindowContact', 'Anna', 20)
-let windowContactAnna1st = new MaxWindowContact('1st', 'Anna', 'WindowContact', 'Fenster Anna', 20)
 windowContactAnna1st.start()
 allLabeledItems.push(windowContactAnna1st)
+allWindows.push(windowContactAnna1st)
 
 let thermostatAnna1st = new MaxThermostat('1st', 'Anna', 'Thermostat', 'Thermostat Anna', 21, [windowContactAnna1st])
 thermostatAnna1st.start()
 thermostatAnna1st.setPresetTemperature(21.0)
 allLabeledItems.push(thermostatAnna1st)
+allThermostatItems.push(thermostatAnna1st)
+
 
 let thermostatAnna1stCron = new Cron('thermostatAnna1stCron', thermostatAnna1st, [
   {cronTime: '00 05 06 * * *', output: 'ON'},
@@ -76,107 +88,198 @@ thermostatAnna1stCron.start()
 
 // Matthias -------------------------------------------------------------------------------------------------
 // Matthias Stehlampen           7 24 1                6 24 1
-let matthiasStandLights = new M433SwitchItem('1st', 'Matthias', 'StandLight', 'Stehlampen Matthias', '7 24 1', '6 24 1')
+let matthiasStandLights = new M433SwitchItem('1st', 'Matthias', 'StandLight', 'Stehlampen', '7 24 1', '6 24 1')
 matthiasStandLights.start()
 allLabeledItems.push(matthiasStandLights)
+allRelevantLights.push(matthiasStandLights)
+allLights.push(matthiasStandLights)
+
 
 // Matthias Bett                 15 24 1               14 24 1
-let matthiasBedLight = new M433SwitchItem('1st', 'Matthias', 'BedLight', 'Bettlicht Matthias', '15 24 1', '14 24 1')
+let matthiasBedLight = new M433SwitchItem('1st', 'Matthias', 'BedLight', 'Bettlicht', '15 24 1', '14 24 1')
 matthiasBedLight.start()
 allLabeledItems.push(matthiasBedLight)
+allRelevantLights.push(matthiasBedLight)
+allLights.push(matthiasBedLight)
 
 // Matthias Lautsprecher         11 24 1               10 24 1
-let matthiasSpeaker = new M433SwitchItem('1st', 'Matthias', 'Speaker', 'Lautsprecher Matthias', '11 24 1', '10 24 1', 'outlet')
+let matthiasSpeaker = new M433SwitchItem('1st', 'Matthias', 'Speaker', 'Lautsprecher', '11 24 1', '10 24 1', 'outlet')
 matthiasSpeaker.start()
 allLabeledItems.push(matthiasSpeaker)
+allRelevantLights.push(matthiasSpeaker)
+allLights.push(matthiasSpeaker)
+
+let windowContactMatthias = new MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Matthias', 24)
+windowContactMatthias.start()
+allLabeledItems.push(windowContactMatthias)
+allWindows.push(windowContactMatthias)
+
+
 
 // Esszimmer ------------------------------------------------------------------------------------------------
 // Esszimmer kleine Lampe        69653 24 1            69652 24 1
-let diningRoomSmallLight = new M433SwitchItem('Gnd', 'DiningRoom', 'SmallLight', 'kleine Lampe Esszimmer', '69653 24 1', '69652 24 1')
+let diningRoomSmallLight = new M433SwitchItem('Gnd', 'Esszimmer', 'SmallLight', 'kleine Lampe', '69653 24 1', '69652 24 1')
 diningRoomSmallLight.start()
 allLabeledItems.push(diningRoomSmallLight)
+allRelevantLights.push(diningRoomSmallLight)
+allLights.push(diningRoomSmallLight)
 
 // Esszimmer Stehlampe           86037 24 1            86036 24 1
-let diningRoomStandLight = new M433SwitchItem('Gnd', 'DiningRoom', 'StandLight', 'Stehlampe Esszimmer', '86037 24 1', '86036 24 1')
+let diningRoomStandLight = new M433SwitchItem('Gnd', 'Esszimmer', 'StandLight', 'Stehlampe', '86037 24 1', '86036 24 1')
 diningRoomStandLight.start()
 allLabeledItems.push(diningRoomStandLight)
+allRelevantLights.push(diningRoomStandLight)
+allLights.push(diningRoomStandLight)
 
 // Esszimmer Schranklicht        65813 24 1            65812 24 1
-let diningRoomCupboardLight = new M433SwitchItem('Gnd', 'DiningRoom', 'CupboardLight', 'Schranklicht Esszimmer', '65813 24 1', '65812 24 1')
+let diningRoomCupboardLight = new M433SwitchItem('Gnd', 'Esszimmer', 'CupboardLight', 'Schranklicht', '65813 24 1', '65812 24 1')
 diningRoomCupboardLight.start()
 allLabeledItems.push(diningRoomCupboardLight)
+allRelevantLights.push(diningRoomCupboardLight)
+allLights.push(diningRoomCupboardLight)
 
 // Esszimmer Regallicht
-let diningRoomShelfLight = new UrlSwitchItem('Gnd', 'DiningRoom', 'ShelfLight', 'Regallicht Esszimmer', 'http://regallampe/dv?dv=1023', 'http://regallampe/dv?dv=0')
+let diningRoomShelfLight = new SimpleTopicSwitchItem('Gnd', 'Esszimmer', 'ShelfLight', 'Regallicht', 'IoT/WifiRelay1/State')
 diningRoomShelfLight.start()
 allLabeledItems.push(diningRoomShelfLight)
+allRelevantLights.push(diningRoomShelfLight)
+allLights.push(diningRoomShelfLight)
 
-let diningRoomNaehkaestchenLight = new HueColorBulbItem('Gnd', 'DiningRoom', 'NaehkaestchenLight', 'Lampe Naehkaestchen', 15)
+let diningRoomNaehkaestchenLight = new HueColorBulbItem('Gnd', 'Esszimmer', 'NaehkaestchenLight', 'Nähkästchen', 15)
 diningRoomNaehkaestchenLight.start()
 allLabeledItems.push(diningRoomNaehkaestchenLight)
+allRelevantLights.push(diningRoomNaehkaestchenLight)
+allLights.push(diningRoomNaehkaestchenLight)
+
+let windowContactDiningRoom1 = new MaxWindowContact('Gnd', 'Esszimmer', 'WindowContact1', 'Essz. links', 26)
+windowContactDiningRoom1.start()
+allLabeledItems.push(windowContactDiningRoom1)
+allWindows.push(windowContactDiningRoom1)
+let windowContactDiningRoom2 = new MaxWindowContact('Gnd', 'Esszimmer', 'WindowContact2', 'Essz. rechts', 27)
+windowContactDiningRoom2.start()
+allLabeledItems.push(windowContactDiningRoom2)
+allWindows.push(windowContactDiningRoom2)
+
+let thermostatDiningRoom = new MaxThermostat('Gnd', 'Esszimmer', 'Thermostat', 'Thermostat Esszimmer', 31, [windowContactDiningRoom1, windowContactDiningRoom2])
+thermostatDiningRoom.start()
+thermostatDiningRoom.setPresetTemperature(21.0)
+allLabeledItems.push(thermostatDiningRoom)
+allThermostatItems.push(thermostatDiningRoom)
 
 // Wohnzimmer -----------------------------------------------------------------------------------------------
 // Wohnzimmer grosse Lampe       65557 24 1            65556 24 1
-let livingRoomLargeLight = new M433SwitchItem('Gnd', 'LivingRoom', 'LargeLight', 'große Lampe Wohnzimmer', '65557 24 1', '65556 24 1')
+let livingRoomLargeLight = new M433SwitchItem('Gnd', 'Wohnzimmer', 'LargeLight', 'große Lampe', '65557 24 1', '65556 24 1')
 livingRoomLargeLight.start()
 allLabeledItems.push(livingRoomLargeLight)
+allRelevantLights.push(livingRoomLargeLight)
+allLights.push(livingRoomLargeLight)
 
 // Wohnzimmer kleine Lampe       87061 24 1            87060 24 1
-let livingRoomSmallLight = new M433SwitchItem('Gnd', 'LivingRoom', 'SmallLight', 'kleine Lampe Wohnzimmer', '87061 24 1', '87060 24 1')
+let livingRoomSmallLight = new M433SwitchItem('Gnd', 'Wohnzimmer', 'SmallLight', 'kleine Lampe', '87061 24 1', '87060 24 1')
 livingRoomSmallLight.start()
 allLabeledItems.push(livingRoomSmallLight)
+allRelevantLights.push(livingRoomSmallLight)
+allLights.push(livingRoomSmallLight)
 
 // Wohnzimmer Sterne             69909 24 1            69908 24 1
-let livingRoomStars = new M433SwitchItem('Gnd', 'LivingRoom', 'Stars', 'Sterne Wohnzimmer', '69909 24 1', '69908 24 1')
+let livingRoomStars = new M433SwitchItem('Gnd', 'Wohnzimmer', 'Stars', 'Sterne', '69909 24 1', '69908 24 1')
 livingRoomStars.start()
 allLabeledItems.push(livingRoomStars)
+allRelevantLights.push(livingRoomStars)
+allLights.push(livingRoomStars)
 
 // Wohnzimmer kleine Stehlampe   81941 24 1            81940 24 1
-let livingRoomStandLight = new M433SwitchItem('Gnd', 'LivingRoom', 'StandLight', 'Stehlampe Wohnzimmer', '81941 24 1', '81940 24 1')
+let livingRoomStandLight = new M433SwitchItem('Gnd', 'Wohnzimmer', 'StandLight', 'Stehlampe', '81941 24 1', '81940 24 1')
 livingRoomStandLight.start()
 allLabeledItems.push(livingRoomStandLight)
+allRelevantLights.push(livingRoomStandLight)
+allLights.push(livingRoomStandLight)
 
+let windowContactLivingRoom1 = new MaxWindowContact('Gnd', 'Wohnzimmer', 'WindowContact1', 'Wohnz. rechts', 28)
+windowContactLivingRoom1.start()
+allLabeledItems.push(windowContactLivingRoom1)
+allWindows.push(windowContactLivingRoom1)
+let windowContactLivingRoom2 = new MaxWindowContact('Gnd', 'Wohnzimmer', 'WindowContact2', 'Wohnz. links', 29)
+windowContactLivingRoom2.start()
+allLabeledItems.push(windowContactLivingRoom2)
+allWindows.push(windowContactLivingRoom2)
+
+let thermostatLivingRoom = new MaxThermostat('Gnd', 'Wohnzimmer', 'Thermostat', 'Thermostat Wohnzimmer', 30, [windowContactLivingRoom1, windowContactLivingRoom2])
+thermostatLivingRoom.start()
+thermostatLivingRoom.setPresetTemperature(21.0)
+allLabeledItems.push(thermostatLivingRoom)
+allThermostatItems.push(thermostatLivingRoom)
 
 // Flur -----------------------------------------------------------------------------------------------------
 // Flur Schreibtisch             83221 24 1            83220 24 1
-let hallwayDeskLight = new M433SwitchItem('Gnd', 'Hallway', 'DeskLight', 'Schreibtischlampe Flur', '83221 24 1', '83220 24 1')
+let hallwayDeskLight = new M433SwitchItem('Gnd', 'Flur', 'DeskLight', 'Schreibtischlampe', '83221 24 1', '83220 24 1')
 hallwayDeskLight.start()
 allLabeledItems.push(hallwayDeskLight)
+allRelevantLights.push(hallwayDeskLight)
+allLights.push(hallwayDeskLight)
 
 // Flur Stehlampe                8704914 24 5          8793154 24 5
-let hallwayStandLight = new M433SwitchItem('Gnd', 'Hallway', 'StandLight', 'Stehlampe Flur', '8704914 24 5', '8793154 24 5')
+let hallwayStandLight = new M433SwitchItem('Gnd', 'Flur', 'StandLight', 'Stehlampe', '8704914 24 5', '8793154 24 5')
 hallwayStandLight.start()
 allLabeledItems.push(hallwayStandLight)
+allRelevantLights.push(hallwayStandLight)
+allLights.push(hallwayStandLight)
 
 // Flur Schranklicht             66581 24 1            66580 24 1
-let hallwayWardrobeLight = new M433SwitchItem('Gnd', 'Hallway', 'WardrobeLight', 'Schranklicht Flur', '66581 24 1', '66580 24 1')
+let hallwayWardrobeLight = new M433SwitchItem('Gnd', 'Flur', 'WardrobeLight', 'Schranklicht', '66581 24 1', '66580 24 1')
 hallwayWardrobeLight.start()
 allLabeledItems.push(hallwayWardrobeLight)
+allRelevantLights.push(hallwayWardrobeLight)
+allLights.push(hallwayWardrobeLight)
 
+let windowContactHallway = new MaxWindowContact('Gnd', 'Flur', 'WindowContact', 'Flur', 25)
+windowContactHallway.start()
+allLabeledItems.push(windowContactHallway)
+allWindows.push(windowContactHallway)
+
+let thermostatHallway1 = new MaxThermostat('Gnd', 'Flur', 'Thermostat1', 'Thermostat Flur vorne', 32, [])
+thermostatHallway1.start()
+thermostatHallway1.setPresetTemperature(19.0)
+allLabeledItems.push(thermostatHallway1)
+allThermostatItems.push(thermostatHallway1)
+
+let thermostatHallway2 = new MaxThermostat('Gnd', 'Flur', 'Thermostat2', 'Thermostat Flur hinten', 33, [])
+thermostatHallway2.start()
+thermostatHallway2.setPresetTemperature(5.0)
+allLabeledItems.push(thermostatHallway2)
+allThermostatItems.push(thermostatHallway2)
 
 // Küche ----------------------------------------------------------------------------------------------------
 // Küche Fensterbank             66837 24 1            66836 24 1
-let kitchenWindowLight = new M433SwitchItem('Gnd', 'Kitchen', 'WindowLight', 'Fensterbanklicht Küche', '66837 24 1', '66836 24 1')
+let kitchenWindowLight = new M433SwitchItem('Gnd', 'Kueche', 'WindowLight', 'Fensterbanklicht', '66837 24 1', '66836 24 1')
 kitchenWindowLight.start()
 allLabeledItems.push(kitchenWindowLight)
+allRelevantLights.push(kitchenWindowLight)
+allLights.push(kitchenWindowLight)
 
 // Küche Deckenlampe             82197 24 1            82196 24 1
-let kitchenCeilingLight = new M433SwitchItem('Gnd', 'Kitchen', 'CeilingLight', 'Deckenlampe Küche', '82197 24 1', '82196 24 1')
+let kitchenCeilingLight = new M433SwitchItem('Gnd', 'Kueche', 'CeilingLight', 'Deckenlampe', '82197 24 1', '82196 24 1')
 kitchenCeilingLight.start()
 allLabeledItems.push(kitchenCeilingLight)
+allRelevantLights.push(kitchenCeilingLight)
+allLights.push(kitchenCeilingLight)
 
 
 // Schlafzimmer ---------------------------------------------------------------------------------------------
 // Schlafzimmer Wolfgangs Seite  13976916 24 1         13976913 24 1
-let bedRoomWolfgangsSide = new M433SwitchItem('1st', 'BedRoom', 'WolfgangsSide', 'Wolfgangs Seite Schlafzimmer', '13976916 24 1', '13976913 24 1')
+let bedRoomWolfgangsSide = new M433SwitchItem('1st', 'Schlafzimmer', 'WolfgangsSide', 'Wolfgangs Seite', '13976916 24 1', '13976913 24 1')
 bedRoomWolfgangsSide.start()
 allLabeledItems.push(bedRoomWolfgangsSide)
+allRelevantLights.push(bedRoomWolfgangsSide)
+allLights.push(bedRoomWolfgangsSide)
 
-let bedRoomWolfgangBedLight = new HueColorBulbItem('1st', 'BedRoom', 'WolfgangBedLight', 'Bettlicht', 16)
+let bedRoomWolfgangBedLight = new HueColorBulbItem('1st', 'Schlafzimmer', 'WolfgangBedLight', 'Wolfgangs Bettlicht', 16)
 bedRoomWolfgangBedLight.start()
 allLabeledItems.push(bedRoomWolfgangBedLight)
+allRelevantLights.push(bedRoomWolfgangBedLight)
+allLights.push(bedRoomWolfgangBedLight)
 
-let bedRoomWolfgangBedLightDimmerAdaptor = new DimmerAdaptor('1st', 'BedRoom', 'WolfgangBedLight')
+let bedRoomWolfgangBedLightDimmerAdaptor = new DimmerAdaptor('1st', 'Schlafzimmer', 'WolfgangBedLight')
 bedRoomWolfgangBedLightDimmerAdaptor.start()
 
 let touchSwitchMultiButtonThing = new TouchSwitchMultiButtonThing('1st', 'Bedroom', 'Wolfgang',
@@ -184,31 +287,39 @@ let touchSwitchMultiButtonThing = new TouchSwitchMultiButtonThing('1st', 'Bedroo
 touchSwitchMultiButtonThing.start()
 
 // Schlafzimmer Pattys Seite     13980756 24 1         13980753 24 1
-let bedRoomPattysSide = new M433SwitchItem('1st', 'BedRoom', 'PattysSide', 'Pattys Seite Schlafzimmer', '13980756 24 1', '13980753 24 1')
+let bedRoomPattysSide = new M433SwitchItem('1st', 'Schlafzimmer', 'PattysSide', 'Pattys Seite', '13980756 24 1', '13980753 24 1')
 bedRoomPattysSide.start()
 allLabeledItems.push(bedRoomPattysSide)
+allRelevantLights.push(bedRoomPattysSide)
+allLights.push(bedRoomPattysSide)
 
 // Schlafzimmer Fensterbank      13979988 24 1         13979985 24 1
-let bedRoomWindowLight = new M433SwitchItem('1st', 'BedRoom', 'WindowLight', 'Fensterbanklicht Schlafzimmer', '13979988 24 1', '13979985 24 1')
+let bedRoomWindowLight = new M433SwitchItem('1st', 'Schlafzimmer', 'WindowLight', 'Fensterbanklicht', '13979988 24 1', '13979985 24 1')
 bedRoomWindowLight.start()
 allLabeledItems.push(bedRoomWindowLight)
+allRelevantLights.push(bedRoomWindowLight)
+allLights.push(bedRoomWindowLight)
 
 
 
-let windowContactBedroomStreet1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17)
+let windowContactBedroomStreet1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Schlafz. Strasse', 17)
 windowContactBedroomStreet1st.start()
 allLabeledItems.push(windowContactBedroomStreet1st)
-let windowContact1BedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContact1Garden', 'Fenster Schlafzimmer 1 Garten', 18)
+allWindows.push(windowContactBedroomStreet1st)
+let windowContact1BedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContact1Garden', 'Schlafz. Garten 1', 18)
 windowContact1BedroomGarden1st.start()
 allLabeledItems.push(windowContact1BedroomGarden1st)
-let windowContact2BedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContact2Garden', 'Fenster Schlafzimmer 2 Garten', 22)
+allWindows.push(windowContact1BedroomGarden1st)
+let windowContact2BedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContact2Garden', 'Schlafz. Garten 2', 22)
 windowContact2BedroomGarden1st.start()
 allLabeledItems.push(windowContact2BedroomGarden1st)
+allWindows.push(windowContact2BedroomGarden1st)
 
 let thermostatBedroom1st = new MaxThermostat('1st', 'Bedroom', 'Thermostat', 'Thermostat Schlafzimmer', 19, [windowContact1BedroomGarden1st, windowContact2BedroomGarden1st, windowContactBedroomStreet1st])
 thermostatBedroom1st.start()
 thermostatBedroom1st.setPresetTemperature(20.0)
 allLabeledItems.push(thermostatBedroom1st)
+allThermostatItems.push(thermostatBedroom1st)
 
 let thermostatBedroom1stCron = new Cron('thermostatBedroom1stCron', thermostatBedroom1st, [
   {cronTime: '00 01 06 * * 1-5', output: 'ON'},
@@ -221,57 +332,16 @@ let thermostatBedroom1stCron = new Cron('thermostatBedroom1stCron', thermostatBe
 thermostatBedroom1stCron.start()
 
 // ---------------------------------------------------------------------------------------------------------
-let dayLightScene = new LightScene('Gnd', 'Hallway', 'DayLight', 'DayLight',
+let windowContactBathroomGnd = new MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Bad unten', 7)
-  [
-    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight, 
-    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-    livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
-  ],
-  []  
-)
-dayLightScene.start()
-allLabeledItems.push(dayLightScene)
-
-let ecoLightScene = new LightScene('Gnd', 'Hallway', 'EcoLight', 'EcoLight',
-  [
-    kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight, 
-    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-    livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
-  ],
-  [ 
-    kitchenCeilingLight, hallwayStandLight, 
-    livingRoomLargeLight, livingRoomSmallLight
-  ]  
-)
-ecoLightScene.start()
-allLabeledItems.push(ecoLightScene)
-
-let ecoSwitch = new MaxEcoSwitch('Gnd', 'Hallway', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene)
-ecoSwitch.start()
-
-let morningLightScene = new LightScene('Gnd', 'Hallway', 'MorningLight', 'MorningLight',
-  [
-    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight, 
-    hallwayStandLight
-  ],
-  [ 
-    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
-    livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
-  ]  
-)
-morningLightScene.start()
-allLabeledItems.push(morningLightScene)
-
-
-// ----------------------------------------------------------------------------------------------------------
-let windowContactBathroomGnd = new MaxWindowContact('Gnd', 'Bathroom', 'WindowContact', 'Fenster Bad unten', 7)
 windowContactBathroomGnd.start()
 allLabeledItems.push(windowContactBathroomGnd)
+allWindows.push(windowContactBathroomGnd)
 
 let thermostatBathroomGnd = new MaxThermostat('Gnd', 'Bathroom', 'Thermostat', 'Thermostat Bad unten', 4, [windowContactBathroomGnd])
 thermostatBathroomGnd.start()
 thermostatBathroomGnd.setPresetTemperature(20.0)
 allLabeledItems.push(thermostatBathroomGnd)
+allThermostatItems.push(thermostatBathroomGnd)
 
 let thermostatBathroomGndCron = new Cron('thermostatBathroomGndCron', thermostatBathroomGnd, [
   {cronTime: '00 02 06 * * 1-5', output: 'ON'},
@@ -283,14 +353,16 @@ let thermostatBathroomGndCron = new Cron('thermostatBathroomGndCron', thermostat
 thermostatBathroomGndCron.start()
 
 
-let windowContactBathroom1st = new MaxWindowContact('1st', 'Bathroom', 'WindowContact', 'Fenster Bad oben', 2)
+let windowContactBathroom1st = new MaxWindowContact('1st', 'Bathroom', 'WindowContact', 'Bad oben', 2)
 windowContactBathroom1st.start()
 allLabeledItems.push(windowContactBathroom1st)
+allWindows.push(windowContactBathroom1st)
 
 let thermostatBathroom1st = new MaxThermostat('1st', 'Bathroom', 'Thermostat', 'Thermostat Bad oben', 3, [windowContactBathroom1st])
 thermostatBathroom1st.start()
 thermostatBathroom1st.setPresetTemperature(20.0)
 allLabeledItems.push(thermostatBathroom1st)
+allThermostatItems.push(thermostatBathroom1st)
 
 let thermostatBathroom1stCron = new Cron('thermostatBathroom1stCron', thermostatBathroom1st, [
   {cronTime: '00 00 06 * * 1-5', output: 'ON'},
@@ -303,24 +375,29 @@ thermostatBathroom1stCron.start()
 
 
 
-let windowContactKitchen1 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact1', 'Fenster Küche Garten', 11)
+let windowContactKitchen1 = new MaxWindowContact('Gnd', 'Kueche', 'WindowContact1', 'Küche Garten', 11)
 windowContactKitchen1.start()
 allLabeledItems.push(windowContactKitchen1)
-let windowContactKitchen2 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact2', 'Fenster Küche Terassentür Garten', 10)
+allWindows.push(windowContactKitchen1)
+let windowContactKitchen2 = new MaxWindowContact('Gnd', 'Kueche', 'WindowContact2', 'Küche Terassentür', 10)
 windowContactKitchen2.start()
 allLabeledItems.push(windowContactKitchen2)
-let windowContactKitchen3 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact3', 'Fenster Küche Straße 1', 12)
+allWindows.push(windowContactKitchen2)
+let windowContactKitchen3 = new MaxWindowContact('Gnd', 'Kueche', 'WindowContact3', 'Küche Straße 1', 12)
 windowContactKitchen3.start()
 allLabeledItems.push(windowContactKitchen3)
-let windowContactKitchen4 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact4', 'Fenster Küche Straße 2', 13)
+allWindows.push(windowContactKitchen3)
+let windowContactKitchen4 = new MaxWindowContact('Gnd', 'Kueche', 'WindowContact4', 'Küche Straße 2', 13)
 windowContactKitchen4.start()
 allLabeledItems.push(windowContactKitchen4)
+allWindows.push(windowContactKitchen4)
 
-let thermostatKitchen = new MaxThermostat('Gnd', 'Kitchen', 'Thermostat', 'Thermostat Küche', 14, [
+let thermostatKitchen = new MaxThermostat('Gnd', 'Kueche', 'Thermostat', 'Thermostat Küche', 14, [
   windowContactKitchen1, windowContactKitchen2, windowContactKitchen3, windowContactKitchen4])
 thermostatKitchen.start()
 thermostatKitchen.setPresetTemperature(20.0)
 allLabeledItems.push(thermostatKitchen)
+allThermostatItems.push(thermostatKitchen)
 
 let thermostatKitchenCron = new Cron('thermostatKitchenCron', thermostatKitchen, [
   {cronTime: '00 00 06 * * 1-5', output: 'ON'},
@@ -332,7 +409,7 @@ let thermostatKitchenCron = new Cron('thermostatKitchenCron', thermostatKitchen,
 thermostatKitchenCron.start()
 
 // ----------------------------------------------------------------------------------------------------------
-let windowContactFrontdoor = new MaxWindowContact('Gnd', 'Hallway', 'FrontdoorContact', 'Haustür', 23)
+let windowContactFrontdoor = new MaxWindowContact('Gnd', 'Flur', 'FrontdoorContact', 'Haustür', 23)
 windowContactFrontdoor.start()
 allLabeledItems.push(windowContactFrontdoor)
 
@@ -345,86 +422,214 @@ let relayBox = new RelayBoxThing('base', 'labor', 'relaybox', 'IoT/Command/Relay
 relayBox.start()
 allLabeledItems.push(relayBox)
 
-// ----------------------------------------------------------------------------------------------------------
-let geoFences = new GeoFences()
-geoFences.exec()
 
-geoFences.on('change', (attendanceSheet: AttendanceSheetType) => {
-  logger.info(`geoFences change event: ${JSON.stringify(attendanceSheet)}`)
-})
 // ----------------------------------------------------------------------------------------------------------
-let testFourButton = new HomematicFourButtonThing('Gnd', 'Hallway', 'TestButton', 9, [
+let heatingSceneAll = new HeatingScene('Gnd', 'House', 'Heatings', 'Alle Heizungen', allThermostatItems)
-  new HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/Testlight/dimmerIn'),
+heatingSceneAll.start()
-  new HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/DeskLight/timerIn'),
+
+
+
+// ----------------------------------------------------------------------------------------------------------
+// Basement
+let workshopLight = new HomematicSwitchItem('Base', 'Keller', 'Light', 'Werkstatt', 5)
+workshopLight.start()
+allLabeledItems.push(workshopLight)
+allRelevantLights.push(workshopLight)
+allLights.push(workshopLight)
+
+let basementSmallLight = new HomematicSwitchItem('Base', 'Keller', 'SmallLight', 'Licht einfach', 35, 1)
+basementSmallLight.start()
+allLabeledItems.push(basementSmallLight)
+allRelevantLights.push(basementSmallLight)
+allLights.push(basementSmallLight)
+basementSmallLight.on('somethingChanged', () => {
+  if (basementSmallLight.getState() == 'ON') {
+    setTimeout(() => {
+      if (basementLargeLight.getState() == 'OFF') {
+        mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF')
+      }
+    }, (3 * 60 * 1000)) 
+  }
+  if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
+    mqttHandler.send(basementLargeLight.getStateTopic(), 'OFF')
+  }
+})
+
+let basementLargeLight = new HomematicSwitchItem('Base', 'Keller', 'LargeLight', 'Licht hell', 35, 2)
+basementLargeLight.start()
+allLabeledItems.push(basementLargeLight)
+allRelevantLights.push(basementLargeLight)
+allLights.push(basementLargeLight)
+basementLargeLight.on('somethingChanged', () => {
+  if (basementLargeLight.getState() == 'ON') {
+    mqttHandler.send(basementSmallLight.getStateTopic(), 'ON')
+  } else if (basementLargeLight.getState() == 'OFF') {
+    mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF')
+  }
+})
+
+
+let basementForwarder = new Forwarder('Base', 'All', 'Forwarder', 'state', 'BasementForwarder', [
+  basementLargeLight.getStateTopic(),
+  basementSmallLight.getStateTopic(),
+  workshopLight.getStateTopic()
+])
+basementForwarder.start()
+
+
+let basementForwarderSwitchOffAdaptor = new SwitchOffAdaptor('Base', 'All', 'Forwarder')
+basementForwarderSwitchOffAdaptor.start()
+
+// ----------------------------------------------------------------------------------------------------------
+let twoLedSignal1 = new TwoLedSignal('Gnd', 'Flur', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger',
+  allRelevantLights, "OFF", "ON",
+  allWindows, "CLOSED", "OPEN")
+twoLedSignal1.start()
+
+// MySwitchTHing
+let mySwitchThingWolfgang = new MySwitchThing('1st', 'Schlafzimmer', 'WolfgangsSwitch', [ 
+  new MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
+  new MySwitchSingleItem(basementForwarderSwitchOffAdaptor.getInTopic()),
+  new MySwitchSingleItem('IoT/InsLeere/2'),
+])
+mySwitchThingWolfgang.start()
+
+
+// ----------------------------------------------------------------------------------------------------------
+let testFourButton = new HomematicFourButtonThing('Gnd', 'Flur', 'TestButton', 9, [
+  new HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Flur/Testlight/dimmerIn'),
+  new HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Flur/DeskLight/timerIn'),
   new HomematicFourButtonSingleItem('test/button/3'),
   new HomematicFourButtonSingleItem('test/button/4')
 ])
 testFourButton.start()
 
-let testDimmerAdaptor = new DimmerAdaptor('Gnd', 'Hallway', 'Testlight')
+let testDimmerAdaptor = new DimmerAdaptor('Gnd', 'Flur', 'Testlight')
 testDimmerAdaptor.start()
 
-let testTimerAdaptor = new TimerAdaptor('Gnd', 'Hallway', 'DeskLight', 10)
+let testTimerAdaptor = new TimerAdaptor('Gnd', 'Flur', 'DeskLight', 10)
 testTimerAdaptor.start()
 
-let testLight = new HomematicDimmerItem('Gnd', 'Hallway', 'Testlight', 'Testlampe mit Dimmer', 8)
+let testLight = new HomematicDimmerItem('Gnd', 'Flur', 'Testlight', 'Testlampe mit Dimmer', 8)
 testLight.start()
 
-let testLight2 = new HomematicSwitchItem('Gnd', 'Hallway', 'Testlight2', 'Testlampe ohne Dimmer', 5)
-testLight2.start()
 
-let testForwarder = new Forwarder('Gnd', 'Hallway', 'TestForwarder', 'state', 'TestForwarder', [
+let testForwarder = new Forwarder('Gnd', 'Flur', 'TestForwarder', 'state', 'TestForwarder', [
-  'dispatcher_ng/items/Gnd/Hallway/Testlight2/state',
+  'dispatcher_ng/items/Gnd/Flur/Testlight2/state',
-  'dispatcher_ng/items/Gnd/Hallway/DeskLight/state'
+  'dispatcher_ng/items/Gnd/Flur/DeskLight/state'
 ])
 testForwarder.start()
 
 
-let testScene = new LightScene('Gnd', 'Hallway', 'TestScene', 'TestScene',
+let testScene = new LightScene('Gnd', 'Flur', 'TestScene', 'TestScene',
   [aquariumLight, annaBedLight],
   [matthiasStandLights, matthiasBedLight]
 )
 testScene.start()
 
+// ----------------------------------------------------------------------------------------------------------
+
+let dayLightScene = new LightScene('Gnd', 'Szenen', 'DayLight', 'DayLight',
+  [
+    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight, 
+    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
+    livingRoomLargeLight, livingRoomSmallLight, livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
+  ],
+  []  
+)
+dayLightScene.start()
+allLabeledItems.push(dayLightScene)
+allLightScenes.push(dayLightScene)
+
+let ecoLightScene = new LightScene('Gnd', 'Szenen', 'EcoLight', 'EcoLight',
+  [
+    kitchenWindowLight, hallwayDeskLight, hallwayWardrobeLight, 
+    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
+    livingRoomStars, livingRoomStandLight, diningRoomNaehkaestchenLight
+  ],
+  [ 
+    kitchenCeilingLight, hallwayStandLight, 
+    livingRoomLargeLight, livingRoomSmallLight
+  ]  
+)
+ecoLightScene.start()
+allLabeledItems.push(ecoLightScene)
+allLightScenes.push(ecoLightScene)
+
+let ecoSwitch = new MaxEcoSwitch('Gnd', 'Szenen', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene)
+ecoSwitch.start()
+
+let morningLightScene = new LightScene('Gnd', 'Szenen', 'MorningLight', 'MorningLight',
+  [
+    kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayWardrobeLight, 
+    hallwayStandLight
+  ],
+  [ 
+    diningRoomSmallLight, diningRoomStandLight, diningRoomCupboardLight, diningRoomShelfLight,
+    livingRoomStars, livingRoomStandLight, livingRoomLargeLight, livingRoomSmallLight, diningRoomNaehkaestchenLight
+  ]  
+)
+morningLightScene.start()
+allLabeledItems.push(morningLightScene)
+allLightScenes.push(morningLightScene)
+
+let sceneOfAllLights = new LightScene('Gnd', 'Szenen', 'AllLights', 'Alle Lampen', allLights, [])
+sceneOfAllLights.start()
+allLightScenes.push(sceneOfAllLights)
 
 
 // ----------------------------------------------------------------------------------------------------------
-// Homekit export
+// heartbeat
-let homekitObject : { [key:string]:{} } = {}
+let heartbeatCounter = 0
-let openhabList : string[] = []
+let heartbeatTimer = setInterval(() => {
+  heartbeatCounter += 1
+  mqttHandler.send(config.dict.heartbeatTopic, `${heartbeatCounter}`)
+}, config.dict.heartbeatInterval)
+  
+// watchdog
+let watchdogCounter = 0
+let watchdogTimer = setInterval(() => {
+  watchdogCounter += 1
+  mqttHandler.send(config.dict.watchdogTopic, `${config.dict.watchdogMessage} ${watchdogCounter}`)
+}, config.dict.watchdogInterval)
+  
 
-// logger.info("allLabeledItems")
-// logger.info(JSON.stringify(allLabeledItems))
 
-allLabeledItems.forEach((item: AItem) => {
+
-  let exportData : ExportType|null = item.exportItem()
+
-  if (exportData != null) {
+// ----------------------------------------------------------------------------------------------------------
-    if ('id' in exportData['homekit']) {
+
-      homekitObject[exportData['homekit']['id']] = exportData['homekit']['object']
+let roomSwitches: any = {}
-    }
+allLights.forEach((item: HasStateAndFeedbackTopicAndLabelAndRoom) => {
-    if (exportData['openhab'] instanceof Array) {
+  let switchItem = {'label': item.getLabel(), 'actionTopic': item.getStateTopic(), 'feedbackTopic': item.getStateFeedbackTopic()}
-      let da : string[] = exportData['openhab'] as string[]
+  if (item.getRoom() in roomSwitches) {
-      da.forEach((o: string) => openhabList.push(o))
+    roomSwitches[item.getRoom()].push(switchItem)
-    } else {
+  } else {
-      let da : string = exportData['openhab'] as string
+    roomSwitches[item.getRoom()] = [ switchItem ]
-      openhabList.push(da)
-    }
-    // logger.info("openHabList")
-    // logger.info(JSON.stringify(openhabList))
   }
 })
-
+let smartClientConfiguration : any = {}
-let heatingMainSwitchExport : ExportType|null = MaxThermostat.exportHeatingMainSwitchItem()
+smartClientConfiguration['switches'] = []
-if (heatingMainSwitchExport != null) {
+for (let key in roomSwitches) {
-  let da : string = heatingMainSwitchExport['openhab'] as string
+  let item : any = { 'room': key, 'switches': roomSwitches[key]}
-  openhabList.push(da)
+  smartClientConfiguration['switches'].push(item)
 }
-
+smartClientConfiguration['scenes'] = []
-fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4))
+allLightScenes.forEach((scene : HasStateAndFeedbackTopicAndLabelAndRoom) => {
-fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'))
+  let item : any = { 'label': scene.getLabel(), 'actionTopic': scene.getStateTopic() }
+  smartClientConfiguration['scenes'].push(item)
+})
+smartClientConfiguration['windows'] = []
+allWindows.forEach((window : HasStateAndFeedbackTopicAndLabel) => {
+  let item : any = { 'label': window.getLabel(), 'topic': window.getStateFeedbackTopic() }
+  smartClientConfiguration['windows'].push(item)
+})
+fs.writeFileSync('smartclient.json', JSON.stringify(smartClientConfiguration, null, 4))
 
 // ----------------------------------------------------------------------------------------------------------
 mqttHandler.exec()
 logger.info("Dispatcher running")
 
 
+mqttHandler.send('smartclient/configuration', JSON.stringify(smartClientConfiguration, null, 4))
+