From ae93f3fa3f617dcffa118a930fcac2d106b466b6 Mon Sep 17 00:00:00 2001 From: Tom Fifield Date: Fri, 27 Dec 2024 22:12:33 +1100 Subject: [PATCH] TFT branch - minor cherry picks (#5676) * fix missing include * fix request, add handled --------- Co-authored-by: mverch67 --- src/mesh/http/ContentHelper.h | 1 + src/modules/AdminModule.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mesh/http/ContentHelper.h b/src/mesh/http/ContentHelper.h index a80c39f47..e5d3a2f57 100644 --- a/src/mesh/http/ContentHelper.h +++ b/src/mesh/http/ContentHelper.h @@ -1,5 +1,6 @@ #include #include +#include #define BoolToString(x) ((x) ? "true" : "false") diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index 6fd2952c0..6b19f04e3 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -243,6 +243,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta case meshtastic_AdminMessage_store_ui_config_tag: { LOG_INFO("Storing device-ui config"); handleStoreDeviceUIConfig(r->store_ui_config); + handled = true; break; } case meshtastic_AdminMessage_begin_edit_settings_tag: { @@ -1010,7 +1011,7 @@ void AdminModule::handleGetDeviceUIConfig(const meshtastic_MeshPacket &req) { meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default; r.which_payload_variant = meshtastic_AdminMessage_get_ui_config_response_tag; - r.store_ui_config = uiconfig; + r.get_ui_config_response = uiconfig; myReply = allocDataProtobuf(r); }