Make OSW fit for Arduino_GFX v1.4.6 (#381)

Open-Smartwatch · Apr 6, 2024 · 1d0d71a · 1d0d71a
2 parents 090def4 + ff43d71
commit 1d0d71a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/emulator/include/Arduino_GFX.h b/emulator/include/Arduino_GFX.h
@@ -3,4 +3,7 @@
 class Graphics2DPrint;
 typedef Graphics2DPrint Arduino_GFX;
 
-#include "Arduino_G.h"
+// in accordance to Arduino_DataBus.h also provide this define
+#define GFX_NOT_DEFINED -1
+
+#include "Arduino_G.h"
diff --git a/include/Arduino_Canvas_Graphics2D.h b/include/Arduino_Canvas_Graphics2D.h
@@ -22,7 +22,7 @@ class Arduino_Canvas_Graphics2D : public Graphics2DPrint {
      * we have copy-pasted this utility together...
      */
 
-    void begin(int32_t speed = 0);
+    void begin(int32_t speed = GFX_NOT_DEFINED);
     void writePixelPreclipped(int16_t x, int16_t y, uint16_t color);
     void writeFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
     void writeFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);

diff --git a/lib/Arduino_GFX b/lib/Arduino_GFX
diff --git a/src/hal/display.cpp b/src/hal/display.cpp
@@ -70,7 +70,7 @@ void OswHal::setupDisplay() {
     if(!this->canvas)
         this->canvas = new Arduino_Canvas_Graphics2D(DISP_W, DISP_H, tft);
 
-    this->canvas->begin(0);
+    this->canvas->begin();  // use default speed and default SPI mode
     this->displayOn();
 }