From 63ca8f0a4292700bd131791d712e537bec6df2da Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 20 Feb 2026 15:50:34 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Allow=20override=20DOGM=20FORCE?= =?UTF-8?q?=5FSOFT=5FSPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/dogm/marlinui_DOGM.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.h b/Marlin/src/lcd/dogm/marlinui_DOGM.h index 9d3511084b..36079f5d8c 100644 --- a/Marlin/src/lcd/dogm/marlinui_DOGM.h +++ b/Marlin/src/lcd/dogm/marlinui_DOGM.h @@ -83,7 +83,7 @@ #if ENABLED(ALTERNATIVE_LCD) #define U8G_CLASS U8GLIB_DOGM128_2X // 4 stripes - #define FORCE_SOFT_SPI // SW-SPI + #define DOGM_FORCE_SOFT_SPI // SW-SPI #else #define U8G_CLASS U8GLIB_DOGM128_2X // 4 stripes (HW-SPI) #endif @@ -106,7 +106,7 @@ #define U8G_CLASS U8GLIB_64128N_2X_HAL // 4 stripes (HW-SPI) #if (SMART_RAMPS && defined(__SAM3X8E__)) || (defined(DOGLCD_SCK) && (DOGLCD_SCK != -1 && DOGLCD_SCK != SD_SCK_PIN)) || (defined(DOGLCD_MOSI) && (DOGLCD_MOSI != -1 && DOGLCD_MOSI != SD_MOSI_PIN)) - #define FORCE_SOFT_SPI // SW-SPI + #define DOGM_FORCE_SOFT_SPI // SW-SPI #endif #elif ANY(FYSETC_MINI_12864, MKS_MINI_12864, ENDER2_STOCKDISPLAY) @@ -134,7 +134,7 @@ #if IS_I2C_LCD #define U8G_CLASS U8GLIB_SSD1306_128X64_2X_I2C_2_WIRE // I2C #else - #define FORCE_SOFT_SPI // SW-SPI + #define DOGM_FORCE_SOFT_SPI // SW-SPI #if ENABLED(ALTERNATIVE_LCD) #define U8G_CLASS U8GLIB_SSD1306_128X64_2X // 4 stripes #else @@ -147,7 +147,7 @@ // FYSETC OLED 2.42" 128 × 64 Full Graphics Controller // or K3D OLED 2.42" 128 × 64 Full Graphics Controller - #define FORCE_SOFT_SPI // SW-SPI + #define DOGM_FORCE_SOFT_SPI // SW-SPI #if ENABLED(ALTERNATIVE_LCD) #define U8G_CLASS U8GLIB_SSD1306_128X64_2X // 4 stripes @@ -159,7 +159,7 @@ // Zonestar SSD1306 OLED SPI LCD - #define FORCE_SOFT_SPI // SW-SPI + #define DOGM_FORCE_SOFT_SPI // SW-SPI #if ENABLED(ALTERNATIVE_LCD) #define U8G_CLASS U8GLIB_SH1306_128X64_2X // 4 stripes #else @@ -177,7 +177,7 @@ // Zonestar SH1106 OLED SPI LCD #if !IS_I2C_LCD - #define FORCE_SOFT_SPI // SW-SPI + #define DOGM_FORCE_SOFT_SPI // SW-SPI #endif #if ENABLED(ALTERNATIVE_LCD) #define U8G_CLASS U8GLIB_SH1106_128X64_2X // 4 stripes @@ -246,6 +246,11 @@ #endif +#if defined(DOGM_FORCE_SOFT_SPI) && !defined(FORCE_SOFT_SPI) + #define FORCE_SOFT_SPI +#endif +#undef DOGM_FORCE_SOFT_SPI + // Use HW-SPI if no other option is specified #ifndef U8G_PARAM #if IS_I2C_LCD