fix: declare class only if USE_EINK, init all members

meshtastic · Feb 28, 2024 · 1e3db57 · 1e3db57
1 parent 440a79e
commit 1e3db57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp
@@ -2,7 +2,6 @@
 
 #ifdef USE_EINK
 #include "EInkDisplay2.h"
-#include "GxEPD2_BW.h"
 #include "SPILock.h"
 #include "main.h"
 #include <SPI.h>

diff --git a/src/graphics/EInkDisplay2.h b/src/graphics/EInkDisplay2.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#ifdef USE_EINK
+
 #include "GxEPD2_BW.h"
 #include <OLEDDisplay.h>
 
@@ -58,7 +60,7 @@ class EInkDisplay : public OLEDDisplay
     virtual bool connect() override;
 
     // AdafruitGFX display object - instantiated in connect(), variant specific
-    GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT> *adafruitDisplay;
+    GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT> *adafruitDisplay = NULL;
 
     // If display uses HSPI
 #if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0)
@@ -67,5 +69,7 @@ class EInkDisplay : public OLEDDisplay
 
   private:
     // FIXME quick hack to limit drawing to a very slow rate
-    uint32_t lastDrawMsec;
+    uint32_t lastDrawMsec = 0;
 };
+
+#endif