From e4d63c21d73f91c09c0bd8b92caa9aa82dfa9cd8 Mon Sep 17 00:00:00 2001 From: Vadim Tkachenko Date: Thu, 25 Apr 2024 17:44:54 -0700 Subject: [PATCH] Documentation update: settings precedence (#319) --- .../src/main/java/net/sf/dz3r/scheduler/Scheduler.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/hcc-scheduler/src/main/java/net/sf/dz3r/scheduler/Scheduler.java b/modules/hcc-scheduler/src/main/java/net/sf/dz3r/scheduler/Scheduler.java index 35134b68..4ca253a4 100644 --- a/modules/hcc-scheduler/src/main/java/net/sf/dz3r/scheduler/Scheduler.java +++ b/modules/hcc-scheduler/src/main/java/net/sf/dz3r/scheduler/Scheduler.java @@ -133,6 +133,12 @@ private Flux>> applySc logger.trace("{}: matched time={} period={}", zoneName, now, period); + // VT: FIXME: https://github.com/home-climate-control/dz/issues/319 + // After that is fixed, the precedence will be: + // + // 1. Local settings change first. + // 2. Changed event settings will NOT be applied upon change, however, "return to schedule" will apply new, changed, settings. + if (same(currentPeriod, period)) { logger.trace("{}: already at {}", zoneName, period); return Flux.empty();