Revert "Reimplement "Dynamic E-Ink" as a derived class (meshtastic#3316…

…)"
upchui · Mar 3, 2024 · 00d742e · 00d742e
1 parent 0efcb8b
commit 00d742e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 503 deletions.
diff --git a/src/graphics/EInkDisplay2.cpp b/src/graphics/EInkDisplay2.cpp
@@ -87,9 +87,9 @@ bool EInkDisplay::forceDisplay(uint32_t msecLimit)
 #ifndef EINK_NO_HIBERNATE // Only hibernate if controller IC will preserve image memory
     // Put screen to sleep to save power (possibly not necessary because we already did poweroff inside of display)
     adafruitDisplay->hibernate();
+    LOG_DEBUG("done\n");
 #endif
 
-    LOG_DEBUG("done\n");
     return true;
 }
 

diff --git a/src/graphics/EInkDisplay2.h b/src/graphics/EInkDisplay2.h
@@ -13,8 +13,6 @@
 /**
  * An adapter class that allows using the GxEPD2 library as if it was an OLEDDisplay implementation.
  *
- * Note: EInkDynamicDisplay derives from this class.
- *
  * Remaining TODO:
  * optimize display() to only draw changed pixels (see other OLED subclasses for examples)
  * implement displayOn/displayOff to turn off the TFT device (and backlight)
@@ -43,7 +41,7 @@ class EInkDisplay : public OLEDDisplay
      *
      * @return true if we did draw the screen
      */
-    virtual bool forceDisplay(uint32_t msecLimit = 1000);
+    bool forceDisplay(uint32_t msecLimit = 1000);
 
     /**
      * shim to make the abstraction happy