From ceeecf500920de5a8314f87ce5ab31f2a3fa752f Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 11 Jul 2018 20:35:55 +0200 Subject: [PATCH] fix SimpleTopic and remove homekit and openhab stuff --- dist/SimpleTopicSwitchItem.js | 4 ++-- dist/main.js | 30 ------------------------------ smartclient.json | 5 +++++ src/SimpleTopicSwitchItem.ts | 4 ++-- src/main.ts | 34 ---------------------------------- 5 files changed, 9 insertions(+), 68 deletions(-) diff --git a/dist/SimpleTopicSwitchItem.js b/dist/SimpleTopicSwitchItem.js index 47050bb..537bcbf 100644 --- a/dist/SimpleTopicSwitchItem.js +++ b/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; } diff --git a/dist/main.js b/dist/main.js index 3433408..7ef1859 100644 --- a/dist/main.js +++ b/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() }; diff --git a/smartclient.json b/smartclient.json index 04df979..e4ca09c 100644 --- a/smartclient.json +++ b/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", diff --git a/src/SimpleTopicSwitchItem.ts b/src/SimpleTopicSwitchItem.ts index 50cfbf4..c46d6d4 100644 --- a/src/SimpleTopicSwitchItem.ts +++ b/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 } diff --git a/src/main.ts b/src/main.ts index 2af360e..9e89000 100644 --- a/src/main.ts +++ b/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) => {