fix SimpleTopic and remove homekit and openhab stuff

dist/HomematicSwitchItem.js

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

dist/M433SwitchItem.js

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

dist/main.js

@@ -477,36 +477,7 @@ let watchdogTimer = setInterval(() => {
     watchdogCounter += 1;
     MqttDispatcher_1.mqttHandler.send(config.dict.watchdogTopic, `${config.dict.watchdogMessage} ${watchdogCounter}`);
 }, config.dict.watchdogInterval);
-// // ----------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------
-// // Homekit export
-// let homekitObject : { [key:string]:{} } = {}
-// let openhabList : string[] = []
-// // logger.info("allLabeledItems")
-// // logger.info(JSON.stringify(allLabeledItems))
-// allLabeledItems.forEach((item: AItem) => {
-//   let exportData : ExportType|null = item.exportItem()
-//   if (exportData != null) {
-//     if ('id' in exportData['homekit']) {
-//       homekitObject[exportData['homekit']['id']] = exportData['homekit']['object']
-//     }
-//     if (exportData['openhab'] instanceof Array) {
-//       let da : string[] = exportData['openhab'] as string[]
-//       da.forEach((o: string) => openhabList.push(o))
-//     } else {
-//       let da : string = exportData['openhab'] as string
-//       openhabList.push(da)
-//     }
-//     // logger.info("openHabList")
-//     // logger.info(JSON.stringify(openhabList))
-//   }
-// })
-// let heatingMainSwitchExport : ExportType|null = MaxThermostat.exportHeatingMainSwitchItem()
-// if (heatingMainSwitchExport != null) {
-//   let da : string = heatingMainSwitchExport['openhab'] as string
-//   openhabList.push(da)
-// }
-// fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4))
-// fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'))
 let roomSwitches = {};
 allLights.forEach((item) => {
     let switchItem = { 'label': item.getLabel(), 'actionTopic': item.getStateTopic(), 'feedbackTopic': item.getStateFeedbackTopic() };

src/HomematicSwitchItem.ts

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

src/M433SwitchItem.ts

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

src/main.ts

@@ -597,41 +597,7 @@ let watchdogTimer = setInterval(() => {
 
 
 
-// // ----------------------------------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------------------------------
-// // Homekit export
-// let homekitObject : { [key:string]:{} } = {}
-// let openhabList : string[] = []
-
-// // logger.info("allLabeledItems")
-// // logger.info(JSON.stringify(allLabeledItems))
-
-// allLabeledItems.forEach((item: AItem) => {
-//   let exportData : ExportType|null = item.exportItem()
-//   if (exportData != null) {
-//     if ('id' in exportData['homekit']) {
-//       homekitObject[exportData['homekit']['id']] = exportData['homekit']['object']
-//     }
-//     if (exportData['openhab'] instanceof Array) {
-//       let da : string[] = exportData['openhab'] as string[]
-//       da.forEach((o: string) => openhabList.push(o))
-//     } else {
-//       let da : string = exportData['openhab'] as string
-//       openhabList.push(da)
-//     }
-//     // logger.info("openHabList")
-//     // logger.info(JSON.stringify(openhabList))
-//   }
-// })
-
-// let heatingMainSwitchExport : ExportType|null = MaxThermostat.exportHeatingMainSwitchItem()
-// if (heatingMainSwitchExport != null) {
-//   let da : string = heatingMainSwitchExport['openhab'] as string
-//   openhabList.push(da)
-// }
-
-// fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4))
-// fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'))
-
 
 let roomSwitches: any = {}
 allLights.forEach((item: HasStateAndFeedbackTopicAndLabelAndRoom) => {