MySwitch, first test passed

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
+

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':
+            case 'PRESS_CONT':
+                MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'LONG_HOLD', true);
+                break;
+            case 'PRESS_LONG_RELEASE':
+                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/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/main.js

@@ -21,9 +21,13 @@ const HueColorBulbItem_1 = require("./HueColorBulbItem");
 const TouchSwitchMultiButtonThing_1 = require("./TouchSwitchMultiButtonThing");
 const RelayBox_1 = require("./RelayBox");
 const HeatingScene_1 = require("./HeatingScene");
+const TwoLedSignal_1 = require("./TwoLedSignal");
+const MySwitchThing_1 = require("./MySwitchThing");
 logger.info("Dispatcher starting");
 let allLabeledItems = new Array();
 let allThermostatItems = new Array();
+let allWindows = new Array();
+let allRelevantLights = 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');
@@ -41,9 +45,11 @@ aquariumLightCron.start();
 let annaBedLight = new M433SwitchItem_1.M433SwitchItem('1st', 'Anna', 'BedLight', 'Bettlicht Anna', '14668116 24 1', '14668113 24 1');
 annaBedLight.start();
 allLabeledItems.push(annaBedLight);
+allRelevantLights.push(annaBedLight);
 let windowContactAnna1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Anna', 'WindowContact', 'Fenster 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);
@@ -65,84 +71,144 @@ thermostatAnna1stCron.start();
 let matthiasStandLights = new M433SwitchItem_1.M433SwitchItem('1st', 'Matthias', 'StandLight', 'Stehlampen Matthias', '7 24 1', '6 24 1');
 matthiasStandLights.start();
 allLabeledItems.push(matthiasStandLights);
+allRelevantLights.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');
 matthiasBedLight.start();
 allLabeledItems.push(matthiasBedLight);
+allRelevantLights.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');
 matthiasSpeaker.start();
 allLabeledItems.push(matthiasSpeaker);
-let windowContactMatthias = new MaxWindowContact_1.MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Fenster', 24);
+allRelevantLights.push(matthiasSpeaker);
+let windowContactMatthias = new MaxWindowContact_1.MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Fenster 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');
 diningRoomSmallLight.start();
 allLabeledItems.push(diningRoomSmallLight);
+allRelevantLights.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');
 diningRoomStandLight.start();
 allLabeledItems.push(diningRoomStandLight);
+allRelevantLights.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');
 diningRoomCupboardLight.start();
 allLabeledItems.push(diningRoomCupboardLight);
+allRelevantLights.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');
 diningRoomShelfLight.start();
 allLabeledItems.push(diningRoomShelfLight);
+allRelevantLights.push(diningRoomShelfLight);
 let diningRoomNaehkaestchenLight = new HueColorBulbItem_1.HueColorBulbItem('Gnd', 'DiningRoom', 'NaehkaestchenLight', 'Lampe Naehkaestchen', 15);
 diningRoomNaehkaestchenLight.start();
 allLabeledItems.push(diningRoomNaehkaestchenLight);
+allRelevantLights.push(diningRoomNaehkaestchenLight);
+let windowContactDiningRoom1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'DiningRoom', 'WindowContact1', 'Fenster Esszimmer Straße links', 26);
+windowContactDiningRoom1.start();
+allLabeledItems.push(windowContactDiningRoom1);
+allWindows.push(windowContactDiningRoom1);
+let windowContactDiningRoom2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'DiningRoom', 'WindowContact2', 'Fenster Esszimmer Straße rechts', 27);
+windowContactDiningRoom2.start();
+allLabeledItems.push(windowContactDiningRoom2);
+allWindows.push(windowContactDiningRoom2);
+let thermostatDiningRoom = new MaxThermostat_1.MaxThermostat('Gnd', 'DiningRoom', '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');
 livingRoomLargeLight.start();
 allLabeledItems.push(livingRoomLargeLight);
