shade/Meshtastic
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'root/master' into dev1.2

Browse Source 
# Conflicts:
#	src/plugins/Plugins.cpp
#	version.properties
This commit is contained in:
Kevin Hester committed 2021-03-01 10:26:16 +08:00
2 parents a51c08bfb1 43673c0598
commit ef612d0b58
7 files changed
+326 -173
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/plugins/Plugins.cpp
+6 -5
View File
@@ -4,15 +4,16 @@
#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"
#include "plugins/RoutingPlugin.h"
#include "plugins/AdminPlugin.h"
#ifndef NO_ESP32
#include "plugins/SerialPlugin.h"
#include "plugins/esp32/EnvironmentalMeasurementPlugin.h"
#include "plugins/esp32/RangeTestPlugin.h"
#include "plugins/esp32/StoreForwardPlugin.h"
#endif
/**
* Create plugin instances here. If you are adding a new plugin, you must 'new' it here (or somewhere else)