From b99d793e23154a59e7d84c45849e60e88ee5ab54 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 19:58:54 -0800
Subject: [PATCH] Remove legacyRadio and Legacy Preferences

---
 src/mesh/NodeDB.cpp                | 12 ---------
 src/mesh/generated/deviceonly.pb.c |  6 -----
 src/mesh/generated/deviceonly.pb.h | 43 +++---------------------------
 3 files changed, 3 insertions(+), 58 deletions(-)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index b112432e8..af8e12cdc 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -227,18 +227,6 @@ void NodeDB::init()
     info->user = owner;
     info->has_user = true;
 
-    // removed from 1.2 (though we do use old values if found)
-    // We set these _after_ loading from disk - because they come from the build and are more trusted than
-    // what is stored in flash
-    // if (xstr(HW_VERSION)[0])
-    //    strncpy(myNodeInfo.region, optstr(HW_VERSION), sizeof(myNodeInfo.region));
-    // else DEBUG_MSG("This build does not specify a HW_VERSION\n"); // Eventually new builds will no longer include this build
-    // flag
-
-    // DEBUG_MSG("legacy region %d\n", devicestate.legacyRadio.preferences.region);
-    if (radioConfig.preferences.region == RegionCode_Unset)
-        radioConfig.preferences.region = devicestate.legacyRadio.preferences.region;
-
     // Check for the old style of region code strings, if found, convert to the new enum.
     // Those strings will look like "1.0-EU433"
     if (radioConfig.preferences.region == RegionCode_Unset && strncmp(myNodeInfo.region, "1.0-", 4) == 0) {
diff --git a/src/mesh/generated/deviceonly.pb.c b/src/mesh/generated/deviceonly.pb.c
index 764c54fdb..9bb586f5a 100644
--- a/src/mesh/generated/deviceonly.pb.c
+++ b/src/mesh/generated/deviceonly.pb.c
@@ -6,12 +6,6 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(LegacyRadioConfig, LegacyRadioConfig, AUTO)
-
-
-PB_BIND(LegacyRadioConfig_LegacyPreferences, LegacyRadioConfig_LegacyPreferences, AUTO)
-
-
 PB_BIND(DeviceState, DeviceState, 4)
 
 
diff --git a/src/mesh/generated/deviceonly.pb.h b/src/mesh/generated/deviceonly.pb.h
index 82b2f6709..1f93989a0 100644
--- a/src/mesh/generated/deviceonly.pb.h
+++ b/src/mesh/generated/deviceonly.pb.h
@@ -18,18 +18,7 @@ typedef struct _ChannelFile {
     Channel channels[8];
 } ChannelFile;
 
-typedef struct _LegacyRadioConfig_LegacyPreferences {
-    RegionCode region;
-} LegacyRadioConfig_LegacyPreferences;
-
-typedef struct _LegacyRadioConfig {
-    bool has_preferences;
-    LegacyRadioConfig_LegacyPreferences preferences;
-} LegacyRadioConfig;
-
 typedef struct _DeviceState {
-    bool has_legacyRadio;
-    LegacyRadioConfig legacyRadio;
     bool has_my_node;
     MyNodeInfo my_node;
     bool has_owner;
@@ -56,20 +45,13 @@ extern "C" {
 #endif
 
 /* Initializer values for message structs */
-#define LegacyRadioConfig_init_default           {false, LegacyRadioConfig_LegacyPreferences_init_default}
-#define LegacyRadioConfig_LegacyPreferences_init_default {_RegionCode_MIN}
-#define DeviceState_init_default                 {false, LegacyRadioConfig_init_default, false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default}, false, MeshPacket_init_default, 0, 0, 0, "", "", "", "", ""}
+#define DeviceState_init_default                 {false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default}, false, MeshPacket_init_default, 0, 0, 0, "", "", "", "", ""}
 #define ChannelFile_init_default                 {0, {Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default}}
-#define LegacyRadioConfig_init_zero              {false, LegacyRadioConfig_LegacyPreferences_init_zero}
-#define LegacyRadioConfig_LegacyPreferences_init_zero {_RegionCode_MIN}
-#define DeviceState_init_zero                    {false, LegacyRadioConfig_init_zero, false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero}, false, MeshPacket_init_zero, 0, 0, 0, "", "", "", "", ""}
+#define DeviceState_init_zero                    {false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero}, false, MeshPacket_init_zero, 0, 0, 0, "", "", "", "", ""}
 #define ChannelFile_init_zero                    {0, {Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero}}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define ChannelFile_channels_tag                 1
-#define LegacyRadioConfig_LegacyPreferences_region_tag 15
-#define LegacyRadioConfig_preferences_tag        1
-#define DeviceState_legacyRadio_tag              1
 #define DeviceState_my_node_tag                  2
 #define DeviceState_owner_tag                    3
 #define DeviceState_node_db_tag                  4
@@ -85,19 +67,7 @@ extern "C" {
 #define DeviceState_canned_message_plugin_message_part5_tag 17
 
 /* Struct field encoding specification for nanopb */
-#define LegacyRadioConfig_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  preferences,       1)
-#define LegacyRadioConfig_CALLBACK NULL
-#define LegacyRadioConfig_DEFAULT NULL
-#define LegacyRadioConfig_preferences_MSGTYPE LegacyRadioConfig_LegacyPreferences
-
-#define LegacyRadioConfig_LegacyPreferences_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    region,           15)
-#define LegacyRadioConfig_LegacyPreferences_CALLBACK NULL
-#define LegacyRadioConfig_LegacyPreferences_DEFAULT NULL
-
 #define DeviceState_FIELDLIST(X, a) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  legacyRadio,       1) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  my_node,           2) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  owner,             3) \
 X(a, STATIC,   REPEATED, MESSAGE,  node_db,           4) \
@@ -113,7 +83,6 @@ X(a, STATIC,   SINGULAR, STRING,   canned_message_plugin_message_part4,  16) \
 X(a, STATIC,   SINGULAR, STRING,   canned_message_plugin_message_part5,  17)
 #define DeviceState_CALLBACK NULL
 #define DeviceState_DEFAULT NULL
-#define DeviceState_legacyRadio_MSGTYPE LegacyRadioConfig
 #define DeviceState_my_node_MSGTYPE MyNodeInfo
 #define DeviceState_owner_MSGTYPE User
 #define DeviceState_node_db_MSGTYPE NodeInfo
@@ -126,21 +95,15 @@ X(a, STATIC,   REPEATED, MESSAGE,  channels,          1)
 #define ChannelFile_DEFAULT NULL
 #define ChannelFile_channels_MSGTYPE Channel
 
-extern const pb_msgdesc_t LegacyRadioConfig_msg;
-extern const pb_msgdesc_t LegacyRadioConfig_LegacyPreferences_msg;
 extern const pb_msgdesc_t DeviceState_msg;
 extern const pb_msgdesc_t ChannelFile_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
-#define LegacyRadioConfig_fields &LegacyRadioConfig_msg
-#define LegacyRadioConfig_LegacyPreferences_fields &LegacyRadioConfig_LegacyPreferences_msg
 #define DeviceState_fields &DeviceState_msg
 #define ChannelFile_fields &ChannelFile_msg
 
 /* Maximum encoded size of messages (where known) */
-#define LegacyRadioConfig_size                   4
-#define LegacyRadioConfig_LegacyPreferences_size 2
-#define DeviceState_size                         11008
+#define DeviceState_size                         11002
 #define ChannelFile_size                         832
 
 #ifdef __cplusplus