diff --git a/dist/main.js b/dist/main.js index 3433408..32ca770 100644 --- a/dist/main.js +++ b/dist/main.js @@ -477,37 +477,36 @@ let watchdogTimer = setInterval(() => { watchdogCounter += 1; 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')); +// // ---------------------------------------------------------------------------------------------------------- +// // 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() }; 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/main.ts b/src/main.ts index 2af360e..a153a73 100644 --- a/src/main.ts +++ b/src/main.ts @@ -597,40 +597,40 @@ let watchdogTimer = setInterval(() => { -// ---------------------------------------------------------------------------------------------------------- -// Homekit export -let homekitObject : { [key:string]:{} } = {} -let openhabList : string[] = [] +// // ---------------------------------------------------------------------------------------------------------- +// // Homekit export +// let homekitObject : { [key:string]:{} } = {} +// let openhabList : string[] = [] -// logger.info("allLabeledItems") -// logger.info(JSON.stringify(allLabeledItems)) +// // 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)) - } -}) +// 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) -} +// 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')) +// fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4)) +// fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n')) let roomSwitches: any = {}