From b5f3a20a6b83debdb8d9f7066b37a7737c998b8a Mon Sep 17 00:00:00 2001 From: Andon Date: Tue, 17 Oct 2017 14:22:43 -0400 Subject: [PATCH 1/3] Added Trinket to README.md Despite shipping with CircuitPython pre-installed, the Trinket M0 is abset from the README.md file. This fixes that issue. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index bdb01a7a4755d..571a849d0e7c2 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ This project is in beta. Most APIs should be stable going forward. * [Adafruit Feather M0 Express][] * [Adafruit Metro M0 Express][] * [Adafruit Gemma M0][] +* [Adafruit Trinket M0][] ### Other @@ -206,6 +207,7 @@ rest are here to maintain compatibility with the [Adafruit Feather M0 Express]: https://www.adafruit.com/product/3403 [Adafruit Metro M0 Express]: https://www.adafruit.com/product/3505 [Adafruit Gemma M0]: https://www.adafruit.com/product/3501 +[Adafruit Trinket M0]: https://www.adafruit.com/product/3500 [Adafruit Feather HUZZAH]: https://www.adafruit.com/products/2821 [Adafruit Feather M0 Basic]: https://www.adafruit.com/products/2772 [Adafruit Feather M0 Bluefruit LE]: https://www.adafruit.com/products/2995 From 166120aa3b3b56ed0fe89fe5ca06118c5af42bdb Mon Sep 17 00:00:00 2001 From: Andon Date: Tue, 17 Oct 2017 14:46:37 -0400 Subject: [PATCH 2/3] Adds pins to finish M0 Adalogger support Adds PA21 as D7 and as SD_CD Adds PA06 as D8 and GREEN_LED Updates README.md file to remove "SD Card not supported" warning. This addresses issues #323 and #317 --- README.md | 2 +- atmel-samd/boards/feather_m0_adalogger/pins.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 571a849d0e7c2..c04bb9c32d504 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This project is in beta. Most APIs should be stable going forward. * [Adafruit Feather HUZZAH][] * [Adafruit Feather M0 Basic][] * [Adafruit Feather M0 Bluefruit LE][] (uses M0 Basic binaries) -* [Adafruit Feather M0 Adalogger][] (MicroSD card not supported yet.) +* [Adafruit Feather M0 Adalogger][] * [Arduino Zero][] ## Download diff --git a/atmel-samd/boards/feather_m0_adalogger/pins.c b/atmel-samd/boards/feather_m0_adalogger/pins.c index 6b2094b72c071..0e11afcde0480 100644 --- a/atmel-samd/boards/feather_m0_adalogger/pins.c +++ b/atmel-samd/boards/feather_m0_adalogger/pins.c @@ -7,6 +7,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) }, { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) }, { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_SD_CD), MP_ROM_PTR(&pin_PA21) }, { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) }, { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) }, @@ -19,6 +20,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) }, { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_GREEN_LED), MP_ROM_PTR(&pin_PA06) }, { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) }, { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) }, { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) }, From d4000212b51dc41b158299d29355816fb86d75c2 Mon Sep 17 00:00:00 2001 From: Andon Date: Tue, 17 Oct 2017 15:55:12 -0400 Subject: [PATCH 3/3] Revert "Adds pins to finish M0 Adalogger support" This reverts commit 166120aa3b3b56ed0fe89fe5ca06118c5af42bdb. --- README.md | 2 +- atmel-samd/boards/feather_m0_adalogger/pins.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index c04bb9c32d504..571a849d0e7c2 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ This project is in beta. Most APIs should be stable going forward. * [Adafruit Feather HUZZAH][] * [Adafruit Feather M0 Basic][] * [Adafruit Feather M0 Bluefruit LE][] (uses M0 Basic binaries) -* [Adafruit Feather M0 Adalogger][] +* [Adafruit Feather M0 Adalogger][] (MicroSD card not supported yet.) * [Arduino Zero][] ## Download diff --git a/atmel-samd/boards/feather_m0_adalogger/pins.c b/atmel-samd/boards/feather_m0_adalogger/pins.c index 0e11afcde0480..6b2094b72c071 100644 --- a/atmel-samd/boards/feather_m0_adalogger/pins.c +++ b/atmel-samd/boards/feather_m0_adalogger/pins.c @@ -7,7 +7,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA04) }, { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA05) }, { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PA08) }, - { MP_ROM_QSTR(MP_QSTR_SD_CD), MP_ROM_PTR(&pin_PA21) }, { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PB02) }, { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PB11) }, { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PB10) }, @@ -20,9 +19,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA15) }, { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA20) }, - { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA21) }, - { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_PA06) }, - { MP_ROM_QSTR(MP_QSTR_GREEN_LED), MP_ROM_PTR(&pin_PA06) }, { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA07) }, { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA18) }, { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA16) },