Merge pull request #10851 from tannewt/fix_tinycircuits

Fix tinycircuits boards after base branch didn't catch the issues

Author: dhalbert

ports/raspberrypi/boards/tinycircuits_thumby/board.c

@@ -37,9 +37,9 @@ void board_init(void) {
     bus->base.type = &fourwire_fourwire_type;
     common_hal_fourwire_fourwire_construct(bus,
         spi,
-        CIRCUITPY_BOARD_OLED_DC, // Command or data
-        CIRCUITPY_BOARD_OLED_CS, // Chip select
-        CIRCUITPY_BOARD_OLED_RESET, // Reset
+        MP_OBJ_FROM_PTR(CIRCUITPY_BOARD_OLED_DC), // Command or data
+        MP_OBJ_FROM_PTR(CIRCUITPY_BOARD_OLED_CS), // Chip select
+        MP_OBJ_FROM_PTR(CIRCUITPY_BOARD_OLED_RESET), // Reset
         10000000, // Baudrate
         0, // Polarity
         0); // Phase

ports/raspberrypi/boards/tinycircuits_thumby/mpconfigboard.h

@@ -18,6 +18,3 @@
 
 #define CIRCUITPY_BOARD_SPI         (1)
 #define CIRCUITPY_BOARD_SPI_PIN     {{.clock = DEFAULT_SPI_BUS_SCK, .mosi = DEFAULT_SPI_BUS_MOSI, .miso = NULL}}
-
-// For entering safe mode
-#define CIRCUITPY_BOOT_BUTTON       (&pin_GPIO6)

ports/raspberrypi/boards/tinycircuits_thumby_color/board.c

@@ -62,12 +62,12 @@ void board_init(void) {
     common_hal_fourwire_fourwire_construct(
         bus,
         spi,
-        CIRCUITPY_BOARD_LCD_DC,     // DC
-        CIRCUITPY_BOARD_LCD_CS,     // CS
-        CIRCUITPY_BOARD_LCD_RESET,  // RST
-        80000000,                   // baudrate
-        0,                          // polarity
-        0                           // phase
+        MP_OBJ_FROM_PTR(CIRCUITPY_BOARD_LCD_DC),     // DC
+        MP_OBJ_FROM_PTR(CIRCUITPY_BOARD_LCD_CS),     // CS
+        MP_OBJ_FROM_PTR(CIRCUITPY_BOARD_LCD_RESET),  // RST
+        80000000,                                    // baudrate
+        0,                                           // polarity
+        0                                            // phase
         );
 
     busdisplay_busdisplay_obj_t *display = &allocate_display()->display;

ports/raspberrypi/mpconfigport.h

@@ -36,10 +36,8 @@
 
 #define CIRCUITPY_PROCESSOR_COUNT           (2)
 
-// For many RP2 boards BOOTSEL is not connected to a GPIO pin.
-#ifndef CIRCUITPY_BOOT_BUTTON
+// For RP2 boards we use a custom way to read BOOTSEL
 #define CIRCUITPY_BOOT_BUTTON_NO_GPIO       (1)
-#endif
 
 #if CIRCUITPY_USB_HOST
 #define CIRCUITPY_USB_HOST_INSTANCE 1