From 2ca029066204e626b2af5da4cffc37f1e0926b53 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Sun, 1 May 2022 15:35:01 -0500 Subject: [PATCH] Admin message implementation --- proto | 2 +- src/mesh/generated/admin.pb.h | 2 +- src/modules/AdminModule.cpp | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/proto b/proto index d02d7131a..a3c790850 160000 --- a/proto +++ b/proto @@ -1 +1 @@ -Subproject commit d02d7131a20210a18f12a87a327753e1e34b4282 +Subproject commit a3c790850d536eb11d898bd40fd7d58977703fac diff --git a/src/mesh/generated/admin.pb.h b/src/mesh/generated/admin.pb.h index b6703c302..c4c2a716f 100644 --- a/src/mesh/generated/admin.pb.h +++ b/src/mesh/generated/admin.pb.h @@ -29,7 +29,7 @@ typedef enum _AdminMessage_ConfigType { AdminMessage_ConfigType_MODULE_EXTNOTIF_CONFIG = 11, AdminMessage_ConfigType_MODULE_STOREFORWARD_CONFIG = 12, AdminMessage_ConfigType_MODULE_RANGETEST_CONFIG = 13, - AdminMessage_ConfigType_MODULE_ENVIRONMENTAL_CONFIG = 14, + AdminMessage_ConfigType_MODULE_TELEMETRY_CONFIG = 14, AdminMessage_ConfigType_MODULE_CANNEDMSG_CONFIG = 15 } AdminMessage_ConfigType; diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index 8b018092f..9d5e161c8 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -124,9 +124,12 @@ void AdminModule::handleGetConfig(const MeshPacket &req) DEBUG_MSG("Requesting AdminMessage_ConfigType_MODULE_RANGETEST_CONFIG\n"); r.get_config_response.which_payloadVariant = AdminMessage_ConfigType_MODULE_RANGETEST_CONFIG; break; - case AdminMessage_ConfigType_MODULE_ENVIRONMENTAL_CONFIG: - DEBUG_MSG("Requesting AdminMessage_ConfigType_MODULE_ENVIRONMENTAL_CONFIG\n"); - r.get_config_response.which_payloadVariant = AdminMessage_ConfigType_MODULE_ENVIRONMENTAL_CONFIG; + case AdminMessage_ConfigType_MODULE_TELEMETRY_CONFIG: + DEBUG_MSG("Requesting AdminMessage_ConfigType_MODULE_TELEMETRY_CONFIG\n"); + r.get_config_response.which_payloadVariant = AdminMessage_ConfigType_MODULE_TELEMETRY_CONFIG; + r.get_config_response.payloadVariant.module_config.which_payloadVariant = Config_ModuleConfig_telemetry_config_tag; + r.get_config_response.payloadVariant.module_config.payloadVariant.telemetry_config = + config.payloadVariant.module_config.payloadVariant.telemetry_config; break; case AdminMessage_ConfigType_MODULE_CANNEDMSG_CONFIG: DEBUG_MSG("Requesting AdminMessage_ConfigType_MODULE_CANNEDMSG_CONFIG\n");