Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-02-20 01:31:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

relay(api): status applies only when active

Browse Source
This commit is contained in:
Maxim Prokhorov
2025-11-30 04:00:23 +03:00
parent 1c2154e1f9
commit 3ed4f5f8d2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/espurna/relay.cpp
View File

@@ -1911,12 +1911,14 @@ Stream* StmProvider::_port = nullptr;
// -----------------------------------------------------------------------------
bool _relayTryParseId(espurna::StringView value, size_t& id) {
return tryParseId(value, _relayCount(), id);
const auto out = tryParseId(value, _relayCount(), id);
return _relays_active[id] && out;
}
[[gnu::unused]]
bool _relayTryParseIdFromPath(espurna::StringView value, size_t& id) {
return tryParseIdPath(value, _relayCount(), id);
const auto out = tryParseIdPath(value, _relayCount(), id);
return _relays_active[id] && out;
}
void _relayHandleStatus(size_t id, PayloadStatus status, uint8_t flags) {
@@ -2574,15 +2576,15 @@ bool _relayToggle(size_t id) {
} // namespace
bool relayStatus(size_t id, bool status) {
if (id < _relays.size()) {
return _relayStatus(id, status, RelayCommonStatusFlags);
if (_relays_active[id]) {
return _relayStatus(id, status);
}
return false;
}
bool relayToggle(size_t id) {
if (id < _relays.size()) {
if (_relays_active[id]) {
return _relayToggle(id);
}
@@ -2600,7 +2602,7 @@ bool relayStatus() {
}
bool relayStatus(size_t id) {
if (id < _relays.size()) {
if (_relays_active[id]) {
return _relayStatus(id);
}
@@ -2608,7 +2610,7 @@ bool relayStatus(size_t id) {
}
bool relayTargetStatus(size_t id) {
if (id < _relays.size()) {
if (_relays_active[id]) {
return _relayTargetStatus(id);
}