Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Wolfgang Hottgenroth
2018-04-02 20:31:18 +02:00
6 changed files with 37 additions and 2 deletions

View File

@ -1,6 +1,7 @@
import * as logger from './log'
import { mqttHandler } from './MqttDispatcher'
import { AItem } from './AItem'
import { RelayBoxExport, ExportType } from './Export'
@ -31,6 +32,10 @@ export class RelayBoxThing extends AItem {
this.oldSwitchStates = ''
}
exportItem() : ExportType|null {
return RelayBoxExport(this.stateTopicPre, this.feedbackTopicPre, this.conflictTopicPre, this.itemNames)
}
processMessage(topic: string, payload: string) {
// logger.info(`RT: ${topic}, ${payload}`)
if (topic == this.deviceStatusTopic) {