+allRelevantLights.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');
 livingRoomSmallLight.start();
 allLabeledItems.push(livingRoomSmallLight);
+allRelevantLights.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');
 livingRoomStars.start();
 allLabeledItems.push(livingRoomStars);
+allRelevantLights.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');
 livingRoomStandLight.start();
 allLabeledItems.push(livingRoomStandLight);
+allRelevantLights.push(livingRoomStandLight);
+let windowContactLivingRoom1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'LivingRoom', 'WindowContact1', 'Fenster Wohnzimmer Garten rechts', 28);
+windowContactLivingRoom1.start();
+allLabeledItems.push(windowContactLivingRoom1);
+allWindows.push(windowContactLivingRoom1);
+let windowContactLivingRoom2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'LivingRoom', 'WindowContact2', 'Fenster Wohnzimmer Garten links', 29);
+windowContactLivingRoom2.start();
+allLabeledItems.push(windowContactLivingRoom2);
+allWindows.push(windowContactLivingRoom2);
+let thermostatLivingRoom = new MaxThermostat_1.MaxThermostat('Gnd', 'LivingRoom', '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');
 hallwayDeskLight.start();
 allLabeledItems.push(hallwayDeskLight);
+allRelevantLights.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');
 hallwayStandLight.start();
 allLabeledItems.push(hallwayStandLight);
+allRelevantLights.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');
 hallwayWardrobeLight.start();
 allLabeledItems.push(hallwayWardrobeLight);
+allRelevantLights.push(hallwayWardrobeLight);
+let windowContactHallway = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Hallway', 'WindowContact', 'Fenster Flur', 25);
+windowContactHallway.start();
+allLabeledItems.push(windowContactHallway);
+allWindows.push(windowContactHallway);
+let thermostatHallway1 = new MaxThermostat_1.MaxThermostat('Gnd', 'Hallway', 'Thermostat1', 'Thermostat Flur vorne', 32, []);
+thermostatHallway1.start();
+thermostatHallway1.setPresetTemperature(19.0);
+allLabeledItems.push(thermostatHallway1);
+allThermostatItems.push(thermostatHallway1);
+let thermostatHallway2 = new MaxThermostat_1.MaxThermostat('Gnd', 'Hallway', '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');
 kitchenWindowLight.start();
 allLabeledItems.push(kitchenWindowLight);
+allRelevantLights.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');
 kitchenCeilingLight.start();
 allLabeledItems.push(kitchenCeilingLight);
+allRelevantLights.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');
 bedRoomWolfgangsSide.start();
 allLabeledItems.push(bedRoomWolfgangsSide);
+allRelevantLights.push(bedRoomWolfgangsSide);
 let bedRoomWolfgangBedLight = new HueColorBulbItem_1.HueColorBulbItem('1st', 'BedRoom', 'WolfgangBedLight', 'Bettlicht', 16);
 bedRoomWolfgangBedLight.start();
 allLabeledItems.push(bedRoomWolfgangBedLight);
+allRelevantLights.push(bedRoomWolfgangBedLight);
 let bedRoomWolfgangBedLightDimmerAdaptor = new DimmerAdaptor_1.DimmerAdaptor('1st', 'BedRoom', 'WolfgangBedLight');
 bedRoomWolfgangBedLightDimmerAdaptor.start();
 let touchSwitchMultiButtonThing = new TouchSwitchMultiButtonThing_1.TouchSwitchMultiButtonThing('1st', 'Bedroom', 'Wolfgang', [new TouchSwitchMultiButtonThing_1.TouchSwitchButtonSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic())]);
@@ -151,19 +217,31 @@ touchSwitchMultiButtonThing.start();
 let bedRoomPattysSide = new M433SwitchItem_1.M433SwitchItem('1st', 'BedRoom', 'PattysSide', 'Pattys Seite Schlafzimmer', '13980756 24 1', '13980753 24 1');
 bedRoomPattysSide.start();
 allLabeledItems.push(bedRoomPattysSide);
