Merge pull request #252 from meshtastic/master

Master to Develop

admin.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/go/generated";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 import "channel.proto";
 import "config.proto";

apponly.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 option java_package = "com.geeksville.mesh";
 option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/go/generated";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 import "channel.proto";
 import "config.proto";

cannedmessages.proto

@@ -4,6 +4,7 @@ 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";
 
 /*
  * Canned message module configuration.

channel.proto

@@ -6,6 +6,7 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/go/generated";
 
 option java_outer_classname = "ChannelProtos";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * Full settings (center freq, spread factor, pre-shared secret key etc...)

config.proto

@@ -4,6 +4,7 @@ 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";
 
 message Config {
   /*

device_metadata.proto

@@ -5,6 +5,7 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/go/generated";
 
 option java_outer_classname = "DeviceMetadataProtos";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * Device metadata response 

deviceonly.proto

@@ -8,6 +8,7 @@ import "channel.proto";
 import "mesh.proto";
 
 option java_outer_classname = "DeviceOnly";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * This message is never sent over the wire, but it is used for serializing DB

localonly.proto

@@ -8,6 +8,7 @@ import "config.proto";
 import "module_config.proto";
 
 option java_outer_classname = "LocalOnlyProtos";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * Protobuf structures common to apponly.proto and deviceonly.proto

mesh.proto

@@ -11,6 +11,7 @@ import "portnums.proto";
 import "telemetry.proto";
 
 option java_outer_classname = "MeshProtos";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * a gps position

module_config.proto

@@ -4,6 +4,7 @@ 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";
 
 /*
  * Module Config

mqtt.proto

@@ -7,6 +7,7 @@ option go_package = "github.com/meshtastic/go/generated";
 import "mesh.proto";
 
 option java_outer_classname = "MQTTProtos";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * This message wraps a MeshPacket with extra metadata about the sender and how it arrived.

portnums.proto

@@ -4,6 +4,7 @@ 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";
 
 /*
  * For any new 'apps' that run on the device or via sister apps on phones/PCs they should pick and use a

remote_hardware.proto

@@ -4,6 +4,7 @@ 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";
 
 /*
  * An example app to show off the module system. This message is used for

storeforward.proto

@@ -4,6 +4,7 @@ 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";
 
 /*
  * TODO: REPLACE

telemetry.proto

@@ -5,6 +5,7 @@ option optimize_for = LITE_RUNTIME;
 option go_package = "github.com/meshtastic/go/generated";
 
 option java_outer_classname = "TelemetryProtos";
+option csharp_namespace = "Meshtastic.Protobufs";
 
 /*
  * Key native device metrics such as battery level