From 4d4af7de59d4b8785124c7e1b6454348c12c695e Mon Sep 17 00:00:00 2001 From: Ben Meadors Date: Wed, 18 Jan 2023 08:56:47 -0600 Subject: [PATCH] generated paths experiment --- bin/regen-protos.sh | 6 +++++- src/detect/i2cScan.h | 2 +- src/error.h | 2 +- src/graphics/Screen.cpp | 2 +- src/main.h | 2 +- src/mesh/mesh-pb-constants.h | 8 ++++---- src/modules/CannedMessageModule.cpp | 2 +- src/modules/ExternalNotificationModule.cpp | 2 +- src/modules/RemoteHardwareModule.h | 2 +- src/modules/Telemetry/DeviceTelemetry.cpp | 2 +- src/modules/Telemetry/DeviceTelemetry.h | 2 +- src/modules/Telemetry/EnvironmentTelemetry.cpp | 2 +- src/modules/Telemetry/EnvironmentTelemetry.h | 2 +- src/modules/Telemetry/Sensor/BME280Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/BME280Sensor.h | 2 +- src/modules/Telemetry/Sensor/BME680Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/BME680Sensor.h | 2 +- src/modules/Telemetry/Sensor/BMP280Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/BMP280Sensor.h | 2 +- src/modules/Telemetry/Sensor/INA219Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/INA219Sensor.h | 2 +- src/modules/Telemetry/Sensor/INA260Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/INA260Sensor.h | 2 +- src/modules/Telemetry/Sensor/LPS22HBSensor.cpp | 2 +- src/modules/Telemetry/Sensor/LPS22HBSensor.h | 2 +- src/modules/Telemetry/Sensor/MCP9808Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/MCP9808Sensor.h | 2 +- src/modules/Telemetry/Sensor/SHT31Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/SHT31Sensor.h | 2 +- src/modules/Telemetry/Sensor/SHTC3Sensor.cpp | 2 +- src/modules/Telemetry/Sensor/SHTC3Sensor.h | 2 +- src/modules/Telemetry/Sensor/TelemetrySensor.cpp | 2 +- src/modules/Telemetry/Sensor/TelemetrySensor.h | 2 +- src/modules/esp32/StoreForwardModule.cpp | 2 +- src/modules/esp32/StoreForwardModule.h | 2 +- src/mqtt/MQTT.cpp | 4 ++-- src/mqtt/MQTT.h | 2 +- src/xmodem.h | 2 +- 38 files changed, 46 insertions(+), 42 deletions(-) diff --git a/bin/regen-protos.sh b/bin/regen-protos.sh index bf3cf7ca0..eae8a121c 100755 --- a/bin/regen-protos.sh +++ b/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." diff --git a/src/detect/i2cScan.h b/src/detect/i2cScan.h index 77d1fff17..6efe6b4e5 100644 --- a/src/detect/i2cScan.h +++ b/src/detect/i2cScan.h @@ -1,7 +1,7 @@ #include "../configuration.h" #include "../main.h" #include -#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 diff --git a/src/error.h b/src/error.h index e57407bf8..4c309e395 100644 --- a/src/error.h +++ b/src/error.h @@ -2,7 +2,7 @@ #include -#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__) diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 034ba3307..ad09368c4 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -33,7 +33,7 @@ along with this program. If not, see . #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" diff --git a/src/main.h b/src/main.h index 89a6bd059..1e02d7c79 100644 --- a/src/main.h +++ b/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 #endif diff --git a/src/mesh/mesh-pb-constants.h b/src/mesh/mesh-pb-constants.h index 59ccc9e16..2b0f7bd06 100644 --- a/src/mesh/mesh-pb-constants.h +++ b/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 diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp index 9e42f8467..6e85a8c71 100644 --- a/src/modules/CannedMessageModule.cpp +++ b/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" diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp index 3f2137ec8..05776bd44 100644 --- a/src/modules/ExternalNotificationModule.cpp +++ b/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 #ifndef PIN_BUZZER diff --git a/src/modules/RemoteHardwareModule.h b/src/modules/RemoteHardwareModule.h index e9c7794fb..2e16d356d 100644 --- a/src/modules/RemoteHardwareModule.h +++ b/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" /** diff --git a/src/modules/Telemetry/DeviceTelemetry.cpp b/src/modules/Telemetry/DeviceTelemetry.cpp index 5f96661e5..1ae28fab3 100644 --- a/src/modules/Telemetry/DeviceTelemetry.cpp +++ b/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" diff --git a/src/modules/Telemetry/DeviceTelemetry.h b/src/modules/Telemetry/DeviceTelemetry.h index 0fb33ceee..199d00307 100644 --- a/src/modules/Telemetry/DeviceTelemetry.h +++ b/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 diff --git a/src/modules/Telemetry/EnvironmentTelemetry.cpp b/src/modules/Telemetry/EnvironmentTelemetry.cpp index 2a29405d3..cc5f56310 100644 --- a/src/modules/Telemetry/EnvironmentTelemetry.cpp +++ b/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" diff --git a/src/modules/Telemetry/EnvironmentTelemetry.h b/src/modules/Telemetry/EnvironmentTelemetry.h index c081ead51..06621363f 100644 --- a/src/modules/Telemetry/EnvironmentTelemetry.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/BME280Sensor.cpp b/src/modules/Telemetry/Sensor/BME280Sensor.cpp index 26f48f89d..93d882238 100644 --- a/src/modules/Telemetry/Sensor/BME280Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/BME280Sensor.h b/src/modules/Telemetry/Sensor/BME280Sensor.h index 166796a37..606372707 100644 --- a/src/modules/Telemetry/Sensor/BME280Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/BME680Sensor.cpp b/src/modules/Telemetry/Sensor/BME680Sensor.cpp index 44690fbaa..e164ec28a 100644 --- a/src/modules/Telemetry/Sensor/BME680Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/BME680Sensor.h b/src/modules/Telemetry/Sensor/BME680Sensor.h index a3c37203d..146730d2c 100644 --- a/src/modules/Telemetry/Sensor/BME680Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp b/src/modules/Telemetry/Sensor/BMP280Sensor.cpp index eddc30649..1f3f3a835 100644 --- a/src/modules/Telemetry/Sensor/BMP280Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/BMP280Sensor.h b/src/modules/Telemetry/Sensor/BMP280Sensor.h index 3525f3fa3..ce41d2d20 100644 --- a/src/modules/Telemetry/Sensor/BMP280Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/INA219Sensor.cpp b/src/modules/Telemetry/Sensor/INA219Sensor.cpp index 4a732e73d..bf36f73b5 100644 --- a/src/modules/Telemetry/Sensor/INA219Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/INA219Sensor.h b/src/modules/Telemetry/Sensor/INA219Sensor.h index 7e0a3c17e..50ce0edbc 100644 --- a/src/modules/Telemetry/Sensor/INA219Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/INA260Sensor.cpp b/src/modules/Telemetry/Sensor/INA260Sensor.cpp index 5b3064e7d..d6b53f4a3 100644 --- a/src/modules/Telemetry/Sensor/INA260Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/INA260Sensor.h b/src/modules/Telemetry/Sensor/INA260Sensor.h index 789b66c2d..8d451ddda 100644 --- a/src/modules/Telemetry/Sensor/INA260Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp b/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp index 1f75a9aa1..6647b2eac 100644 --- a/src/modules/Telemetry/Sensor/LPS22HBSensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/LPS22HBSensor.h b/src/modules/Telemetry/Sensor/LPS22HBSensor.h index 1ded032fb..2e8593d2b 100644 --- a/src/modules/Telemetry/Sensor/LPS22HBSensor.h +++ b/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 #include diff --git a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp index 4dd3be635..d8e14922a 100644 --- a/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/MCP9808Sensor.h b/src/modules/Telemetry/Sensor/MCP9808Sensor.h index 81f50b886..aa3eadbe6 100644 --- a/src/modules/Telemetry/Sensor/MCP9808Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp b/src/modules/Telemetry/Sensor/SHT31Sensor.cpp index 528d5a030..22284d5c0 100644 --- a/src/modules/Telemetry/Sensor/SHT31Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/SHT31Sensor.h b/src/modules/Telemetry/Sensor/SHT31Sensor.h index 5f236e21e..92ea9a05d 100644 --- a/src/modules/Telemetry/Sensor/SHT31Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp b/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp index 3a20d37a1..99335d87c 100644 --- a/src/modules/Telemetry/Sensor/SHTC3Sensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/SHTC3Sensor.h b/src/modules/Telemetry/Sensor/SHTC3Sensor.h index 28a1648bb..d0cd33f03 100644 --- a/src/modules/Telemetry/Sensor/SHTC3Sensor.h +++ b/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 diff --git a/src/modules/Telemetry/Sensor/TelemetrySensor.cpp b/src/modules/Telemetry/Sensor/TelemetrySensor.cpp index e811d7182..cd8fe2566 100644 --- a/src/modules/Telemetry/Sensor/TelemetrySensor.cpp +++ b/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" diff --git a/src/modules/Telemetry/Sensor/TelemetrySensor.h b/src/modules/Telemetry/Sensor/TelemetrySensor.h index 87f2d68ba..97582f9b4 100644 --- a/src/modules/Telemetry/Sensor/TelemetrySensor.h +++ b/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" diff --git a/src/modules/esp32/StoreForwardModule.cpp b/src/modules/esp32/StoreForwardModule.cpp index ba0e7d6ee..825b0376b 100644 --- a/src/modules/esp32/StoreForwardModule.cpp +++ b/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 #include diff --git a/src/modules/esp32/StoreForwardModule.h b/src/modules/esp32/StoreForwardModule.h index c9cb72a5b..4d9e080cf 100644 --- a/src/modules/esp32/StoreForwardModule.h +++ b/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 diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index 34b75e5bb..f54ecd0b7 100644 --- a/src/mqtt/MQTT.cpp +++ b/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 diff --git a/src/mqtt/MQTT.h b/src/mqtt/MQTT.h index 16ce4c37a..563ba7164 100644 --- a/src/mqtt/MQTT.h +++ b/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 #if HAS_WIFI #include diff --git a/src/xmodem.h b/src/xmodem.h index 6c2418926..3540c0649 100644 --- a/src/xmodem.h +++ b/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