Rules can have a second condition, and contains / does not contain

A paused printer that is only soaking no longer brings the printer page to the
front: print state = paused and display message does not contain soaking.

The schedule format changes (version 6), so the stored schedule has to be saved
again after flashing. Pins espressif32@6.10.0: the unpinned platform now resolves
to Arduino core 3, which the firmware doesn't build on.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
mangavalkandClaude Opus 5.5 committed 2026-11-03 22:43:17 +01:00
1 parent abd63d070f
commit 35e678d78d
13 files changed
+155 -31

No files matched your search

+2 -1
View File
@@ -274,7 +274,8 @@ void appPageLoop(bool time_valid, const LocalTime &time)
for (int i = 0; i < page_schedule.rule_count; i++)
{
const TriggerRule &r = page_schedule.rules[i];
selector.setRuleState(i, ruleMatches(r, haApiValue(r.entity, r.attribute)), now);
const char *and_value = r.and_entity[0] ? haApiValue(r.and_entity, r.and_attribute) : nullptr;
selector.setRuleState(i, ruleMatches(r, haApiValue(r.entity, r.attribute), and_value), now);
}
time_known = time_valid;
if (!time_valid)