mv plugins/ to modules/

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} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<plugins/esp32> -<mqtt/>
+  ${arduino_base.src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
 lib_ignore =
   BluetoothOTA
 ; monitor_port = /dev/ttyACM1

src/graphics/Screen.cpp

@@ -32,7 +32,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 "plugins/TextMessagePlugin.h"
+#include "modules/TextMessagePlugin.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"

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 <OneButton.h>

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 <assert.h>
 
 std::vector<MeshPlugin *> *MeshPlugin::plugins;

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"
 
 /*

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 <Preferences.h>
 #include <nvs_flash.h>
 #endif

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"

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

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
 
 /**

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 <Arduino.h>
 #include <iterator>
 #include <map>

variants/portduino/platformio.ini

@@ -7,8 +7,8 @@ src_filter =
   -<nimble/> 
   -<nrf52/> 
   -<mesh/http/> 
-  -<plugins/esp32>
-  -<plugins/Telemetry>
+  -<modules/esp32>
+  -<modules/Telemetry>
   +<../variants/portduino>
 build_flags = ${arduino_base.build_flags} -O0 -I variants/portduino
 framework = arduino
@@ -26,8 +26,8 @@ src_filter =
   -<nimble/> 
   -<nrf52/> 
   -<mesh/http/> 
-  -<plugins/esp32>
-  -<plugins/Telemetry>
+  -<modules/esp32>
+  -<modules/Telemetry>
   +<../variants/portduino>
 build_flags = ${arduino_base.build_flags} -O0 -lgpiod -I variants/portduino
 framework = arduino