Trunk format

.github/workflows/create_tag.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       increment_type:
         type: choice
-        description: "Select the type of version increment"
+        description: Select the type of version increment
         required: true
         options:
           - patch

.trunk/.gitignore

@@ -5,3 +5,4 @@
 plugins
 user_trunk.yaml
 user.yaml
+shims

.trunk/trunk.yaml

@@ -1,6 +1,6 @@
 version: 0.1
 cli:
-  version: 1.7.0
+  version: 1.9.1
 plugins:
   sources:
     - id: trunk
@@ -8,13 +8,13 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - yamllint@1.30.0
+    - yamllint@1.31.0
-    - buf-lint@1.17.0
+    - buf-lint@1.19.0
-    - buf-breaking@1.17.0
+    - buf-breaking@1.19.0
     - actionlint@1.6.24
-    - markdownlint@0.33.0
+    - markdownlint@0.34.0
-    - prettier@2.8.7
+    - prettier@2.8.8
-    - gitleaks@8.16.2
+    - gitleaks@8.16.3
     - git-diff-check
 runtimes:
   enabled:

.vscode/extensions.json

@@ -1,7 +1,3 @@
 {
-  "recommendations": [
+  "recommendations": ["trunk.io", "pbkit.vscode-pbkit", "bufbuild.vscode-buf"]
-    "trunk.io",
-    "pbkit.vscode-pbkit",
-    "bufbuild.vscode-buf"
-  ]
 }

meshtastic/admin.proto

@@ -2,18 +2,18 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "AdminProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
-import "meshtastic/mesh.proto";
-import "meshtastic/module_config.proto";
 import "meshtastic/connection_status.proto";
 import "meshtastic/deviceonly.proto";
