From 7ead49a67a47d3504aac331e738c61efaa0aad00 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Thu, 22 Feb 2018 17:59:05 +0100 Subject: [PATCH] Thermostat Bedroom --- dist/DimmerAdaptor.js | 3 +++ dist/main.js | 22 +++++++++++++++++++++- src/main.ts | 22 ++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dist/DimmerAdaptor.js b/dist/DimmerAdaptor.js index de07e72..5479a7e 100644 --- a/dist/DimmerAdaptor.js +++ b/dist/DimmerAdaptor.js @@ -13,6 +13,9 @@ class DimmerAdaptor extends AItem_1.AItem { this.bright = 100; this.brightDirection = -1; } + getInTopic() { + return this.inTopic; + } processMessage(topic, payload) { switch (topic) { case this.inTopic: diff --git a/dist/main.js b/dist/main.js index 131d546..9dc5a59 100644 --- a/dist/main.js +++ b/dist/main.js @@ -118,7 +118,9 @@ allLabeledItems.push(bedRoomWolfgangsSide); let bedRoomWolfgangBedLight = new HueColorBulbItem_1.HueColorBulbItem('1st', 'BedRoom', 'WolfgangBedLight', 'Bettlicht', 16); bedRoomWolfgangBedLight.start(); allLabeledItems.push(bedRoomWolfgangBedLight); -let touchSwitchMultiButtonThing = new TouchSwitchMultiButtonThing_1.TouchSwitchMultiButtonThing('1st', 'Bedroom', 'Wolfgang', [new TouchSwitchMultiButtonThing_1.TouchSwitchButtonSingleItem(bedRoomWolfgangBedLight.getStateTopic())]); +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())]); 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'); @@ -128,6 +130,24 @@ allLabeledItems.push(bedRoomPattysSide); let bedRoomWindowLight = new M433SwitchItem_1.M433SwitchItem('1st', 'BedRoom', 'WindowLight', 'Fensterbanklicht Schlafzimmer', '13979988 24 1', '13979985 24 1'); bedRoomWindowLight.start(); allLabeledItems.push(bedRoomWindowLight); +let windowContactBedroomStreet1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17); +windowContactBedroomStreet1st.start(); +allLabeledItems.push(windowContactBedroomStreet1st); +let windowContactBedroomGarden1st = new MaxWindowContact_1.MaxWindowContact('1st', 'Bedroom', 'WindowContactGarden', 'Fenster Schlafzimmer Garten', 18); +windowContactBedroomGarden1st.start(); +allLabeledItems.push(windowContactBedroomGarden1st); +let thermostatBedroom1st = new MaxThermostat_1.MaxThermostat('1st', 'Bedroom', 'Thermostat', 'Thermostat Schlafzimmer', 19, [windowContactBedroomGarden1st, windowContactBedroomStreet1st]); +thermostatBedroom1st.start(); +allLabeledItems.push(thermostatBedroom1st); +let thermostatBedroom1stCron = new Cron_1.Cron('thermostatBedroom1stCron', thermostatBedroom1st, [ + { cronTime: '00 00 06 * * mon-fri', output: '21.0' }, + { cronTime: '00 00 09 * * mon-fri', output: '5.0' }, + { cronTime: '00 00 08 * * sat-sun', output: '21.0' }, + { cronTime: '00 00 11 * * sat-sun', output: '5.0' }, + { cronTime: '00 00 17 * * *', output: '21.0' }, + { cronTime: '00 59 23 * * *', output: '5.0' } +]); +thermostatBedroom1stCron.start(); // --------------------------------------------------------------------------------------------------------- let dayLightScene = new Scene_1.LightScene('Gnd', 'Hallway', 'DayLight', 'DayLight', [ kitchenWindowLight, kitchenCeilingLight, hallwayDeskLight, hallwayStandLight, hallwayWardrobeLight, diff --git a/src/main.ts b/src/main.ts index e6bafa8..08634aa 100644 --- a/src/main.ts +++ b/src/main.ts @@ -168,6 +168,28 @@ bedRoomWindowLight.start() allLabeledItems.push(bedRoomWindowLight) + +let windowContactBedroomStreet1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContactStreet', 'Fenster Schlafzimmer Strasse', 17) +windowContactBedroomStreet1st.start() +allLabeledItems.push(windowContactBedroomStreet1st) +let windowContactBedroomGarden1st = new MaxWindowContact('1st', 'Bedroom', 'WindowContactGarden', 'Fenster Schlafzimmer Garten', 18) +windowContactBedroomGarden1st.start() +allLabeledItems.push(windowContactBedroomGarden1st) + +let thermostatBedroom1st = new MaxThermostat('1st', 'Bedroom', 'Thermostat', 'Thermostat Schlafzimmer', 19, [windowContactBedroomGarden1st, windowContactBedroomStreet1st]) +thermostatBedroom1st.start() +allLabeledItems.push(thermostatBedroom1st) + +let thermostatBedroom1stCron = new Cron('thermostatBedroom1stCron', thermostatBedroom1st, [ + {cronTime: '00 00 06 * * mon-fri', output: '21.0'}, + {cronTime: '00 00 09 * * mon-fri', output: '5.0'}, + {cronTime: '00 00 08 * * sat-sun', output: '21.0'}, + {cronTime: '00 00 11 * * sat-sun', output: '5.0'}, + {cronTime: '00 00 17 * * *', output: '21.0'}, + {cronTime: '00 59 23 * * *', output: '5.0'} +]) +thermostatBedroom1stCron.start() + // --------------------------------------------------------------------------------------------------------- let dayLightScene = new LightScene('Gnd', 'Hallway', 'DayLight', 'DayLight', [