openhab-scripting 2.19.0 → 2.19.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/openhab/dsl/rules/automation_rule.rb +4 -6
- data/lib/openhab/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: eb5d419e011ded3c2944f92dcfafa5f21f7add4d003439226d41b7c653b03077
|
|
4
|
+
data.tar.gz: f8f970fa2a14576e73c832b289b9b3b115c47686377de4ad574575fa1d017e00
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: cb45e5bd5bfc28a4a0a706328c3f7eb1b4fb9e6895ab07782d9395fb44f2c1a833758f4387c1600d1650f256b7a29a0bb13bd6af2590e78e6cec1141a668dea0
|
|
7
|
+
data.tar.gz: bc250561d69f374b144b7f76e96cbf26d32b86216984ab7e3668f19a56078be087a6404a9c2da70828ae7077e3037fba554ef479de5d295344b68a3e8f13383f
|
|
@@ -145,16 +145,14 @@ module OpenHAB
|
|
|
145
145
|
#
|
|
146
146
|
#
|
|
147
147
|
def process_trigger_delay(trigger_delay, mod, inputs)
|
|
148
|
-
if
|
|
148
|
+
if trigger_delay.timer_active?
|
|
149
|
+
process_active_timer(inputs, mod, trigger_delay)
|
|
150
|
+
elsif check_trigger_guards(trigger_delay, inputs)
|
|
149
151
|
logger.trace("Trigger Guards Matched for #{trigger_delay}, delaying rule execution")
|
|
150
152
|
# Add timer and attach timer to delay object, and also state being tracked to so timer can be cancelled if
|
|
151
153
|
# state changes
|
|
152
154
|
# Also another timer should not be created if changed to same value again but instead rescheduled
|
|
153
|
-
|
|
154
|
-
process_active_timer(inputs, mod, trigger_delay)
|
|
155
|
-
else
|
|
156
|
-
create_trigger_delay_timer(inputs, mod, trigger_delay)
|
|
157
|
-
end
|
|
155
|
+
create_trigger_delay_timer(inputs, mod, trigger_delay)
|
|
158
156
|
else
|
|
159
157
|
logger.trace("Trigger Guards did not match for #{trigger_delay}, ignoring trigger.")
|
|
160
158
|
end
|
data/lib/openhab/version.rb
CHANGED