wn/dispatcher_ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

off

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2018-05-25 00:08:19 +02:00
parent e413f2871c
commit 4d0b708e4a
4 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/SwitchAdaptor.ts → src/SwitchOffAdaptor.ts
View File

@ -2,8 +2,7 @@ import { AItem, HasInTopic } from './AItem'
import * as logger from './log'
import { mqttHandler } from './MqttDispatcher'
export class SwitchAdaptor extends AItem implements HasInTopic {
private state: string
export class SwitchOffAdaptor extends AItem implements HasInTopic {
private inTopic: string
private actionStateTopic: string
@ -12,7 +11,6 @@ export class SwitchAdaptor extends AItem implements HasInTopic {
this.actionStateTopic = `${this.topicFirstPart}/state`
this.inTopic = `${this.topicFirstPart}/in`
this.subscribeTopics = [ this.inTopic ]
this.state = 'OFF'
}
getInTopic() : string {
@ -21,19 +19,8 @@ export class SwitchAdaptor extends AItem implements HasInTopic {
processMessage(topic: string, payload: string) : void {
switch (topic) {
case this.inTopic:
switch (payload) {
case 'SHORT':
if (this.state == 'OFF') {
this.state = 'ON'
} else {
this.state = 'OFF'
}
mqttHandler.send(this.actionStateTopic, this.state, true)
break
}
break
if ((topic == this.inTopic) && (payload == 'SHORT')) {
mqttHandler.send(this.actionStateTopic, 'OFF', true)
}
}
}

16
src/main.ts
View File

@ -10,7 +10,7 @@ import { M433SwitchItem } from './M433SwitchItem'
import { HomematicFourButtonThing, HomematicFourButtonSingleItem } from './HomematicFourButtonThing'
import { DimmerAdaptor } from './DimmerAdaptor'
import { TimerAdaptor } from './TimerAdaptor'
import { SwitchAdaptor } from './SwitchAdaptor'
import { SwitchOffAdaptor } from './SwitchOffAdaptor'
import { HomematicDimmerItem } from './HomematicDimmerItem'
import { HomematicSwitchItem } from './HomematicSwitchItem'
import { Forwarder } from './Forwarder'
@ -463,7 +463,7 @@ basementSmallLight.on('somethingChanged', () => {
if ((basementLargeLight.getState() == 'OFF') && (basementSmallLight.getState() == 'ON')) {
setTimeout(() => {
mqttHandler.send(basementSmallLight.getStateTopic(), 'OFF')
}, (3 * 1000))
}, (3 * 60 * 1000))
} else if ((basementLargeLight.getState() == 'ON') && (basementSmallLight.getState() == 'OFF')) {
mqttHandler.send(basementLargeLight.getStateTopic(), 'OFF')
}
@ -483,15 +483,15 @@ basementLargeLight.on('somethingChanged', () => {
let basementForwarder = new Forwarder('Base', 'All', 'Forwarder', 'state', 'BasementForwarder', [
basementLargeLight.getState(),
basementSmallLight.getState(),
workshopLight.getState()
basementLargeLight.getStateTopic(),
basementSmallLight.getStateTopic(),
workshopLight.getStateTopic()
])
basementForwarder.start()
let basementForwarderSwitchAdaptor = new SwitchAdaptor('Base', 'All', 'Forwarder')
basementForwarderSwitchAdaptor.start()
let basementForwarderSwitchOffAdaptor = new SwitchOffAdaptor('Base', 'All', 'Forwarder')
basementForwarderSwitchOffAdaptor.start()
// ----------------------------------------------------------------------------------------------------------
let twoLedSignal1 = new TwoLedSignal('Gnd', 'Hallway', 'TwoLedSignal1', 'Licht- und Fenster-Anzeiger',
@ -502,7 +502,7 @@ twoLedSignal1.start()
// MySwitchTHing
let mySwitchThingWolfgang = new MySwitchThing('1st', 'BedRoom', 'WolfgangsSwitch', [
new MySwitchSingleItem(bedRoomWolfgangBedLightDimmerAdaptor.getInTopic()),
new MySwitchSingleItem(basementForwarderSwitchAdaptor.getInTopic()),
new MySwitchSingleItem(basementForwarderSwitchOffAdaptor.getInTopic()),
new MySwitchSingleItem('IoT/InsLeere/2'),
])
mySwitchThingWolfgang.start()