homebridge-loxone-control 1.0.2 â 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/blindsController.d.ts +2 -1
- package/dist/blindsController.d.ts.map +1 -1
- package/dist/blindsController.js +41 -19
- package/dist/blindsController.js.map +1 -1
- package/dist/platformWindowCoveringAccessory.d.ts.map +1 -1
- package/dist/platformWindowCoveringAccessory.js +13 -10
- package/dist/platformWindowCoveringAccessory.js.map +1 -1
- package/homebridge-ui/public/index.html +17 -0
- package/package.json +1 -1
|
@@ -19,7 +19,8 @@ export declare class BlindsController {
|
|
|
19
19
|
commandsExecuting: boolean;
|
|
20
20
|
constructor(platform: LoxoneControlPlatform);
|
|
21
21
|
moveBlindsToPosition: (params: MoveBlindsToPositionParams) => Promise<number[]>;
|
|
22
|
-
|
|
22
|
+
resetTiltButtonsAfterDelay: (accessory: PlatformWindowCoveringAccessory, delay: number) => Promise<void>;
|
|
23
|
+
moveBlindsToPositionNow: ({ value, platformAccessory }: MoveBlindsToPositionParams, waitBeforeExecute?: number) => Promise<number>;
|
|
23
24
|
moveBlindsToFinalPosition: ({ platformAccessory, isMovingDown, tilt, blindsType, }: MoveBlindsToFinalPositionParams) => Promise<void>;
|
|
24
25
|
sendMoveJalousieCommand: (platformAccessory: PlatformWindowCoveringAccessory, shouldMove: boolean, command?: string, failOver?: number) => Promise<unknown>;
|
|
25
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blindsController.d.ts","sourceRoot":"","sources":["../src/blindsController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"blindsController.d.ts","sourceRoot":"","sources":["../src/blindsController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAuB,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAK7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AAEpF,UAAU,0BAA0B;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,iBAAiB,EAAE,+BAA+B,CAAC;CACpD;AAED,UAAU,+BAA+B;IACvC,iBAAiB,EAAE,+BAA+B,CAAC;IACnD,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,UAAU,CAAC;IACjB,UAAU,EAAE,UAAU,CAAC;CACxB;AAED,qBAAa,gBAAgB;aAOC,QAAQ,EAAE,qBAAqB;IAN3D,OAAO,CAAC,YAAY,CAA8B;IAElD,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,gBAAgB,CAA+B;IAChD,iBAAiB,UAAS;gBAEL,QAAQ,EAAE,qBAAqB;IAO3D,oBAAoB,WAAkB,0BAA0B,uBA0C9D;IAEF,0BAA0B,cACb,+BAA+B,SACnC,MAAM,mBAIb;IAEF,uBAAuB,iCACS,0BAA0B,iDA4JxD;IAEF,yBAAyB,2DAKtB,+BAA+B,mBA8EhC;IAEF,uBAAuB,sBACF,+BAA+B,cACtC,OAAO,2DAcnB;CACH"}
|
package/dist/blindsController.js
CHANGED
|
@@ -8,7 +8,6 @@ const toPositive_1 = require("./loxone/utils/toPositive");
|
|
|
8
8
|
class BlindsController {
|
|
9
9
|
constructor(platform) {
|
|
10
10
|
this.platform = platform;
|
|
11
|
-
this.activeTimers = {};
|
|
12
11
|
this.runCommands = [];
|
|
13
12
|
this.runDebounceTimer = null;
|
|
14
13
|
this.commandsExecuting = false;
|
|
@@ -26,9 +25,9 @@ class BlindsController {
|
|
|
26
25
|
const promises = this.runCommands.map(async (command, index) => {
|
|
27
26
|
const additionalDelay = 600;
|
|
28
27
|
const delay = index * additionalDelay;
|
|
29
|
-
const
|
|
30
|
-
command.platformAccessory
|
|
31
|
-
return
|
|
28
|
+
const movingDelay = await this.moveBlindsToPositionNow(command, delay);
|
|
29
|
+
this.resetTiltButtonsAfterDelay(command.platformAccessory, movingDelay);
|
|
30
|
+
return movingDelay;
|
|
32
31
|
});
|
|
33
32
|
Promise.all(promises).then((delays) => {
|
|
34
33
|
this.platform.log.debug(`â
All commands executed!, collected delays: ${JSON.stringify(delays.flat())}`);
|
|
@@ -40,6 +39,10 @@ class BlindsController {
|
|
|
40
39
|
}, debounceDelay);
|
|
41
40
|
});
|
|
42
41
|
};
|
|
42
|
+
this.resetTiltButtonsAfterDelay = async (accessory, delay) => {
|
|
43
|
+
await (0, sleep_1.sleep)(delay + 1000);
|
|
44
|
+
accessory.resetTiltPositions();
|
|
45
|
+
};
|
|
43
46
|
this.moveBlindsToPositionNow = async ({ value, platformAccessory }, waitBeforeExecute = 0) => {
|
|
44
47
|
try {
|
|
45
48
|
await (0, sleep_1.sleep)(waitBeforeExecute);
|
|
@@ -50,11 +53,14 @@ class BlindsController {
|
|
|
50
53
|
: "closed";
|
|
51
54
|
const tilt = (value > 0 ? actualTilt : "closed");
|
|
52
55
|
const { accessory, identifier, states } = platformAccessory;
|
|
53
|
-
const
|
|
54
|
-
if (
|
|
55
|
-
this.platform.log.debug(`
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
const [_searchDescription, _typeQuery, actionUuid] = identifier.split(":");
|
|
57
|
+
if (this.activeTimers.has(actionUuid)) {
|
|
58
|
+
this.platform.log.debug(` > đ°ī¸ Clear active timer for "${actionUuid}"`);
|
|
59
|
+
clearTimeout(this.activeTimers.get(actionUuid));
|
|
60
|
+
this.activeTimers.delete(actionUuid);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
this.platform.log.debug(` > đ°ī¸ No active timer for "${actionUuid}", ${JSON.stringify(this.activeTimers.get(actionUuid))}`);
|
|
58
64
|
}
|
|
59
65
|
let delay = 0;
|
|
60
66
|
const { blindsTiming, blindsMaxPosition } = accessory.context.device;
|
|
@@ -74,14 +80,24 @@ class BlindsController {
|
|
|
74
80
|
}
|
|
75
81
|
const steps = value - states.Position;
|
|
76
82
|
const isMovingDown = steps > 0;
|
|
83
|
+
const isPositionStateChanged = isMovingDown
|
|
84
|
+
? states.PositionState !==
|
|
85
|
+
this.platform.Characteristic.PositionState.INCREASING
|
|
86
|
+
: states.PositionState !==
|
|
87
|
+
this.platform.Characteristic.PositionState.DECREASING;
|
|
88
|
+
const isAlreadyRunning = states.PositionState !==
|
|
89
|
+
this.platform.Characteristic.PositionState.STOPPED;
|
|
90
|
+
if (isAlreadyRunning && isPositionStateChanged) {
|
|
91
|
+
this.platform.log.debug(` đĨ Blinds "${accessory.context.device.name}" are already running and will have a new direction, stop them! ${JSON.stringify({ isMovingDown, PositionState: states.PositionState })}`);
|
|
92
|
+
await (0, sendCommand_1.sendCommand)(this.platform, identifier, ["FullDown"]);
|
|
93
|
+
await (0, sleep_1.sleep)(500);
|
|
94
|
+
}
|
|
95
|
+
else if (isAlreadyRunning && !isPositionStateChanged) {
|
|
96
|
+
this.platform.log.debug(` đ Blinds "${accessory.context.device.name}" are already running in the correct direction, do not stop them!`);
|
|
97
|
+
}
|
|
77
98
|
const stepsToTarget = (0, toPositive_1.toPositive)(steps);
|
|
78
99
|
const targetIsFullyDownOrUp = value === 0 || (value === 100 && tilt === "closed");
|
|
79
100
|
if (stepsToTarget > 0) {
|
|
80
|
-
if (this.activeTimers[identifier]) {
|
|
81
|
-
this.platform.log.debug(` đ¨ Clear active timer for "${identifier}"`);
|
|
82
|
-
clearTimeout(this.activeTimers[identifier]);
|
|
83
|
-
this.activeTimers[identifier] = undefined;
|
|
84
|
-
}
|
|
85
101
|
if (!targetIsFullyDownOrUp) {
|
|
86
102
|
// calculate exact delay to reach "stepsToTarget"
|
|
87
103
|
delay = Math.floor(stepsToTarget * ((isMovingDown ? timing : timingUp) / 100) * 1000);
|
|
@@ -89,20 +105,24 @@ class BlindsController {
|
|
|
89
105
|
const { name } = accessory.context.device;
|
|
90
106
|
this.platform.log.info(`đšī¸ Move jalousie "${name}" from ${states.Position}% to ${value}% (${tilt}), wait ${delay}ms to reach position`);
|
|
91
107
|
states.TargetPosition = value;
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
108
|
+
if (!isAlreadyRunning) {
|
|
109
|
+
const jsError = await this.sendMoveJalousieCommand(platformAccessory, true, isMovingDown ? "FullDown" : "FullUp");
|
|
110
|
+
if (jsError) {
|
|
111
|
+
this.platform.log.error(`Error in sendCommand: ${jsError}`);
|
|
112
|
+
}
|
|
95
113
|
}
|
|
96
114
|
if (delay > 0) {
|
|
97
|
-
|
|
98
|
-
this.activeTimers[identifier] = undefined;
|
|
115
|
+
const newTimer = setTimeout((() => {
|
|
99
116
|
this.moveBlindsToFinalPosition({
|
|
100
117
|
platformAccessory,
|
|
101
118
|
isMovingDown,
|
|
102
119
|
tilt,
|
|
103
120
|
blindsType,
|
|
104
121
|
});
|
|
122
|
+
this.activeTimers.delete(actionUuid);
|
|
105
123
|
}).bind(this), delay);
|
|
124
|
+
this.activeTimers.set(actionUuid, newTimer);
|
|
125
|
+
this.platform.log.debug(` > đ°ī¸ Set timer for "${actionUuid}" to ${delay}ms, ${JSON.stringify(this.activeTimers.has(actionUuid))}`);
|
|
106
126
|
}
|
|
107
127
|
}
|
|
108
128
|
else {
|
|
@@ -124,6 +144,7 @@ class BlindsController {
|
|
|
124
144
|
}
|
|
125
145
|
catch (e) {
|
|
126
146
|
this.platform.log.error(`Error in moveBlindsToPositionNow: ${e}`);
|
|
147
|
+
return 0;
|
|
127
148
|
}
|
|
128
149
|
};
|
|
129
150
|
this.moveBlindsToFinalPosition = async ({ platformAccessory, isMovingDown, tilt, blindsType, }) => {
|
|
@@ -187,6 +208,7 @@ class BlindsController {
|
|
|
187
208
|
const jsError = await (0, sendCommand_1.sendCommand)(this.platform, platformAccessory.identifier, [command]);
|
|
188
209
|
return jsError;
|
|
189
210
|
};
|
|
211
|
+
this.activeTimers = new Map();
|
|
190
212
|
this.moveBlindsToPosition = this.moveBlindsToPosition.bind(this);
|
|
191
213
|
this.moveBlindsToPositionNow = this.moveBlindsToPositionNow.bind(this);
|
|
192
214
|
this.moveBlindsToFinalPosition = this.moveBlindsToFinalPosition.bind(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blindsController.js","sourceRoot":"","sources":["../src/blindsController.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"blindsController.js","sourceRoot":"","sources":["../src/blindsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformWindowCoveringAccessory.d.ts","sourceRoot":"","sources":["../src/platformWindowCoveringAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAc,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,qBAAa,+BAAgC,SAAQ,aAAa;aAS9C,QAAQ,EAAE,qBAAqB;aAC/B,SAAS,EAAE,iBAAiB;aAC5B,UAAU,EAAE,MAAM;IAVpC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,mBAAmB,CAAsB;IAE1C,MAAM,UAAS;IACf,MAAM,UAAS;gBAGJ,QAAQ,EAAE,qBAAqB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,MAAM;IA8FpC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAItC,WAAW,IAAI,mBAAmB;IAIlC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAItC,WAAW,IAAI,mBAAmB;IAIlC,mBAAmB;IAInB,WAAW;IAIX,mBAAmB;IAYnB,WAAW;IAKX,gBAAgB;IAQhB,iBAAiB;IAKX,iBAAiB,CAAC,KAAK,EAAE,mBAAmB;IAS5C,uBAAuB,CAAC,KAAK,EAAE,MAAM;IA2B3C,kBAAkB,aAehB;IAEF,QAAQ,gBAAiB,MAAM,
|
|
1
|
+
{"version":3,"file":"platformWindowCoveringAccessory.d.ts","sourceRoot":"","sources":["../src/platformWindowCoveringAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAW,MAAM,YAAY,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAc,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,qBAAa,+BAAgC,SAAQ,aAAa;aAS9C,QAAQ,EAAE,qBAAqB;aAC/B,SAAS,EAAE,iBAAiB;aAC5B,UAAU,EAAE,MAAM;IAVpC,OAAO,CAAC,WAAW,CAAsB;IACzC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,mBAAmB,CAAsB;IAE1C,MAAM,UAAS;IACf,MAAM,UAAS;gBAGJ,QAAQ,EAAE,qBAAqB,EAC/B,SAAS,EAAE,iBAAiB,EAC5B,UAAU,EAAE,MAAM;IA8FpC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAItC,WAAW,IAAI,mBAAmB;IAIlC,WAAW,CAAC,KAAK,EAAE,mBAAmB;IAItC,WAAW,IAAI,mBAAmB;IAIlC,mBAAmB;IAInB,WAAW;IAIX,mBAAmB;IAYnB,WAAW;IAKX,gBAAgB;IAQhB,iBAAiB;IAKX,iBAAiB,CAAC,KAAK,EAAE,mBAAmB;IAS5C,uBAAuB,CAAC,KAAK,EAAE,MAAM;IA2B3C,kBAAkB,aAehB;IAEF,QAAQ,gBAAiB,MAAM,UA+F7B;CACH"}
|
|
@@ -81,16 +81,19 @@ class PlatformWindowCoveringAccessory extends accessoryBase_1.AccessoryBase {
|
|
|
81
81
|
anyStateChanged = true;
|
|
82
82
|
(_c = this.service) === null || _c === void 0 ? void 0 : _c.updateCharacteristic(this.platform.Characteristic.TargetPosition, newStates.TargetPosition);
|
|
83
83
|
}
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
84
|
+
if (anyStateChanged) {
|
|
85
|
+
const { name } = this.accessory.context.device;
|
|
86
|
+
this.platform.log.debug(`âšī¸ State change for "${name}": ${JSON.stringify({
|
|
87
|
+
PositionState: newStates.PositionState === 2
|
|
88
|
+
? "stopped"
|
|
89
|
+
: newStates.PositionState === 0
|
|
90
|
+
? "decreasing"
|
|
91
|
+
: "increasing",
|
|
92
|
+
Position: newStates.Position,
|
|
93
|
+
TiltPosition: newStates.TiltPosition,
|
|
94
|
+
TargetPosition: newStates.TargetPosition,
|
|
95
|
+
})}`);
|
|
96
|
+
}
|
|
94
97
|
this.states = newStates;
|
|
95
98
|
};
|
|
96
99
|
// set accessory information
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platformWindowCoveringAccessory.js","sourceRoot":"","sources":["../src/platformWindowCoveringAccessory.ts"],"names":[],"mappings":";;;AAGA,mDAAgD;AAGhD,gGAA6F;AAE7F,MAAa,+BAAgC,SAAQ,6BAAa;IAQhE,YACkB,QAA+B,EAC/B,SAA4B,EAC5B,UAAkB;;QAElC,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC;QAJvB,aAAQ,GAAR,QAAQ,CAAuB;QAC/B,cAAS,GAAT,SAAS,CAAmB;QAC5B,eAAU,GAAV,UAAU,CAAQ;QAN7B,WAAM,GAAG,KAAK,CAAC;QACf,WAAM,GAAG,KAAK,CAAC;QA6LtB,uBAAkB,GAAG,GAAG,EAAE;;YACxB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;gBACpB,MAAA,IAAI,CAAC,mBAAmB,0CAAE,oBAAoB,CAC5C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAC/B,IAAI,CAAC,MAAM,CACZ,CAAC;aACH;YACD,IAAI,IAAI,CAAC,MAAM,EAAE;gBACf,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;gBACpB,MAAA,IAAI,CAAC,mBAAmB,0CAAE,oBAAoB,CAC5C,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAC/B,IAAI,CAAC,MAAM,CACZ,CAAC;aACH;QACH,CAAC,CAAC;QAEF,aAAQ,GAAG,CAAC,WAAmB,EAAE,EAAE;;YACjC,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC3E,MAAM,SAAS,GAAW;gBACxB,GAAG,IAAI,CAAC,MAAM;gBACd,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO;gBACjE,YAAY,EAAE,QAAQ;aACvB,CAAC;YAEF,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAErE,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvD,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACvD,MAAM,QAAQ,GACZ,QAAQ,CAAC,QAAQ,IAAI,WAAW,KAAK,CAAC,IAAI,WAAW,KAAK,CAAC,CAAC;YAC9D,MAAM,eAAe,GAAG,CAAC,QAAQ;gBAC/B,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,WAAW,KAAK,CAAC;oBACnB,CAAC,CAAC,IAAI;oBACN,CAAC,CAAC,WAAW,KAAK,CAAC;wBACnB,CAAC,CAAC,MAAM;wBACR,CAAC,CAAC,IAAI,CAAC;YAET,IAAI,QAAQ,GAAG,CAAC,CAAC;YACjB,IAAI,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE;gBAClC,QAAQ,GAAG,QAAQ,CAAC,aAAa;oBAC/B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,GAAG,GAAG,CAAC;oBAC1C,CAAC,CAAC,CAAC,CAAC;gBAEN,SAAS,CAAC,YAAY,GAAG,IAAA,6DAA6B,EACpD,QAAQ,CAAC,eAAe,CACzB,CAAC;gBAEF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBACpB,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;iBAC/B;aACF;iBAAM;gBACL,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtD,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC;gBACxC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;oBACpB,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;oBAC9B,SAAS,CAAC,cAAc,GAAG,QAAQ,CAAC;iBACrC;aACF;YAED,SAAS,CAAC,aAAa,GAAG,QAAQ;gBAChC,CAAC,CAAC,eAAe,KAAK,IAAI;oBACxB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,UAAU;oBACvD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,UAAU;gBACzD,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,OAAO,CAAC;YAEvD,IAAI,SAAS,CAAC,aAAa,KAAK,CAAC,EAAE;gBACjC,SAAS,CAAC,cAAc,GAAG,QAAQ,CAAC;aACrC;YAED,IAAI,eAAe,GAAG,KAAK,CAAC;YAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,KAAK,SAAS,CAAC,aAAa,EAAE;gBACzD,eAAe,GAAG,IAAI,CAAC;gBACvB,MAAA,IAAI,CAAC,OAAO,0CAAE,oBAAoB,CAChC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAC1C,SAAS,CAAC,aAAa,CACxB,CAAC;aACH;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE;gBAC/C,eAAe,GAAG,IAAI,CAAC;gBACvB,MAAA,IAAI,CAAC,OAAO,0CAAE,oBAAoB,CAChC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,eAAe,EAC5C,SAAS,CAAC,QAAQ,CACnB,CAAC;aACH;YAED,IAAI,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,SAAS,CAAC,cAAc,EAAE;gBAC3D,eAAe,GAAG,IAAI,CAAC;gBACvB,MAAA,IAAI,CAAC,OAAO,0CAAE,oBAAoB,CAChC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,cAAc,EAC3C,SAAS,CAAC,cAAc,CACzB,CAAC;aACH;YACD,
|
|
1
|
+
{"version":3,"file":"platformWindowCoveringAccessory.js","sourceRoot":"","sources":["../src/platformWindowCoveringAccessory.ts"],"names":[],"mappings":"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"}
|
|
@@ -186,6 +186,23 @@
|
|
|
186
186
|
document.getElementById('pageAdvanced').style.display = 'none'
|
|
187
187
|
document.getElementById('pageDevices').style.display = 'block'
|
|
188
188
|
|
|
189
|
+
const pluginConfig = await homebridge.getPluginConfig();
|
|
190
|
+
const config = pluginConfig.length ? pluginConfig[0] : {};
|
|
191
|
+
if (
|
|
192
|
+
!config.loxoneMiniServerId ||
|
|
193
|
+
!config.loxoneUser ||
|
|
194
|
+
!config.loxonePassword
|
|
195
|
+
) {
|
|
196
|
+
const innerHTML = `
|
|
197
|
+
<li style="display: flex; align-items: center;">
|
|
198
|
+
<div style="width: 100%; background: rgba(255, 0, 0, 0.35); color: white; text-align: center; padding: 9px;">
|
|
199
|
+
<strong>Setup must be completed to unlock device discovery</strong>
|
|
200
|
+
</div>
|
|
201
|
+
</li>`;
|
|
202
|
+
document.querySelector('#discoveredDevices').innerHTML = innerHTML;
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
|
|
189
206
|
const response = await fetch(`${urlPrefix}/discoverDevices`);
|
|
190
207
|
const discoverDevices = await response.json();
|
|
191
208
|
await renderDevices(discoverDevices);
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"displayName": "Homebridge Loxone Control",
|
|
3
3
|
"name": "homebridge-loxone-control",
|
|
4
|
-
"version": "1.0
|
|
4
|
+
"version": "1.2.0",
|
|
5
5
|
"description": "Homebridge plugin to control a loxone system trough the web-interface - useful if you have zero access to the Miniserver",
|
|
6
6
|
"license": "Apache-2.0",
|
|
7
7
|
"repository": {
|