From 62303cf27e87f94d3453258249de468b41dae1b2 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 11 Apr 2018 21:28:43 +0200 Subject: [PATCH] add windowcontact matthias --- dist/main.js | 3 +++ homekit.json | 22 ++++++++++++++++++++++ openhab.items | 2 ++ src/main.ts | 4 ++++ 4 files changed, 31 insertions(+) diff --git a/dist/main.js b/dist/main.js index 7a15923..dab6c21 100644 --- a/dist/main.js +++ b/dist/main.js @@ -70,6 +70,9 @@ allLabeledItems.push(matthiasBedLight); 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); +windowContactMatthias.start(); +allLabeledItems.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'); diff --git a/homekit.json b/homekit.json index 6660112..971cf1f 100644 --- a/homekit.json +++ b/homekit.json @@ -103,6 +103,17 @@ }, "config": {} }, + "1st_Matthias_WindowContact": { + "id": "1st_Matthias_WindowContact", + "name": "Fenster", + "service": "ContactSensor", + "topic": { + "statusContactSensorState": "dispatcher_ng/items/1st/Matthias/WindowContact/state/feedback" + }, + "payload": { + "onContactDetected": "CLOSED" + } + }, "Gnd_DiningRoom_SmallLight": { "id": "Gnd_DiningRoom_SmallLight", "name": "kleine Lampe Esszimmer", @@ -621,5 +632,16 @@ }, "payload": {} }, + "Gnd_Hallway_FrontdoorContact": { + "id": "Gnd_Hallway_FrontdoorContact", + "name": "Haustür", + "service": "ContactSensor", + "topic": { + "statusContactSensorState": "dispatcher_ng/items/Gnd/Hallway/FrontdoorContact/state/feedback" + }, + "payload": { + "onContactDetected": "CLOSED" + } + }, "": {} } \ No newline at end of file diff --git a/openhab.items b/openhab.items index e5b4305..5700882 100644 --- a/openhab.items +++ b/openhab.items @@ -6,6 +6,7 @@ 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]"} 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]"} @@ -44,6 +45,7 @@ Contact Gnd_Kitchen_WindowContact3 "Fenster Küche Straße 1" {mqtt="<[localbrok Contact Gnd_Kitchen_WindowContact4 "Fenster Küche Straße 2" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Kitchen/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 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]"} +Contact Gnd_Hallway_FrontdoorContact "Haustür" {mqtt="<[localbroker:dispatcher_ng/items/Gnd/Hallway/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]"} diff --git a/src/main.ts b/src/main.ts index 082ba02..70f77b9 100644 --- a/src/main.ts +++ b/src/main.ts @@ -89,6 +89,10 @@ let matthiasSpeaker = new M433SwitchItem('1st', 'Matthias', 'Speaker', 'Lautspre matthiasSpeaker.start() allLabeledItems.push(matthiasSpeaker) +let windowContactMatthias = new MaxWindowContact('1st', 'Matthias', 'WindowContact', 'Fenster', 24) +windowContactMatthias.start() +allLabeledItems.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')