Merge branch 'dev1.2' of https://github.com/meshtastic/Meshtastic-pro…

…tobufs into dev1.2
rickmark · Mar 2, 2021 · 2def8ec · 2def8ec
2 parents f16485d + 39c41e0
commit 2def8ec
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/admin.proto b/admin.proto
@@ -1,13 +1,14 @@
 syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
-option java_outer_classname = "AdminProtos";
 option optimize_for = LITE_RUNTIME;
 
 import "mesh.proto";
 import "radioconfig.proto";
 import "channel.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 used to do settings operations to both remote AND local nodes.
 

diff --git a/apponly.proto b/apponly.proto
@@ -1,12 +1,13 @@
 syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
-option java_outer_classname = "AppOnlyProtos";
 option optimize_for = LITE_RUNTIME;
 
 import "mesh.proto";
 import "channel.proto";
 
+option java_outer_classname = "AppOnlyProtos";
+
 /*
  * This message wraps a MeshPacket with extra metadata about the sender and how it arrived.
  */

diff --git a/channel.proto b/channel.proto
@@ -20,9 +20,10 @@ syntax = "proto3";
  */
 
 option java_package = "com.geeksville.mesh";
-option java_outer_classname = "ChannelProtos";
 option optimize_for = LITE_RUNTIME;
 
+option java_outer_classname = "ChannelProtos";
+
 /*
  * Full settings (center freq, spread factor, pre-shared secret key etc...)
  * needed to configure a radio for speaking on a particular channel This

diff --git a/deviceonly.proto b/deviceonly.proto
@@ -1,13 +1,14 @@
 syntax = "proto3";
 
 option java_package = "com.geeksville.mesh";
-option java_outer_classname = "DeviceOnly";
 option optimize_for = LITE_RUNTIME;
 
 import "mesh.proto";
 import "radioconfig.proto";
 import "channel.proto";
 
+option java_outer_classname = "DeviceOnly";
+
 /*
  * This message is never sent over the wire, but it is used for serializing DB
  * state to flash in the device code

diff --git a/mesh.proto b/mesh.proto
@@ -20,11 +20,12 @@ syntax = "proto3";
  */
 
 option java_package = "com.geeksville.mesh";
-option java_outer_classname = "MeshProtos";
 option optimize_for = LITE_RUNTIME;
 
 import "portnums.proto";
 
+option java_outer_classname = "MeshProtos";
+
 /*
  * a gps position
  */