From aaa019d3ba1d6b688299d6b51800c715e50cd758 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 16:56:34 -0800
Subject: [PATCH 01/16] Update EU865 to EU868

---
 radioconfig.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radioconfig.proto b/radioconfig.proto
index 61e0c08..0546bda 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -39,7 +39,7 @@ enum RegionCode {
   Unset = 0;
   US = 1;
   EU433 = 2;
-  EU865 = 3;
+  EU868 = 3;
   CN = 4;
   JP = 5;
   ANZ = 6;

From d21899ff4f2e5c0a659a8df17f2da91d4eaf943c Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 16:58:16 -0800
Subject: [PATCH 02/16] Add TH and IN

---
 radioconfig.proto | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/radioconfig.proto b/radioconfig.proto
index 0546bda..4e6336b 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -46,6 +46,8 @@ enum RegionCode {
   KR = 7;
   TW = 8;
   RU = 9;
+  IN = 10;
+  TH = 11;
 
   /*
    * Add new regions here

From 4d844f6532f43f1cbf49f1586ab76c3d425b9618 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 17:56:17 -0800
Subject: [PATCH 03/16] Update with new default modem configurations

---
 channel.proto | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/channel.proto b/channel.proto
index b0a06d4..4b98846 100644
--- a/channel.proto
+++ b/channel.proto
@@ -65,40 +65,32 @@ message ChannelSettings {
   enum ModemConfig {
 
     /*
-     * < Bw = 125 kHz, Cr = 4/5, Sf(7) = 128chips/symbol, CRC
-     * < on. ShortSlow | Short Range / Slow (5.469 kbps)
      */
-    Bw125Cr45Sf128 = 0;
+    VLongSlow = 0;
 
     /*
-     * < Bw = 500 kHz, Cr = 4/5, Sf(7) = 128chips/symbol, CRC
-     * < on. ShortFast | Short Range / Fast (21.875 kbps)
      */
-    Bw500Cr45Sf128 = 1;
+    LongSlow = 1;
 
     /*
-     * < Bw = 31.25 kHz, Cr = 4/8, Sf(9) = 512chips/symbol,
-     * < CRC on. LongFast | Long Range / Fast (275 bps)
      */
-    Bw31_25Cr48Sf512 = 2;
+    LongFast = 2;
 
     /*
-     * < Bw = 125 kHz, Cr = 4/8, Sf(12) = 4096chips/symbol, CRC
-     * < on. LongSlow | Long Range / Slow (183 bps)
      */
-    Bw125Cr48Sf4096 = 3;
+    MidSlow = 3;
 
     /*
-     * < Bw = 250 kHz, Cr = 4/6, Sf(11) = 2048chips/symbol, CRC
-     * < on. MediumSlow | Medium Range / Slow (895 bps)
      */
-    Bw250Cr46Sf2048 = 4;
+    MidFast = 4;
 
     /*
-     * < Bw = 250 kHz, Cr = 4/7, Sf(10) = 1024chips/symbol, CRC
-     * < on. MediumFast | Medium Range / Fast (1400 bps)
      */
-    Bw250Cr47Sf1024 = 5;
+    ShortSlow = 5;
+
+    /*
+     */
+    ShortFast = 6;
   }
 
   /*

From 3024fd60981d610f289b047e23935d91d31e8895 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 19:40:57 -0800
Subject: [PATCH 04/16] Remove mynodeinfo.num_bands

---
 mesh.proto | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/mesh.proto b/mesh.proto
index 14d1bc6..f94f34f 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -918,13 +918,6 @@ message MyNodeInfo {
    */
   bool has_gps = 2;
 
-  /*
-   * # of frequencies that can be used (set at build time in the device flash image).
-   * Note: this is different from max_channels, this field is telling the # of frequency bands this node can use.
-   * (old name was num_channels)
-   */
-  uint32 num_bands = 3;
-
   /*
    * The maximum number of 'software' channels that can be set on this node.
    */

From 3ca0b534307d00e3ed56648bc938014d6bc1ec57 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 19:54:21 -0800
Subject: [PATCH 05/16] Removed legacy LegacyRadioConfig and LegacyPreferences

---
 deviceonly.proto | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/deviceonly.proto b/deviceonly.proto
index 7a68534..e24b334 100644
--- a/deviceonly.proto
+++ b/deviceonly.proto
@@ -10,22 +10,6 @@ import "radioconfig.proto";
 
 option java_outer_classname = "DeviceOnly";
 
-/*
- * This is a stub version of the old 1.1 representation of RadioConfig.
- * But only keeping the region info.
- * The device firmware uses this stub while migrating old nodes to the new preferences system.
- */
-message LegacyRadioConfig {
-  message LegacyPreferences {
-
-    /*
-     * The region code for my radio (US, CN, EU433, etc...)
-     */
-    RegionCode region = 15;
-  }
-
-  LegacyPreferences preferences = 1;
-}
 
 /*
  * This message is never sent over the wire, but it is used for serializing DB
@@ -41,11 +25,6 @@ message DeviceState {
    */
   reserved 12;
 
-  /*
-   * Moved to its own file, but we keep this here so we can automatically migrate old radio.region settings
-   */
-  LegacyRadioConfig legacyRadio = 1;
-
   /*
    * Read only settings/info about this node
    */

From e5f1e3c90b85bb7848f60bcb8a71f57cd26f1419 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 20:07:33 -0800
Subject: [PATCH 06/16] Remove deprecated protos.

---
 mesh.options      |  1 -
 mesh.proto        | 26 --------------------------
 radioconfig.proto |  8 --------
 3 files changed, 35 deletions(-)

diff --git a/mesh.options b/mesh.options
index 7116b18..43519d4 100644
--- a/mesh.options
+++ b/mesh.options
@@ -16,7 +16,6 @@
 # Big enough for 1.2.28.568032c-d
 *MyNodeInfo.firmware_version max_size:18
 
-*MyNodeInfo.hw_model_deprecated max_size:16
 *MyNodeInfo.region max_size:12
 
 # Note: the actual limit (because of header bytes) on the size of encrypted payloads is 251 bytes, but I use 256
diff --git a/mesh.proto b/mesh.proto
index f94f34f..c25c95d 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -466,24 +466,6 @@ message Routing {
      */
     Error error_reason = 3;
 
-    /*
-     * Deprecated - this has been replced with error_reason == NONE && request_id != 0
-     * This is an ack.
-     * This packet is a requested acknoledgement indicating that we have received
-     * the specified message ID.
-     * This packet type can be used both for immediate (0 hops) messages or can be routed through multiple hops if dest is set.
-     * Note: As an optimization, recipients can _also_ populate a field in payload
-     * if they think the recipient would appreciate that extra state.
-     *
-     * fixed32 success_id = 4;
-     */
-
-     /*
-      * Deprecated - this has been replced with error_reason !== NONE && request_id != 0
-      * This is a nak, we failed to deliver this message.
-      *
-      * fixed32 fail_id = 5;
-      */
   }
 }
 
