Merge branch 'meshtastic:master' into master

This commit is contained in:
Mictronics 2024-03-02 17:02:04 +01:00 committed by GitHub
commit a8455b9e1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -13,7 +13,6 @@
#include "modules/NodeInfoModule.h" #include "modules/NodeInfoModule.h"
#include "modules/PositionModule.h" #include "modules/PositionModule.h"
#include "modules/RemoteHardwareModule.h" #include "modules/RemoteHardwareModule.h"
#include "modules/ReplyModule.h"
#include "modules/RoutingModule.h" #include "modules/RoutingModule.h"
#include "modules/TextMessageModule.h" #include "modules/TextMessageModule.h"
#include "modules/TraceRouteModule.h" #include "modules/TraceRouteModule.h"
@ -67,7 +66,8 @@ void setupModules()
// to a global variable. // to a global variable.
new RemoteHardwareModule(); new RemoteHardwareModule();
new ReplyModule(); // Example: Put your module here
// new ReplyModule();
#if HAS_BUTTON || ARCH_PORTDUINO #if HAS_BUTTON || ARCH_PORTDUINO
rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1(); rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
if (!rotaryEncoderInterruptImpl1->init()) { if (!rotaryEncoderInterruptImpl1->init()) {