+allRelevantLights.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');
 bedRoomWindowLight.start();
 allLabeledItems.push(bedRoomWindowLight);
+allRelevantLights.push(bedRoomWindowLight);
+// MySwitchTHing
+let mySwitchThingWolfgang = new MySwitchThing_1.MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [
+    new MySwitchThing_1.MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
+    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/1'),
+    new MySwitchThing_1.MySwitchSingleItem('IoT/InsLeere/2'),
+]);
+mySwitchThingWolfgang.start();
 let windowContactBedroomStreet1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17);
 windowContactBedroomStreet1st.start();
 allLabeledItems.push(windowContactBedroomStreet1st);
+allWindows.push(windowContactBedroomStreet1st);
 let windowContact1BedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContact1Garden', 'Fenster Schlafzimmer 1 Garten', 18);
 windowContact1BedroomGarden1st.start();
 allLabeledItems.push(windowContact1BedroomGarden1st);
+allWindows.push(windowContact1BedroomGarden1st);
 let windowContact2BedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContact2Garden', 'Fenster Schlafzimmer 2 Garten', 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);
@@ -211,6 +289,7 @@ 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);
@@ -227,6 +306,7 @@ thermostatBathroomGndCron.start();
 let windowContactBathroom1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bathroom', 'WindowContact', 'Fenster 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);
@@ -243,15 +323,19 @@ thermostatBathroom1stCron.start();
 let windowContactKitchen1 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact1', 'Fenster Küche Garten', 11);
 windowContactKitchen1.start();
 allLabeledItems.push(windowContactKitchen1);
+allWindows.push(windowContactKitchen1);
 let windowContactKitchen2 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact2', 'Fenster Küche Terassentür Garten', 10);
 windowContactKitchen2.start();
 allLabeledItems.push(windowContactKitchen2);
+allWindows.push(windowContactKitchen2);
 let windowContactKitchen3 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact3', 'Fenster Küche Straße 1', 12);
 windowContactKitchen3.start();
 allLabeledItems.push(windowContactKitchen3);
+allWindows.push(windowContactKitchen3);
 let windowContactKitchen4 = new MaxWindowContact_1.MaxWindowContact('Gnd', 'Kitchen', 'WindowContact4', 'Fenster Küche Straße 2', 13);
 windowContactKitchen4.start();
 allLabeledItems.push(windowContactKitchen4);
+allWindows.push(windowContactKitchen4);
 let thermostatKitchen = new MaxThermostat_1.MaxThermostat('Gnd', 'Kitchen', 'Thermostat', 'Thermostat Küche', 14, [
     windowContactKitchen1, windowContactKitchen2, windowContactKitchen3, windowContactKitchen4
 ]);
@@ -281,6 +365,9 @@ allLabeledItems.push(relayBox);
 let heatingSceneAll = new HeatingScene_1.HeatingScene('Gnd', 'House', 'Heatings', 'Alle Heizungen', allThermostatItems);
 heatingSceneAll.start();
 // ----------------------------------------------------------------------------------------------------------
