From c7f6576708dc97c46e03facb92cc9f7df0dc2bf9 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Tue, 6 Jun 2023 19:36:57 -0500 Subject: [PATCH 1/7] Deprecate user.macaddr --- meshtastic/mesh.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 6cc8467..12af211 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -448,10 +448,11 @@ message User { string short_name = 3; /* + * Deprecated in Meshtastic 2.1.x * This is the addr of the radio. * Not populated by the phone, but added by the esp32 when broadcasting */ - bytes macaddr = 4; + bytes macaddr = 4 [deprecated = true]; /* * TBEAM, HELTEC, etc... From dc691a1c45b40cad781438fe0acf414a14172ffc Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 7 Jun 2023 07:02:35 -0500 Subject: [PATCH 2/7] Also deprecate max_channels --- meshtastic/mesh.proto | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 12af211..d30c0ef 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1062,9 +1062,10 @@ message MyNodeInfo { bool has_gps = 2; /* + * Deprecated in 2.1.x * The maximum number of 'software' channels that can be set on this node. */ - uint32 max_channels = 3; + uint32 max_channels = 3 [deprecated = true]; /* * 0.0.5 etc... From b04abada376e486604b2b22ddcacd7aa6ee5ffe8 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 7 Jun 2023 07:26:43 -0500 Subject: [PATCH 3/7] Deprecate has_wifi --- meshtastic/mesh.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index d30c0ef..cdf7dda 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1105,12 +1105,13 @@ message MyNodeInfo { float bitrate = 9; /* + * 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; + uint32 message_timeout_msec = 10 [deprecated = true]; /* * The minimum app version that can talk to this device. @@ -1129,9 +1130,10 @@ message MyNodeInfo { repeated uint32 air_period_rx = 13; /* + * Deprecated in 2.1.x (Source from DeviceMetadata instead) * Is the device wifi capable? */ - bool has_wifi = 14; + bool has_wifi = 14 [deprecated = true]; /* * Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise). From 4531dd779d6ce0957da4f3dc1f68eace2c029744 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 7 Jun 2023 07:27:24 -0500 Subject: [PATCH 4/7] Deprecate min_app_version --- meshtastic/mesh.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index cdf7dda..aa5cc78 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1117,7 +1117,7 @@ message MyNodeInfo { * 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; + uint32 min_app_version = 11 [deprecated = true]; /* * 24 time windows of 1hr each with the airtime transmitted out of the device per hour. From d0ed6a87c450fddf687edfc3a559b49b1fb11c5f Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 7 Jun 2023 07:33:37 -0500 Subject: [PATCH 5/7] Comment --- meshtastic/mesh.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index aa5cc78..5702398 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1114,6 +1114,7 @@ message MyNodeInfo { uint32 message_timeout_msec = 10 [deprecated = true]; /* + * Deprecated in 2.1.x * 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 */ From 55749d0b9212c23981b87ebeb2c8be76bda2a774 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 7 Jun 2023 10:05:51 -0500 Subject: [PATCH 6/7] Update --- meshtastic/mesh.proto | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 5702398..fd9f39e 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1114,11 +1114,10 @@ message MyNodeInfo { uint32 message_timeout_msec = 10 [deprecated = true]; /* - * Deprecated in 2.1.x * 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 = true]; + uint32 min_app_version = 11; /* * 24 time windows of 1hr each with the airtime transmitted out of the device per hour. @@ -1137,14 +1136,16 @@ message MyNodeInfo { 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; + 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; + float air_util_tx = 16 [deprecated = true]; } /* From 99496e5778e1215293fb42b66802f3fe686d0221 Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 7 Jun 2023 10:18:02 -0500 Subject: [PATCH 7/7] Deprecated periods --- meshtastic/mesh.proto | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index fd9f39e..3bc9837 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -1120,14 +1120,16 @@ message MyNodeInfo { 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; + 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; + repeated uint32 air_period_rx = 13 [deprecated = true]; /* * Deprecated in 2.1.x (Source from DeviceMetadata instead)