hoffmation-base 3.0.0-alpha.0 → 3.0.0-alpha.2
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/lib/server/devices/groups/lightGroup.d.ts +1 -1
- package/lib/server/devices/groups/lightGroup.js +2 -2
- package/lib/server/devices/sharedFunctions/lampUtils.js +2 -4
- package/lib/server/services/room-service/room-service.js +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -19,7 +19,7 @@ export declare class LightGroup extends BaseGroup {
|
|
|
19
19
|
switchTimeConditional(c: LightGroupSwitchTimeConditionalCommand): void;
|
|
20
20
|
setAllLampen(c: LampSetLightCommand): void;
|
|
21
21
|
setAllLampenTimeBased(c: LampSetTimeBasedCommand): void;
|
|
22
|
-
|
|
22
|
+
setAllOutlets(c: ActuatorSetStateCommand): void;
|
|
23
23
|
setAllActuatorsTimeBased(time: TimeOfDay): void;
|
|
24
24
|
setAllLED(c: LedSetLightCommand): void;
|
|
25
25
|
setAllWled(c: WledSetLightCommand): void;
|
|
@@ -115,7 +115,7 @@ class LightGroup extends base_group_1.BaseGroup {
|
|
|
115
115
|
this.setAllActuatorsTimeBased(c.time);
|
|
116
116
|
}
|
|
117
117
|
else {
|
|
118
|
-
this.
|
|
118
|
+
this.setAllOutlets(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'LightGroup switchTimeConditional --> off'));
|
|
119
119
|
}
|
|
120
120
|
}
|
|
121
121
|
setAllLampen(c) {
|
|
@@ -128,7 +128,7 @@ class LightGroup extends base_group_1.BaseGroup {
|
|
|
128
128
|
s.setTimeBased(c);
|
|
129
129
|
});
|
|
130
130
|
}
|
|
131
|
-
|
|
131
|
+
setAllOutlets(c) {
|
|
132
132
|
this.getOutlets().forEach((s) => {
|
|
133
133
|
s.setActuator(c);
|
|
134
134
|
});
|
|
@@ -64,6 +64,7 @@ class LampUtils {
|
|
|
64
64
|
return false;
|
|
65
65
|
}
|
|
66
66
|
static setActuator(device, c) {
|
|
67
|
+
const dontBlock = LampUtils.checkUnBlock(device, c);
|
|
67
68
|
if (LampUtils.checkBlockActive(device, c)) {
|
|
68
69
|
return;
|
|
69
70
|
}
|
|
@@ -76,10 +77,7 @@ class LampUtils {
|
|
|
76
77
|
c.timeout = 3000;
|
|
77
78
|
LampUtils.stromStossOn(device);
|
|
78
79
|
}
|
|
79
|
-
if (c.timeout
|
|
80
|
-
return;
|
|
81
|
-
}
|
|
82
|
-
if (c.timeout > -1 && device.blockAutomationHandler !== undefined) {
|
|
80
|
+
if (c.timeout > -1 && !dontBlock) {
|
|
83
81
|
device.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
|
|
84
82
|
}
|
|
85
83
|
}
|
|
@@ -37,7 +37,7 @@ class RoomService {
|
|
|
37
37
|
for (const [_name, room] of rooms) {
|
|
38
38
|
(_a = room.LightGroup) === null || _a === void 0 ? void 0 : _a.setAllLampen(command);
|
|
39
39
|
(_b = room.LightGroup) === null || _b === void 0 ? void 0 : _b.setAllLED(new models_1.LedSetLightCommand(command, command.on));
|
|
40
|
-
(_c = room.LightGroup) === null || _c === void 0 ? void 0 : _c.
|
|
40
|
+
(_c = room.LightGroup) === null || _c === void 0 ? void 0 : _c.setAllOutlets(command);
|
|
41
41
|
(_d = room.LightGroup) === null || _d === void 0 ? void 0 : _d.setAllWled(new models_1.WledSetLightCommand(command, command.on));
|
|
42
42
|
}
|
|
43
43
|
}
|