diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2019-04-23 16:13:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 16:13:38 -0700 |
| commit | 681bfcbb41598e821b63ecba4a7d92919fcc31f8 (patch) | |
| tree | c5ea2914f400a9591ace87830e8d058735df234a | |
| parent | b87ce5bf9e798a06230d42cc9ac9022a08a9ddca (diff) | |
| parent | 9b593cd154e4c6f0264f84f4da6dd4b946f75e33 (diff) | |
Merge pull request #1823 from ladyada/master4.0.0-rc.1
fix up pybadge for final release board (swap backlite and reset)
| -rw-r--r-- | ports/atmel-samd/boards/pybadge/board.c | 4 | ||||
| -rw-r--r-- | ports/atmel-samd/boards/pybadge/pins.c | 4 | ||||
| m--------- | ports/atmel-samd/peripherals | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ports/atmel-samd/boards/pybadge/board.c b/ports/atmel-samd/boards/pybadge/board.c index d559ba7fc..2b0e334fa 100644 --- 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 index 2e7e6d496..ca65d9df4 100644 --- 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 -Subproject 778d4f3736728da7ba7795c5c44176c415c903c +Subproject 83a4759d186574d8034435cd2303def85e4ed79 |