ws: module clean-up

This commit is contained in:
Maxim Prokhorov
2024-03-18 02:54:12 +03:00
parent e92be04eea
commit 5a0767786b
29 changed files with 117 additions and 71 deletions

View File

@@ -625,6 +625,12 @@ constexpr ButtonProvider provider(size_t index) {
} // namespace build
namespace settings {
namespace {
STRING_VIEW_INLINE(Prefix, "btn");
} // namespace
namespace internal {
namespace {
@@ -824,7 +830,7 @@ static constexpr espurna::settings::query::IndexedSetting IndexedSettings[] PROG
};
bool checkSamePrefix(StringView key) {
return espurna::settings::query::samePrefix(key, STRING_VIEW("btn"));
return espurna::settings::query::samePrefix(key, espurna::button::settings::Prefix);
}
String findValueFrom(StringView key) {
@@ -1052,7 +1058,7 @@ void _buttonRelayAction(size_t id, ButtonAction action) {
namespace {
void _buttonWebSocketOnVisible(JsonObject& root) {
wsPayloadModule(root, PSTR("btn"));
wsPayloadModule(root, espurna::button::settings::Prefix);
}
void _buttonWebSocketOnConnected(JsonObject& root) {