lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix multi relay.

Browse Source
This commit is contained in:
Blaz Kristan 2023-06-01 22:17:41 +02:00
parent 9d22a06969
commit 130f495fb6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usermods/multi_relay/usermod_multi_relay.h
View File

@ -36,13 +36,13 @@
typedef struct relay_t { typedef struct relay_t {
int8_t pin; int8_t pin;
struct { // reduces memory footprint struct { // reduces memory footprint
bool active : 1; bool active : 1; // is the relay waiting to be switched
bool mode : 1; bool mode : 1; // does On mean 1 or 0 (inverted output)
bool state : 1; bool state : 1; // 1 relay is On, 0 relay is Off
bool external : 1; bool external : 1; // is the relay externally controlled
int8_t button : 4; int8_t button : 4; // which button triggers relay
}; };
uint16_t delay; uint16_t delay; // amount of ms to wait after it is activated
} Relay; } Relay;
@ -217,7 +217,7 @@ void MultiRelay::handleOffTimer() {
bool activeRelays = false; bool activeRelays = false;
for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) { for (int i=0; i<MULTI_RELAY_MAX_RELAYS; i++) {
if (_relay[i].active && _switchTimerStart > 0 && now - _switchTimerStart > (_relay[i].delay*1000)) { if (_relay[i].active && _switchTimerStart > 0 && now - _switchTimerStart > (_relay[i].delay*1000)) {
if (!_relay[i].external) toggleRelay(i); if (!_relay[i].external) switchRelay(i, !offMode);
_relay[i].active = false; _relay[i].active = false;
} else if (periodicBroadcastSec && now - lastBroadcast > (periodicBroadcastSec*1000)) { } else if (periodicBroadcastSec && now - lastBroadcast > (periodicBroadcastSec*1000)) {
if (_relay[i].pin>=0) publishMqtt(i); if (_relay[i].pin>=0) publishMqtt(i);