move generated protobuf c code to own directory

bin/regen-protos.sh

@@ -8,7 +8,7 @@ echo "prebuilt binaries for your computer into nanopb-0.4.4"
 
 # the nanopb tool seems to require that the .options file be in the current directory!
 cd proto
-../nanopb-0.4.4/generator-bin/protoc --nanopb_out=-v:../src/mesh -I=../proto *.proto
+../nanopb-0.4.4/generator-bin/protoc --nanopb_out=-v:../src/mesh/generated -I=../proto *.proto
 
 echo "Regenerating protobuf documentation - if you see an error message"
 echo "you can ignore it unless doing a new protobuf release to github."

src/error.h

@@ -2,7 +2,7 @@
 
 #include <Arduino.h>
 
-#include "mesh/mesh.pb.h" // For CriticalErrorCode
+#include "mesh/generated/mesh.pb.h" // For CriticalErrorCode
 
 /// Record an error that should be reported via analytics
 void recordCriticalError(CriticalErrorCode code = CriticalErrorCode_Unspecified, uint32_t address = 0);

src/mesh/MeshRadio.h

@@ -4,7 +4,6 @@
 #include "MeshTypes.h"
 #include "PointerQueue.h"
 #include "configuration.h"
-#include "mesh.pb.h"
 
 // Map from old region names to new region enums
 struct RegionInfo {

src/mesh/MeshService.h

@@ -10,7 +10,6 @@
 #include "MeshTypes.h"
 #include "Observer.h"
 #include "PointerQueue.h"
-#include "mesh.pb.h"
 
 /**
  * Top level app for this service.  keeps the mesh, the radio config and the queue of received packets.

src/mesh/MeshTypes.h

@@ -3,7 +3,7 @@
 // low level types
 
 #include "MemoryPool.h"
-#include "mesh.pb.h"
+#include "mesh/mesh-pb-constants.h"
 #include <Arduino.h>
 
 typedef uint32_t NodeNum;

src/mesh/PhoneAPI.h

@@ -2,7 +2,6 @@
 
 #include "Observer.h"
 #include "mesh-pb-constants.h"
-#include "mesh.pb.h"
 #include <string>
 
 // Make sure that we never let our packets grow too large for one BLE packet

src/mesh/RadioInterface.h

@@ -6,7 +6,6 @@
 #include "Observer.h"
 #include "PointerQueue.h"
 #include "airtime.h"
-#include "mesh.pb.h"
 
 #define MAX_TX_QUEUE 16 // max number of packets which can be waiting for transmission
 

src/mesh/Router.h

@@ -6,7 +6,6 @@
 #include "PointerQueue.h"
 #include "RadioInterface.h"
 #include "concurrency/OSThread.h"
-#include "mesh.pb.h"
 
 /**
  * A mesh aware router that supports multiple interfaces.

src/mesh/mesh-pb-constants.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "mesh.pb.h"
+#include "mesh/generated/mesh.pb.h"
-#include "deviceonly.pb.h"
+#include "mesh/generated/deviceonly.pb.h"
 
 // this file defines constants which come from mesh.options
 

src/plugins/RemoteHardwarePlugin.h

@@ -1,6 +1,6 @@
 #pragma once
 #include "ProtobufPlugin.h"
-#include "remote_hardware.pb.h"
+#include "mesh/generated/remote_hardware.pb.h"
 #include "concurrency/OSThread.h"
 
 /**