Merge pull request adafruit#1823 from ladyada/master

tannewt · web-flow · commit 681bfcbb4159 · 2019-04-23T16:13:38.000-07:00
fix up pybadge for final release board (swap backlite and reset)
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c
@@ -81,7 +81,7 @@ void board_init(void) {
         spi,
         &pin_PB05, // TFT_DC Command or data
         &pin_PB07, // TFT_CS Chip select
-        &pin_PA01); // TFT_RST Reset
+        &pin_PA00); // TFT_RST Reset
 
     displayio_display_obj_t* display = &displays[0].display;
     display->base.type = &displayio_display_type;
@@ -99,7 +99,7 @@ void board_init(void) {
         0x37, // set vertical scroll command
         display_init_sequence,
         sizeof(display_init_sequence),
-        &pin_PA00,
+        &pin_PA01,  // backlight pin
         1.0f, // brightness (ignored)
         true, // auto_brightness
         false, // single_byte_bounds
diff --git a/ports/atmel-samd/boards/pybadge/pins.c b/ports/atmel-samd/boards/pybadge/pins.c
@@ -54,10 +54,10 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_BUTTON_CLOCK),  MP_ROM_PTR(&pin_PB31) },
 
     // TFT control pins
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE),  MP_ROM_PTR(&pin_PA00) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE),  MP_ROM_PTR(&pin_PA01) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_MOSI),  MP_ROM_PTR(&pin_PB15) },
     { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_SCK),  MP_ROM_PTR(&pin_PB13) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST),  MP_ROM_PTR(&pin_PA01) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_TFT_RST),  MP_ROM_PTR(&pin_PA00) },
     { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_PB07) },
     { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_PB05) },
 
diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals
@@ -1 +1 @@
-Subproject commit 778d4f3736728da7ba7795c5c44176c415c903cf
+Subproject commit 83a4759d186574d8034435cd2303def85e4ed793
