fix #ifdef sections. disable for atmel boards that overflowed

FoamyGuy · FoamyGuy · commit d48b5c99376d · 2025-03-05T11:36:59.000-06:00
diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk
@@ -14,3 +14,4 @@ CIRCUITPY_PS2IO = 1
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SPITARGET = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk b/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk
@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SPITARGET = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C, W25Q16JVxQ"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_RAINBOWIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL064L"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk b/ports/atmel-samd/boards/huntercat_nfc/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
@@ -13,3 +13,4 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_BITBANG_APA102 = 1
 
 CIRCUITPY_PULSEIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY_CODEOP = 0
 CIRCUITPY_FLOPPYIO = 0
 CIRCUITPY_GIFIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
 
 CIRCUITPY_BITBANG_APA102 = 1
 
diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_RAINBOWIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk b/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk
@@ -14,3 +14,4 @@ CIRCUITPY_KEYPAD = 1
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_lcd/mpconfigboard.mk
@@ -54,6 +54,7 @@ CIRCUITPY_PULSEIO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
 CIRCUITPY_ULAB = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
diff --git a/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/qtpy_m0_haxpress/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 LONGINT_IMPL = MPZ
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C,W25Q16JVxQ,W25Q32FV"
+
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk b/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk
@@ -13,3 +13,4 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_JPEGIO = 0
 CIRCUITPY_SPITARGET = 0
 CIRCUITPY_SYNTHIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_CODEOP = 0
 CIRCUITPY_RAINBOWIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = W25Q32BV
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_CODEOP = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/ports/atmel-samd/boards/uartlogger2/mpconfigboard.mk b/ports/atmel-samd/boards/uartlogger2/mpconfigboard.mk
@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_SPITARGET = 0
 CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_JPEGIO = 0
+CIRCUITPY_TILEPALETTEMAPPER = 0
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
@@ -27,7 +27,7 @@ void displayio_tilegrid_validate_pixel_shader(mp_obj_t pixel_shader) {
     if (!mp_obj_is_type(pixel_shader, &displayio_palette_type) && !mp_obj_is_type(pixel_shader, &displayio_colorconverter_type)) {
         valid_type = false;
     }
-    #ifdef CIRCUITPY_TILEPALETTEMAPPER
+    #if CIRCUITPY_TILEPALETTEMAPPER
     if (mp_obj_is_type(pixel_shader, &tilepalettemapper_tilepalettemapper_type)) {
         valid_type = true;
     }
diff --git a/shared-module/displayio/TileGrid.c b/shared-module/displayio/TileGrid.c
@@ -11,7 +11,7 @@
 #include "shared-bindings/displayio/ColorConverter.h"
 #include "shared-bindings/displayio/OnDiskBitmap.h"
 #include "shared-bindings/displayio/Palette.h"
-#ifdef CIRCUITPY_TILEPALETTEMAPPER
+#if CIRCUITPY_TILEPALETTEMAPPER
 #include "shared-bindings/tilepalettemapper/TilePaletteMapper.h"
 #endif
 
@@ -488,7 +488,7 @@ bool displayio_tilegrid_fill_area(displayio_tilegrid_t *self,
             }
 
             output_pixel.opaque = true;
-            #ifdef CIRCUITPY_TILEPALETTEMAPPER
+            #if CIRCUITPY_TILEPALETTEMAPPER
             if (mp_obj_is_type(self->pixel_shader, &tilepalettemapper_tilepalettemapper_type)) {
                 output_pixel.pixel = tilepalettemapper_tilepalettemapper_get_color(self->pixel_shader, tile_location, input_pixel.pixel);
             }
@@ -558,7 +558,7 @@ void displayio_tilegrid_finish_refresh(displayio_tilegrid_t *self) {
     } else if (mp_obj_is_type(self->pixel_shader, &displayio_colorconverter_type)) {
         displayio_colorconverter_finish_refresh(self->pixel_shader);
     }
-    #ifdef CIRCUITPY_TILEPALETTEMAPPER
+    #if CIRCUITPY_TILEPALETTEMAPPER
     if (mp_obj_is_type(self->pixel_shader, &tilepalettemapper_tilepalettemapper_type)) {
         tilepalettemapper_tilepalettemapper_finish_refresh(self->pixel_shader);
     }
@@ -616,7 +616,7 @@ displayio_area_t *displayio_tilegrid_get_refresh_areas(displayio_tilegrid_t *sel
             displayio_palette_needs_refresh(self->pixel_shader)) ||
         (mp_obj_is_type(self->pixel_shader, &displayio_colorconverter_type) &&
             displayio_colorconverter_needs_refresh(self->pixel_shader));
-    #ifdef CIRCUITPY_TILEPALETTEMAPPER
+    #if CIRCUITPY_TILEPALETTEMAPPER
     self->full_change = self->full_change ||
         (mp_obj_is_type(self->pixel_shader, &tilepalettemapper_tilepalettemapper_type) &&
             tilepalettemapper_tilepalettemapper_needs_refresh(self->pixel_shader));

Original file line number	Diff line number	Diff line change
`@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"`
`11`	`11`	`LONGINT_IMPL = MPZ`
`12`	`12`
`13`	`13`	`CIRCUITPY_JPEGIO = 0`
	`14`	`+CIRCUITPY_TILEPALETTEMAPPER = 0`
Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,4 @@ LONGINT_IMPL = MPZ`
`13`	`13`	`CIRCUITPY_BITBANG_APA102 = 1`
`14`	`14`
`15`	`15`	`CIRCUITPY_PULSEIO = 0`
	`16`	`+CIRCUITPY_TILEPALETTEMAPPER = 0`
Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@ LONGINT_IMPL = MPZ`
`12`	`12`
`13`	`13`	`CIRCUITPY_CODEOP = 0`
`14`	`14`	`CIRCUITPY_RAINBOWIO = 0`
	`15`	`+CIRCUITPY_TILEPALETTEMAPPER = 0`