From 42d22a911b9a2cdc0d739e2b8c0b0b246469241a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Sat, 26 Oct 2024 18:04:31 +0200 Subject: [PATCH] dummy for config transfer (#5154) --- src/main.cpp | 1 - src/mesh/PhoneAPI.cpp | 6 +++++- src/modules/AdminModule.cpp | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index b92df83d4..99d3282b8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1324,4 +1324,3 @@ void tft_task_handler(void *param = nullptr) } #endif - diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp index 58685b6b5..8a8838af1 100644 --- a/src/mesh/PhoneAPI.cpp +++ b/src/mesh/PhoneAPI.cpp @@ -165,6 +165,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength) * * Our sending states progress in the following sequence (the client apps ASSUME THIS SEQUENCE, DO NOT CHANGE IT): STATE_SEND_MY_INFO, // send our my info record + STATE_SEND_UIDATA, STATE_SEND_OWN_NODEINFO, STATE_SEND_METADATA, STATE_SEND_CHANNELS @@ -280,9 +281,12 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) fromRadioScratch.config.which_payload_variant = meshtastic_Config_security_tag; fromRadioScratch.config.payload_variant.security = config.security; break; - case meshtastic_Config_sessionkey_tag: + case meshtastic_Config_sessionkey_tag: // NOOP! fromRadioScratch.config.which_payload_variant = meshtastic_Config_sessionkey_tag; break; + case meshtastic_Config_device_ui_tag: // NOOP! + fromRadioScratch.config.which_payload_variant = meshtastic_Config_device_ui_tag; + break; default: LOG_ERROR("Unknown config type %d", config_state); } diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index c1aa69fba..fe7a0514d 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -606,6 +606,9 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c) requiresReboot = false; break; + case meshtastic_Config_device_ui_tag: + // NOOP! This is handled by handleStoreDeviceUIConfig + break; } if (requiresReboot && !hasOpenEditTransaction) { disableBluetooth(); @@ -768,6 +771,10 @@ void AdminModule::handleGetConfig(const meshtastic_MeshPacket &req, const uint32 LOG_INFO("Getting config: Sessionkey"); res.get_config_response.which_payload_variant = meshtastic_Config_sessionkey_tag; break; + case meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG: + // NOOP! This is handled by handleGetDeviceUIConfig + res.get_config_response.which_payload_variant = meshtastic_Config_device_ui_tag; + break; } // NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior. // So even if we internally use 0 to represent 'use default' we still need to send the value we are