fix SimpleTopic and remove homekit and openhab stuff

dist/SimpleTopicSwitchItem.js

@@ -40,10 +40,10 @@ class SimpleTopicSwitchItem extends AItem_1.AItem {
                 MqttDispatcher_1.mqttHandler.send(this.stateFeedbackTopic, this.state);
                 if (this.state != this.oldState) {
                     if (this.state == 'ON') {
-                        MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'true');
+                        MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'ON');
                     }
                     else {
-                        MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'false');
+                        MqttDispatcher_1.mqttHandler.send(this.actionTopic, 'OFF');
                     }
                     this.oldState = this.state;
                 }

dist/main.js

@@ -478,36 +478,6 @@ let watchdogTimer = setInterval(() => {
     MqttDispatcher_1.mqttHandler.send(config.dict.watchdogTopic, `${config.dict.watchdogMessage} ${watchdogCounter}`);
 }, config.dict.watchdogInterval);
 // ----------------------------------------------------------------------------------------------------------
-// Homekit export
-let homekitObject = {};
-let openhabList = [];
-// logger.info("allLabeledItems")
-// logger.info(JSON.stringify(allLabeledItems))
-allLabeledItems.forEach((item) => {
-    let exportData = item.exportItem();
-    if (exportData != null) {
-        if ('id' in exportData['homekit']) {
-            homekitObject[exportData['homekit']['id']] = exportData['homekit']['object'];
-        }
-        if (exportData['openhab'] instanceof Array) {
-            let da = exportData['openhab'];
-            da.forEach((o) => openhabList.push(o));
-        }
-        else {
-            let da = exportData['openhab'];
-            openhabList.push(da);
-        }
-        // logger.info("openHabList")
-        // logger.info(JSON.stringify(openhabList))
-    }
-});
-let heatingMainSwitchExport = MaxThermostat_1.MaxThermostat.exportHeatingMainSwitchItem();
-if (heatingMainSwitchExport != null) {
-    let da = heatingMainSwitchExport['openhab'];
-    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() };

smartclient.json

@@ -48,6 +48,11 @@
                     "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state",
                     "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state/feedback"
                 },
+                {
+                    "label": "Regallicht",
+                    "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/ShelfLight/state",
+                    "feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/ShelfLight/state/feedback"
+                },
                 {
                     "label": "Nähkästchen",
                     "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state",

src/SimpleTopicSwitchItem.ts

@@ -57,9 +57,9 @@ export class SimpleTopicSwitchItem extends AItem implements HasStateAndFeedbackT
                 mqttHandler.send(this.stateFeedbackTopic, this.state)
                 if (this.state != this.oldState) {                
                     if (this.state == 'ON') {
-                        mqttHandler.send(this.actionTopic, 'true')
+                        mqttHandler.send(this.actionTopic, 'ON')
                     } else {
-                        mqttHandler.send(this.actionTopic, 'false')
+                        mqttHandler.send(this.actionTopic, 'OFF')
                     }
                     this.oldState = this.state
                 }

src/main.ts

@@ -598,40 +598,6 @@ 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) => {