diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..595d758 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,9 @@ + +## What does this PR do? + +> [Related Issue](https://github.com/meshtastic/Meshtastic-protobufs/issues/0) + +## Checklist before merging +- [ ] All top level messages commented +- [ ] All enum members have unique descriptions +- [ ] Formatting is consistant with the defined protolint rules 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 930812c..e3800a3 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"; @@ -105,7 +104,7 @@ message AdminMessage { /* * TODO: REPLACE */ - 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. @@ -115,7 +114,7 @@ message AdminMessage { /* * TODO: REPLACE */ - 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. @@ -125,7 +124,7 @@ message AdminMessage { /* * TODO: REPLACE */ - 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. @@ -135,42 +134,27 @@ message AdminMessage { /* * TODO: REPLACE */ - 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; - - /* - * TODO: REPLACE - */ - 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 85babc5..4115f1b 100644 --- a/cannedmessages.proto +++ b/cannedmessages.proto @@ -25,62 +25,27 @@ 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; -} - -/* - * Canned message plugin part 2 - */ -message CannedMessagePluginMessagePart2 { + string messagesPart1 = 11; /* - * Predefined messages for canned message plugin separated by '|' characters. - * This is part 2. + * TODO: REPLACE */ - string text = 1; -} - -/* - * Canned message plugin part 3 - */ -message CannedMessagePluginMessagePart3 { + string messagesPart2 = 12; /* - * Predefined messages for canned message plugin separated by '|' characters. - * This is part 3. + * TODO: REPLACE */ - string text = 1; -} - -/* - * Canned message plugin part 4 - */ -message CannedMessagePluginMessagePart4 { + string messagesPart3 = 13; /* - * Predefined messages for canned message plugin separated by '|' characters. - * This is part 4. + * TODO: REPLACE */ - string text = 1; + string messagesPart4 = 14; } - -/* - * 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 2c06d50..2677232 100644 --- a/deviceonly.proto +++ b/deviceonly.proto @@ -44,11 +44,6 @@ 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 @@ -74,31 +69,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/mesh.proto b/mesh.proto index f6a03a0..ad7027c 100644 --- a/mesh.proto +++ b/mesh.proto @@ -718,12 +718,6 @@ 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; } /* @@ -1104,18 +1098,6 @@ enum CriticalErrorCode { RadioSpiBug = 11; } -/* - * GroupInfo for group chats like #FoodFreaks and #CoolPeopleOnly - */ -message GroupInfo { - - /* - * TODO: REPLACE - */ - repeated string group = 1; -} - - /* * Unique local debugging info for this node * Note: we don't include position or the user info, because that will come in the @@ -1371,10 +1353,6 @@ message FromRadio { */ bool rebooted = 9; - /* - * Groups - */ - GroupInfo groups = 12; } } diff --git a/portnums.proto b/portnums.proto index a74d34b..11f7b2a 100644 --- a/portnums.proto +++ b/portnums.proto @@ -93,11 +93,11 @@ enum PortNum { IP_TUNNEL_APP = 33; /* - * Used for managing chat groups + * Used for the router plugin */ - GROUP_APP = 34; + ROUTER_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. diff --git a/radioconfig.proto b/radioconfig.proto index dc9ec59..b42eaf4 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -658,6 +658,11 @@ message RadioConfig { */ uint32 serialplugin_txd = 123; + /* + * TODO: REPLACE + */ + uint32 serialplugin_baud = 176; + /* * TODO: REPLACE */ @@ -946,14 +951,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.