@@ -934,14 +916,6 @@ message MyNodeInfo {
    */
   string region = 4 [deprecated = true];
 
-  /*
-   * TBEAM, HELTEC, etc...
-   * Starting in 1.2.11 moved to hw_model enum in the NodeInfo object.
-   * Apps will still need the string here for older builds
-   * (so OTA update can find the right image), but if the enum is available it will be used instead.
-   */
-  string hw_model_deprecated = 5 [deprecated = true];
-
   /*
    * 0.0.5 etc...
    */
diff --git a/radioconfig.proto b/radioconfig.proto
index 4e6336b..b3ea1ac 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -673,14 +673,6 @@ message RadioConfig {
      */
     string canned_message_plugin_allow_input_source = 171;
 
-    /*
-     * Predefined messages for CannedMessagePlugin separated by '|' characters.
-     * Note: Split out the messages out to their own messages because we want to store 1,000 characters.
-     * and the entire message must fit within 256 bytes.
-     * Not sure if we should deprecate this or just remove it since we're in dev phase.
-     */
-    string canned_message_plugin_messages = 172 [deprecated = true];
-
     /*
      * CannedMessagePlugin also sends a bell character with the messages.
      * ExternalNotificationPlugin can benefit from this feature.

From fcfed58083d826c9f373d3f60d583e528cf7539f Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Mon, 14 Feb 2022 20:34:10 -0800
Subject: [PATCH 07/16] Add canned_message_plugin_messages back

---
 radioconfig.proto | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/radioconfig.proto b/radioconfig.proto
index b3ea1ac..a166341 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -673,6 +673,14 @@ message RadioConfig {
      */
     string canned_message_plugin_allow_input_source = 171;
 
+    /*
+      * Predefined messages for CannedMessagePlugin separated by '|' characters.
+      * Note: Split out the messages out to their own messages because we want to store 1,000 characters.
+      * and the entire message must fit within 256 bytes.
+      * Not sure if we should deprecate this or just remove it since we're in dev phase.
+      */
+    string canned_message_plugin_messages = 172 [deprecated = true];
+
     /*
      * CannedMessagePlugin also sends a bell character with the messages.
      * ExternalNotificationPlugin can benefit from this feature.

From 5f98af3261bf0fccecfc64418d28c2f32ab47e9c Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 19 Feb 2022 22:32:11 -0800
Subject: [PATCH 08/16] Add group_id to Data

---
 mesh.proto | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mesh.proto b/mesh.proto
index c25c95d..acf1c56 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -525,6 +525,12 @@ message Data {
    * a message a heart or poop emoji.
    */
   bool is_tapback = 8;
+
+  /*
+   * Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
+   * a message a heart or poop emoji.
+   */
+   uint32 group_id = 9;
 }
 
 /*

From 90079e900148266c4bec4153a82336c1d71aab8e Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 19 Feb 2022 22:53:58 -0800
Subject: [PATCH 09/16] Add GROUP_APP

---
 portnums.proto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/portnums.proto b/portnums.proto
index a9725d3..70509f1 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -92,6 +92,11 @@ enum PortNum {
   IP_TUNNEL_APP = 33;
 
   /*
+   * Used for managing chat groups
+   */
+  GROUP_APP = 34;
+
+   /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.
    * Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
    * network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.

From 22a5d39fb6ce66a7d8f35f3d501cd14318808873 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 19 Feb 2022 22:54:05 -0800
Subject: [PATCH 10/16] Add GroupInfo

---
 mesh.proto | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mesh.proto b/mesh.proto
index acf1c56..33c17e8 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -887,6 +887,14 @@ enum CriticalErrorCode {
   RadioSpiBug = 11;
 }
 
+/*
+ * GroupInfo for group chats like #FoodFreaks and #CoolPeopleOnly
+ */
+message GroupInfo {
+  repeated string group = 1 [(nanopb).max_length = 16, (nanopb).max_count = 10];
+}
+
+
 /*
  * Unique local debugging info for this node
  * Note: we don't include position or the user info, because that will come in the

From 8302a041926771d66b4ad1529ad7602cb24ffcfd Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 19 Feb 2022 23:09:26 -0800
Subject: [PATCH 11/16] Move max_length and max_count into .options

---
 mesh.options | 4 +++-
 mesh.proto   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mesh.options b/mesh.options
index 43519d4..5db0b7c 100644
--- a/mesh.options
+++ b/mesh.options
@@ -12,6 +12,9 @@
 # note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
 # outside of this envelope
 *Data.payload max_size:237
+*Data.int_size:8
+
+*GroupInfo.group max_length:16 max_count:10
 
 # Big enough for 1.2.28.568032c-d
 *MyNodeInfo.firmware_version max_size:18
@@ -39,4 +42,3 @@
 
 *MyNodeInfo.air_period_tx       max_count:24
 *MyNodeInfo.air_period_rx       max_count:24
-# *MyNodeInfo.air_period_rx_all   max_count:12
\ No newline at end of file
diff --git a/mesh.proto b/mesh.proto
index 33c17e8..5af5b8c 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -891,7 +891,7 @@ enum CriticalErrorCode {
  * GroupInfo for group chats like #FoodFreaks and #CoolPeopleOnly
  */
 message GroupInfo {
-  repeated string group = 1 [(nanopb).max_length = 16, (nanopb).max_count = 10];
+  repeated string group = 1;
 }
 
 

From c58e981c84131e56125874f57f5a2160875e299e Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 19 Feb 2022 23:15:55 -0800
Subject: [PATCH 12/16] typo in Data.group_id

---
 mesh.options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mesh.options b/mesh.options
index 5db0b7c..05a7ef6 100644
--- a/mesh.options
+++ b/mesh.options
@@ -12,7 +12,7 @@
 # note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
 # outside of this envelope
 *Data.payload max_size:237
-*Data.int_size:8
+*Data.group_id int_size:8
 
 *GroupInfo.group max_length:16 max_count:10
 

From 6fbcb672dc0381cea47da10a903a840bde68c22c Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sat, 19 Feb 2022 23:47:28 -0800
Subject: [PATCH 13/16] Add group_info to DeviceState

---
 deviceonly.proto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/deviceonly.proto b/deviceonly.proto
index e24b334..62263d1 100644
--- a/deviceonly.proto
+++ b/deviceonly.proto
@@ -42,6 +42,11 @@ message DeviceState {
    */
   repeated MeshPacket receive_queue = 5;
 
+  /*
+   * Group Info
+   */
+  GroupInfo group_info = 6;
+
   /*
    * A version integer used to invalidate old save files when we make
    * incompatible changes This integer is set at build time and is private to

From 44ab5a4fc6e78f2ab9d884b2a19dc647f3e7c866 Mon Sep 17 00:00:00 2001
From: Jm Casler <jm@casler.org>
Date: Sun, 20 Feb 2022 01:31:49 -0800
Subject: [PATCH 14/16] Add groups to payloadVariant

---
 mesh.proto | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mesh.proto b/mesh.proto
index 5af5b8c..8508e78 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -1115,6 +1115,11 @@ message FromRadio {
      * NOTE: This ID must not change - to keep (minimal) compatibility with <1.2 version of android apps.
      */
     bool rebooted = 9;
+
+    /*
+     * Groups
+     */
+    GroupInfo groups = 12;
   }
 }
 