+let twoLedSignal1 = new TwoLedSignal_1.TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger', allRelevantLights, "OFF", "ON", allWindows, "CLOSED", "OPEN");
+twoLedSignal1.start();
+// ----------------------------------------------------------------------------------------------------------
 let testFourButton = new HomematicFourButtonThing_1.HomematicFourButtonThing('Gnd', 'Hallway', 'TestButton', 9, [
     new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/Testlight/dimmerIn'),
     new HomematicFourButtonThing_1.HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/DeskLight/timerIn'),

homekit.json

@@ -105,7 +105,7 @@
     },
     "1st_Matthias_WindowContact": {
         "id": "1st_Matthias_WindowContact",
-        "name": "Fenster",
+        "name": "Fenster Matthias",
         "service": "ContactSensor",
         "topic": {
             "statusContactSensorState": "dispatcher_ng/items/1st/Matthias/WindowContact/state/feedback"
@@ -208,6 +208,39 @@
             "saturationFactor": 1
         }
     },
+    "Gnd_DiningRoom_WindowContact1": {
+        "id": "Gnd_DiningRoom_WindowContact1",
+        "name": "Fenster Esszimmer Straße links",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/DiningRoom/WindowContact1/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_DiningRoom_WindowContact2": {
+        "id": "Gnd_DiningRoom_WindowContact2",
+        "name": "Fenster Esszimmer Straße rechts",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/DiningRoom/WindowContact2/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_DiningRoom_Thermostat": {
+        "id": "Gnd_DiningRoom_Thermostat",
+        "name": "Thermostat Esszimmer",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature/feedback"
+        },
+        "payload": {}
+    },
     "Gnd_LivingRoom_LargeLight": {
         "id": "Gnd_LivingRoom_LargeLight",
         "name": "große Lampe Wohnzimmer",
@@ -276,6 +309,39 @@
         },
         "config": {}
     },
+    "Gnd_LivingRoom_WindowContact1": {
+        "id": "Gnd_LivingRoom_WindowContact1",
+        "name": "Fenster Wohnzimmer Garten rechts",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/LivingRoom/WindowContact1/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_LivingRoom_WindowContact2": {
+        "id": "Gnd_LivingRoom_WindowContact2",
+        "name": "Fenster Wohnzimmer Garten links",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/LivingRoom/WindowContact2/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_LivingRoom_Thermostat": {
+        "id": "Gnd_LivingRoom_Thermostat",
+        "name": "Thermostat Wohnzimmer",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature/feedback"
+        },
+        "payload": {}
+    },
     "Gnd_Hallway_DeskLight": {
         "id": "Gnd_Hallway_DeskLight",
         "name": "Schreibtischlampe Flur",
@@ -327,6 +393,39 @@
         },
         "config": {}
     },
+    "Gnd_Hallway_WindowContact": {
+        "id": "Gnd_Hallway_WindowContact",
+        "name": "Fenster Flur",
+        "service": "ContactSensor",
+        "topic": {
+            "statusContactSensorState": "dispatcher_ng/items/Gnd/Hallway/WindowContact/state/feedback"
+        },
+        "payload": {
+            "onContactDetected": "CLOSED"
+        }
+    },
+    "Gnd_Hallway_Thermostat1": {
+        "id": "Gnd_Hallway_Thermostat1",
+        "name": "Thermostat Flur vorne",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature/feedback"
+        },
+        "payload": {}
+    },
+    "Gnd_Hallway_Thermostat2": {
+        "id": "Gnd_Hallway_Thermostat2",
+        "name": "Thermostat Flur hinten",
+        "service": "Thermostat",
+        "topic": {
+            "setTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature",
+            "statusTargetTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature/feedback",
+            "statusCurrentTemperature": "dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature/feedback"
+        },
+        "payload": {}
+    },
     "Gnd_Kitchen_WindowLight": {
         "id": "Gnd_Kitchen_WindowLight",
         "name": "Fensterbanklicht Küche",

openhab.items

@@ -6,19 +6,32 @@ Number Preset_1st_Anna_Thermostat "Preset_Thermostat Anna [%.1f °C]" {mqtt=">[l
 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_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_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]"}
-Contact 1st_Matthias_WindowContact "Fenster" {mqtt="<[localbroker:dispatcher_ng/items/1st/Matthias/WindowContact/state/feedback:state:default]"}
+Contact 1st_Matthias_WindowContact "Fenster Matthias" {mqtt="<[localbroker:dispatcher_ng/items/1st/Matthias/WindowContact/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]"}
 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_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_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]"}
 
