From 769d87aaf0264193401ae867601f8666744e5aae Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sun, 27 Feb 2022 00:58:46 -0800 Subject: [PATCH] More update plugin to module, mostly cannedmessages --- admin.options | 16 ++++++++-------- admin.proto | 42 +++++++++++++++++++++--------------------- cannedmessages.options | 8 ++++---- cannedmessages.proto | 6 +++--- mesh.options | 3 --- mesh.proto | 2 +- portnums.proto | 8 ++++---- radioconfig.proto | 16 ++++++++-------- remote_hardware.proto | 2 +- 9 files changed, 50 insertions(+), 53 deletions(-) diff --git a/admin.options b/admin.options index 404d3fa..77e9bc0 100644 --- a/admin.options +++ b/admin.options @@ -1,10 +1,10 @@ *AdminMessage.variant anonymous_oneof:true -*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 +*AdminMessage.set_canned_message_module_part1 max_size:201 +*AdminMessage.set_canned_message_module_part2 max_size:201 +*AdminMessage.set_canned_message_module_part3 max_size:201 +*AdminMessage.set_canned_message_module_part4 max_size:201 +*AdminMessage.get_canned_message_module_part1_response max_size:201 +*AdminMessage.get_canned_message_module_part2_response max_size:201 +*AdminMessage.get_canned_message_module_part3_response max_size:201 +*AdminMessage.get_canned_message_module_part4_response max_size:201 diff --git a/admin.proto b/admin.proto index e3800a3..1f93b30 100644 --- a/admin.proto +++ b/admin.proto @@ -11,7 +11,7 @@ import "radioconfig.proto"; option java_outer_classname = "AdminProtos"; /* - * This message is handled by the Admin plugin and is responsible for all settings/channel read/write operations. + * This message is handled by the Admin module and is responsible for all settings/channel read/write operations. * This message is used to do settings operations to both remote AND local nodes. * (Prior to 1.2 these operations were done via special ToRadio operations) */ @@ -97,64 +97,64 @@ message AdminMessage { int32 reboot_seconds = 35; /* - * Get the Canned Message Plugin message part1 in the response to this message. + * Get the Canned Message Module message part1 in the response to this message. */ - bool get_canned_message_plugin_part1_request = 36; + bool get_canned_message_module_part1_request = 36; /* * TODO: REPLACE */ - string get_canned_message_plugin_part1_response = 37; + string get_canned_message_module_part1_response = 37; /* - * Get the Canned Message Plugin message part2 in the response to this message. + * Get the Canned Message Module message part2 in the response to this message. */ - bool get_canned_message_plugin_part2_request = 38; + bool get_canned_message_module_part2_request = 38; /* * TODO: REPLACE */ - string get_canned_message_plugin_part2_response = 39; + string get_canned_message_module_part2_response = 39; /* - * Get the Canned Message Plugin message part3 in the response to this message. + * Get the Canned Message Module message part3 in the response to this message. */ - bool get_canned_message_plugin_part3_request = 40; + bool get_canned_message_module_part3_request = 40; /* * TODO: REPLACE */ - string get_canned_message_plugin_part3_response = 41; + string get_canned_message_module_part3_response = 41; /* - * Get the Canned Message Plugin message part4 in the response to this message. + * Get the Canned Message Module message part4 in the response to this message. */ - bool get_canned_message_plugin_part4_request = 42; + bool get_canned_message_module_part4_request = 42; /* * TODO: REPLACE */ - string get_canned_message_plugin_part4_response = 43; + string get_canned_message_module_part4_response = 43; /* - * Set the canned message plugin part 1 text. + * Set the canned message module part 1 text. */ - string set_canned_message_plugin_part1 = 44; + string set_canned_message_module_part1 = 44; /* - * Set the canned message plugin part 2 text. + * Set the canned message module part 2 text. */ - string set_canned_message_plugin_part2 = 45; + string set_canned_message_module_part2 = 45; /* - * Set the canned message plugin part 3 text. + * Set the canned message module part 3 text. */ - string set_canned_message_plugin_part3 = 46; + string set_canned_message_module_part3 = 46; /* - * Set the canned message plugin part 4 text. + * Set the canned message module part 4 text. */ - string set_canned_message_plugin_part4 = 47; + string set_canned_message_module_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 f3ecacc..0a68613 100644 --- a/cannedmessages.options +++ b/cannedmessages.options @@ -1,4 +1,4 @@ -*CannedMessagePluginConfig.messagesPart1 max_size:201 -*CannedMessagePluginConfig.messagesPart2 max_size:201 -*CannedMessagePluginConfig.messagesPart3 max_size:201 -*CannedMessagePluginConfig.messagesPart4 max_size:201 +*CannedMessageModuleConfig.messagesPart1 max_size:201 +*CannedMessageModuleConfig.messagesPart2 max_size:201 +*CannedMessageModuleConfig.messagesPart3 max_size:201 +*CannedMessageModuleConfig.messagesPart4 max_size:201 diff --git a/cannedmessages.proto b/cannedmessages.proto index 4115f1b..4b4f599 100644 --- a/cannedmessages.proto +++ b/cannedmessages.proto @@ -25,12 +25,12 @@ option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/gomeshproto"; /* - * Canned message plugin configuration. + * Canned message module configuration. */ -message CannedMessagePluginConfig { +message CannedMessageModuleConfig { /* - * Predefined messages for canned message plugin separated by '|' characters. + * Predefined messages for canned message module separated by '|' characters. */ string messagesPart1 = 11; diff --git a/mesh.options b/mesh.options index 05a7ef6..9599acc 100644 --- a/mesh.options +++ b/mesh.options @@ -12,9 +12,6 @@ # 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.group_id 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 diff --git a/mesh.proto b/mesh.proto index ad7027c..181aa9a 100644 --- a/mesh.proto +++ b/mesh.proto @@ -573,7 +573,7 @@ message RouteDiscovery { } /* - * A Routing control Data packet handled by the routing plugin + * A Routing control Data packet handled by the routing module */ message Routing { diff --git a/portnums.proto b/portnums.proto index 1df9a89..690ca17 100644 --- a/portnums.proto +++ b/portnums.proto @@ -83,7 +83,7 @@ enum PortNum { /* * Provides a 'ping' service that replies to any packet it receives. - * Also serves as a small example plugin. + * Also serves as a small example module. */ REPLY_APP = 32; @@ -93,7 +93,7 @@ enum PortNum { IP_TUNNEL_APP = 33; /* - * Used for the router plugin + * Used for the router module */ ROUTER_APP = 34; @@ -102,7 +102,7 @@ enum PortNum { * 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. * Maximum packet size of 240 bytes. - * Plugin is disabled by default can be turned on by setting SERIALPLUGIN_ENABLED = 1 in SerialPlugh.cpp. + * Module is disabled by default can be turned on by setting SERIALMODULE_ENABLED = 1 in SerialPlugh.cpp. * Maintained by Jm Casler (MC Hamster) : jm@casler.org */ SERIAL_APP = 64; @@ -140,7 +140,7 @@ enum PortNum { PRIVATE_APP = 256; /* - * ATAK Forwarder Plugin https://github.com/paulmandal/atak-forwarder + * ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder */ ATAK_FORWARDER = 257; diff --git a/radioconfig.proto b/radioconfig.proto index ba41194..760a294 100644 --- a/radioconfig.proto +++ b/radioconfig.proto @@ -643,7 +643,7 @@ message RadioConfig { repeated uint32 ignore_incoming = 103; /* - * Preferences for the SerialPlugin + * Preferences for the SerialModule * FIXME - Move this out of UserPreferences and into a section for module configuration. */ bool serialmodule_enabled = 120; @@ -679,7 +679,7 @@ message RadioConfig { uint32 serialmodule_mode = 125; /* - * Preferences for the ExternalNotificationPlugin + * Preferences for the ExternalNotificationModule * FIXME - Move this out of UserPreferences and into a section for module configuration. */ bool ext_notification_module_enabled = 126; @@ -710,7 +710,7 @@ message RadioConfig { bool ext_notification_module_alert_bell = 131; /* - * Preferences for the RangeTestPlugin + * Preferences for the RangeTestModule * FIXME - Move this out of UserPreferences and into a section for module configuration. */ bool range_test_module_enabled = 132; @@ -726,7 +726,7 @@ message RadioConfig { bool range_test_module_save = 134; /* - * Preferences for the StoreForwardPlugin + * Preferences for the StoreForwardModule *FIXME - Move this out of UserPreferences and into a section for module configuration. (was 136) */ bool store_forward_module_enabled = 148; @@ -757,7 +757,7 @@ message RadioConfig { reserved 136; /* - * Preferences for the Teletry Plugin + * Preferences for the Teletry Module * FIXME - Move this out of UserPreferences and into a section for module configuration. * Enable/Disable the telemetry measurement module measurement collection */ @@ -946,7 +946,7 @@ message RadioConfig { InputEventChar rotary1_event_press = 166; /* - * Enable/disable CannedMessagePlugin. + * Enable/disable CannedMessageModule. */ bool canned_message_module_enabled = 170; @@ -957,8 +957,8 @@ message RadioConfig { string canned_message_module_allow_input_source = 171; /* - * CannedMessagePlugin also sends a bell character with the messages. - * ExternalNotificationPlugin can benefit from this feature. + * CannedMessageModule also sends a bell character with the messages. + * ExternalNotificationModule can benefit from this feature. */ bool canned_message_module_send_bell = 173; diff --git a/remote_hardware.proto b/remote_hardware.proto index 54a0259..654678c 100644 --- a/remote_hardware.proto +++ b/remote_hardware.proto @@ -6,7 +6,7 @@ option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/gomeshproto"; /* - * An example app to show off the plugin system. This message is used for + * An example app to show off the module system. This message is used for * REMOTE_HARDWARE_APP PortNums. * * Also provides easy remote access to any GPIO.