Stay up-to-date wrt master (cc @mc-hamster)

# Conflicts: # src/plugins/Plugins.cpp # src/plugins/RangeTestPlugin.cpp # src/plugins/StoreForwardPlugin.cpp
2021-02-22 10:39:46 +08:00
parent d4781280b7 c6864417c6
commit 3088fe3f91
19 changed files with 845 additions and 278 deletions
@@ -1,9 +1,13 @@
 #include "plugins/ExternalNotificationPlugin.h"
 #include "plugins/NodeInfoPlugin.h"
 #include "plugins/PositionPlugin.h"
-#include "plugins/RangeTestPlugin.h"
 #include "plugins/RemoteHardwarePlugin.h"
 #include "plugins/ReplyPlugin.h"
+#include "plugins/TextMessagePlugin.h" 
+#ifndef NO_ESP32
+#include "plugins/esp32/EnvironmentalMeasurementPlugin.h"
+#include "plugins/esp32/RangeTestPlugin.h"
+#endif
 #include "plugins/SerialPlugin.h"
 #include "plugins/StoreForwardPlugin.h"
 #include "plugins/TextMessagePlugin.h"
@@ -35,7 +39,12 @@ void setupPlugins()
    */
    new SerialPlugin();
    new ExternalNotificationPlugin();
-    //storeForwardPlugin = new StoreForwardPlugin();
-    rangeTestPlugin = new RangeTestPlugin();
+
+    // rangeTestPlugin = new RangeTestPlugin();
+    storeForwardPlugin = new StoreForwardPlugin();
+
+    new RangeTestPlugin();
+    // new StoreForwardPlugin();
+    new EnvironmentalMeasurementPlugin();
 #endif
 }