+Contact Gnd_DiningRoom_WindowContact1 "Fenster Esszimmer Straße links" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/WindowContact1/state/feedback:state:default]"}
+Contact Gnd_DiningRoom_WindowContact2 "Fenster Esszimmer Straße rechts" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/WindowContact2/state/feedback:state:default]"}
+Number Gnd_DiningRoom_Thermostat "Thermostat Esszimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/temperature/feedback:state:default]"}
+Number Preset_Gnd_DiningRoom_Thermostat "Preset_Thermostat Esszimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/DiningRoom/Thermostat/presetTemperature/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]"}
 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]"}
 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]"}
 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]"}
+Contact Gnd_LivingRoom_WindowContact1 "Fenster Wohnzimmer Garten rechts" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/WindowContact1/state/feedback:state:default]"}
+Contact Gnd_LivingRoom_WindowContact2 "Fenster Wohnzimmer Garten links" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/WindowContact2/state/feedback:state:default]"}
+Number Gnd_LivingRoom_Thermostat "Thermostat Wohnzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/temperature/feedback:state:default]"}
+Number Preset_Gnd_LivingRoom_Thermostat "Preset_Thermostat Wohnzimmer [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/LivingRoom/Thermostat/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/LivingRoom/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_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_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]"}
+Contact Gnd_Hallway_WindowContact "Fenster Flur" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Hallway/WindowContact/state/feedback:state:default]"}
+Number Gnd_Hallway_Thermostat1 "Thermostat Flur vorne [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/temperature/feedback:state:default]"}
+Number Preset_Gnd_Hallway_Thermostat1 "Preset_Thermostat Flur vorne [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat1/presetTemperature/feedback:state:default]"}
+Number Gnd_Hallway_Thermostat2 "Thermostat Flur hinten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/temperature/feedback:state:default]"}
+Number Preset_Gnd_Hallway_Thermostat2 "Preset_Thermostat Flur hinten [%.1f °C]" {mqtt=">[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/presetTemperature:command:*:default],<[localbroker:dispatcher_ng/items/Gnd/Hallway/Thermostat2/presetTemperature/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_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]"}
 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]"}

src/AItem.ts

@@ -12,6 +12,10 @@ export interface HasStateAndFeedbackTopic extends HasStateTopic {
     getStateFeedbackTopic() : string
 }
 
+export interface HasFeedbackTopic {
+    getStateFeedbackTopic() : string
+}
+
 export interface HasInTopic {
     getInTopic() : string
 }

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 } from './AItem'
 