From 996940f44c2dbaa8409d82d885dcb968253228a3 Mon Sep 17 00:00:00 2001
From: Balazs Kelemen <10376327+prampec@users.noreply.github.com>
Date: Mon, 24 Jan 2022 21:41:27 +0100
Subject: [PATCH 15/16] Canned message - Extend messages length

---
 admin.options          | 13 ++++++----
 admin.proto            | 28 ++++++---------------
 cannedmessages.options |  9 +++----
 cannedmessages.proto   | 55 +++++-------------------------------------
 deviceonly.options     |  6 -----
 deviceonly.proto       | 25 -------------------
 radioconfig.proto      |  8 ------
 7 files changed, 26 insertions(+), 118 deletions(-)

diff --git a/admin.options b/admin.options
index 8f8a1c2..404d3fa 100644
--- a/admin.options
+++ b/admin.options
@@ -1,7 +1,10 @@
 *AdminMessage.variant anonymous_oneof:true
 
-*AdminMessage.set_canned_message_plugin_part1 max_size:200
-*AdminMessage.set_canned_message_plugin_part2 max_size:200
-*AdminMessage.set_canned_message_plugin_part3 max_size:200
-*AdminMessage.set_canned_message_plugin_part4 max_size:200
-*AdminMessage.set_canned_message_plugin_part5 max_size:200
+*AdminMessage.set_canned_message_plugin_part1 max_size:201
+*AdminMessage.set_canned_message_plugin_part2 max_size:201
+*AdminMessage.set_canned_message_plugin_part3 max_size:201
+*AdminMessage.set_canned_message_plugin_part4 max_size:201
+*AdminMessage.get_canned_message_plugin_part1_response max_size:201
+*AdminMessage.get_canned_message_plugin_part2_response max_size:201
+*AdminMessage.get_canned_message_plugin_part3_response max_size:201
+*AdminMessage.get_canned_message_plugin_part4_response max_size:201
diff --git a/admin.proto b/admin.proto
index 2ba4e2a..979e967 100644
--- a/admin.proto
+++ b/admin.proto
@@ -4,7 +4,6 @@ option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/gomeshproto";
 
