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

remove openhab and homekit export calls

Browse Source
This commit is contained in:
Wolfgang Hottgenroth
2018-09-22 18:42:27 +02:00
parent f98b1c2f39
commit 80550321d2
3 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
dist/main.js vendored
View File

@ -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() };

5
smartclient.json
View File

@ -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",

60
src/main.ts
View File

@ -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 = {}