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; watchdogCounter += 1;
MqttDispatcher_1.mqttHandler.send(config.dict.watchdogTopic, `${config.dict.watchdogMessage} ${watchdogCounter}`); MqttDispatcher_1.mqttHandler.send(config.dict.watchdogTopic, `${config.dict.watchdogMessage} ${watchdogCounter}`);
}, config.dict.watchdogInterval); }, config.dict.watchdogInterval);
// ---------------------------------------------------------------------------------------------------------- // // ----------------------------------------------------------------------------------------------------------
// Homekit export // // Homekit export
let homekitObject = {}; // let homekitObject : { [key:string]:{} } = {}
let openhabList = []; // let openhabList : string[] = []
// logger.info("allLabeledItems") // // logger.info("allLabeledItems")
// logger.info(JSON.stringify(allLabeledItems)) // // logger.info(JSON.stringify(allLabeledItems))
allLabeledItems.forEach((item) => { // allLabeledItems.forEach((item: AItem) => {
let exportData = item.exportItem(); // let exportData : ExportType|null = item.exportItem()
if (exportData != null) { // if (exportData != null) {
if ('id' in exportData['homekit']) { // if ('id' in exportData['homekit']) {
homekitObject[exportData['homekit']['id']] = exportData['homekit']['object']; // homekitObject[exportData['homekit']['id']] = exportData['homekit']['object']
} // }
if (exportData['openhab'] instanceof Array) { // if (exportData['openhab'] instanceof Array) {
let da = exportData['openhab']; // let da : string[] = exportData['openhab'] as string[]
da.forEach((o) => openhabList.push(o)); // da.forEach((o: string) => openhabList.push(o))
} // } else {
else { // let da : string = exportData['openhab'] as string
let da = exportData['openhab']; // openhabList.push(da)
openhabList.push(da); // }
} // // logger.info("openHabList")
// logger.info("openHabList") // // logger.info(JSON.stringify(openhabList))
// logger.info(JSON.stringify(openhabList)) // }
} // })
}); // let heatingMainSwitchExport : ExportType|null = MaxThermostat.exportHeatingMainSwitchItem()
let heatingMainSwitchExport = MaxThermostat_1.MaxThermostat.exportHeatingMainSwitchItem(); // if (heatingMainSwitchExport != null) {
if (heatingMainSwitchExport != null) { // let da : string = heatingMainSwitchExport['openhab'] as string
let da = heatingMainSwitchExport['openhab']; // openhabList.push(da)
openhabList.push(da); // }
} // fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4))
fs.writeFileSync(config.dict.homekitFile, JSON.stringify(homekitObject, null, 4)); // fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'))
fs.writeFileSync(config.dict.openhabItemFile, openhabList.join('\n'));
let roomSwitches = {}; let roomSwitches = {};
allLights.forEach((item) => { allLights.forEach((item) => {
let switchItem = { 'label': item.getLabel(), 'actionTopic': item.getStateTopic(), 'feedbackTopic': item.getStateFeedbackTopic() }; 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", "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state",
"feedbackTopic": "dispatcher_ng/items/Gnd/Esszimmer/CupboardLight/state/feedback" "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", "label": "Nähkästchen",
"actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state", "actionTopic": "dispatcher_ng/items/Gnd/Esszimmer/NaehkaestchenLight/state",

60
src/main.ts
View File

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