From 49d891c5e93f162aeadf938b5933a98d28da128a Mon Sep 17 00:00:00 2001 From: Sacha Weatherstone Date: Sun, 22 Jan 2023 01:26:47 +1000 Subject: [PATCH] add swift_prefix --- README.md | 2 +- meshtastic/admin.proto | 5 +++-- meshtastic/apponly.proto | 6 ++++-- meshtastic/cannedmessages.proto | 3 ++- meshtastic/channel.proto | 5 +++-- meshtastic/config.proto | 3 ++- meshtastic/device_metadata.proto | 9 +++++---- meshtastic/deviceonly.proto | 5 +++-- meshtastic/localonly.proto | 5 +++-- meshtastic/mesh.proto | 5 +++-- meshtastic/module_config.proto | 3 ++- meshtastic/mqtt.proto | 5 +++-- meshtastic/portnums.proto | 3 ++- meshtastic/remote_hardware.proto | 3 ++- meshtastic/rtttl.proto | 3 ++- meshtastic/storeforward.proto | 3 ++- meshtastic/telemetry.proto | 5 +++-- meshtastic/xmodem.proto | 5 +++-- 18 files changed, 48 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 5d7b9fe..9e36197 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ The [Protobuf](https://developers.google.com/protocol-buffers) message definitio ## Stats -![Alt](https://repobeats.axiom.co/api/embed/47e9ee1d81d9c0fdd2b4b5b4c673adb1756f6db5.svg "Repobeats analytics image") \ No newline at end of file +![Alt](https://repobeats.axiom.co/api/embed/47e9ee1d81d9c0fdd2b4b5b4c673adb1756f6db5.svg "Repobeats analytics image") diff --git a/meshtastic/admin.proto b/meshtastic/admin.proto index 3b21d5d..d8170e9 100644 --- a/meshtastic/admin.proto +++ b/meshtastic/admin.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; +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 java_outer_classname = "AdminProtos"; +option swift_prefix = ""; import "meshtastic/channel.proto"; import "meshtastic/config.proto"; diff --git a/meshtastic/apponly.proto b/meshtastic/apponly.proto index 7057fa0..16315c0 100644 --- a/meshtastic/apponly.proto +++ b/meshtastic/apponly.proto @@ -2,11 +2,13 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; +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 java_outer_classname = "AppOnlyProtos"; +option swift_prefix = ""; + import "meshtastic/channel.proto"; import "meshtastic/config.proto"; diff --git a/meshtastic/cannedmessages.proto b/meshtastic/cannedmessages.proto index ba46487..84f1406 100644 --- a/meshtastic/cannedmessages.proto +++ b/meshtastic/cannedmessages.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "CannedMessageConfigProtos"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; /* * Canned message module configuration. diff --git a/meshtastic/channel.proto b/meshtastic/channel.proto index 1ac4f23..d74aed5 100644 --- a/meshtastic/channel.proto +++ b/meshtastic/channel.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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 swift_prefix = ""; /* * Full settings (center freq, spread factor, pre-shared secret key etc...) diff --git a/meshtastic/config.proto b/meshtastic/config.proto index 7eecf4a..e49468a 100644 --- a/meshtastic/config.proto +++ b/meshtastic/config.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "ConfigProtos"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; message Config { /* diff --git a/meshtastic/device_metadata.proto b/meshtastic/device_metadata.proto index 38a5122..0d50b8f 100644 --- a/meshtastic/device_metadata.proto +++ b/meshtastic/device_metadata.proto @@ -2,13 +2,14 @@ syntax = "proto3"; package meshtastic; -import "meshtastic/config.proto"; - -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +option java_package = "com.geeksville.mesh"; option java_outer_classname = "DeviceMetadataProtos"; +option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; + +import "meshtastic/config.proto"; /* * Device metadata response diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto index 39a9247..6470e25 100644 --- a/meshtastic/deviceonly.proto +++ b/meshtastic/deviceonly.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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/mesh.proto"; diff --git a/meshtastic/localonly.proto b/meshtastic/localonly.proto index 2986943..20e1e4b 100644 --- a/meshtastic/localonly.proto +++ b/meshtastic/localonly.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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"; diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto index 9aae938..fbe4db6 100644 --- a/meshtastic/mesh.proto +++ b/meshtastic/mesh.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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"; diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto index 3a4f080..b19dd49 100644 --- a/meshtastic/module_config.proto +++ b/meshtastic/module_config.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "ModuleConfigProtos"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; /* * Module Config diff --git a/meshtastic/mqtt.proto b/meshtastic/mqtt.proto index 610a15c..bedecaf 100644 --- a/meshtastic/mqtt.proto +++ b/meshtastic/mqtt.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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"; diff --git a/meshtastic/portnums.proto b/meshtastic/portnums.proto index d37d6bf..9e1a9fa 100644 --- a/meshtastic/portnums.proto +++ b/meshtastic/portnums.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "Portnums"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; /* * For any new 'apps' that run on the device or via sister apps on phones/PCs they should pick and use a diff --git a/meshtastic/remote_hardware.proto b/meshtastic/remote_hardware.proto index 89a8e6b..dad5a94 100644 --- a/meshtastic/remote_hardware.proto +++ b/meshtastic/remote_hardware.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "RemoteHardware"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; /* * An example app to show off the module system. This message is used for diff --git a/meshtastic/rtttl.proto b/meshtastic/rtttl.proto index 44c3dd2..0cdee52 100644 --- a/meshtastic/rtttl.proto +++ b/meshtastic/rtttl.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "RTTTLConfigProtos"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; /* * Canned message module configuration. diff --git a/meshtastic/storeforward.proto b/meshtastic/storeforward.proto index 3af5ac9..56f9c6c 100644 --- a/meshtastic/storeforward.proto +++ b/meshtastic/storeforward.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; +option optimize_for = LITE_RUNTIME; option java_package = "com.geeksville.mesh"; option java_outer_classname = "StoreAndForwardProtos"; -option optimize_for = LITE_RUNTIME; option go_package = "github.com/meshtastic/go/generated"; option csharp_namespace = "Meshtastic.Protobufs"; +option swift_prefix = ""; /* * TODO: REPLACE diff --git a/meshtastic/telemetry.proto b/meshtastic/telemetry.proto index 2fc81b9..3661b28 100644 --- a/meshtastic/telemetry.proto +++ b/meshtastic/telemetry.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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 swift_prefix = ""; /* * Key native device metrics such as battery level diff --git a/meshtastic/xmodem.proto b/meshtastic/xmodem.proto index 6fdd1b5..45ac875 100644 --- a/meshtastic/xmodem.proto +++ b/meshtastic/xmodem.proto @@ -2,11 +2,12 @@ syntax = "proto3"; package meshtastic; -option java_package = "com.geeksville.mesh"; option optimize_for = LITE_RUNTIME; -option go_package = "github.com/meshtastic/go/generated"; +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 swift_prefix = ""; message XModem { enum Control {