From e88f9d225c93aee3e9c27b61dcf9dd26bec4660b Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Fri, 12 Jan 2018 19:39:04 +0100 Subject: [PATCH] fix MaxSwitch --- dist/MaxEcoSwitch.js | 18 +++++++++--------- dist/main.js | 2 +- src/MaxEcoSwitch.ts | 24 ++++++++++++------------ src/main.ts | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dist/MaxEcoSwitch.js b/dist/MaxEcoSwitch.js index 7e2373f..ed3da35 100644 --- a/dist/MaxEcoSwitch.js +++ b/dist/MaxEcoSwitch.js @@ -5,9 +5,9 @@ const AHomematicItem_1 = require("./AHomematicItem"); class MaxEcoSwitch extends AHomematicItem_1.AHomematicItem { constructor(floor, room, item, label, hmId, mainScene, ecoScene) { super(floor, room, item, label, hmId); - this.buttonTopic1 = `${this.deviceTopicPre}/1/PRESS`; - this.buttonTopic2 = `${this.deviceTopicPre}/2/PRESS`; - this.subscribeTopics = [this.buttonTopic1, this.buttonTopic2]; + this.mainButtonTopic = `${this.deviceTopicPre}/1/PRESS`; + this.ecoButtonTopic = `${this.deviceTopicPre}/2/PRESS`; + this.subscribeTopics = [this.mainButtonTopic, this.ecoButtonTopic]; this.mainTopic = mainScene.getStateTopic(); this.ecoTopic = ecoScene.getStateTopic(); this.state = 'OFF'; @@ -15,26 +15,26 @@ class MaxEcoSwitch extends AHomematicItem_1.AHomematicItem { processMessage(topic, payload) { switch (this.state) { case 'OFF': - if (topic == this.mainTopic) { + if (topic == this.mainButtonTopic) { this.state = 'ON'; } - else if (topic == this.ecoTopic) { + else if (topic == this.ecoButtonTopic) { this.state = 'ECO'; } break; case 'ON': - if (topic == this.mainTopic) { + if (topic == this.mainButtonTopic) { this.state = 'OFF'; } - else if (topic == this.ecoTopic) { + else if (topic == this.ecoButtonTopic) { this.state = 'ECO'; } break; case 'ECO': - if (topic == this.mainTopic) { + if (topic == this.mainButtonTopic) { this.state = 'ON'; } - else if (topic == this.ecoTopic) { + else if (topic == this.ecoButtonTopic) { this.state = 'OFF'; } break; diff --git a/dist/main.js b/dist/main.js index dad15d6..330b4b3 100644 --- a/dist/main.js +++ b/dist/main.js @@ -120,7 +120,7 @@ let ecoLightScene = new Scene_1.LightScene('Gnd', 'Hallway', 'EcoLight', 'EcoLig ]); ecoLightScene.start(); allLabeledItems.push(ecoLightScene); -let ecoSwitch = new MaxEcoSwitch_1.MaxEcoSwitch('Gnd', 'Hallway', 'EcoSwitch', 'EcoSwitch', 5, dayLightScene, 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, diff --git a/src/MaxEcoSwitch.ts b/src/MaxEcoSwitch.ts index af7419b..0b41d8a 100644 --- a/src/MaxEcoSwitch.ts +++ b/src/MaxEcoSwitch.ts @@ -6,18 +6,18 @@ import { LightScene } from './Scene' export class MaxEcoSwitch extends AHomematicItem { private ecoTopic: string private mainTopic: string - private buttonTopic2: string - private buttonTopic1: string + private mainButtonTopic: string + private ecoButtonTopic: string private state: string constructor(floor: string, room: string, item: string, label: string, hmId: number, mainScene: LightScene, ecoScene: LightScene) { super(floor, room, item, label, hmId) - this.buttonTopic1 = `${this.deviceTopicPre}/1/PRESS` - this.buttonTopic2 = `${this.deviceTopicPre}/2/PRESS` + this.mainButtonTopic = `${this.deviceTopicPre}/1/PRESS` + this.ecoButtonTopic = `${this.deviceTopicPre}/2/PRESS` - this.subscribeTopics = [ this.buttonTopic1, this.buttonTopic2 ] + this.subscribeTopics = [ this.mainButtonTopic, this.ecoButtonTopic ] this.mainTopic = mainScene.getStateTopic() this.ecoTopic = ecoScene.getStateTopic() @@ -30,23 +30,23 @@ export class MaxEcoSwitch extends AHomematicItem { processMessage(topic: string, payload: string) : void { switch(this.state) { case 'OFF': - if (topic == this.mainTopic) { + if (topic == this.mainButtonTopic) { this.state = 'ON' - } else if (topic == this.ecoTopic) { + } else if (topic == this.ecoButtonTopic) { this.state = 'ECO' } break case 'ON': - if (topic == this.mainTopic) { + if (topic == this.mainButtonTopic) { this.state = 'OFF' - } else if (topic == this.ecoTopic) { + } else if (topic == this.ecoButtonTopic) { this.state = 'ECO' } break case 'ECO': - if (topic == this.mainTopic) { + if (topic == this.mainButtonTopic) { this.state = 'ON' - } else if (topic == this.ecoTopic) { + } else if (topic == this.ecoButtonTopic) { this.state = 'OFF' } break @@ -63,4 +63,4 @@ export class MaxEcoSwitch extends AHomematicItem { break } } -} \ No newline at end of file +} diff --git a/src/main.ts b/src/main.ts index 3e0cf22..7d2c4d2 100644 --- a/src/main.ts +++ b/src/main.ts @@ -159,7 +159,7 @@ let ecoLightScene = new LightScene('Gnd', 'Hallway', 'EcoLight', 'EcoLight', ecoLightScene.start() allLabeledItems.push(ecoLightScene) -let ecoSwitch = new MaxEcoSwitch('Gnd', 'Hallway', 'EcoSwitch', 'EcoSwitch', 5, dayLightScene, ecoLightScene) +let ecoSwitch = new MaxEcoSwitch('Gnd', 'Hallway', 'EcoSwitch', 'EcoSwitch', 6, dayLightScene, ecoLightScene) ecoSwitch.start() let morningLightScene = new LightScene('Gnd', 'Hallway', 'MorningLight', 'MorningLight',