From 16dbe1e7e62e09bfebaf71ca5f3ec10928667230 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Tue, 25 Jul 2023 16:24:48 -0500
Subject: [PATCH] Completely remove deprecated fields

---
 meshtastic/channel.proto    |  7 +--
 meshtastic/deviceonly.proto |  6 ---
 meshtastic/mesh.proto       | 85 -------------------------------------
 3 files changed, 1 insertion(+), 97 deletions(-)

diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto
index 6667874..82401e0 100644
--- a/meshtastic/channel.proto
+++ b/meshtastic/channel.proto
@@ -26,11 +26,6 @@ option swift_prefix = "";
  * explain how remote settings and remote gpio are managed as an example
  */
 message ChannelSettings {
-  /*
-   * Deprecated in favor of LoraConfig.channel_num
-   */
-  uint32 channel_num = 1 [deprecated = true];
-
   /*
    * A simple pre-shared key for now for crypto.
    * Must be either 0 bytes (no crypto), 16 bytes (AES128), or 32 bytes (AES256).
@@ -132,4 +127,4 @@ message Channel {
    * TODO: REPLACE
    */
   Role role = 3;
-}
+}
\ No newline at end of file
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index 60203f4..4f6b9a9 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -32,12 +32,6 @@ message DeviceState {
    */
   User owner = 3;
 
-  /*
-   * Deprecated in 2.1.x
-   * Old node_db. See NodeInfoLite node_db_lite
-   */
-  repeated NodeInfo node_db = 4 [deprecated = true];
-
   /*
    * Received packets saved for delivery to the phone
    */
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index f39b746..f6e083f 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -1105,102 +1105,17 @@ message MyNodeInfo {
    */
   uint32 my_node_num = 1;
 
-  /*
-   * Deprecated in 2.1.x (Source from device_metadata)
-   * Note: This flag merely means we detected a hardware GPS in our node.
-   * Not the same as UserPreferences.location_sharing
-   */
-  bool has_gps = 2 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x
-   * The maximum number of 'software' channels that can be set on this node.
-   */
-  uint32 max_channels = 3 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x (Source from device_metadata)
-   * 0.0.5 etc...
-   */
-  string firmware_version = 4 [deprecated = true];
-
-  /*
-   * An error message we'd like to report back to the mothership through analytics.
-   * It indicates a serious bug occurred on the device, the device coped with it,
-   * but we still want to tell the devs about the bug.
-   * This field will be cleared after the phone reads MyNodeInfo
-   * (i.e. it will only be reported once)
-   * a numeric error code to go with error message, zero means no error
-   */
-  CriticalErrorCode error_code = 5 [deprecated = true];
-
-  /*
-   * A numeric error address (nonzero if available)
-   */
-  uint32 error_address = 6 [deprecated = true];
-
-  /*
-   * The total number of errors this node has ever encountered
-   * (well - since the last time we discarded preferences)
-   */
-  uint32 error_count = 7 [deprecated = true];
-
   /*
    * The total number of reboots this node has ever encountered
    * (well - since the last time we discarded preferences)
    */
   uint32 reboot_count = 8;
 
-  /*
-   * Deprecated in 2.1.x
-   * Calculated bitrate of the current channel (in Bytes Per Second)
-   */
-  float bitrate = 9 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x
-   * How long before we consider a message abandoned and we can clear our
-   * caches of any messages in flight Normally quite large to handle the worst case
-   * message delivery time, 5 minutes.
-   * Formerly called FLOOD_EXPIRE_TIME in the device code
-   */
-  uint32 message_timeout_msec = 10 [deprecated = true];
-
   /*
    * The minimum app version that can talk to this device.
    * Phone/PC apps should compare this to their build number and if too low tell the user they must update their app
    */
   uint32 min_app_version = 11;
-
-  /*
-   * Deprecated in 2.1.x (Only used on device to keep track of utilization)
-   * 24 time windows of 1hr each with the airtime transmitted out of the device per hour.
-   */
-  repeated uint32 air_period_tx = 12 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x (Only used on device to keep track of utilization)
-   * 24 time windows of 1hr each with the airtime of valid packets for your mesh.
-   */
-  repeated uint32 air_period_rx = 13 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x (Source from DeviceMetadata instead)
-   * Is the device wifi capable?
-   */
-  bool has_wifi = 14 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x (Source from DeviceMetrics telemetry payloads)
-   * Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).
-   */
-  float channel_utilization = 15 [deprecated = true];
-
-  /*
-   * Deprecated in 2.1.x (Source from DeviceMetrics telemetry payloads)
-   * Percent of airtime for transmission used within the last hour.
-   */
-  float air_util_tx = 16 [deprecated = true];
 }
 
 /*