From 8a24d8128bf1f8522463ac8749bc02607892f9e8 Mon Sep 17 00:00:00 2001 From: Stewart Colborne Date: Sat, 25 Nov 2017 16:13:40 -0500 Subject: [PATCH 1/4] atmel-samd/boards/feather_m0_adalogger/pins: Added missing pins - Added D4 and moved associated SD_CS so that they are paired within list - Added D7 and SD_CD which is the SD Card Detect pin - Added D8 and GREEN_LED - Added RED_LED associated with D13 --- atmel-samd/boards/feather_m0_adalogger/pins.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/atmel-samd/boards/feather_m0_adalogger/pins.c b/atmel-samd/boards/feather_m0_adalogger/pins.c index 6b2094b72c071..a229b6bab1814 100644 --- a/atmel-samd/boards/feather_m0_adalogger/pins.c +++ b/atmel-samd/boards/feather_m0_adalogger/pins.c @@ -6,7 +6,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PB09) }, { 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_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) }, @@ -17,12 +16,19 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) }, { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PA08) }, { 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_SD_CD), 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) }, { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA19) }, { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA17) }, + { MP_ROM_QSTR(MP_QSTR_RED_LED), MP_ROM_PTR(&pin_PA17) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From 6a68ffdacb8271e73acb234355e15f8696210f46 Mon Sep 17 00:00:00 2001 From: Stewart Colborne Date: Sat, 25 Nov 2017 16:13:40 -0500 Subject: [PATCH 2/4] atmel-samd/README: Added feather_m0_adalogger missing pins to match updated pins.c - Added D4 and moved associated SD_CS so that they are paired within list - Added D7 and SD_CD which is the SD Card Detect pin - Added D8 and GREEN_LED - Added RED_LED associated with D13 - Added Setup information regarding arm complier packages - [skip ci] doc not code --- atmel-samd/README.rst | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/atmel-samd/README.rst b/atmel-samd/README.rst index 9352f47d67170..d6e1c49f0b228 100644 --- a/atmel-samd/README.rst +++ b/atmel-samd/README.rst @@ -28,9 +28,9 @@ PB08 ``A1`` ``A7`` / ``TX`` ``A1`` PB09 ``A2`` ``A6`` / ``RX`` ``A2`` ``A2`` ``A2`` ``A2`` PA04 ``A3`` ``IR_PROXIMITY`` ``A3`` ``A3`` ``A3`` ``D0`` / ``TX`` / ``SDA`` ``A3`` PA05 ``A4`` ``A1`` ``A4`` ``A4`` ``A4`` ``D2`` / ``RX`` / ``SCL`` ``A4`` -PA06 ``D8`` ``A2`` ``NEOPIXEL`` ``D8`` ``D4`` / ``TX`` +PA06 ``D8`` ``A2`` ``D8`` / ``GREEN_LED`` ``NEOPIXEL`` ``D8`` ``D4`` / ``TX`` PA07 ``D9`` ``A3`` ``D9`` ``D9`` ``D9`` ``D9`` ``D3`` / ``RX`` -PA08 ``D4`` ``MICROPHONE_DO`` ``SD_CS`` ``D4`` ``D0`` / ``SDA`` +PA08 ``D4`` ``MICROPHONE_DO`` ``D4`` / ``SD_CS`` ``D4`` ``D0`` / ``SDA`` PA09 ``D3`` ``TEMPERATURE`` / ``A9`` ``D3`` ``D2`` / ``SCL`` PA10 ``D1`` / ``TX`` ``MICROPHONE_SCK`` ``D1`` / ``TX`` ``D1`` / ``TX`` ``D1`` / ``TX`` ``D1`` / ``TX`` ``D13`` PA11 ``D0`` / ``RX`` ``LIGHT`` / ``A8`` ``D0`` / ``RX`` ``D0`` / ``RX`` ``D0`` / ``RX`` ``D0`` / ``RX`` @@ -41,11 +41,11 @@ PA13 ``ACCELEROMETER_INTERRUPT`` PA14 ``D2`` ``BUTTON_B`` / ``D5`` ``D2`` PA15 ``D5`` ``SLIDE_SWITCH`` / ``D7`` ``D5`` ``D5`` ``D5`` ``D5`` PA16 ``D11`` ``MISO`` ``D11`` ``D11`` ``D11`` ``D11`` -PA17 ``D13`` ``D13`` ``D13`` ``D13`` ``D13`` ``D13`` +PA17 ``D13`` ``D13`` ``D13`` / ``RED_LED`` ``D13`` ``D13`` ``D13`` PA18 ``D10`` ``D10`` ``D10`` ``D10`` ``D10`` PA19 ``D12`` ``D12`` ``D12`` ``D12`` ``D12`` PA20 ``D6`` ``MOSI`` ``D6`` ``D6`` ``D6`` ``D6`` -PA21 ``D7`` ``SCK`` ``D7`` +PA21 ``D7`` ``SCK`` ``D7`` / ``SD_CD`` ``D7`` PA22 ``SDA`` ``SDA`` ``SDA`` ``SDA`` ``SDA`` PA23 ``SCL`` ``REMOTEOUT`` / ``IR_TX`` ``SCL`` ``SCL`` ``SCL`` ``L`` / ``D13`` ``SCL`` PA24 @@ -113,6 +113,18 @@ PB02 **Yes** **Yes** **Yes** **Yes** PB03 **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** **Yes** ===================== ======== ========= ========= ======= ======= ======= ========= ========= ======= ========== ========== ========= ========= ========= ============ ======= ======= ========= +Setup +----- +Install required compiler packages: + +.. code-block:: shell + + sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa + sudo dpkg --add-architecture i386 + sudo apt-get update -qq || true + sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system gcc-mingw-w64 + sudo apt-get install -y --force-yes gcc-arm-embedded + Building -------- From 6314cef514d7af1c3330397a62a1496289b40452 Mon Sep 17 00:00:00 2001 From: Stewart Colborne Date: Sun, 26 Nov 2017 02:50:14 -0500 Subject: [PATCH 3/4] README - Updated to reflect that feather_m0_adalogger microSD is supported - [skip ci] doc not code --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c4fc236e8ab7..dedafb96b65b7 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,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][] (MicroSD card supported using the [Adafruit CircuitPython SD library](https://github.com/adafruit/Adafruit_CircuitPython_SD)) * [Arduino Zero][] ## Download From 16fb4652817b2e0b18ff48ad59e58fbdd7bf8c6d Mon Sep 17 00:00:00 2001 From: Stewart Colborne Date: Sun, 26 Nov 2017 15:26:37 -0500 Subject: [PATCH 4/4] atmel-samd/README: Updated Setup information - Setup information regarding arm complier packages was cleaned up - [skip ci] doc not code --- atmel-samd/README.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/atmel-samd/README.rst b/atmel-samd/README.rst index d6e1c49f0b228..5c314c53f6f69 100644 --- a/atmel-samd/README.rst +++ b/atmel-samd/README.rst @@ -119,11 +119,8 @@ Install required compiler packages: .. code-block:: shell - sudo add-apt-repository -y ppa:team-gcc-arm-embedded/ppa - sudo dpkg --add-architecture i386 - sudo apt-get update -qq || true - sudo apt-get install -y python3 gcc-multilib pkg-config libffi-dev libffi-dev:i386 qemu-system gcc-mingw-w64 - sudo apt-get install -y --force-yes gcc-arm-embedded + sudo add-apt-repository ppa:team-gcc-arm-embedded/ppa + sudo apt-get install gcc-arm-embedded Building --------