mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

generated paths experiment

pull/2164/head
Ben Meadors 2023-01-18 08:56:47 -06:00
rodzic 1b932c6bbe
commit 4d4af7de59
38 zmienionych plików z 46 dodań i 42 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
bin/regen-protos.sh
Wyświetl plik

@ -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! # the nanopb tool seems to require that the .options file be in the current directory!
cd protobufs 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 "Regenerating protobuf documentation - if you see an error message"
#echo "you can ignore it unless doing a new protobuf release to github." #echo "you can ignore it unless doing a new protobuf release to github."

2
src/detect/i2cScan.h
Wyświetl plik

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

2
src/error.h
Wyświetl plik

@ -2,7 +2,7 @@
#include <Arduino.h> #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 /// A macro that include filename and line
#define RECORD_CRITICALERROR(code) recordCriticalError(code, __LINE__, __FILE__) #define RECORD_CRITICALERROR(code) recordCriticalError(code, __LINE__, __FILE__)

2
src/graphics/Screen.cpp
Wyświetl plik

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

2
src/main.h
Wyświetl plik

@ -5,7 +5,7 @@
#include "NodeStatus.h" #include "NodeStatus.h"
#include "PowerStatus.h" #include "PowerStatus.h"
#include "graphics/Screen.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) #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
#include <SparkFun_ATECCX08a_Arduino_Library.h> #include <SparkFun_ATECCX08a_Arduino_Library.h>
#endif #endif

8
src/mesh/mesh-pb-constants.h
Wyświetl plik

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

2
src/modules/CannedMessageModule.cpp
Wyświetl plik

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

2
src/modules/ExternalNotificationModule.cpp
Wyświetl plik

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

2
src/modules/RemoteHardwareModule.h
Wyświetl plik

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

2
src/modules/Telemetry/DeviceTelemetry.cpp
Wyświetl plik

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

2
src/modules/Telemetry/DeviceTelemetry.h
Wyświetl plik

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

2
src/modules/Telemetry/EnvironmentTelemetry.cpp
Wyświetl plik

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

2
src/modules/Telemetry/EnvironmentTelemetry.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/BME280Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/BME280Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/BME680Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/BME680Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/BMP280Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/BMP280Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/INA219Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/INA219Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/INA260Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/INA260Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/LPS22HBSensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/LPS22HBSensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/MCP9808Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/MCP9808Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/SHT31Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/SHT31Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/SHTC3Sensor.h
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/TelemetrySensor.cpp
Wyświetl plik

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

2
src/modules/Telemetry/Sensor/TelemetrySensor.h
Wyświetl plik

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

2
src/modules/esp32/StoreForwardModule.cpp
Wyświetl plik

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

2
src/modules/esp32/StoreForwardModule.h
Wyświetl plik

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

4
src/mqtt/MQTT.cpp
Wyświetl plik

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

2
src/mqtt/MQTT.h
Wyświetl plik

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

2
src/xmodem.h
Wyświetl plik

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