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

remove state for switch actors

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2018-09-21 13:38:11 +02:00
parent 3dc256f960
commit f98b1c2f39
4 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dist/HomematicSwitchItem.js vendored
View File

@ -31,7 +31,6 @@ class HomematicSwitchItem extends AHomegearItem_1.AHomegearItem {
this.deviceFeedbackTopic this.deviceFeedbackTopic
]; ];
this.state = 'OFF'; this.state = 'OFF';
this.oldState = undefined;
this.type = type; this.type = type;
} }
exportItem() { exportItem() {
@ -42,14 +41,11 @@ class HomematicSwitchItem extends AHomegearItem_1.AHomegearItem {
case this.stateTopic: case this.stateTopic:
this.state = payload; this.state = payload;
MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state); MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
if (this.state != this.oldState) { if (this.state == 'ON') {
if (this.state == 'ON') { MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'true');
MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'true'); }
} else {
else { MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'false');
MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'false');
}
this.oldState = this.state;
} }
break; break;
case this.deviceFeedbackTopic: case this.deviceFeedbackTopic:
@ -59,7 +55,6 @@ class HomematicSwitchItem extends AHomegearItem_1.AHomegearItem {
else { else {
this.state = 'OFF'; this.state = 'OFF';
} }
this.oldState = this.state;
MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state); MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
break; break;
} }

14
dist/M433SwitchItem.js vendored
View File

@ -26,7 +26,6 @@ class M433SwitchItem extends AItem_1.AItem {
this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`; this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`;
this.actionTopic = 'IoT/Mqtt433Gateway/Message'; this.actionTopic = 'IoT/Mqtt433Gateway/Message';
this.state = 'OFF'; this.state = 'OFF';
this.oldState = undefined;
this.onCode = onCode; this.onCode = onCode;
this.offCode = offCode; this.offCode = offCode;
this.type = type; this.type = type;
@ -37,14 +36,11 @@ class M433SwitchItem extends AItem_1.AItem {
processMessage(topic, payload) { processMessage(topic, payload) {
this.state = payload; this.state = payload;
MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state); MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
if (this.state != this.oldState) { if (this.state == 'ON') {
if (this.state == 'ON') { MqttDispatcher_1.mqttHandler.send(this.actionTopic, this.onCode);
MqttDispatcher_1.mqttHandler.send(this.actionTopic, this.onCode); }
} else {
else { MqttDispatcher_1.mqttHandler.send(this.actionTopic, this.offCode);
MqttDispatcher_1.mqttHandler.send(this.actionTopic, this.offCode);
}
this.oldState = this.state;
} }
} }
} }

13
src/HomematicSwitchItem.ts
View File

@ -46,7 +46,6 @@ export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFee
this.deviceFeedbackTopic this.deviceFeedbackTopic
] ]
this.state = 'OFF' this.state = 'OFF'
this.oldState = undefined
this.type = type this.type = type
} }
@ -59,13 +58,10 @@ export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFee
case this.stateTopic: case this.stateTopic:
this.state = payload this.state = payload
mqttHandler.send(this.stateFeedbackTopic, this.state) mqttHandler.send(this.stateFeedbackTopic, this.state)
if (this.state != this.oldState) { if (this.state == 'ON') {
if (this.state == 'ON') { mqttHandler.send(this.actionTopic, 'true')
mqttHandler.send(this.actionTopic, 'true') } else {
} else { mqttHandler.send(this.actionTopic, 'false')
mqttHandler.send(this.actionTopic, 'false')
}
this.oldState = this.state
} }
break break
case this.deviceFeedbackTopic: case this.deviceFeedbackTopic:
@ -74,7 +70,6 @@ export class HomematicSwitchItem extends AHomegearItem implements HasStateAndFee
} else { } else {
this.state = 'OFF' this.state = 'OFF'
} }
this.oldState = this.state
mqttHandler.send(this.stateFeedbackTopic, this.state) mqttHandler.send(this.stateFeedbackTopic, this.state)
break break
} }

12
src/M433SwitchItem.ts
View File

@ -41,7 +41,6 @@ export class M433SwitchItem extends AItem implements HasStateAndFeedbackTopicAnd
this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback` this.stateFeedbackTopic = `${this.topicFirstPart}/state/feedback`
this.actionTopic = 'IoT/Mqtt433Gateway/Message' this.actionTopic = 'IoT/Mqtt433Gateway/Message'
this.state = 'OFF' this.state = 'OFF'
this.oldState = undefined
this.onCode = onCode this.onCode = onCode
this.offCode = offCode this.offCode = offCode
this.type = type this.type = type
@ -54,13 +53,10 @@ export class M433SwitchItem extends AItem implements HasStateAndFeedbackTopicAnd
processMessage(topic: string, payload: string) { processMessage(topic: string, payload: string) {
this.state = payload; this.state = payload;
mqttHandler.send(this.stateFeedbackTopic, this.state); mqttHandler.send(this.stateFeedbackTopic, this.state);
if (this.state != this.oldState) { if (this.state == 'ON') {
if (this.state == 'ON') { mqttHandler.send(this.actionTopic, this.onCode);
mqttHandler.send(this.actionTopic, this.onCode); } else {
} else { mqttHandler.send(this.actionTopic, this.offCode);
mqttHandler.send(this.actionTopic, this.offCode);
}
this.oldState = this.state;
} }
} }
} }