Fix up available SPI buses; swap I2C pins

Author: dhalbert

ports/atmel-samd/boards/microchip_curiosity_circuitpython_nano/mpconfigboard.h

@@ -14,18 +14,16 @@
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
 
-#define DEFAULT_I2C_BUS_SCL (&pin_PB31)
-#define DEFAULT_I2C_BUS_SDA (&pin_PB30)
-
-#define LCD_SPI_BUS_SCK (&pin_PA05)
-#define LCD_SPI_BUS_MOSI (&pin_PA04)
-#define LCD_SPI_BUS_CS (&pin_PA07)
-#define LCD_BACKLIGHT (&pin_PA06)
-
-#define SDCARD_SPI_BUS_SCK (&pin_PA17)
-#define SDCARD_SPI_BUS_MOSI (&pin_PA16)
-#define SDCARD_SPI_BUS_MISO (&pin_PA18)
-#define SDCARD_SPI_BUS_CS (&pin_PA19)
+#define DEFAULT_I2C_BUS_SCL (&pin_PB30)
+#define DEFAULT_I2C_BUS_SDA (&pin_PB31)
+
+#define CIRCUITPY_BOARD_SPI         (3)
+// These correspond to the CIRCUITPY_BOARD_BUS_SINGLETON definitions in pins.c
+#define CIRCUITPY_BOARD_SPI_PIN     { \
+        {.clock = &pin_PB03, .mosi = &pin_PB02, .miso = &pin_PB00}, /*board.SPI()*/ \
+        {.clock = &pin_PA05, .mosi = &pin_PA04, .miso = NULL},      /*board.LCD_SPI()*/ \
+        {.clock = &pin_PA17, .mosi = &pin_PA16, .miso = &pin_PA18}, /*board.SD_SPI()*/ \
+}
 
 #define DEFAULT_CAN_BUS_TX (&pin_PB12)
 #define DEFAULT_CAN_BUS_RX (&pin_PB13)

ports/atmel-samd/boards/microchip_curiosity_circuitpython_nano/pins.c

@@ -6,6 +6,12 @@
 
 #include "shared-bindings/board/__init__.h"
 
+// The singleton for board.SPI() is already defined.
+// board.LCD_SPI()
+CIRCUITPY_BOARD_BUS_SINGLETON(lcd_spi, spi, 1)
+// board.SD_SPI()
+CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 2)
+
 static const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
@@ -19,7 +25,7 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PB17) },
     { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PB22) },
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PB23) },
-    
+
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_PB23) },
 
     { MP_ROM_QSTR(MP_QSTR_NEOPIX), MP_ROM_PTR(&pin_PB22) },
@@ -41,8 +47,8 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_PA04) },
     { MP_ROM_QSTR(MP_QSTR_LCD_SCK), MP_ROM_PTR(&pin_PA05) },
 
-    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB30) },
-    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB31) },
+    { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PB30) },
+    { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PB31) },
 
     { MP_ROM_QSTR(MP_QSTR_BLE_TX), MP_ROM_PTR(&pin_PA12) },
     { MP_ROM_QSTR(MP_QSTR_BLE_RX), MP_ROM_PTR(&pin_PA13) },
@@ -53,9 +59,16 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_PA17) },
     { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PA19) },
 
+    { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PB00) },
     { MP_ROM_QSTR(MP_QSTR_SPARE_0), MP_ROM_PTR(&pin_PB00) },
+
+    { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_PB01) },
     { MP_ROM_QSTR(MP_QSTR_SPARE_1), MP_ROM_PTR(&pin_PB01) },
+
+    { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB02) },
     { MP_ROM_QSTR(MP_QSTR_SPARE_2), MP_ROM_PTR(&pin_PB02) },
+
+    { MP_ROM_QSTR(MP_QSTR_SCK ), MP_ROM_PTR(&pin_PB03) },
     { MP_ROM_QSTR(MP_QSTR_SPARE_3), MP_ROM_PTR(&pin_PB03) },
 
     { MP_ROM_QSTR(MP_QSTR_DEBUG_TX), MP_ROM_PTR(&pin_PA22) },
@@ -65,14 +78,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX),  MP_ROM_PTR(&pin_PB12) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_CAN_STANDBY),  MP_ROM_PTR(&pin_PB17) },
 
-    { MP_ROM_QSTR(MP_QSTR_CAN_RX),  MP_ROM_PTR(&pin_PB13) },
-    { MP_ROM_QSTR(MP_QSTR_CAN_TX),  MP_ROM_PTR(&pin_PB12) },
-    { MP_ROM_QSTR(MP_QSTR_CAN_STANDBY),  MP_ROM_PTR(&pin_PB17) },
-
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
-    { MP_ROM_QSTR(MP_QSTR_SDSPI), MP_ROM_PTR(&board_sdspi_obj) },
-    { MP_ROM_QSTR(MP_QSTR_LCDSPI), MP_ROM_PTR(&board_lcdspi_obj) },
+
+    { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_LCD_SPI), MP_ROM_PTR(&board_lcd_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_sd_spi_obj) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);