undef if def

jblanked · jblanked · commit 2fe8fa199d33 · 2026-02-15T22:01:35.000-05:00
diff --git a/src/MicroPython/PicoCalc/picoware_lcd/picoware_lcd.c b/src/MicroPython/PicoCalc/picoware_lcd/picoware_lcd.c
@@ -23,7 +23,10 @@
 #define STATIC static
 #endif
 
+#ifdef FONT_DEFAULT
+#undef FONT_DEFAULT
 #define FONT_DEFAULT FONT_XTRA_SMALL
+#endif
 
 #define LCD_CHUNK_LINES 16
 
diff --git a/src/MicroPython/Waveshare/RP2350-Touch-LCD-1.28/waveshare_lcd/waveshare_lcd.c b/src/MicroPython/Waveshare/RP2350-Touch-LCD-1.28/waveshare_lcd/waveshare_lcd.c
@@ -16,7 +16,10 @@
 #define STATIC static
 #endif
 
+#ifdef FONT_DEFAULT
+#undef FONT_DEFAULT
 #define FONT_DEFAULT FONT_XTRA_SMALL
+#endif
 
 // Function to get backlight level
 STATIC mp_obj_t waveshare_lcd_get_backlight_level(void)
diff --git a/src/MicroPython/Waveshare/RP2350-Touch-LCD-1.43/waveshare_lcd/waveshare_lcd.c b/src/MicroPython/Waveshare/RP2350-Touch-LCD-1.43/waveshare_lcd/waveshare_lcd.c
@@ -16,7 +16,10 @@
 #define STATIC static
 #endif
 
+#ifdef FONT_DEFAULT
+#undef FONT_DEFAULT
 #define FONT_DEFAULT FONT_MEDIUM
+#endif
 
 // Function to get backlight level
 STATIC mp_obj_t waveshare_lcd_get_backlight_level(void)
diff --git a/src/MicroPython/Waveshare/RP2350-Touch-LCD-3.49/waveshare_lcd/waveshare_lcd.c b/src/MicroPython/Waveshare/RP2350-Touch-LCD-3.49/waveshare_lcd/waveshare_lcd.c
@@ -16,7 +16,10 @@
 #define STATIC static
 #endif
 
+#ifdef FONT_DEFAULT
+#undef FONT_DEFAULT
 #define FONT_DEFAULT FONT_MEDIUM
+#endif
 
 // Function to get backlight level
 STATIC mp_obj_t waveshare_lcd_get_backlight_level(void)
