relay(all): boot & sync refactoring by mcspr · Pull Request #2654 · xoseperez/espurna

mcspr · 2025-11-26T08:17:57Z

support sync mode at boot and in timers. boot mode also introduces separate ON & OFF delays specifically for handling sync mode in bulk w/o accessing individual relay settings
boot sync ID configuration to control which relay drives synchronization behaviour during boot
by default, last relay boot'ed is used for status.
properly retain hw gpio relay status when rebooting & deal with sync cases. fallback to normal setup when dealing with mixed relay provider configurations. currently, only hw gpio flagged as 'retain'ing
relays now keep all status transition timers in a shared pool. mqtt disconnect, pulse & on / off delay cannot overlap
some api calls try to avoid relays that were not boot'ed yet processing must happen at least once for it to begin working. internal api tracks 'first time' relay status is set. whenever any other call happens internally, it may override the initial one with something else
various clean-ups in public & private api reuse. for one, internals now prefer internal (sic) funcs to at least optimize out id < .size() check when it is already known / parsed that id < .size()

- support sync mode at boot, apply based on specific ID change default to the last relay ID for setting status (set as build flag / setting otherwise) - retain hw gpio relay status when rebooting - relays keep timers in a shared pool mqtt disconnect, pulse & on / off delay cannot overlap - some api calls try to avoid relays that were not boot'ed yet processing must happen at least once for it to begin working

Copilot

Pull request overview

This PR refactors the relay boot and synchronization system to introduce shared timer management, improved boot sequence handling, and enhanced sync mode capabilities. The changes aim to unify timer handling across different relay operations and improve relay state retention across reboots.

Introduces a shared timer pool (BulkTimer) that manages MQTT disconnect, pulse, and on/off delay timers to prevent overlapping operations
Adds sync mode ID configuration to control which relay drives synchronization behavior during boot
Implements relay status retention for GPIO-based relays across reboots using hardware state

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 10 comments.

Show a summary per file

File	Description
code/espurna/thermostat.cpp	Simplified `relayStatus()` call by removing explicit forward and group report parameters
code/espurna/relay.h	Updated API signatures, removed overloaded functions, added `relayTimer()` and improved documentation
code/espurna/relay.cpp	Major refactoring including timer pool implementation, boot sequence changes, sync logic improvements, and relay activation tracking
code/espurna/config/general.h	Added `RELAY_SYNC_ID`, `RELAY_DELAY_ON`, and `RELAY_DELAY_OFF` configuration options
code/espurna/config/defaults.h	Updated relay delay defaults to use global `RELAY_DELAY_ON/OFF` settings

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

code/espurna/relay.cpp

code/espurna/relay.h

code/espurna/relay.cpp

code/espurna/config/general.h

code/espurna/relay.cpp

Copilot · 2025-11-26T08:35:47Z

@mcspr I've opened a new pull request, #2655, to work on those changes. Once the pull request is ready, I'll request review from you.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

code/espurna/relay.cpp

code/espurna/config/general.h

code/espurna/relay.cpp

previously retrieving 'last relay #'

amends de8cb76 clean up cancelation logic & fix notifier also be more diligent when discovering sync func prefer using sync mask for delayed timers, but keep id for pulse

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

code/espurna/relay.cpp

fix 32 -> 8 size assumption & generate bulk request immediately just a guess, though. no idea how real hw would work here

…target

…etter

…) > 0

mcspr requested a review from Copilot November 26, 2025 08:17

Copilot started reviewing on behalf of mcspr November 26, 2025 08:18 View session

Copilot finished reviewing on behalf of mcspr November 26, 2025 08:20

Copilot AI reviewed Nov 26, 2025

View reviewed changes

Copilot AI mentioned this pull request Nov 26, 2025

Fix timer pointer dangling issue in _relayStatusNotify #2655

Closed

mcspr added 14 commits November 26, 2025 11:42

rpnrules status signature fix

b9bab97

relays bitset gaps

3dcc039

fixup! rpnrules status signature fix

88d00d9

if dupe

a42d4bf

immediately

930645c

std::min oops

a156595

settings query

0bb330f

expect timer to be already started

9b14f4f

uninitialized mem

8649314

2nd clamp when setting mask[index]

bff767c

sem

6e8809a

pulse lingers w/o flags

cfab77d

pulse find id in both

1829235

params

c8491ae

mcspr requested a review from Copilot November 27, 2025 04:16

Copilot started reviewing on behalf of mcspr November 27, 2025 04:16 View session

Copilot finished reviewing on behalf of mcspr November 27, 2025 04:19

Copilot AI reviewed Nov 27, 2025

View reviewed changes

mcspr added 5 commits November 27, 2025 07:55

oops

27a192c

missing null check

de8cb76

unused method. count() used instead

d98e336

previously retrieving 'last relay #'

calculate sync mask for timer api

3da06cf

check pending timers when notifying

9f46e28

amends de8cb76 clean up cancelation logic & fix notifier also be more diligent when discovering sync func prefer using sync mask for delayed timers, but keep id for pulse

mcspr added 5 commits November 27, 2025 21:48

fixup! std::min oops

9dc8cde

mask size fix x2

31040bd

words

38c1a1d

oops

71ab1ca

words

45d85c6

mcspr requested a review from Copilot November 27, 2025 20:32

Copilot started reviewing on behalf of mcspr November 27, 2025 20:32 View session

Copilot finished reviewing on behalf of mcspr November 27, 2025 20:33

Copilot AI reviewed Nov 27, 2025

View reviewed changes

code/espurna/relay.cpp Show resolved Hide resolved

code/espurna/relay.cpp Show resolved Hide resolved

code/espurna/relay.cpp Show resolved Hide resolved

mcspr added 9 commits November 28, 2025 09:56

missing pulse delay reset & fix mqtt forward

24ef1fe

api & mqtt handlers

49ac705

another broken sync code in dual prov

9a3dd1a

fix 32 -> 8 size assumption & generate bulk request immediately just a guess, though. no idea how real hw would work here

test warnings

dc5a754

previous iteration used relay.flags, fix to apply only when changing …

7f1b673

…target

terminal output shows flags only when changing target

45c2dea

mqttForward() false handling aka dont report id changes when getter=s…

70e9084

…etter

unused branch

1f42a0f

.count() -> .any(), no need to count every bit when expecting .count(…

e769932

…) > 0

mcspr merged commit 9fe8d9c into dev Nov 28, 2025
6 checks passed

mcspr deleted the relay-flags branch November 28, 2025 19:47

mcspr mentioned this pull request Nov 30, 2025

relay(api): status applies only when active #2656

Draft

Conversation

mcspr commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Nov 26, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mcspr commented Nov 26, 2025 •

edited

Loading