From 218a208ab733415a9b9ae643cf88cbd6d8efbe94 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 26 Feb 2022 23:56:26 -0800 Subject: [PATCH] mv plugins/ to modules/ --- platformio.ini | 2 +- src/graphics/Screen.cpp | 2 +- src/main.cpp | 2 +- src/mesh/MeshPlugin.cpp | 2 +- src/mesh/MeshService.cpp | 4 +-- src/mesh/NodeDB.cpp | 2 +- src/mesh/Router.cpp | 2 +- src/{plugins => modules}/AdminPlugin.cpp | 0 src/{plugins => modules}/AdminPlugin.h | 0 .../CannedMessagePlugin.cpp | 0 .../CannedMessagePlugin.h | 0 .../ExternalNotificationPlugin.cpp | 2 +- .../ExternalNotificationPlugin.h | 0 src/{plugins => modules}/NodeInfoPlugin.cpp | 0 src/{plugins => modules}/NodeInfoPlugin.h | 0 src/{plugins => modules}/PluginDev.h | 0 src/{plugins => modules}/Plugins.cpp | 26 +++++++++---------- src/{plugins => modules}/Plugins.h | 0 src/{plugins => modules}/PositionPlugin.cpp | 0 src/{plugins => modules}/PositionPlugin.h | 0 .../RemoteHardwarePlugin.cpp | 0 .../RemoteHardwarePlugin.h | 0 src/{plugins => modules}/ReplyPlugin.cpp | 0 src/{plugins => modules}/ReplyPlugin.h | 0 src/{plugins => modules}/RoutingPlugin.cpp | 0 src/{plugins => modules}/RoutingPlugin.h | 0 .../Telemetry/Sensor/BME280Sensor.cpp | 0 .../Telemetry/Sensor/BME280Sensor.h | 0 .../Telemetry/Sensor/BME680Sensor.cpp | 0 .../Telemetry/Sensor/BME680Sensor.h | 0 .../Telemetry/Sensor/DHTSensor.cpp | 0 .../Telemetry/Sensor/DHTSensor.h | 0 .../Telemetry/Sensor/DallasSensor.cpp | 0 .../Telemetry/Sensor/DallasSensor.h | 0 .../Telemetry/Sensor/MCP9808Sensor.cpp | 0 .../Telemetry/Sensor/MCP9808Sensor.h | 0 .../Telemetry/Sensor/TelemetrySensor.h | 0 .../Telemetry/Telemetry.cpp | 0 .../Telemetry/Telemetry.h | 0 .../TextMessagePlugin.cpp | 0 src/{plugins => modules}/TextMessagePlugin.h | 0 .../esp32/RangeTestPlugin.cpp | 0 .../esp32/RangeTestPlugin.h | 0 .../esp32/SerialPlugin.cpp | 0 src/{plugins => modules}/esp32/SerialPlugin.h | 0 .../esp32/StoreForwardPlugin.cpp | 2 +- .../esp32/StoreForwardPlugin.h | 0 variants/portduino/platformio.ini | 8 +++--- 48 files changed, 27 insertions(+), 27 deletions(-) rename src/{plugins => modules}/AdminPlugin.cpp (100%) rename src/{plugins => modules}/AdminPlugin.h (100%) rename src/{plugins => modules}/CannedMessagePlugin.cpp (100%) rename src/{plugins => modules}/CannedMessagePlugin.h (100%) rename src/{plugins => modules}/ExternalNotificationPlugin.cpp (99%) rename src/{plugins => modules}/ExternalNotificationPlugin.h (100%) rename src/{plugins => modules}/NodeInfoPlugin.cpp (100%) rename src/{plugins => modules}/NodeInfoPlugin.h (100%) rename src/{plugins => modules}/PluginDev.h (100%) rename src/{plugins => modules}/Plugins.cpp (74%) rename src/{plugins => modules}/Plugins.h (100%) rename src/{plugins => modules}/PositionPlugin.cpp (100%) rename src/{plugins => modules}/PositionPlugin.h (100%) rename src/{plugins => modules}/RemoteHardwarePlugin.cpp (100%) rename src/{plugins => modules}/RemoteHardwarePlugin.h (100%) rename src/{plugins => modules}/ReplyPlugin.cpp (100%) rename src/{plugins => modules}/ReplyPlugin.h (100%) rename src/{plugins => modules}/RoutingPlugin.cpp (100%) rename src/{plugins => modules}/RoutingPlugin.h (100%) rename src/{plugins => modules}/Telemetry/Sensor/BME280Sensor.cpp (100%) rename src/{plugins => modules}/Telemetry/Sensor/BME280Sensor.h (100%) rename src/{plugins => modules}/Telemetry/Sensor/BME680Sensor.cpp (100%) rename src/{plugins => modules}/Telemetry/Sensor/BME680Sensor.h (100%) rename src/{plugins => modules}/Telemetry/Sensor/DHTSensor.cpp (100%) rename src/{plugins => modules}/Telemetry/Sensor/DHTSensor.h (100%) rename src/{plugins => modules}/Telemetry/Sensor/DallasSensor.cpp (100%) rename src/{plugins => modules}/Telemetry/Sensor/DallasSensor.h (100%) rename src/{plugins => modules}/Telemetry/Sensor/MCP9808Sensor.cpp (100%) rename src/{plugins => modules}/Telemetry/Sensor/MCP9808Sensor.h (100%) rename src/{plugins => modules}/Telemetry/Sensor/TelemetrySensor.h (100%) rename src/{plugins => modules}/Telemetry/Telemetry.cpp (100%) rename src/{plugins => modules}/Telemetry/Telemetry.h (100%) rename src/{plugins => modules}/TextMessagePlugin.cpp (100%) rename src/{plugins => modules}/TextMessagePlugin.h (100%) rename src/{plugins => modules}/esp32/RangeTestPlugin.cpp (100%) rename src/{plugins => modules}/esp32/RangeTestPlugin.h (100%) rename src/{plugins => modules}/esp32/SerialPlugin.cpp (100%) rename src/{plugins => modules}/esp32/SerialPlugin.h (100%) rename src/{plugins => modules}/esp32/StoreForwardPlugin.cpp (99%) rename src/{plugins => modules}/esp32/StoreForwardPlugin.h (100%) diff --git a/platformio.ini b/platformio.ini index d45101430..f19c6a526 100644 --- a/platformio.ini +++ b/platformio.ini @@ -196,7 +196,7 @@ build_flags = -Isdk-nrfxlib/crypto/nrf_oberon/include -Lsdk-nrfxlib/crypto/nrf_oberon/lib/cortex-m4/hard-float/ -lliboberon_3.0.7 ;-DCFG_DEBUG=3 src_filter = - ${arduino_base.src_filter} - - - - - - + ${arduino_base.src_filter} - - - - - - lib_ignore = BluetoothOTA ; monitor_port = /dev/ttyACM1 diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index e679227f7..370bc9a54 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -32,7 +32,7 @@ along with this program. If not, see . #include "main.h" #include "mesh-pb-constants.h" #include "mesh/Channels.h" -#include "plugins/TextMessagePlugin.h" +#include "modules/TextMessagePlugin.h" #include "sleep.h" #include "target_specific.h" #include "utils.h" diff --git a/src/main.cpp b/src/main.cpp index 544040ac0..813309de2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,7 +18,7 @@ #include "concurrency/Periodic.h" #include "graphics/Screen.h" #include "main.h" -#include "plugins/Plugins.h" +#include "modules/Plugins.h" #include "sleep.h" #include "target_specific.h" #include diff --git a/src/mesh/MeshPlugin.cpp b/src/mesh/MeshPlugin.cpp index 180e1ebfd..b2261a471 100644 --- a/src/mesh/MeshPlugin.cpp +++ b/src/mesh/MeshPlugin.cpp @@ -3,7 +3,7 @@ #include "Channels.h" #include "MeshService.h" #include "NodeDB.h" -#include "plugins/RoutingPlugin.h" +#include "modules/RoutingPlugin.h" #include std::vector *MeshPlugin::plugins; diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp index bbc75e38b..151c4e2de 100644 --- a/src/mesh/MeshService.cpp +++ b/src/mesh/MeshService.cpp @@ -12,8 +12,8 @@ #include "RTC.h" #include "main.h" #include "mesh-pb-constants.h" -#include "plugins/NodeInfoPlugin.h" -#include "plugins/PositionPlugin.h" +#include "modules/NodeInfoPlugin.h" +#include "modules/PositionPlugin.h" #include "power.h" /* diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 0587b9457..fd7203f7d 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -19,7 +19,7 @@ #ifndef NO_ESP32 #include "mesh/http/WiFiAPClient.h" -#include "plugins/esp32/StoreForwardPlugin.h" +#include "modules/esp32/StoreForwardPlugin.h" #include #include #endif diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index 64e0a4795..0917ec65f 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -6,7 +6,7 @@ #include "RTC.h" #include "main.h" #include "mesh-pb-constants.h" -#include "plugins/RoutingPlugin.h" +#include "modules/RoutingPlugin.h" #if defined(HAS_WIFI) || defined(PORTDUINO) #include "mqtt/MQTT.h" diff --git a/src/plugins/AdminPlugin.cpp b/src/modules/AdminPlugin.cpp similarity index 100% rename from src/plugins/AdminPlugin.cpp rename to src/modules/AdminPlugin.cpp diff --git a/src/plugins/AdminPlugin.h b/src/modules/AdminPlugin.h similarity index 100% rename from src/plugins/AdminPlugin.h rename to src/modules/AdminPlugin.h diff --git a/src/plugins/CannedMessagePlugin.cpp b/src/modules/CannedMessagePlugin.cpp similarity index 100% rename from src/plugins/CannedMessagePlugin.cpp rename to src/modules/CannedMessagePlugin.cpp diff --git a/src/plugins/CannedMessagePlugin.h b/src/modules/CannedMessagePlugin.h similarity index 100% rename from src/plugins/CannedMessagePlugin.h rename to src/modules/CannedMessagePlugin.h diff --git a/src/plugins/ExternalNotificationPlugin.cpp b/src/modules/ExternalNotificationPlugin.cpp similarity index 99% rename from src/plugins/ExternalNotificationPlugin.cpp rename to src/modules/ExternalNotificationPlugin.cpp index 122c77be8..bea9a7e06 100644 --- a/src/plugins/ExternalNotificationPlugin.cpp +++ b/src/modules/ExternalNotificationPlugin.cpp @@ -11,7 +11,7 @@ /* Documentation: - https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/plugins/ExternalNotificationPlugin.md + https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationPlugin.md This plugin supports: https://github.com/meshtastic/Meshtastic-device/issues/654 diff --git a/src/plugins/ExternalNotificationPlugin.h b/src/modules/ExternalNotificationPlugin.h similarity index 100% rename from src/plugins/ExternalNotificationPlugin.h rename to src/modules/ExternalNotificationPlugin.h diff --git a/src/plugins/NodeInfoPlugin.cpp b/src/modules/NodeInfoPlugin.cpp similarity index 100% rename from src/plugins/NodeInfoPlugin.cpp rename to src/modules/NodeInfoPlugin.cpp diff --git a/src/plugins/NodeInfoPlugin.h b/src/modules/NodeInfoPlugin.h similarity index 100% rename from src/plugins/NodeInfoPlugin.h rename to src/modules/NodeInfoPlugin.h diff --git a/src/plugins/PluginDev.h b/src/modules/PluginDev.h similarity index 100% rename from src/plugins/PluginDev.h rename to src/modules/PluginDev.h diff --git a/src/plugins/Plugins.cpp b/src/modules/Plugins.cpp similarity index 74% rename from src/plugins/Plugins.cpp rename to src/modules/Plugins.cpp index f2dc7a7df..8b543265d 100644 --- a/src/plugins/Plugins.cpp +++ b/src/modules/Plugins.cpp @@ -1,22 +1,22 @@ #include "configuration.h" #include "input/InputBroker.h" #include "input/RotaryEncoderInterruptImpl1.h" -#include "plugins/AdminPlugin.h" -#include "plugins/CannedMessagePlugin.h" -#include "plugins/ExternalNotificationPlugin.h" -#include "plugins/NodeInfoPlugin.h" -#include "plugins/PositionPlugin.h" -#include "plugins/RemoteHardwarePlugin.h" -#include "plugins/ReplyPlugin.h" -#include "plugins/RoutingPlugin.h" -#include "plugins/TextMessagePlugin.h" +#include "modules/AdminPlugin.h" +#include "modules/CannedMessagePlugin.h" +#include "modules/ExternalNotificationPlugin.h" +#include "modules/NodeInfoPlugin.h" +#include "modules/PositionPlugin.h" +#include "modules/RemoteHardwarePlugin.h" +#include "modules/ReplyPlugin.h" +#include "modules/RoutingPlugin.h" +#include "modules/TextMessagePlugin.h" #ifndef PORTDUINO -#include "plugins/Telemetry/Telemetry.h" +#include "modules/Telemetry/Telemetry.h" #endif #ifndef NO_ESP32 -#include "plugins/esp32/RangeTestPlugin.h" -#include "plugins/esp32/SerialPlugin.h" -#include "plugins/esp32/StoreForwardPlugin.h" +#include "modules/esp32/RangeTestPlugin.h" +#include "modules/esp32/SerialPlugin.h" +#include "modules/esp32/StoreForwardPlugin.h" #endif /** diff --git a/src/plugins/Plugins.h b/src/modules/Plugins.h similarity index 100% rename from src/plugins/Plugins.h rename to src/modules/Plugins.h diff --git a/src/plugins/PositionPlugin.cpp b/src/modules/PositionPlugin.cpp similarity index 100% rename from src/plugins/PositionPlugin.cpp rename to src/modules/PositionPlugin.cpp diff --git a/src/plugins/PositionPlugin.h b/src/modules/PositionPlugin.h similarity index 100% rename from src/plugins/PositionPlugin.h rename to src/modules/PositionPlugin.h diff --git a/src/plugins/RemoteHardwarePlugin.cpp b/src/modules/RemoteHardwarePlugin.cpp similarity index 100% rename from src/plugins/RemoteHardwarePlugin.cpp rename to src/modules/RemoteHardwarePlugin.cpp diff --git a/src/plugins/RemoteHardwarePlugin.h b/src/modules/RemoteHardwarePlugin.h similarity index 100% rename from src/plugins/RemoteHardwarePlugin.h rename to src/modules/RemoteHardwarePlugin.h diff --git a/src/plugins/ReplyPlugin.cpp b/src/modules/ReplyPlugin.cpp similarity index 100% rename from src/plugins/ReplyPlugin.cpp rename to src/modules/ReplyPlugin.cpp diff --git a/src/plugins/ReplyPlugin.h b/src/modules/ReplyPlugin.h similarity index 100% rename from src/plugins/ReplyPlugin.h rename to src/modules/ReplyPlugin.h diff --git a/src/plugins/RoutingPlugin.cpp b/src/modules/RoutingPlugin.cpp similarity index 100% rename from src/plugins/RoutingPlugin.cpp rename to src/modules/RoutingPlugin.cpp diff --git a/src/plugins/RoutingPlugin.h b/src/modules/RoutingPlugin.h similarity index 100% rename from src/plugins/RoutingPlugin.h rename to src/modules/RoutingPlugin.h diff --git a/src/plugins/Telemetry/Sensor/BME280Sensor.cpp b/src/modules/Telemetry/Sensor/BME280Sensor.cpp similarity index 100% rename from src/plugins/Telemetry/Sensor/BME280Sensor.cpp rename to src/modules/Telemetry/Sensor/BME280Sensor.cpp diff --git a/src/plugins/Telemetry/Sensor/BME280Sensor.h b/src/modules/Telemetry/Sensor/BME280Sensor.h similarity index 100% rename from src/plugins/Telemetry/Sensor/BME280Sensor.h rename to src/modules/Telemetry/Sensor/BME280Sensor.h diff --git a/src/plugins/Telemetry/Sensor/BME680Sensor.cpp b/src/modules/Telemetry/Sensor/BME680Sensor.cpp similarity index 100% rename from src/plugins/Telemetry/Sensor/BME680Sensor.cpp rename to src/modules/Telemetry/Sensor/BME680Sensor.cpp diff --git a/src/plugins/Telemetry/Sensor/BME680Sensor.h b/src/modules/Telemetry/Sensor/BME680Sensor.h similarity index 100% rename from src/plugins/Telemetry/Sensor/BME680Sensor.h rename to src/modules/Telemetry/Sensor/BME680Sensor.h diff --git a/src/plugins/Telemetry/Sensor/DHTSensor.cpp b/src/modules/Telemetry/Sensor/DHTSensor.cpp similarity index 100% rename from src/plugins/Telemetry/Sensor/DHTSensor.cpp rename to src/modules/Telemetry/Sensor/DHTSensor.cpp diff --git a/src/plugins/Telemetry/Sensor/DHTSensor.h b/src/modules/Telemetry/Sensor/DHTSensor.h similarity index 100% rename from src/plugins/Telemetry/Sensor/DHTSensor.h rename to src/modules/Telemetry/Sensor/DHTSensor.h diff --git a/src/plugins/Telemetry/Sensor/DallasSensor.cpp b/src/modules/Telemetry/Sensor/DallasSensor.cpp similarity index 100% rename from src/plugins/Telemetry/Sensor/DallasSensor.cpp rename to src/modules/Telemetry/Sensor/DallasSensor.cpp diff --git a/src/plugins/Telemetry/Sensor/DallasSensor.h b/src/modules/Telemetry/Sensor/DallasSensor.h similarity index 100% rename from src/plugins/Telemetry/Sensor/DallasSensor.h rename to src/modules/Telemetry/Sensor/DallasSensor.h diff --git a/src/plugins/Telemetry/Sensor/MCP9808Sensor.cpp b/src/modules/Telemetry/Sensor/MCP9808Sensor.cpp similarity index 100% rename from src/plugins/Telemetry/Sensor/MCP9808Sensor.cpp rename to src/modules/Telemetry/Sensor/MCP9808Sensor.cpp diff --git a/src/plugins/Telemetry/Sensor/MCP9808Sensor.h b/src/modules/Telemetry/Sensor/MCP9808Sensor.h similarity index 100% rename from src/plugins/Telemetry/Sensor/MCP9808Sensor.h rename to src/modules/Telemetry/Sensor/MCP9808Sensor.h diff --git a/src/plugins/Telemetry/Sensor/TelemetrySensor.h b/src/modules/Telemetry/Sensor/TelemetrySensor.h similarity index 100% rename from src/plugins/Telemetry/Sensor/TelemetrySensor.h rename to src/modules/Telemetry/Sensor/TelemetrySensor.h diff --git a/src/plugins/Telemetry/Telemetry.cpp b/src/modules/Telemetry/Telemetry.cpp similarity index 100% rename from src/plugins/Telemetry/Telemetry.cpp rename to src/modules/Telemetry/Telemetry.cpp diff --git a/src/plugins/Telemetry/Telemetry.h b/src/modules/Telemetry/Telemetry.h similarity index 100% rename from src/plugins/Telemetry/Telemetry.h rename to src/modules/Telemetry/Telemetry.h diff --git a/src/plugins/TextMessagePlugin.cpp b/src/modules/TextMessagePlugin.cpp similarity index 100% rename from src/plugins/TextMessagePlugin.cpp rename to src/modules/TextMessagePlugin.cpp diff --git a/src/plugins/TextMessagePlugin.h b/src/modules/TextMessagePlugin.h similarity index 100% rename from src/plugins/TextMessagePlugin.h rename to src/modules/TextMessagePlugin.h diff --git a/src/plugins/esp32/RangeTestPlugin.cpp b/src/modules/esp32/RangeTestPlugin.cpp similarity index 100% rename from src/plugins/esp32/RangeTestPlugin.cpp rename to src/modules/esp32/RangeTestPlugin.cpp diff --git a/src/plugins/esp32/RangeTestPlugin.h b/src/modules/esp32/RangeTestPlugin.h similarity index 100% rename from src/plugins/esp32/RangeTestPlugin.h rename to src/modules/esp32/RangeTestPlugin.h diff --git a/src/plugins/esp32/SerialPlugin.cpp b/src/modules/esp32/SerialPlugin.cpp similarity index 100% rename from src/plugins/esp32/SerialPlugin.cpp rename to src/modules/esp32/SerialPlugin.cpp diff --git a/src/plugins/esp32/SerialPlugin.h b/src/modules/esp32/SerialPlugin.h similarity index 100% rename from src/plugins/esp32/SerialPlugin.h rename to src/modules/esp32/SerialPlugin.h diff --git a/src/plugins/esp32/StoreForwardPlugin.cpp b/src/modules/esp32/StoreForwardPlugin.cpp similarity index 99% rename from src/plugins/esp32/StoreForwardPlugin.cpp rename to src/modules/esp32/StoreForwardPlugin.cpp index f556359f2..7a05b9ab1 100644 --- a/src/plugins/esp32/StoreForwardPlugin.cpp +++ b/src/modules/esp32/StoreForwardPlugin.cpp @@ -7,7 +7,7 @@ #include "configuration.h" #include "mesh-pb-constants.h" #include "mesh/generated/storeforward.pb.h" -#include "plugins/PluginDev.h" +#include "modules/PluginDev.h" #include #include #include diff --git a/src/plugins/esp32/StoreForwardPlugin.h b/src/modules/esp32/StoreForwardPlugin.h similarity index 100% rename from src/plugins/esp32/StoreForwardPlugin.h rename to src/modules/esp32/StoreForwardPlugin.h diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini index 3bb12d48e..dd37c3bc9 100644 --- a/variants/portduino/platformio.ini +++ b/variants/portduino/platformio.ini @@ -7,8 +7,8 @@ src_filter = - - - - - - - + - + - +<../variants/portduino> build_flags = ${arduino_base.build_flags} -O0 -I variants/portduino framework = arduino @@ -26,8 +26,8 @@ src_filter = - - - - - - - + - + - +<../variants/portduino> build_flags = ${arduino_base.build_flags} -O0 -lgpiod -I variants/portduino framework = arduino