Merge pull request #1278 from bdring/FixOLED

Fixed recently-introduced bug in OLED code
bdring · Aug 2, 2024 · 0f9a326 · 0f9a326
2 parents 1493e85 + fb76e0e
commit 0f9a326
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/FluidNC/src/OLED.h b/FluidNC/src/OLED.h
@@ -12,7 +12,7 @@ typedef const uint8_t* font_t;
 
 class OLED : public Channel, public Module {
 public:
-    OLED(const char* name) : Module(name) {}
+    OLED(const char* name) : Channel(name), Module(name) {}
     struct Layout {
         uint8_t                    _x;
         uint8_t                    _y;
@@ -81,8 +81,6 @@ class OLED : public Channel, public Module {
     bool _error = false;
 
 public:
-    OLED() : Channel("oled"), Module("oled") {}
-
     OLED(const OLED&)            = delete;
     OLED(OLED&&)                 = delete;
     OLED& operator=(const OLED&) = delete;

diff --git a/platformio.ini b/platformio.ini
@@ -74,7 +74,7 @@ build_src_filter =
         +<stdfs>
         -<src/WebUI>
         -<src/BTConfig.cpp>
-        -<src/OLED.cpp>
+        ; -<src/OLED.cpp>
 
 lib_extra_dirs = 
 	libraries