generated paths experiment

bin/regen-protos.sh

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

src/detect/i2cScan.h

@@ -1,7 +1,7 @@
 #include "../configuration.h"
 #include "../main.h"
 #include <Wire.h>
-#include "mesh/generated/telemetry.pb.h"
+#include "mesh/generated/meshtastic/telemetry.pb.h"
 
 // AXP192 and AXP2101 have the same device address, we just need to identify it in Power.cpp
 #ifndef XPOWERS_AXP192_AXP2101_ADDRESS

src/error.h

@@ -2,7 +2,7 @@
 
 #include <Arduino.h>
 
-#include "mesh/generated/mesh.pb.h" // For CriticalErrorCode
+#include "mesh/generated/meshtastic/mesh.pb.h" // For CriticalErrorCode
 
 /// A macro that include filename and line
 #define RECORD_CRITICALERROR(code) recordCriticalError(code, __LINE__, __FILE__)

src/graphics/Screen.cpp

@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "mesh/Channels.h"
-#include "mesh/generated/deviceonly.pb.h"
+#include "mesh/generated/meshtastic/deviceonly.pb.h"
 #include "modules/TextMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
 #include "sleep.h"

src/main.h

@@ -5,7 +5,7 @@
 #include "NodeStatus.h"
 #include "PowerStatus.h"
 #include "graphics/Screen.h"
-#include "mesh/generated/telemetry.pb.h"
+#include "mesh/generated/meshtastic/telemetry.pb.h"
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
 #include <SparkFun_ATECCX08a_Arduino_Library.h>
 #endif

src/mesh/mesh-pb-constants.h

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

src/modules/CannedMessageModule.cpp

@@ -5,7 +5,7 @@
 #include "NodeDB.h"
 #include "MeshService.h"
 #include "PowerFSM.h" // neede for button bypass
-#include "mesh/generated/cannedmessages.pb.h"
+#include "mesh/generated/meshtastic/cannedmessages.pb.h"
 
 #ifdef OLED_RU
 #include "graphics/fonts/OLEDDisplayFontsRU.h"

src/modules/ExternalNotificationModule.cpp

@@ -5,7 +5,7 @@
 #include "Router.h"
 #include "buzz/buzz.h"
 #include "configuration.h"
-#include "mesh/generated/rtttl.pb.h"
+#include "mesh/generated/meshtastic/rtttl.pb.h"
 #include <Arduino.h>
 
 #ifndef PIN_BUZZER

src/modules/RemoteHardwareModule.h

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

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -1,5 +1,5 @@
 #include "DeviceTelemetry.h"
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"

src/modules/Telemetry/DeviceTelemetry.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
 #include <OLEDDisplay.h>

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -1,5 +1,5 @@
 #include "EnvironmentTelemetry.h"
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"

src/modules/Telemetry/EnvironmentTelemetry.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "ProtobufModule.h"
 #include <OLEDDisplay.h>

src/modules/Telemetry/Sensor/BME280Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "BME280Sensor.h"

src/modules/Telemetry/Sensor/BME280Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BME280.h>
 

src/modules/Telemetry/Sensor/BME680Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "BME680Sensor.h"

src/modules/Telemetry/Sensor/BME680Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BME680.h>
 

src/modules/Telemetry/Sensor/BMP280Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "BMP280Sensor.h"

src/modules/Telemetry/Sensor/BMP280Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_BMP280.h>
 

src/modules/Telemetry/Sensor/INA219Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "INA219Sensor.h"

src/modules/Telemetry/Sensor/INA219Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_INA219.h>
 

src/modules/Telemetry/Sensor/INA260Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "INA260Sensor.h"

src/modules/Telemetry/Sensor/INA260Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_INA260.h>
 

src/modules/Telemetry/Sensor/LPS22HBSensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "LPS22HBSensor.h"

src/modules/Telemetry/Sensor/LPS22HBSensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_LPS2X.h>
 #include <Adafruit_Sensor.h>

src/modules/Telemetry/Sensor/MCP9808Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "MCP9808Sensor.h"

src/modules/Telemetry/Sensor/MCP9808Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_MCP9808.h>
 

src/modules/Telemetry/Sensor/SHT31Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "SHT31Sensor.h"

src/modules/Telemetry/Sensor/SHT31Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_SHT31.h>
 

src/modules/Telemetry/Sensor/SHTC3Sensor.cpp

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "configuration.h"
 #include "TelemetrySensor.h"
 #include "SHTC3Sensor.h"

src/modules/Telemetry/Sensor/SHTC3Sensor.h

@@ -1,4 +1,4 @@
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "TelemetrySensor.h"
 #include <Adafruit_SHTC3.h>
 

src/modules/Telemetry/Sensor/TelemetrySensor.cpp

@@ -1,4 +1,4 @@
 #include "TelemetrySensor.h"
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "main.h"

src/modules/Telemetry/Sensor/TelemetrySensor.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "../mesh/generated/telemetry.pb.h"
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "NodeDB.h"
 #include "main.h"
 

src/modules/esp32/StoreForwardModule.cpp

@@ -6,7 +6,7 @@
 #include "airtime.h"
 #include "configuration.h"
 #include "mesh-pb-constants.h"
-#include "mesh/generated/storeforward.pb.h"
+#include "mesh/generated/meshtastic/storeforward.pb.h"
 #include "modules/ModuleDev.h"
 #include <Arduino.h>
 #include <iterator>

src/modules/esp32/StoreForwardModule.h

@@ -2,7 +2,7 @@
 
 #include "ProtobufModule.h"
 #include "concurrency/OSThread.h"
-#include "mesh/generated/storeforward.pb.h"
+#include "mesh/generated/meshtastic/storeforward.pb.h"
 
 #include "configuration.h"
 #include <Arduino.h>

src/mqtt/MQTT.cpp

@@ -5,8 +5,8 @@
 #include "main.h"
 #include "mesh/Channels.h"
 #include "mesh/Router.h"
-#include "mesh/generated/mqtt.pb.h"
-#include "mesh/generated/telemetry.pb.h"
+#include "mesh/generated/meshtastic/mqtt.pb.h"
+#include "mesh/generated/meshtastic/telemetry.pb.h"
 #include "mesh/http/WiFiAPClient.h"
 #include "sleep.h"
 #if HAS_WIFI

src/mqtt/MQTT.h

@@ -4,7 +4,7 @@
 
 #include "concurrency/OSThread.h"
 #include "mesh/Channels.h"
-#include "mesh/generated/mqtt.pb.h"
+#include "mesh/generated/meshtastic/mqtt.pb.h"
 #include <PubSubClient.h>
 #if HAS_WIFI
 #include <WiFiClient.h>

src/xmodem.h

@@ -33,7 +33,7 @@
 #pragma once
 
 #include "configuration.h"
-#include "mesh/generated/xmodem.pb.h"
+#include "mesh/generated/meshtastic/xmodem.pb.h"
 #include "FSCommon.h"
 
 #define MAXRETRANS 25