-import "cannedmessages.proto";
 import "channel.proto";
 import "mesh.proto";
 import "radioconfig.proto";
@@ -82,56 +81,45 @@ message AdminMessage {
      * Get the Canned Message Plugin message part1 in the response to this message.
      */
     bool get_canned_message_plugin_part1_request = 36;
-    CannedMessagePluginMessagePart1 get_canned_message_plugin_part1_response = 37;
+    string get_canned_message_plugin_part1_response = 37;
 
     /*
      * Get the Canned Message Plugin message part2 in the response to this message.
      */
     bool get_canned_message_plugin_part2_request = 38;
-    CannedMessagePluginMessagePart2 get_canned_message_plugin_part2_response = 39;
+    string get_canned_message_plugin_part2_response = 39;
 
     /*
      * Get the Canned Message Plugin message part3 in the response to this message.
      */
     bool get_canned_message_plugin_part3_request = 40;
-    CannedMessagePluginMessagePart3 get_canned_message_plugin_part3_response = 41;
+    string get_canned_message_plugin_part3_response = 41;
 
     /*
      * Get the Canned Message Plugin message part4 in the response to this message.
      */
     bool get_canned_message_plugin_part4_request = 42;
-    CannedMessagePluginMessagePart4 get_canned_message_plugin_part4_response = 43;
-
-    /*
-     * Get the Canned Message Plugin message part5 in the response to this message.
-     */
-    bool get_canned_message_plugin_part5_request = 44;
-    CannedMessagePluginMessagePart5 get_canned_message_plugin_part5_response = 45;
+    string get_canned_message_plugin_part4_response = 43;
 
     /*
      * Set the canned message plugin part 1 text.
      */
-    CannedMessagePluginMessagePart1 set_canned_message_plugin_part1 = 46;
+    string set_canned_message_plugin_part1 = 44;
 
     /*
      * Set the canned message plugin part 2 text.
      */
-    CannedMessagePluginMessagePart2 set_canned_message_plugin_part2 = 47;
+    string set_canned_message_plugin_part2 = 45;
 
     /*
      * Set the canned message plugin part 3 text.
      */
-    CannedMessagePluginMessagePart3 set_canned_message_plugin_part3 = 48;
+    string set_canned_message_plugin_part3 = 46;
 
     /*
      * Set the canned message plugin part 4 text.
      */
-    CannedMessagePluginMessagePart4 set_canned_message_plugin_part4 = 49;
-
-    /*
-     * Set the canned message plugin part 5 text.
-     */
-    CannedMessagePluginMessagePart5 set_canned_message_plugin_part5 = 50;
+    string set_canned_message_plugin_part4 = 47;
 
     /*
      * Tell the node to shutdown in this many seconds (or <0 to cancel shutdown)
diff --git a/cannedmessages.options b/cannedmessages.options
index d06a327..f3ecacc 100644
--- a/cannedmessages.options
+++ b/cannedmessages.options
@@ -1,5 +1,4 @@
-*CannedMessagePluginMessagePart1.text max_size:200
-*CannedMessagePluginMessagePart2.text max_size:200
-*CannedMessagePluginMessagePart3.text max_size:200
-*CannedMessagePluginMessagePart4.text max_size:200
-*CannedMessagePluginMessagePart5.text max_size:200
+*CannedMessagePluginConfig.messagesPart1 max_size:201
+*CannedMessagePluginConfig.messagesPart2 max_size:201
+*CannedMessagePluginConfig.messagesPart3 max_size:201
+*CannedMessagePluginConfig.messagesPart4 max_size:201
diff --git a/cannedmessages.proto b/cannedmessages.proto
index 8a249da..a90b27e 100644
--- a/cannedmessages.proto
+++ b/cannedmessages.proto
@@ -25,57 +25,14 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/gomeshproto";
 
 /*
- * Canned message plugin part 1
+ * Canned message plugin configuration.
  */
-message CannedMessagePluginMessagePart1 {
+message CannedMessagePluginConfig {
   /*
    * Predefined messages for canned message plugin separated by '|' characters.
-   * This is part 1.
    */
-  string text = 1;
+  string messagesPart1 = 11;
+  string messagesPart2 = 12;
+  string messagesPart3 = 13;
+  string messagesPart4 = 14;
 }
-
-/*
- * Canned message plugin part 2
- */
-message CannedMessagePluginMessagePart2 {
-  /*
-   * Predefined messages for canned message plugin separated by '|' characters.
-   * This is part 2.
-   */
-  string text = 1;
-}
-
-/*
- * Canned message plugin part 3
- */
-message CannedMessagePluginMessagePart3 {
-  /*
-   * Predefined messages for canned message plugin separated by '|' characters.
-   * This is part 3.
-   */
-  string text = 1;
-}
-
-/*
- * Canned message plugin part 4
- */
-message CannedMessagePluginMessagePart4 {
-  /*
-   * Predefined messages for canned message plugin separated by '|' characters.
-   * This is part 4.
-   */
-  string text = 1;
-}
-
-/*
- * Canned message plugin part 5
- */
-message CannedMessagePluginMessagePart5 {
-  /*
-   * Predefined messages for canned message plugin separated by '|' characters.
-   * This is part 5.
-   */
-  string text = 1;
-}
-
diff --git a/deviceonly.options b/deviceonly.options
index 321174a..9e04083 100644
--- a/deviceonly.options
+++ b/deviceonly.options
@@ -7,11 +7,5 @@
 # FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
 *DeviceState.receive_queue max_count:1
 
-*DeviceState.canned_message_plugin_message_part1 max_size:200
-*DeviceState.canned_message_plugin_message_part2 max_size:200
-*DeviceState.canned_message_plugin_message_part3 max_size:200
-*DeviceState.canned_message_plugin_message_part4 max_size:200
-*DeviceState.canned_message_plugin_message_part5 max_size:200
-
 *ChannelFile.channels max_count:8
 
diff --git a/deviceonly.proto b/deviceonly.proto
index 62263d1..42e06cb 100644
--- a/deviceonly.proto
+++ b/deviceonly.proto
@@ -72,31 +72,6 @@ message DeviceState {
    */
   bool did_gps_reset = 11;
 
-  /*
-   * Canned Message Plugin message part1.
-   */
-  string canned_message_plugin_message_part1 = 13;
-
-  /*
-   * Canned Message Plugin message part2.
-   */
-  string canned_message_plugin_message_part2 = 14;
-
-  /*
-   * Canned Message Plugin message part3.
-   */
-  string canned_message_plugin_message_part3 = 15;
-
-  /*
-   * Canned Message Plugin message part4.
-   */
-  string canned_message_plugin_message_part4 = 16;
-
-  /*
-   * Canned Message Plugin message part5.
-   */
-  string canned_message_plugin_message_part5 = 17;
-
 }
 
 /*
diff --git a/radioconfig.proto b/radioconfig.proto
index a166341..b3ea1ac 100644
--- a/radioconfig.proto
+++ b/radioconfig.proto
@@ -673,14 +673,6 @@ message RadioConfig {
      */
     string canned_message_plugin_allow_input_source = 171;
 
-    /*
-      * Predefined messages for CannedMessagePlugin separated by '|' characters.
-      * Note: Split out the messages out to their own messages because we want to store 1,000 characters.
-      * and the entire message must fit within 256 bytes.
-      * Not sure if we should deprecate this or just remove it since we're in dev phase.
-      */
-    string canned_message_plugin_messages = 172 [deprecated = true];
-
     /*
      * CannedMessagePlugin also sends a bell character with the messages.
      * ExternalNotificationPlugin can benefit from this feature.

From 98929a163afdcfe3db0331016b2485a348fbbec2 Mon Sep 17 00:00:00 2001
From: Balazs Kelemen <10376327+prampec@users.noreply.github.com>
Date: Mon, 21 Feb 2022 23:39:30 +0100
Subject: [PATCH 16/16] Canned message - Fixes

---
 mesh.proto     | 2 +-
 portnums.proto | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mesh.proto b/mesh.proto
index 8508e78..a1eab8a 100644
--- a/mesh.proto
+++ b/mesh.proto
@@ -530,7 +530,7 @@ message Data {
    * Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
    * a message a heart or poop emoji.
    */
-   uint32 group_id = 9;
+  uint32 group_id = 9;
 }
 
 /*
diff --git a/portnums.proto b/portnums.proto
index 70509f1..fc1f223 100644
--- a/portnums.proto
+++ b/portnums.proto
@@ -96,7 +96,7 @@ enum PortNum {
    */
   GROUP_APP = 34;
 
-   /*
+  /*
    * Provides a hardware serial interface to send and receive from the Meshtastic network.
    * Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
    * network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.