adjust ordering

MarlinFirmware · Aug 7, 2023 · 302df30 · 302df30
1 parent 9e83321
commit 302df30
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h b/Marlin/src/lcd/dogm/HAL_LCD_com_defines.h
@@ -42,7 +42,7 @@
     #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_samd51_st7920_hw_spi_fn
 
   #elif defined(__SAMD21__)
-  
+
     uint8_t u8g_com_samd21_st7920_hw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr);
     #define U8G_COM_ST7920_HAL_HW_SPI u8g_com_samd21_st7920_hw_spi_fn
 

diff --git a/Marlin/src/lcd/dogm/marlinui_DOGM.h b/Marlin/src/lcd/dogm/marlinui_DOGM.h
@@ -36,17 +36,21 @@
 
   // RepRapWorld Graphical LCD
 
-  #if !HAS_MEDIA && (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN)
-    #define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
-    #define U8G_PARAM LCD_PINS_RS
-  #elif HAS_MEDIA && __SAMD21__
+  #if HAS_MEDIA
+    #ifdef __SAMD21__
+      #define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
+    #else
+      #define U8G_CLASS U8GLIB_ST7920_128X64_4X
+    #endif
+  #elif (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN)
     #define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
-    #define U8G_PARAM LCD_PINS_RS
-  #elif HAS_MEDIA
+  #else
     #define U8G_CLASS U8GLIB_ST7920_128X64_4X
+  #endif
+
+  #if HAS_MEDIA || ((LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN))
     #define U8G_PARAM LCD_PINS_RS
   #else
-    #define U8G_CLASS U8GLIB_ST7920_128X64_4X
     #define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS
   #endif
 
@@ -64,7 +68,7 @@
     #else
       #define U8G_CLASS U8GLIB_ST7920_128X64_RRD                // Adjust stripes with PAGE_HEIGHT in ultralcd_st7920_u8glib_rrd.h
     #endif
-    #define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS // AVR version ignores these pin settings
+    #define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS     // AVR version ignores these pin settings
                                                                 // HAL version uses these pin settings
   #endif