From 9c6da233b95599137d360d651f149210228d8a06 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 29 Jun 2022 19:41:43 -0500 Subject: [PATCH] Phoneapi moduleconfig (#1538) --- src/mesh/PhoneAPI.cpp | 41 ++++++++++++++++++++++++++++++++++++++++- src/mesh/PhoneAPI.h | 1 + 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp index e41e2f58..a22c4c5a 100644 --- a/src/mesh/PhoneAPI.cpp +++ b/src/mesh/PhoneAPI.cpp @@ -183,11 +183,47 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) config_state++; // Advance when we have sent all of our config objects if (config_state > Config_lora_tag) { + state = STATE_SEND_MODULECONFIG; + config_state = ModuleConfig_mqtt_tag; + } + break; + + case STATE_SEND_MODULECONFIG: + fromRadioScratch.which_payloadVariant = FromRadio_moduleConfig_tag; + switch (config_state) { + case ModuleConfig_mqtt_tag: + fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_mqtt_tag; + fromRadioScratch.moduleConfig.payloadVariant.mqtt = moduleConfig.mqtt; + break; + case ModuleConfig_serial_tag: + fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_serial_tag; + fromRadioScratch.moduleConfig.payloadVariant.serial = moduleConfig.serial; + break; + case ModuleConfig_external_notification_tag: + fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_external_notification_tag; + fromRadioScratch.moduleConfig.payloadVariant.external_notification = moduleConfig.external_notification; + break; + case ModuleConfig_range_test_tag: + fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_range_test_tag; + fromRadioScratch.moduleConfig.payloadVariant.range_test = moduleConfig.range_test; + break; + case ModuleConfig_telemetry_tag: + fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_telemetry_tag; + fromRadioScratch.moduleConfig.payloadVariant.telemetry = moduleConfig.telemetry; + break; + case ModuleConfig_canned_message_tag: + fromRadioScratch.moduleConfig.which_payloadVariant = ModuleConfig_canned_message_tag; + fromRadioScratch.moduleConfig.payloadVariant.canned_message = moduleConfig.canned_message; + break; + } + + config_state++; + // Advance when we have sent all of our ModuleConfig objects + if (config_state > ModuleConfig_canned_message_tag) { state = STATE_SEND_NODEINFO; config_state = Config_device_tag; } break; - case STATE_SEND_NODEINFO: { const NodeInfo *info = nodeInfoForPhone; nodeInfoForPhone = NULL; // We just consumed a nodeinfo, will need a new one next time @@ -265,6 +301,9 @@ bool PhoneAPI::available() return true; case STATE_SEND_CONFIG: + return true; + + case STATE_SEND_MODULECONFIG: return true; case STATE_SEND_NODEINFO: diff --git a/src/mesh/PhoneAPI.h b/src/mesh/PhoneAPI.h index 3109a5e8..8367b392 100644 --- a/src/mesh/PhoneAPI.h +++ b/src/mesh/PhoneAPI.h @@ -24,6 +24,7 @@ class PhoneAPI STATE_SEND_MY_INFO, // send our my info record STATE_SEND_GROUPS, // new in 1.3? STATE_SEND_CONFIG, // Replacement for the old Radioconfig + STATE_SEND_MODULECONFIG, // Send Module specific config STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client STATE_SEND_COMPLETE_ID, STATE_SEND_PACKETS // send packets or debug strings