From 39c41e0ef130e7239eed916f7609aad1aa7f6db8 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 27 Feb 2021 13:43:36 +0800 Subject: [PATCH] fix java paths --- admin.proto | 3 ++- apponly.proto | 3 ++- channel.proto | 3 ++- deviceonly.proto | 3 ++- mesh.proto | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/admin.proto b/admin.proto index 728f28c..faa02f5 100644 --- 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 index 6c6cd5c..d25a434 100644 --- 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 index 3248686..2dc7cb0 100644 --- 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 index fe25597..b7365c3 100644 --- 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 index c2ac899..9f81ec4 100644 --- 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 */