-export class MaxWindowContact extends AHomegearItem implements Disabler {
+export class MaxWindowContact extends AHomegearItem implements Disabler, HasFeedbackTopic {
     private deviceFeedbackTopic: string
     private stateFeedbackTopic: string
     private stateTopic: string

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':
+            case 'PRESS_CONT':
+                mqttHandler.send(this.actionTopic, 'LONG_HOLD', true)
+                break
+            case 'PRESS_LONG_RELEASE':
+                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/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

@@ -45,7 +45,7 @@ export class UrlSwitchItem extends AItem implements HasStateAndFeedbackTopic {
         mqttHandler.send(this.stateFeedbackTopic, this.state);
         if (this.state != this.oldState) {                
             if (this.state == 'ON') {
-                http.get(this.onUrl)
+                http.get(this.onUrl,)
             } else {
                 http.get(this.offUrl)
             }

src/main.ts

@@ -4,7 +4,7 @@ import * as config from './config'
 import * as logger from './log'
 import { mqttHandler } from './MqttDispatcher'
 
-import { AItem, HasInTopic } from './AItem'
+import { AItem, HasInTopic, HasFeedbackTopic, HasStateAndFeedbackTopic } from './AItem'
 import { HomekitExportType, ExportType } from './Export'
 import { M433SwitchItem } from './M433SwitchItem'
 import { HomematicFourButtonThing, HomematicFourButtonSingleItem } from './HomematicFourButtonThing'
@@ -23,12 +23,17 @@ import { HueColorBulbItem } from './HueColorBulbItem'
 import { TouchSwitchMultiButtonThing, TouchSwitchButtonSingleItem } from './TouchSwitchMultiButtonThing'
 import { RelayBoxThing } from './RelayBox'
 import { HeatingScene } from './HeatingScene'
+import { TwoLedSignal } from './TwoLedSignal'
+import { MySwitchThing, MySwitchSingleItem } from './MySwitchThing'
 
 
 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()
+
 
 // Anna -----------------------------------------------------------------------------------------------------
 // Anna Aquarium                 14665044 24 1         14665041 24 1
@@ -51,11 +56,12 @@ aquariumLightCron.start()
 let annaBedLight = new M433SwitchItem('1st', 'Anna', 'BedLight', 'Bettlicht Anna', '14668116 24 1', '14668113 24 1')
 annaBedLight.start()
 allLabeledItems.push(annaBedLight)
-
+allRelevantLights.push(annaBedLight)
 
 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()
@@ -81,95 +87,161 @@ thermostatAnna1stCron.start()
 let matthiasStandLights = new M433SwitchItem('1st', 'Matthias', 'StandLight', 'Stehlampen Matthias', '7 24 1', '6 24 1')
 matthiasStandLights.start()
 allLabeledItems.push(matthiasStandLights)
+allRelevantLights.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')
 matthiasBedLight.start()
 allLabeledItems.push(matthiasBedLight)
+allRelevantLights.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')
 matthiasSpeaker.start()
 allLabeledItems.push(matthiasSpeaker)
+allRelevantLights.push(matthiasSpeaker)
 
-let windowContactMatthias = new MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Fenster', 24)
+let windowContactMatthias = new MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Fenster 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')
 diningRoomSmallLight.start()
 allLabeledItems.push(diningRoomSmallLight)
+allRelevantLights.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')
 diningRoomStandLight.start()
 allLabeledItems.push(diningRoomStandLight)
+allRelevantLights.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')
 diningRoomCupboardLight.start()
 allLabeledItems.push(diningRoomCupboardLight)
+allRelevantLights.push(diningRoomCupboardLight)
 
 // Esszimmer Regallicht
 let diningRoomShelfLight = new UrlSwitchItem('Gnd', 'DiningRoom', 'ShelfLight', 'Regallicht Esszimmer', 'http://regallampe/dv?dv=1023', 'http://regallampe/dv?dv=0')
 diningRoomShelfLight.start()
 allLabeledItems.push(diningRoomShelfLight)
+allRelevantLights.push(diningRoomShelfLight)
 
 let diningRoomNaehkaestchenLight = new HueColorBulbItem('Gnd', 'DiningRoom', 'NaehkaestchenLight', 'Lampe Naehkaestchen', 15)
 diningRoomNaehkaestchenLight.start()
 allLabeledItems.push(diningRoomNaehkaestchenLight)
+allRelevantLights.push(diningRoomNaehkaestchenLight)
+
+let windowContactDiningRoom1 = new MaxWindowContact('Gnd', 'DiningRoom', 'WindowContact1', 'Fenster Esszimmer Straße links', 26)
+windowContactDiningRoom1.start()
+allLabeledItems.push(windowContactDiningRoom1)
+allWindows.push(windowContactDiningRoom1)
+let windowContactDiningRoom2 = new MaxWindowContact('Gnd', 'DiningRoom', 'WindowContact2', 'Fenster Esszimmer Straße rechts', 27)
+windowContactDiningRoom2.start()
+allLabeledItems.push(windowContactDiningRoom2)
+allWindows.push(windowContactDiningRoom2)
+
+let thermostatDiningRoom = new MaxThermostat('Gnd', 'DiningRoom', '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')
 livingRoomLargeLight.start()
 allLabeledItems.push(livingRoomLargeLight)
+allRelevantLights.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')
 livingRoomSmallLight.start()
 allLabeledItems.push(livingRoomSmallLight)
+allRelevantLights.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')
 livingRoomStars.start()
 allLabeledItems.push(livingRoomStars)
+allRelevantLights.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')
 livingRoomStandLight.start()
 allLabeledItems.push(livingRoomStandLight)
+allRelevantLights.push(livingRoomStandLight)
 
+let windowContactLivingRoom1 = new MaxWindowContact('Gnd', 'LivingRoom', 'WindowContact1', 'Fenster Wohnzimmer Garten rechts', 28)
+windowContactLivingRoom1.start()
+allLabeledItems.push(windowContactLivingRoom1)
+allWindows.push(windowContactLivingRoom1)
+let windowContactLivingRoom2 = new MaxWindowContact('Gnd', 'LivingRoom', 'WindowContact2', 'Fenster Wohnzimmer Garten links', 29)
+windowContactLivingRoom2.start()
+allLabeledItems.push(windowContactLivingRoom2)
+allWindows.push(windowContactLivingRoom2)
+
+let thermostatLivingRoom = new MaxThermostat('Gnd', 'LivingRoom', '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')
 hallwayDeskLight.start()
 allLabeledItems.push(hallwayDeskLight)
+allRelevantLights.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')
 hallwayStandLight.start()
 allLabeledItems.push(hallwayStandLight)
+allRelevantLights.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')
 hallwayWardrobeLight.start()
 allLabeledItems.push(hallwayWardrobeLight)
+allRelevantLights.push(hallwayWardrobeLight)
 
+let windowContactHallway = new MaxWindowContact('Gnd', 'Hallway', 'WindowContact', 'Fenster Flur', 25)
+windowContactHallway.start()
+allLabeledItems.push(windowContactHallway)
+allWindows.push(windowContactHallway)
+
+let thermostatHallway1 = new MaxThermostat('Gnd', 'Hallway', 'Thermostat1', 'Thermostat Flur vorne', 32, [])
+thermostatHallway1.start()
+thermostatHallway1.setPresetTemperature(19.0)
+allLabeledItems.push(thermostatHallway1)
+allThermostatItems.push(thermostatHallway1)
+
+let thermostatHallway2 = new MaxThermostat('Gnd', 'Hallway', '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')
 kitchenWindowLight.start()
 allLabeledItems.push(kitchenWindowLight)
+allRelevantLights.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')
 kitchenCeilingLight.start()
 allLabeledItems.push(kitchenCeilingLight)
+allRelevantLights.push(kitchenCeilingLight)
 
 
 // Schlafzimmer ---------------------------------------------------------------------------------------------
@@ -177,10 +249,12 @@ allLabeledItems.push(kitchenCeilingLight)
 let bedRoomWolfgangsSide = new M433SwitchItem('1st', 'BedRoom', 'WolfgangsSide', 'Wolfgangs Seite Schlafzimmer', '13976916 24 1', '13976913 24 1')
 bedRoomWolfgangsSide.start()
 allLabeledItems.push(bedRoomWolfgangsSide)
+allRelevantLights.push(bedRoomWolfgangsSide)
 
 let bedRoomWolfgangBedLight = new HueColorBulbItem('1st', 'BedRoom', 'WolfgangBedLight', 'Bettlicht', 16)
 bedRoomWolfgangBedLight.start()
 allLabeledItems.push(bedRoomWolfgangBedLight)
+allRelevantLights.push(bedRoomWolfgangBedLight)
 
 let bedRoomWolfgangBedLightDimmerAdaptor = new DimmerAdaptor('1st', 'BedRoom', 'WolfgangBedLight')
 bedRoomWolfgangBedLightDimmerAdaptor.start()
@@ -193,23 +267,35 @@ touchSwitchMultiButtonThing.start()
 let bedRoomPattysSide = new M433SwitchItem('1st', 'BedRoom', 'PattysSide', 'Pattys Seite Schlafzimmer', '13980756 24 1', '13980753 24 1')
 bedRoomPattysSide.start()
 allLabeledItems.push(bedRoomPattysSide)
+allRelevantLights.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')
 bedRoomWindowLight.start()
 allLabeledItems.push(bedRoomWindowLight)
+allRelevantLights.push(bedRoomWindowLight)
 
+// MySwitchTHing
+let mySwitchThingWolfgang = new MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [ 
+  new MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
+  new MySwitchSingleItem('IoT/InsLeere/1'),
+  new MySwitchSingleItem('IoT/InsLeere/2'),
+])
+mySwitchThingWolfgang.start()
 
 
 let windowContactBedroomStreet1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17)
 windowContactBedroomStreet1st.start()
 allLabeledItems.push(windowContactBedroomStreet1st)
+allWindows.push(windowContactBedroomStreet1st)
 let windowContact1BedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContact1Garden', 'Fenster Schlafzimmer 1 Garten', 18)
 windowContact1BedroomGarden1st.start()
 allLabeledItems.push(windowContact1BedroomGarden1st)
+allWindows.push(windowContact1BedroomGarden1st)
 let windowContact2BedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContact2Garden', 'Fenster Schlafzimmer 2 Garten', 22)
 windowContact2BedroomGarden1st.start()
 allLabeledItems.push(windowContact2BedroomGarden1st)
+allWindows.push(windowContact2BedroomGarden1st)
 
 let thermostatBedroom1st = new MaxThermostat('1st', 'Bedroom', 'Thermostat', 'Thermostat Schlafzimmer', 19, [windowContact1BedroomGarden1st, windowContact2BedroomGarden1st, windowContactBedroomStreet1st])
 thermostatBedroom1st.start()
@@ -274,6 +360,7 @@ 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()
@@ -294,6 +381,7 @@ thermostatBathroomGndCron.start()
 let windowContactBathroom1st = new MaxWindowContact('1st', 'Bathroom', 'WindowContact', 'Fenster 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()
@@ -315,15 +403,19 @@ thermostatBathroom1stCron.start()
 let windowContactKitchen1 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact1', 'Fenster Küche Garten', 11)
 windowContactKitchen1.start()
 allLabeledItems.push(windowContactKitchen1)
+allWindows.push(windowContactKitchen1)
 let windowContactKitchen2 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact2', 'Fenster Küche Terassentür Garten', 10)
 windowContactKitchen2.start()
 allLabeledItems.push(windowContactKitchen2)
+allWindows.push(windowContactKitchen2)
 let windowContactKitchen3 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact3', 'Fenster Küche Straße 1', 12)
 windowContactKitchen3.start()
 allLabeledItems.push(windowContactKitchen3)
+allWindows.push(windowContactKitchen3)
 let windowContactKitchen4 = new MaxWindowContact('Gnd', 'Kitchen', 'WindowContact4', 'Fenster 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, [
   windowContactKitchen1, windowContactKitchen2, windowContactKitchen3, windowContactKitchen4])
@@ -360,6 +452,14 @@ allLabeledItems.push(relayBox)
 let heatingSceneAll = new HeatingScene('Gnd', 'House', 'Heatings', 'Alle Heizungen', allThermostatItems)
 heatingSceneAll.start()
 
+
+// ----------------------------------------------------------------------------------------------------------
+let twoLedSignal1 = new TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger',
+  allRelevantLights, "OFF", "ON",
+  allWindows, "CLOSED", "OPEN")
+twoLedSignal1.start()
+
+
 // ----------------------------------------------------------------------------------------------------------
 let testFourButton = new HomematicFourButtonThing('Gnd', 'Hallway', 'TestButton', 9, [
   new HomematicFourButtonSingleItem('dispatcher_ng/items/Gnd/Hallway/Testlight/dimmerIn'),
@@ -435,4 +535,3 @@ fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'))
 mqttHandler.exec()
 logger.info("Dispatcher running")
 
-