+import "meshtastic/mesh.proto";
+import "meshtastic/module_config.proto";
+
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "AdminProtos";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
 
 /*
  * This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
@@ -21,12 +21,10 @@ import "meshtastic/deviceonly.proto";
  * (Prior to 1.2 these operations were done via special ToRadio operations)
  */
 message AdminMessage {
-
   /*
    * TODO: REPLACE
    */
   enum ConfigType {
-
     /*
      * TODO: REPLACE
      */
@@ -67,7 +65,6 @@ message AdminMessage {
    * TODO: REPLACE
    */
   enum ModuleConfigType {
-
     /*
      * TODO: REPLACE
      */
@@ -118,7 +115,6 @@ message AdminMessage {
    * TODO: REPLACE
    */
   oneof payload_variant {
-
     /*
      * Send the specified channel in the response to this message
      * NOTE: This field is sent with the channel index + 1 (to ensure we never try to send 'zero' - which protobufs treats as not present)

meshtastic/apponly.proto

@@ -2,16 +2,15 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "AppOnlyProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
-
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "AppOnlyProtos";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
+
 /*
  * This is the most compact possible representation for a set of channels.
  * It includes only one PRIMARY channel (which must be first) and
@@ -20,7 +19,6 @@ import "meshtastic/config.proto";
  * This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL
  */
 message ChannelSet {
-
   /*
    * Channel list with settings
    */

meshtastic/cannedmessages.proto

@@ -2,17 +2,16 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "CannedMessageConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "CannedMessageConfigProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
  * Canned message module configuration.
  */
 message CannedMessageModuleConfig {
-
   /*
    * Predefined messages for canned message module separated by '|' characters.
    */

meshtastic/channel.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ChannelProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ChannelProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
@@ -26,7 +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
    */
@@ -88,7 +87,6 @@ message ChannelSettings {
  * A pair of a channel number, mode and the (sharable) settings for that channel
  */
 message Channel {
-
   /*
    * How this channel is being used (or not).
    * Note: this field is an enum to give us options for the future.
@@ -101,7 +99,6 @@ message Channel {
    * (but any number of SECONDARY channels can't be sent received on that common frequency)
    */
   enum Role {
-
     /*
      * This channel is not in use right now
      */

meshtastic/clientonly.proto

@@ -2,15 +2,14 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ClientOnlyProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
-
 import "meshtastic/localonly.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ClientOnlyProtos";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
+
 /*
  * This abstraction is used to contain any configuration for provisioning a node on any client.
  * It is useful for importing and exporting configurations.

meshtastic/config.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ConfigProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 message Config {
@@ -17,7 +17,6 @@ message Config {
      * Defines the device's role on the Mesh network
      */
     enum Role {
-    
       /*
        * Client device role
        */
@@ -279,7 +278,6 @@ message Config {
    * See [Power Config](/docs/settings/config/power) for additional power config details.
    */
   message PowerConfig {
-
     /*
      * If set, we are powered from a low-current source (i.e. solar), so even if it looks like we have power flowing in
      * we should try to minimize power consumption as much as possible.
@@ -338,14 +336,12 @@ message Config {
      * 0 for default of 10 seconds
      */
     uint32 min_wake_secs = 8;
-
   }
 
   /*
    * Network Config
    */
   message NetworkConfig {
-
     enum AddressMode {
       /*
        * obtain ip address via DHCP
@@ -430,7 +426,6 @@ message Config {
      * How the GPS coordinates are displayed on the OLED screen.
      */
     enum GpsCoordinateFormat {
-
       /*
        * GPS coordinates are displayed in the normal decimal degrees format:
        * DD.DDDDDD DDD.DDDDDD
@@ -473,7 +468,6 @@ message Config {
      * Unit display preference
      */
     enum DisplayUnits {
-
       /*
        * Metric (Default)
        */
@@ -489,7 +483,6 @@ message Config {
      * Override OLED outo detect with this if it fails.
      */
     enum OledType {
-    
       /*
        * Default / Auto
        */
@@ -590,9 +583,7 @@ message Config {
    * Lora Config
    */
   message LoRaConfig {
-
     enum RegionCode {
-
       /*
        * Region is not set
        */
@@ -679,7 +670,6 @@ message Config {
      * Note: these mappings must match ModemPreset Choice in the device code.
      */
     enum ModemPreset {
-
       /*
        * Long Range - Fast
        */
@@ -825,11 +815,9 @@ message Config {
      * in ignore_incoming will have packets they send dropped on receive (by router.cpp)
      */
     repeated uint32 ignore_incoming = 103;
-
   }
 
   message BluetoothConfig {
-
     enum PairingMode {
       /*
        * Device generates a random PIN that will be shown on the screen of the device for pairing
@@ -861,14 +849,12 @@ message Config {
      * Specified PIN for PairingMode.FixedPin
      */
     uint32 fixed_pin = 3;
-    
   }
 
   /*
    * Payload Variant
    */
   oneof payload_variant {
-
     DeviceConfig device = 1;
     PositionConfig position = 2;
     PowerConfig power = 3;
@@ -876,6 +862,5 @@ message Config {
     DisplayConfig display = 5;
     LoRaConfig lora = 6;
     BluetoothConfig bluetooth = 7;
-
   }
 }

meshtastic/connection_status.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ConnStatusProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ConnStatusProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 message DeviceConnectionStatus {
@@ -107,7 +107,7 @@ message BluetoothConnectionStatus {
 /*
  * Serial connection status
  */
- message SerialConnectionStatus {
+message SerialConnectionStatus {
   /*
    * Serial baud rate
    */

meshtastic/deviceonly.proto

@@ -2,17 +2,17 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "DeviceOnly";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
 import "meshtastic/channel.proto";
 import "meshtastic/localonly.proto";
 import "meshtastic/mesh.proto";
 import "meshtastic/module_config.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "DeviceOnly";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
+
 /*
  * This message is never sent over the wire, but it is used for serializing DB
  * state to flash in the device code
@@ -21,7 +21,6 @@ import "meshtastic/module_config.proto";
  * the receive queue and use the preferences store for the other stuff
  */
 message DeviceState {
-
   /*
    * Read only settings/info about this node
    */
@@ -84,7 +83,6 @@ message DeviceState {
  * The on-disk saved channels
  */
 message ChannelFile {
-
   /*
    * The channels our node knows about
    */
@@ -102,7 +100,6 @@ message ChannelFile {
  * TODO: REPLACE
  */
 enum ScreenFonts {
-
   /*
    * TODO: REPLACE
    */
@@ -124,7 +121,6 @@ enum ScreenFonts {
  * show a secondary bootup screen with custom logo and text for 2.5 seconds.
  */
 message OEMStore {
-
   /*
    * The Logo width in Px
    */
@@ -170,7 +166,6 @@ message OEMStore {
  * RemoteHardwarePins associated with a node
  */
 message NodeRemoteHardwarePin {
-
   /*
    * The node_num exposing the available gpio pin
    */

meshtastic/localonly.proto

@@ -2,15 +2,15 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "LocalOnlyProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
 import "meshtastic/config.proto";
 import "meshtastic/module_config.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "LocalOnlyProtos";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
+
 /*
  * Protobuf structures common to apponly.proto and deviceonly.proto
  * This is never sent over the wire, only for local use

meshtastic/mesh.proto

@@ -2,12 +2,6 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "MeshProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
 import "meshtastic/channel.proto";
 import "meshtastic/config.proto";
 import "meshtastic/module_config.proto";
@@ -15,6 +9,12 @@ import "meshtastic/portnums.proto";
 import "meshtastic/telemetry.proto";
 import "meshtastic/xmodem.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "MeshProtos";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
+
 /*
  * a gps position
  */
@@ -48,7 +48,6 @@ message Position {
    * How the location was acquired: manual, onboard GPS, external (EUD) GPS
    */
   enum LocSource {
-
     /*
      * TODO: REPLACE
      */
@@ -80,7 +79,6 @@ message Position {
    * Default: same as location_source if present
    */
   enum AltSource {
-
     /*
      * TODO: REPLACE
      */
@@ -215,7 +213,6 @@ message Position {
  * To match the old style filenames, _ is converted to -, p is converted to .
  */
 enum HardwareModel {
-
   /*
    * TODO: REPLACE
    */
@@ -421,7 +418,6 @@ enum HardwareModel {
  * 0 through 3 - for future use
  */
 message User {
-
   /*
    * A globally unique ID string for this user.
    * In the case of Signal that would mean +16504442323, for the default macaddr derived id it would be !<8 hexidecimal bytes>.
@@ -467,7 +463,6 @@ message User {
  * A message used in our Dynamic Source Routing protocol (RFC 4728 based)
  */
 message RouteDiscovery {
-
   /*
    * The list of nodenums this packet has visited so far
    */
@@ -478,13 +473,11 @@ message RouteDiscovery {
  * A Routing control Data packet handled by the routing module
  */
 message Routing {
-
   /*
    * A failure in delivering a message (usually used for routing control messages, but might be provided in addition to ack.fail_id to provide
    * details on the type of failure).
    */
   enum Error {
-
     /*
      * This message is not a failure
      */
@@ -549,7 +542,6 @@ message Routing {
   }
 
   oneof variant {
-
     /*
      * A route request going from the requester
      */
@@ -565,7 +557,6 @@ message Routing {
      * in addition to ack.fail_id to provide details on the type of failure).
      */
     Error error_reason = 3;
-
   }
 }
 
@@ -575,7 +566,6 @@ message Routing {
  * inside a radio packet (because from/to are broken out by the comms library)
  */
 message Data {
-
   /*
    * Formerly named typ and of type Type
    */
@@ -625,14 +615,12 @@ message Data {
    * a message a heart or poop emoji.
    */
   fixed32 emoji = 8;
-
 }
 
 /*
  * Waypoint message, used to share arbitrary locations across the mesh
  */
 message Waypoint {
-
   /*
    * Id of the waypoint
    */
@@ -681,7 +669,6 @@ message Waypoint {
  * The other fields are either not sent at all, or sent in the special 16 byte LORA header.
  */
 message MeshPacket {
-
   /*
    * The priority of this message for sending.
    * Higher priorities are sent first (when managing the transmit queue).
@@ -703,7 +690,6 @@ message MeshPacket {
    * And the transmission queue in the router object is now a priority queue.
    */
   enum Priority {
-
     /*
      * Treated as Priority.DEFAULT
      */
@@ -747,7 +733,6 @@ message MeshPacket {
    * Identify if this is a delayed packet
    */
   enum Delayed {
-
     /*
      * If unset, the message is being sent in real time.
      */
@@ -799,7 +784,6 @@ message MeshPacket {
    */
 
   oneof payload_variant {
-
     /*
      * TODO: REPLACE
      */
@@ -876,14 +860,12 @@ message MeshPacket {
    * Describe if this message is delayed
    */
   Delayed delayed = 13;
-
 }
 
 /*
  * Shared constants between device and phone
  */
 enum Constants {
-
   /*
    * First enum must be zero, and we are just using this enum to
    * pass int constants between two very different environments
@@ -917,7 +899,6 @@ enum Constants {
  * Full information about a node on the mesh
  */
 message NodeInfo {
-
   /*
    * The node number
    */
@@ -980,7 +961,6 @@ message NodeInfo {
    * local channel index we heard that node on. Only populated if its not the default channel.
    */
   uint32 channel = 7;
-
 }
 
 /*
@@ -990,7 +970,6 @@ message NodeInfo {
  * and we'll try to help.
  */
 enum CriticalErrorCode {
-
   /*
    * TODO: REPLACE
    */
@@ -1059,7 +1038,6 @@ enum CriticalErrorCode {
  * Sent to the phone in response to WantNodes.
  */
 message MyNodeInfo {
-
   /*
    * Tells the phone what our node number is, default starting value is
    * lowbyte of macaddr, but it will be fixed if that is already in use
@@ -1162,7 +1140,6 @@ message MyNodeInfo {
  * and then extend as needed by emitting multiple records.
  */
 message LogRecord {
-
   /*
    * Log levels, chosen to match python logging conventions.
    */
@@ -1245,7 +1222,6 @@ message QueueStatus {
  * at which point the next item in the FIFO will be populated.
  */
 message FromRadio {
-
   /*
    * The packet id, used to allow the phone to request missing read packets from the FIFO,
    * see our bluetooth docs
@@ -1256,7 +1232,6 @@ message FromRadio {
    * Log levels, chosen to match python logging conventions.
    */
   oneof payload_variant {
-
     /*
      * Log levels, chosen to match python logging conventions.
      */
@@ -1327,18 +1302,15 @@ message FromRadio {
   }
 }
 
-
 /*
  * Packets/commands to the radio will be written (reliably) to the toRadio characteristic.
  * Once the write completes the phone can assume it is handled.
  */
 message ToRadio {
-
   /*
    * Log levels, chosen to match python logging conventions.
    */
   oneof payload_variant {
-
     /*
      * Send this packet on the mesh
      */
@@ -1375,7 +1347,6 @@ message ToRadio {
  * Compressed message payload
  */
 message Compressed {
-
   /*
    * PortNum to determine the how to handle the compressed payload.
    */
@@ -1388,8 +1359,8 @@ message Compressed {
 }
 
 /*
-* Full info on edges for a single node
+ * Full info on edges for a single node
-*/
+ */
 message NeighborInfo {
   /*
    * The node ID of the node sending info on its neighbors
@@ -1406,8 +1377,8 @@ message NeighborInfo {
 }
 
 /*
-* A single edge in the mesh
+ * A single edge in the mesh
-*/
+ */
 message Neighbor {
   /*
    * Node ID of neighbor
@@ -1423,7 +1394,7 @@ message Neighbor {
 /*
  * Device metadata response
  */
- message DeviceMetadata {
+message DeviceMetadata {
   /*
    * Device firmware version string
    */

meshtastic/module_config.proto

@@ -2,22 +2,20 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ModuleConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "ModuleConfigProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
  * Module Config
  */
 message ModuleConfig {
-
   /*
    * MQTT Client Config
    */
   message MQTTConfig {
-
     /*
      * If a meshtastic node is able to reach the internet it will normally attempt to gateway any channels that are marked as
      * is_uplink_enabled or is_downlink_enabled.
@@ -73,7 +71,6 @@ message ModuleConfig {
    * RemoteHardwareModule Config
    */
   message RemoteHardwareConfig {
-
     /*
      * Whether the Module is enabled
      */
@@ -94,7 +91,6 @@ message ModuleConfig {
    * Audio Config for codec2 voice
    */
   message AudioConfig {
-
     /*
      * Baudrate for codec2 voice
      */
@@ -108,7 +104,7 @@ message ModuleConfig {
       CODEC2_1200 = 6;
       CODEC2_700 = 7;
       CODEC2_700B = 8;
-    };
+    }
 
     /*
      * Whether Audio is enabled
@@ -150,7 +146,6 @@ message ModuleConfig {
    * Serial Config
    */
   message SerialConfig {
-
     /*
      * TODO: REPLACE
      */
@@ -171,7 +166,7 @@ message ModuleConfig {
       BAUD_460800 = 13;
       BAUD_576000 = 14;
       BAUD_921600 = 15;
-    };
+    }
 
     /*
      * TODO: REPLACE
@@ -182,7 +177,7 @@ message ModuleConfig {
       PROTO = 2;
       TEXTMSG = 3;
       NMEA = 4;
-    };
+    }
 
     /*
      * Preferences for the SerialModule
@@ -219,14 +214,12 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     Serial_Mode mode = 7;
-
   }
 
   /*
    * External Notifications Config
    */
   message ExternalNotificationConfig {
-
     /*
      * Enable the ExternalNotificationModule
      */
@@ -336,7 +329,6 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     uint32 history_return_window = 5;
-
   }
 
   /*
@@ -364,7 +356,6 @@ message ModuleConfig {
    * Configuration for both device and environment metrics
    */
   message TelemetryConfig {
-    
     /*
      * Interval in seconds of how often we should try to send our
      * device metrics to the mesh
@@ -411,12 +402,10 @@ message ModuleConfig {
    * TODO: REPLACE
    */
   message CannedMessageConfig {
-    
     /*
      * TODO: REPLACE
      */
     enum InputEventChar {
-    
       /*
        * TODO: REPLACE
        */
@@ -520,7 +509,6 @@ message ModuleConfig {
    * TODO: REPLACE
    */
   oneof payload_variant {
-
     /*
      * TODO: REPLACE
      */
@@ -565,14 +553,13 @@ message ModuleConfig {
      * TODO: REPLACE
      */
     RemoteHardwareConfig remote_hardware = 9;
-
   }
 }
 
 /*
  * A GPIO pin definition for remote hardware module
  */
- message RemoteHardwarePin {
+message RemoteHardwarePin {
   /*
    * GPIO Pin number (must match Arduino)
    */

meshtastic/mqtt.proto

@@ -2,19 +2,18 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "MQTTProtos";
-option go_package = "github.com/meshtastic/go/generated";
-option csharp_namespace = "Meshtastic.Protobufs";
-option swift_prefix = "";
-
 import "meshtastic/mesh.proto";
 
+option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "MQTTProtos";
+option java_package = "com.geeksville.mesh";
+option swift_prefix = "";
+
 /*
  * This message wraps a MeshPacket with extra metadata about the sender and how it arrived.
  */
 message ServiceEnvelope {
-
   /*
    * The (probably encrypted) packet
    */

meshtastic/portnums.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "Portnums";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "Portnums";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
@@ -23,7 +23,6 @@ option swift_prefix = "";
  * This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically.
  */
 enum PortNum {
-
   /*
    * Deprecated: do not use in new code (formerly called OPAQUE)
    * A message sent from a device outside of the mesh, in a form the mesh does not understand

meshtastic/remote_hardware.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "RemoteHardware";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "RemoteHardware";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
@@ -20,12 +20,10 @@ option swift_prefix = "";
  * (a special channel once multichannel support is included?)
  */
 message HardwareMessage {
-
   /*
    * TODO: REPLACE
    */
   enum Type {
-
     /*
      * Unset/unused
      */

meshtastic/rtttl.proto

@@ -2,17 +2,16 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "RTTTLConfigProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "RTTTLConfigProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
  * Canned message module configuration.
  */
 message RTTTLConfig {
-
   /*
    * Ringtone for PWM Buzzer in RTTTL Format.
    */

meshtastic/storeforward.proto

@@ -2,23 +2,21 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "StoreAndForwardProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "StoreAndForwardProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
  * TODO: REPLACE
  */
 message StoreAndForward {
-
   /*
    * 001 - 063 = From Router
    * 064 - 127 = From Client
    */
   enum RequestResponse {
-
     /*
      * Unset/unused
      */
@@ -96,7 +94,6 @@ message StoreAndForward {
    * TODO: REPLACE
    */
   message Statistics {
-
     /*
      * Number of messages we have ever seen
      */
@@ -147,7 +144,6 @@ message StoreAndForward {
    * TODO: REPLACE
    */
   message History {
-
     /*
      * Number of that will be sent to the client
      */
@@ -168,7 +164,6 @@ message StoreAndForward {
    * TODO: REPLACE
    */
   message Heartbeat {
-
     /*
      * Number of that will be sent to the client
      */

meshtastic/telemetry.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "TelemetryProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "TelemetryProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 /*
@@ -71,7 +71,7 @@ message EnvironmentMetrics {
 /*
  * Air quality metrics
  */
- message AirQualityMetrics {
+message AirQualityMetrics {
   /*
    * Concentration Units Standard PM1.0
    */
@@ -165,8 +165,8 @@ message Telemetry {
 }
 
 /*
-* Supported I2C Sensors for telemetry in Meshtastic
+ * Supported I2C Sensors for telemetry in Meshtastic
-*/
+ */
 enum TelemetrySensorType {
   /*
    * No external telemetry sensor explicitly set
@@ -237,4 +237,4 @@ enum TelemetrySensorType {
    * PM2.5 air quality sensor
    */
   PMSA003I = 13;
-};
+}

meshtastic/xmodem.proto

@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package meshtastic;
 
-option java_package = "com.geeksville.mesh";
-option java_outer_classname = "XmodemProtos";
-option go_package = "github.com/meshtastic/go/generated";
 option csharp_namespace = "Meshtastic.Protobufs";
+option go_package = "github.com/meshtastic/go/generated";
+option java_outer_classname = "XmodemProtos";
+option java_package = "com.geeksville.mesh";
 option swift_prefix = "";
 
 message XModem {