Merge branch 'master' of github.com:meshtastic/Meshtastic-device

src/modules/CannedMessageModule.cpp

@@ -1,4 +1,5 @@
 #include "configuration.h"
+#ifndef NO_SCREEN
 #include "CannedMessageModule.h"
 #include "PowerFSM.h" // neede for button bypass
 #include "MeshService.h"
@@ -548,3 +549,4 @@ void CannedMessageModule::handleSetCannedMessageModulePart4(const char *from_msg
         this->saveProtoForModule();
     }
 }
+#endif

src/modules/CannedMessageModule.h

@@ -1,4 +1,6 @@
 #pragma once
+#ifdef NO_SCREEN
+#else
 #include "ProtobufModule.h"
 #include "input/InputBroker.h"
 
@@ -84,3 +86,4 @@ class CannedMessageModule :
 };
 
 extern CannedMessageModule *cannedMessageModule;
+#endif

src/modules/Modules.cpp

@@ -47,7 +47,9 @@ void setupModules()
     cardKbI2cImpl->init();
     facesKbI2cImpl = new FacesKbI2cImpl();
     facesKbI2cImpl->init();
+#ifndef NO_SCREEN    
     cannedMessageModule = new CannedMessageModule();
+#endif
 #ifndef PORTDUINO
     new DeviceTelemetryModule();
     new EnvironmentTelemetryModule();

src/modules/Telemetry/EnvironmentTelemetry.h

@@ -15,7 +15,11 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
         lastMeasurementPacket = nullptr;
     }
     virtual bool wantUIFrame() override;
+#ifdef NO_SCREEN    
+    void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+#else
     virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
+#endif
 
   protected:
     /** Called to handle a particular incoming message