Merge remote-tracking branch 'origin/master' into capablerobot-usbhub

2020-01-20 13:11:57 -05:00 · 2020-01-20 13:11:57 -05:00 · 97420994e8
commit 97420994e8
parent 137a4f8a5d 85c731734a
1758 changed files with 45339 additions and 227915 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -0,0 +1,221 @@
+name: Build CI
+
+on:
+  push:
+  pull_request:
+  release:
+    types: [published]
+  check_suite:
+    types: [rerequested]
+
+jobs:
+  test:
+    runs-on: ubuntu-16.04
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Set up Python 3.5
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.5
+    - name: Install deps
+      run: |
+        sudo apt-get install -y gettext librsvg2-bin
+        pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
+    - name: Versions
+      run: |
+        gcc --version
+        python3 --version
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: CircuitPython version
+      run: git describe --dirty --always --tags
+    - name: Build mpy-cross
+      run: make -C mpy-cross -j2
+    - name: Build unix port
+      run: |
+        make -C ports/unix deplibs -j2
+        make -C ports/unix -j2
+        make -C ports/unix coverage -j2
+    - name: Test all
+      run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1
+      working-directory: tests
+    - name: Print failure info
+      run: |
+        for exp in *.exp;
+        do testbase=$(basename $exp .exp);
+        echo -e "\nFAILURE $testbase";
+        diff -u $testbase.exp $testbase.out;
+        done
+      working-directory: tests
+      if: failure()
+    - name: Native Tests
+      run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native
+      working-directory: tests
+    - name: mpy Tests
+      run: MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float
+      working-directory: tests
+    - name: Docs
+      run: sphinx-build -E -W -b html . _build/html
+    - name: Translations
+      run: make check-translate
+    - name: New boards check
+      run: python3 -u ci_new_boards_check.py
+      working-directory: tools
+
+  build-arm:
+    runs-on: ubuntu-16.04
+    needs: test
+    strategy:
+      fail-fast: false
+      matrix:
+        board:
+        - "aramcon_badge_2019"
+        - "arduino_mkr1300"
+        - "arduino_mkrzero"
+        - "arduino_nano_33_ble"
+        - "arduino_zero"
+        - "bast_pro_mini_m0"
+        - "capablerobot_usbhub"
+        - "catwan_usbstick"
+        - "circuitplayground_bluefruit"
+        - "circuitplayground_express"
+        - "circuitplayground_express_crickit"
+        - "circuitplayground_express_displayio"
+        - "clue_nrf52840_express"
+        - "cp32-m4"
+        - "datalore_ip_m4"
+        - "datum_distance"
+        - "datum_imu"
+        - "datum_light"
+        - "datum_weather"
+        - "electronut_labs_blip"
+        - "electronut_labs_papyr"
+        - "escornabot_makech"
+        - "feather_m0_adalogger"
+        - "feather_m0_basic"
+        - "feather_m0_express"
+        - "feather_m0_express_crickit"
+        - "feather_m0_rfm69"
+        - "feather_m0_rfm9x"
+        - "feather_m0_supersized"
+        - "feather_m4_express"
+        - "feather_mimxrt1011"
+        - "feather_mimxrt1062"
+        - "feather_nrf52840_express"
+        - "feather_radiofruit_zigbee"
+        - "feather_stm32f405_express"
+        - "gemma_m0"
+        - "grandcentral_m4_express"
+        - "hallowing_m0_express"
+        - "hallowing_m4_express"
+        - "imxrt1010_evk"
+        - "itsybitsy_m0_express"
+        - "itsybitsy_m4_express"
+        - "itsybitsy_nrf52840_express"
+        - "kicksat-sprite"
+        - "makerdiary_nrf52840_mdk"
+        - "makerdiary_nrf52840_mdk_usb_dongle"
+        - "meowmeow"
+        - "metro_m0_express"
+        - "metro_m4_airlift_lite"
+        - "metro_m4_express"
+        - "metro_nrf52840_express"
+        - "mini_sam_m4"
+        - "monster_m4sk"
+        - "ohs2020_badge"
+        - "openbook_m4"
+        - "particle_argon"
+        - "particle_boron"
+        - "particle_xenon"
+        - "pca10056"
+        - "pca10059"
+        - "pewpew10"
+        - "pewpew_m4"
+        - "pirkey_m0"
+        - "pyb_nano_v2"
+        - "pybadge"
+        - "pybadge_airlift"
+        - "pyboard_v11"
+        - "pygamer"
+        - "pygamer_advance"
+        - "pyportal"
+        - "pyportal_titano"
+        - "pyruler"
+        - "robohatmm1_m4"
+        - "sam32"
+        - "seeeduino_xiao"
+        - "serpente"
+        - "shirtty"
+        - "snekboard"
+        - "sparkfun_lumidrive"
+        - "sparkfun_nrf52840_mini"
+        - "sparkfun_qwiic_micro_no_flash"
+        - "sparkfun_qwiic_micro_with_flash"
+        - "sparkfun_redboard_turbo"
+        - "sparkfun_samd21_dev"
+        - "sparkfun_samd21_mini"
+        - "spresense"
+        - "stm32f411ce_blackpill"
+        - "stm32f411ve_discovery"
+        - "stm32f412zg_discovery"
+        - "stringcar_m0_express"
+        - "teknikio_bluebird"
+        - "trellis_m4_express"
+        - "trinket_m0"
+        - "trinket_m0_haxpress"
+        - "uchip"
+        - "ugame10"
+        - "winterbloom_sol"
+        - "xinabox_cc03"
+        - "xinabox_cs11"
+
+    steps:
+    - name: Set up Python 3.5
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.5
+    - name: Install deps
+      run: |
+        sudo apt-get install -y gettext
+        pip install requests sh click setuptools awscli
+        wget https://adafruit-circuit-python.s3.amazonaws.com/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
+        sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
+    - name: Versions
+      run: |
+        gcc --version
+        arm-none-eabi-gcc --version
+        python3 --version
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: mpy-cross
+      run: make -C mpy-cross -j2
+    - name: build
+      run: python3 -u build_release_files.py
+      working-directory: tools
+      env:
+        BOARDS: ${{ matrix.board }}
+    - uses: actions/upload-artifact@v1.0.0
+      with:
+        name: ${{ matrix.board }}
+        path: bin/${{ matrix.board }}
+    - name: Upload to S3
+      run: "[ -z \"$AWS_ACCESS_KEY_ID\" ] || aws s3 cp bin/ s3://adafruit-circuit-python/bin/ --recursive --no-progress --region us-east-1"
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      if: github.event_name == 'push' || (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
+    - name: Install upload deps
+      run: |
+        pip install uritemplate
+    - name: Upload to Release
+      run: "[ -z \"$ADABOT_GITHUB_ACCESS_TOKEN\" ] || python3 -u upload_release_files.py"
+      working-directory: tools
+      env:
+        UPLOAD_URL: ${{ github.event.release.upload_url }}
+        ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
+      if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested')
--- a/.github/workflows/create_website_pr.yml
+++ b/.github/workflows/create_website_pr.yml
@ -0,0 +1,37 @@
+name: Update CircuitPython.org
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Dump GitHub context
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: echo "$GITHUB_CONTEXT"
+    - name: Set up Python 3.5
+      uses: actions/setup-python@v1
+      with:
+        python-version: 3.5
+    - name: Install deps
+      run: |
+        pip install requests sh click 
+    - name: Versions
+      run: |
+        gcc --version
+        python3 --version
+    - uses: actions/checkout@v1
+      with:
+        submodules: true
+    - name: CircuitPython version
+      run: git describe --dirty --always --tags
+    - name: Website
+      run: python3 build_board_info.py
+      working-directory: tools
+      env:
+        RELEASE_TAG: ${{ github.event.release.tag_name }}
+        ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.BLINKA_GITHUB_ACCESS_TOKEN }}
+      if: github.event_name == 'release' && (github.event.action == 'published'  || github.event.action == 'rerequested')
--- a/.gitignore
+++ b/.gitignore
@ -65,6 +65,8 @@ TAGS
 *~

 *.DS_Store
+**/*.DS_Store
+*.icloud

 # POEdit mo files
 ####################
--- a/.gitmodules
+++ b/.gitmodules
@ -76,7 +76,8 @@
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
 	url = https://github.com/hathach/tinyusb.git
-	branch = develop
+	branch = master
+	fetchRecurseSubmodules = false
 [submodule "tools/huffman"]
 	path = tools/huffman
 	url = https://github.com/tannewt/huffman.git
@ -98,3 +99,15 @@
 [submodule "ports/stm32f4/stm32f4"]
 	path = ports/stm32f4/stm32f4
 	url = https://github.com/adafruit/stm32f4.git
+[submodule "ports/cxd56/spresense-exported-sdk"]
+	path = ports/cxd56/spresense-exported-sdk
+	url = https://github.com/sonydevworld/spresense-exported-sdk.git
+[submodule "frozen/Adafruit_CircuitPython_SD"]
+	path = frozen/Adafruit_CircuitPython_SD
+	url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git
+[submodule "lib/mp3"]
+	path = lib/mp3
+	url = https://github.com/adafruit/Adafruit_MP3
+[submodule "ports/mimxrt10xx/sdk"]
+	path = ports/mimxrt10xx/sdk
+	url = https://github.com/arturo182/MIMXRT10xx_SDK
--- a/.travis.yml
+++ b/.travis.yml
@ -1,148 +0,0 @@
-sudo: required
-dist: xenial
-language: c
-compiler:
-  - gcc
-git:
-  depth: 6
-
-# Each item under 'env' is a separate Travis job to execute.
-# They run in separate environments, so each one must take the time
-# to clone the repository and submodules; to download and install SDKs,
-# pip packages, and so forth.  By gathering activities together in optimal
-# ways, the "run time" and "total time" of the travis jobs can be minimized.
-#
-# Since at the time of writing Travis generally starts 5 or 6 jobs, the
-# builds have been organized into 5 groups of *approximately* equal durations.
-# Additionally, the jobs that need extra SDKs are also organized together.
-#
-# When adding new boards, take a look on the travis CI page
-# https://travis-ci.org/adafruit/circuitpython to which build that installs
-# that SDK is shortest and add it there.  In the case of major re-organizations,
-# just try to make the builds "about equal in run time"
-env:
-  - TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="trinket_m0_haxpress circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express metro_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" TRAVIS_SDK=arm:nrf
-  - TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0 datum_distance pyruler" TRAVIS_SDK=arm
-  - TRAVIS_BOARDS="cp32-m4 feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech pygamer_advance datum_imu snekboard" TRAVIS_SDK=arm
-  - TRAVIS_BOARDS="feather_m0_supersized feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1_m0 robohatmm1_m4 datum_light" TRAVIS_SDK=arm
-  - TRAVIS_BOARDS="datalore_ip_m4 circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge pybadge_airlift datum_weather" TRAVIS_SDK=arm
-
-addons:
-  artifacts:
-    paths:
-    - $(ls -d1 bin/*/*/* | tr "\n" ":")
-    target_paths: /
-
-# Some deploy jobs take over 10 minutes so use this keep alive hack to make sure Travis doesn't kill us.
-before_deploy: |
-  function keep_alive() {
-    while true; do
-      echo -en "\a"
-      sleep 5
-    done
-  }
-  keep_alive &
-
-deploy:
-  provider: releases
-  api_key:
-    secure: "jdqVFw6itRY4qwQF4ReXo0uaymT+Mob6RhYX0lw8KWFNqBgHnLVuKmKKcGMEuRvBVMPkvxF7bMuOQzSBOunqwlHFse3oMzdWvQODv1zwV7pSRXGwTdIvTPbBjKWxnBG9uSNRf2R5AMflJFUxy2CbtBpgvNzr+4VLREZDrrjEu8C1iTtXGpSm5AQ5iIp2fkMAWD85FP7CQPpkqRoxhSIFZmTdurfYRmenq1OZ/4SeD5TESKcyvqJNzVT9z210B3cg3eAkP6ukvelW4qE2zgIANqUkGqvDEnAvEII9M89kuwhCMAekdfwnUSPrry+g77i1dUZHoRN1+MFj+waYtPaqxdYo2G1sysa6enxlu4jHMR5MfMk9eKHgaNgL3PiyANusYSS44amh8QIiVaX5nw82myZDCpQOZW7YqJKE6WX70Lbs4mS+wIs+ig4KIXO1B0p9kMb0OeVjHRl+KcXsWGRu/ECG/ExpqlVIssSPU407LohMXT2cJ37CY/R/EeK2XSDsQ2M3L3EAGUjCJdBGuwsOJ+2lG+HQpAVu9vAB4kq5jy9Ye+MG+8Xlkly3XZZ5+FkXyYxKnXb26/QVv0e5sIG5OmdJCPYFaH2J1QdKo7CdhEcBtrf6DMPWaimGMldShFqzLjOz3b3qLysRxFF0aGb7ipKPa57vawNzYHoPAViOcXQ="
-  file_glob: true
-  file: "$TRAVIS_BUILD_DIR/bin/*/*/*"
-  skip_cleanup: true
-  on:
-    tags: true
-
-notifications:
-  webhooks:
-    urls:
-      - https://rosie-ci.ngrok.io/travis
-    on_success: always
-    on_failure: always
-    on_start: always
-    on_cancel: always
-    on_error: always
-
-before_script:
-  # Expand the git tree back to 4.0.0-alpha.1 and then fetch the latest tag.
-  - LAST_TAG=`git ls-remote --quiet --tags --sort=version:refname | egrep -o "refs/tags/[0-9]+.*\$" | tail -n 1`
-  - git fetch --depth 1 origin $LAST_TAG:$LAST_TAG
-  - git describe --dirty --always --tags
-  - function var_search () { case "$1" in *$2*) true;; *) false;; esac; }
-  - sudo dpkg --add-architecture i386
-
-  - (! var_search "${TRAVIS_SDK-}" arm || (wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~xenial1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb))
-
-  # For huzzah builds
-  - (! var_search "${TRAVIS_SDK-}" esp8266 || (wget https://github.com/jepler/esp-open-sdk/releases/download/2018-06-10/xtensa-lx106-elf-standalone.tar.gz && tar -C .. -xaf xtensa-lx106-elf-standalone.tar.gz))
-  - if var_search "${TRAVIS_SDK-}" esp8266 ; then PATH=$(readlink -f ../xtensa-lx106-elf/bin):$PATH; fi
-
-  # For coverage testing (upgrade is used to get latest urllib3 version)
-  - sudo apt-get install -y python3-pip
-  - pip3 install --user sh click setuptools
-  - ([[ -z "$TRAVIS_TESTS" ]] || sudo pip install --upgrade cpp-coveralls)
-  - (! var_search "${TRAVIS_TESTS-}" docs || sudo apt-get install -y librsvg2-bin)
-  - (! var_search "${TRAVIS_TESTS-}" docs || pip3 install --user Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter)
-  - (! var_search "${TRAVIS_TESTS-}" translations || pip3 install --user polib)
-
-  # Check if there's any board missing in TRAVIS_BOARDS
-  - cd tools && python3 -u travis_new_boards_check.py
-  - cd ..
-
-  # report some good version numbers to the build
-  - gcc --version
-  - (! var_search "${TRAVIS_SDK-}" arm || arm-none-eabi-gcc --version)
-  - (! var_search "${TRAVIS_SDK-}" esp8266 || xtensa-lx106-elf-gcc --version)
-  - python3 --version
-
-script:
-  # Build mpy-cross first because other builds depend on it.
-  - echo 'Building mpy-cross' && echo 'travis_fold:start:mpy-cross'
-  - make -C mpy-cross -j2 ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:mpy-cross' && tools/print_status.py status
-
-  # Use unbuffered output because building all the releases can take a long time.
-  # Travis will cancel the job if it sees no output for >10 minutes.
-  - cd tools && python3 -u build_release_files.py
-  - cd ..
-
-  - echo 'Building unix' && echo 'travis_fold:start:unix'
-  - (! var_search "${TRAVIS_TESTS-}" unix || (make -C ports/unix deplibs -j2 && make -C ports/unix -j2 && make -C ports/unix coverage -j2)) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:unix' && tools/print_status.py status
-
-  # run tests without coverage info
-  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1)
-  #- (cd tests && MICROPY_CPYTHON3=python3.4 ./run-tests -j1 --emit native)
-
-  # run tests with coverage info
-  - echo 'Test all' && echo 'travis_fold:start:test_all'
-  - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1)) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:test_all' && tools/print_status.py status
-
-  - echo 'Test threads' && echo 'travis_fold:start:test_threads'
-  - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 -d thread)) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:test_threads' && tools/print_status.py status
-
-  - echo 'Testing with native' && echo 'travis_fold:start:test_native'
-  - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --emit native)) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:test_native' && tools/print_status.py status
-
-  - (echo 'Testing with mpy' && echo 'travis_fold:start:test_mpy')
-  - (! var_search "${TRAVIS_TESTS-}" unix || (cd tests && MICROPY_CPYTHON3=python3.5 MICROPY_MICROPYTHON=../ports/unix/micropython_coverage ./run-tests -j1 --via-mpy -d basics float)) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:test_mpy' && tools/print_status.py status
-
-  - (echo 'Building docs' && echo 'travis_fold:start:build_docs')
-  - (! var_search "${TRAVIS_TESTS-}" docs || sphinx-build -E -W -b html . _build/html) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:build_docs' && tools/print_status.py status
-
-  - (echo 'Building translations' && echo 'travis_fold:start:build_translations')
-  - (! var_search "${TRAVIS_TESTS-}" translations || make check-translate) ; S=$? ; echo $S > status ; (exit $S)
-  - echo 'travis_fold:end:build_translations' && tools/print_status.py status
-
-  # run coveralls coverage analysis (try to, even if some builds/tests failed)
-  #- (cd ports/unix && coveralls --root ../.. --build-root . --gcov $(which gcov) --gcov-options '\-o build-coverage/' --include py --include extmod)
-
-  - (! var_search "${TRAVIS_TESTS-}" website || (cd tools && python3 build_board_info.py && cd ..))
-
-after_failure:
-  - (cd tests && for exp in *.exp; do testbase=$(basename $exp .exp); echo -e "\nFAILURE $testbase"; diff -u $testbase.exp $testbase.out; done)
--- a/BUILDING.md
+++ b/BUILDING.md
@ -0,0 +1,82 @@
+
+# Building CircuitPython
+
+Welcome to CircuitPython!  
+
+This document is a quick-start guide only.
+
+Detailed guides on how to build CircuitPython can be found in the Adafruit Learn system at
+https://learn.adafruit.com/building-circuitpython/
+
+## Setup
+
+Please ensure you setup your build environment appropriately, as per the guide.  You will need:
+
+* Linux: https://learn.adafruit.com/building-circuitpython/linux
+* MacOS: https://learn.adafruit.com/building-circuitpython/macos
+* Windows Subsystem for Linux (WSL): https://learn.adafruit.com/building-circuitpython/windows-subsystem-for-linux
+
+### Submodules
+
+This project has a bunch of git submodules.  You will need to update them regularly.
+
+    git submodule sync
+    git submodule update --init
+
+### mpy-cross
+
+As part of the build process, mpy-cross is needed to compile .py files into .mpy files.
+To compile (or recompile) mpy-cross:
+
+    make -C mpy-cross 
+
+# Building
+
+There a number of ports of CircuitPython!  To build for your board, change to the appropriate ports directory and build.
+
+Examples:
+
+    cd ports/atmel-samd
+    make BOARD=circuitplayground_express
+
+    cd ports/nrf
+    make BOARD=circuitplayground_bluefruit
+
+If you aren't sure what boards exist, have a peek in the boards subdirectory of your port.
+If you have a fast computer with many cores, consider adding `-j` to your build flags, such as `-j17` on
+a 6-core 12-thread machine.
+
+# Testing
+
+If you are working on changes to the core language, you might find it useful to run the test suite.
+The test suite in the top level `tests` directory.  It needs the unix port to run.
+
+    cd ports/unix
+    make axtls
+    make micropython
+
+Then you can run the test suite:
+
+    cd ../../tests
+    ./run-tests
+
+A successful run will say something like
+
+    676 tests performed (19129 individual testcases)
+    676 tests passed
+    30 tests skipped: buffered_writer builtin_help builtin_range_binop class_delattr_setattr cmd_parsetree extra_coverage framebuf1 framebuf16 framebuf2 framebuf4 framebuf8 framebuf_subclass mpy_invalid namedtuple_asdict non_compliant resource_stream schedule sys_getsizeof urandom_extra ure_groups ure_span ure_sub ure_sub_unmatched vfs_basic vfs_fat_fileio1 vfs_fat_fileio2 vfs_fat_more vfs_fat_oldproto vfs_fat_ramdisk vfs_userfs
+
+# Debugging
+
+The easiest way to debug CircuitPython on hardware is with a JLink device, JLinkGDBServer, and an appropriate GDB.   
+Instructions can be found at https://learn.adafruit.com/debugging-the-samd21-with-gdb
+
+If using JLink, you'll need both the `JLinkGDBServer` and `arm-none-eabi-gdb` running.
+
+Example:
+
+    JLinkGDBServer -if SWD -device ATSAMD51J19
+    arm-none-eabi-gdb build-metro_m4_express/firmware.elf -iex "target extended-remote :2331"
+
+If your port/build includes `arm-none-eabi-gdb-py`, consider using it instead, as it can be used for better register
+debugging with https://github.com/bnahill/PyCortexMDebug
--- a/2
+++ b/2
@ -204,7 +204,7 @@ pseudoxml:
 all-source:

 locale/circuitpython.pot: all-source
-	find $(TRANSLATE_SOURCES) -iname "*.c" -print0 | (LC_ALL=C sort -z) | xargs -0 xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
+	find $(TRANSLATE_SOURCES) -iname "*.c" -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale

 translate: locale/circuitpython.pot
 	for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done
--- a/README.rst
+++ b/README.rst
@ -78,7 +78,7 @@ If you'd like to use the term "CircuitPython" and Blinka for your product here i
 * Your product is supported by the primary
  `"adafruit/circuitpython" <https://github.com/adafruit/circuitpython>`_ repo. This way we can
  update any custom code as we update the CircuitPython internals.
-* Your product is listed on `circuitpython.org <https:/circuitpython.org>`__ (source
+* Your product is listed on `circuitpython.org <https://circuitpython.org>`__ (source
  `here <https://github.com/adafruit/circuitpython-org/>`_). This is to ensure that a user of your
  product can always download the latest version of CircuitPython from the standard place.
 * Your product has a user accessible USB plug which appears as a CIRCUITPY drive when plugged in.
--- a/conf.py
+++ b/conf.py
@ -125,11 +125,15 @@ exclude_patterns = ["**/build*",
                    "ports/cc3200",
                    "ports/cc3200/FreeRTOS",
                    "ports/cc3200/hal",
+                    "ports/cxd56/mkspk",
+                    "ports/cxd56/spresense-exported-sdk",
                    "ports/esp32",
                    "ports/esp8266/boards",
                    "ports/esp8266/common-hal",
                    "ports/esp8266/modules",
                    "ports/minimal",
+                    "ports/mimxrt10xx/peripherals",
+                    "ports/mimxrt10xx/sdk",
                    "ports/nrf/device",
                    "ports/nrf/bluetooth",
                    "ports/nrf/modules",
@ -139,7 +143,6 @@ exclude_patterns = ["**/build*",
                    "ports/stm32f4/stm32f4",
                    "ports/stm32f4/peripherals",
                    "ports/stm32f4/ref",
-                    "ports/stm32f4/README.md",
                    "ports/pic16bit",
                    "ports/qemu-arm",
                    "ports/stm32",
@ -369,3 +372,6 @@ texinfo_documents = [
 intersphinx_mapping = {"cpython": ('https://docs.python.org/3/', None),
                       "bus_device": ('https://circuitpython.readthedocs.io/projects/busdevice/en/latest/', None),
                       "register": ('https://circuitpython.readthedocs.io/projects/register/en/latest/', None)}
+
+def setup(app):
+    app.add_stylesheet("customstyle.css")
--- a/docs/index.rst
+++ b/docs/index.rst
@ -43,6 +43,7 @@ Full Table of Contents

   ../README
   ../CONTRIBUTING
+   ../BUILDING
   ../CODE_OF_CONDUCT
   ../license.rst

--- a/docs/shared_bindings_matrix.py
+++ b/docs/shared_bindings_matrix.py
@ -26,7 +26,7 @@ import os
 import re


-SUPPORTED_PORTS = ["atmel-samd", "nrf"]
+SUPPORTED_PORTS = ["atmel-samd", "nrf", "mimxrt10xx"]


 def parse_port_config(contents, chip_keyword=None):
@ -87,7 +87,8 @@ def read_mpconfig():
 def build_module_map():
    """ Establish the base of the JSON file, based on the contents from
        `configs`. Base will contain module names, if they're part of
-        the `FULL_BUILD`, or their default value (0 | 1).
+        the `FULL_BUILD`, or their default value (0, 1, or a list of
+        modules that determine default [see audiocore, audiomixer, etc.]).

    """
    base = dict()
@ -98,16 +99,17 @@ def build_module_map():
        full_name = module
        search_name = module.lstrip("_")
        re_pattern = "CIRCUITPY_{}\s=\s(.+)".format(search_name.upper())
-        find_config = re.search(re_pattern, configs)
-        #print(module, "|", find_config)
+        find_config = re.findall(re_pattern, configs)
        if not find_config:
            continue
-        full_build = int("FULL_BUILD" in find_config.group(0))
-        #print(find_config[1])
+        find_config = ", ".join([x.strip("$()") for x in find_config])
+
+        full_build = int("CIRCUITPY_FULL_BUILD" in find_config)
        if not full_build:
-            default_val = find_config.group(1)
+            default_val = find_config
        else:
            default_val = "None"
+
        base[search_name] = {
            "name": full_name,
            "full_build": str(full_build),
@ -115,6 +117,7 @@ def build_module_map():
            "excluded": {}
        }

+    #print(base)
    return base


@ -166,6 +169,7 @@ def get_excluded_boards(base):
            if board_chip in port_config:
                contents += "\n" + "\n".join(port_config[board_chip])

+            check_dependent_modules = dict()
            for module in modules:
                board_is_excluded = False
                # check if board uses `SMALL_BUILD`. if yes, and current
@ -173,14 +177,32 @@ def get_excluded_boards(base):
                small_build = re.search("CIRCUITPY_SMALL_BUILD = 1", contents)
                if small_build and base[module]["full_build"] == "1":
                    board_is_excluded = True
+
+                # check if board uses `MINIMAL_BUILD`. if yes, and current
+                # module is marked as `DEFAULT_BUILD`, board is excluded
+                min_build = re.search("CIRCUITPY_MINIMAL_BUILD = 1", contents)
+                if min_build and base[module]["default_value"] == "CIRCUITPY_DEFAULT_BUILD":
+                    board_is_excluded = True
+
                # check if module is specifically disabled for this board
                re_pattern = "CIRCUITPY_{}\s=\s(\w)".format(module.upper())
                find_module = re.search(re_pattern, contents)
                if not find_module:
-                    # check if default inclusion is off ('0'). if the board doesn't
-                    # have it explicitly enabled, its excluded.
-                    if base[module]["default_value"] == "0":
-                        board_is_excluded = True
+                    if base[module]["default_value"].isdigit():
+                        # check if default inclusion is off ('0'). if the board doesn't
+                        # have it explicitly enabled, its excluded.
+                        if base[module]["default_value"] == "0":
+                            board_is_excluded = True
+                    else:
+                        # this module is dependent on another module. add it
+                        # to the list to check after processing all other modules.
+                        # only need to check exclusion if it isn't already excluded.
+                        if (not board_is_excluded and
+                            base[module]["default_value"] not in [
+                                "None",
+                                "CIRCUITPY_DEFAULT_BUILD"
+                            ]):
+                                check_dependent_modules[module] = base[module]["default_value"]
                else:
                    if (find_module.group(1) == "0" and
                        find_module.group(1) != base[module]["default_value"]):
@ -191,6 +213,29 @@ def get_excluded_boards(base):
                        base[module]["excluded"][board_chip].append(entry.name)
                    else:
                        base[module]["excluded"][board_chip] = [entry.name]
+
+            for module in check_dependent_modules:
+                depend_results = set()
+
+                parents = check_dependent_modules[module].split("CIRCUITPY_")
+                parents = [item.strip(", ").lower() for item in parents if item]
+
+                for parent in parents:
+                    if parent in base:
+                        if (board_chip in base[parent]["excluded"] and
+                            entry.name in base[parent]["excluded"][board_chip]):
+                                depend_results.add(False)
+                        else:
+                            depend_results.add(True)
+
+                # only exclude the module if there were zero parents enabled
+                # as determined by the 'depend_results' set.
+                if not any(depend_results):
+                    if board_chip in base[module]["excluded"]:
+                        base[module]["excluded"][board_chip].append(entry.name)
+                    else:
+                        base[module]["excluded"][board_chip] = [entry.name]
+
    #print(json.dumps(base, indent=2))
    return base

--- a/docs/supported_ports.rst
+++ b/docs/supported_ports.rst
@ -8,5 +8,7 @@ and ESP8266.
    :maxdepth: 2

    ../ports/atmel-samd/README
-    ../ports/esp8266/README
+    ../ports/mimxrt10xx/README
    ../ports/nrf/README
+    ../ports/stm32f4/README
+    ../ports/cxd56/README
--- a/drivers/wiznet5k/internet/dns/dns.c
+++ b/drivers/wiznet5k/internet/dns/dns.c
@ -52,7 +52,7 @@

 #include <string.h>
 #include <stdlib.h>
-#include "tick.h"
+#include "supervisor/shared/tick.h"

 //#include "Ethernet/socket.h"
 //#include "Internet/DNS/dns.h"
@ -125,7 +125,7 @@ uint16_t DNS_MSGID;     // DNS message ID


 uint32_t HAL_GetTick(void) {
-    return ticks_ms;
+    return supervisor_ticks_ms32();
 }

 uint32_t hal_sys_tick;
--- a/ports/stm32/font_petme128_8x8.h
+++ b/ports/stm32/font_petme128_8x8.h
--- a/extmod/machine_i2c.c
+++ b/extmod/machine_i2c.c
@ -318,7 +318,7 @@ MP_DEFINE_CONST_FUN_OBJ_KW(machine_i2c_init_obj, 1, machine_i2c_obj_init);

 STATIC mp_obj_t machine_i2c_scan(mp_obj_t self_in) {
    mp_obj_base_t *self = MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    mp_obj_t list = mp_obj_new_list(0, NULL);
    // 7-bit addresses 0b0000xxx and 0b1111xxx are reserved
    for (int addr = 0x08; addr < 0x78; ++addr) {
@ -333,7 +333,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_scan_obj, machine_i2c_scan);

 STATIC mp_obj_t machine_i2c_start(mp_obj_t self_in) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    if (i2c_p->start == NULL) {
        mp_raise_msg(&mp_type_OSError, translate("I2C operation not supported"));
    }
@ -347,7 +347,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_start_obj, machine_i2c_start);

 STATIC mp_obj_t machine_i2c_stop(mp_obj_t self_in) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    if (i2c_p->stop == NULL) {
        mp_raise_msg(&mp_type_OSError, translate("I2C operation not supported"));
    }
@ -361,7 +361,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(machine_i2c_stop_obj, machine_i2c_stop);

 STATIC mp_obj_t machine_i2c_readinto(size_t n_args, const mp_obj_t *args) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    if (i2c_p->read == NULL) {
        mp_raise_msg(&mp_type_OSError, translate("I2C operation not supported"));
    }
@ -385,7 +385,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readinto_obj, 2, 3, machine_i2c_

 STATIC mp_obj_t machine_i2c_write(mp_obj_t self_in, mp_obj_t buf_in) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    if (i2c_p->write == NULL) {
        mp_raise_msg(&mp_type_OSError, translate("I2C operation not supported"));
    }
@ -407,7 +407,7 @@ MP_DEFINE_CONST_FUN_OBJ_2(machine_i2c_write_obj, machine_i2c_write);

 STATIC mp_obj_t machine_i2c_readfrom(size_t n_args, const mp_obj_t *args) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    mp_int_t addr = mp_obj_get_int(args[1]);
    vstr_t vstr;
    vstr_init_len(&vstr, mp_obj_get_int(args[2]));
@ -422,7 +422,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_obj, 3, 4, machine_i2c_

 STATIC mp_obj_t machine_i2c_readfrom_into(size_t n_args, const mp_obj_t *args) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    mp_int_t addr = mp_obj_get_int(args[1]);
    mp_buffer_info_t bufinfo;
    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_WRITE);
@ -437,7 +437,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_readfrom_into_obj, 3, 4, machine

 STATIC mp_obj_t machine_i2c_writeto(size_t n_args, const mp_obj_t *args) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    mp_int_t addr = mp_obj_get_int(args[1]);
    mp_buffer_info_t bufinfo;
    mp_get_buffer_raise(args[2], &bufinfo, MP_BUFFER_READ);
@ -453,7 +453,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_i2c_writeto_obj, 3, 4, machin

 STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, uint8_t *buf, size_t len) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);
    uint8_t memaddr_buf[4];
    size_t memaddr_len = 0;
    for (int16_t i = addrsize - 8; i >= 0; i -= 8) {
@ -473,7 +473,7 @@ STATIC int read_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t a

 STATIC int write_mem(mp_obj_t self_in, uint16_t addr, uint32_t memaddr, uint8_t addrsize, const uint8_t *buf, size_t len) {
    mp_obj_base_t *self = (mp_obj_base_t*)MP_OBJ_TO_PTR(self_in);
-    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)self->type->protocol;
+    mp_machine_i2c_p_t *i2c_p = (mp_machine_i2c_p_t*)mp_proto_get(self, QSTR_protocol_i2c);

    // need some memory to create the buffer to send; try to use stack if possible
    uint8_t buf2_stack[MAX_MEMADDR_SIZE + BUF_STACK_SIZE];
@ -621,6 +621,7 @@ int mp_machine_soft_i2c_write(mp_obj_base_t *self_in, const uint8_t *src, size_t
 }

 STATIC const mp_machine_i2c_p_t mp_machine_soft_i2c_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_i2c)
    .start = (int(*)(mp_obj_base_t*))mp_hal_i2c_start,
    .stop = (int(*)(mp_obj_base_t*))mp_hal_i2c_stop,
    .read = mp_machine_soft_i2c_read,
--- a/extmod/machine_i2c.h
+++ b/extmod/machine_i2c.h
@ -27,10 +27,12 @@
 #define MICROPY_INCLUDED_EXTMOD_MACHINE_I2C_H

 #include "py/obj.h"
+#include "py/proto.h"

 // I2C protocol
 // the first 4 methods can be NULL, meaning operation is not supported
 typedef struct _mp_machine_i2c_p_t {
+    MP_PROTOCOL_HEAD
    int (*start)(mp_obj_base_t *obj);
    int (*stop)(mp_obj_base_t *obj);
    int (*read)(mp_obj_base_t *obj, uint8_t *dest, size_t len, bool nack);
--- a/extmod/machine_pinbase.c
+++ b/extmod/machine_pinbase.c
@ -74,6 +74,7 @@ mp_uint_t pinbase_ioctl(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *err
 }

 STATIC const mp_pin_p_t pinbase_pin_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_pin)
    .ioctl = pinbase_ioctl,
 };

--- a/extmod/machine_signal.c
+++ b/extmod/machine_signal.c
@ -47,12 +47,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, const
    bool invert = false;

    #if defined(MICROPY_PY_MACHINE_PIN_MAKE_NEW)
-    mp_pin_p_t *pin_p = NULL;
-
-    if (MP_OBJ_IS_OBJ(pin)) {
-        mp_obj_base_t *pin_base = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
-        pin_p = (mp_pin_p_t*)pin_base->type->protocol;
-    }
+    mp_pin_p_t *pin_p = (mp_pin_t*)mp_proto_get(QSTR_pin_protocol, pin);

    if (pin_p == NULL) {
        // If first argument isn't a Pin-like object, we filter out "invert"
@ -170,6 +165,7 @@ STATIC const mp_rom_map_elem_t signal_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(signal_locals_dict, signal_locals_dict_table);

 STATIC const mp_pin_p_t signal_pin_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_pin)
    .ioctl = signal_ioctl,
 };

--- a/extmod/machine_spi.c
+++ b/extmod/machine_spi.c
@ -67,7 +67,7 @@ mp_obj_t mp_machine_spi_make_new(const mp_obj_type_t *type, size_t n_args, const

 STATIC mp_obj_t machine_spi_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
    mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(args[0]);
-    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)s->type->protocol;
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)mp_proto_get(QSTR_protocol_spi, s);
    spi_p->init(s, n_args - 1, args + 1, kw_args);
    return mp_const_none;
 }
@ -75,7 +75,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_spi_init_obj, 1, machine_spi_init);

 STATIC mp_obj_t machine_spi_deinit(mp_obj_t self) {
    mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self);
-    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)s->type->protocol;
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)mp_proto_get(QSTR_protocol_spi, s);
    if (spi_p->deinit != NULL) {
        spi_p->deinit(s);
    }
@ -85,7 +85,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_spi_deinit_obj, machine_spi_deinit);

 STATIC void mp_machine_spi_transfer(mp_obj_t self, size_t len, const void *src, void *dest) {
    mp_obj_base_t *s = (mp_obj_base_t*)MP_OBJ_TO_PTR(self);
-    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)s->type->protocol;
+    mp_machine_spi_p_t *spi_p = (mp_machine_spi_p_t*)mp_proto_get(QSTR_protocol_spi, s);
    spi_p->transfer(s, len, src, dest);
 }

@ -268,6 +268,7 @@ STATIC void mp_machine_soft_spi_transfer(mp_obj_base_t *self_in, size_t len, con
 }

 const mp_machine_spi_p_t mp_machine_soft_spi_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_spi)
    .init = mp_machine_soft_spi_init,
    .deinit = NULL,
    .transfer = mp_machine_soft_spi_transfer,
--- a/extmod/machine_spi.h
+++ b/extmod/machine_spi.h
@ -27,11 +27,13 @@
 #define MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H

 #include "py/obj.h"
+#include "py/proto.h"
 #include "py/mphal.h"
 #include "drivers/bus/spi.h"

 // SPI protocol
 typedef struct _mp_machine_spi_p_t {
+    MP_PROTOCOL_HEAD
    void (*init)(mp_obj_base_t *obj, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
    void (*deinit)(mp_obj_base_t *obj); // can be NULL
    void (*transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
--- a/extmod/modbtree.c
+++ b/extmod/modbtree.c
@ -247,7 +247,7 @@ STATIC mp_obj_t btree_iternext(mp_obj_t self_in) {
 }

 STATIC mp_obj_t btree_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
-    mp_obj_btree_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_obj_btree_t *self = mp_instance_cast_to_native_base(self_in, &btree_type);
    if (value == MP_OBJ_NULL) {
        // delete
        DBT key;
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@ -28,10 +28,11 @@
 #include <string.h>

 #include "py/runtime.h"
+#include "py/proto.h"

 #if MICROPY_PY_FRAMEBUF

-#include "ports/stm32/font_petme128_8x8.h"
+#include "font_petme128_8x8.h"

 typedef struct _mp_obj_framebuf_t {
    mp_obj_base_t base;
@ -46,6 +47,7 @@ typedef uint32_t (*getpixel_t)(const mp_obj_framebuf_t*, int, int);
 typedef void (*fill_rect_t)(const mp_obj_framebuf_t *, int, int, int, int, uint32_t);

 typedef struct _mp_framebuf_p_t {
+    MP_PROTOCOL_HEAD
    setpixel_t setpixel;
    getpixel_t getpixel;
    fill_rect_t fill_rect;
@ -227,13 +229,13 @@ STATIC void gs8_fill_rect(const mp_obj_framebuf_t *fb, int x, int y, int w, int
 }

 STATIC mp_framebuf_p_t formats[] = {
-    [FRAMEBUF_MVLSB] = {mvlsb_setpixel, mvlsb_getpixel, mvlsb_fill_rect},
-    [FRAMEBUF_RGB565] = {rgb565_setpixel, rgb565_getpixel, rgb565_fill_rect},
-    [FRAMEBUF_GS2_HMSB] = {gs2_hmsb_setpixel, gs2_hmsb_getpixel, gs2_hmsb_fill_rect},
-    [FRAMEBUF_GS4_HMSB] = {gs4_hmsb_setpixel, gs4_hmsb_getpixel, gs4_hmsb_fill_rect},
-    [FRAMEBUF_GS8] = {gs8_setpixel, gs8_getpixel, gs8_fill_rect},
-    [FRAMEBUF_MHLSB] = {mono_horiz_setpixel, mono_horiz_getpixel, mono_horiz_fill_rect},
-    [FRAMEBUF_MHMSB] = {mono_horiz_setpixel, mono_horiz_getpixel, mono_horiz_fill_rect},
+    [FRAMEBUF_MVLSB] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) mvlsb_setpixel, mvlsb_getpixel, mvlsb_fill_rect},
+    [FRAMEBUF_RGB565] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) rgb565_setpixel, rgb565_getpixel, rgb565_fill_rect},
+    [FRAMEBUF_GS2_HMSB] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) gs2_hmsb_setpixel, gs2_hmsb_getpixel, gs2_hmsb_fill_rect},
+    [FRAMEBUF_GS4_HMSB] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) gs4_hmsb_setpixel, gs4_hmsb_getpixel, gs4_hmsb_fill_rect},
+    [FRAMEBUF_GS8] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) gs8_setpixel, gs8_getpixel, gs8_fill_rect},
+    [FRAMEBUF_MHLSB] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) mono_horiz_setpixel, mono_horiz_getpixel, mono_horiz_fill_rect},
+    [FRAMEBUF_MHMSB] = {MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuf) mono_horiz_setpixel, mono_horiz_getpixel, mono_horiz_fill_rect},
 };

 static inline void setpixel(const mp_obj_framebuf_t *fb, int x, int y, uint32_t col) {
--- a/extmod/modlwip.c
+++ b/extmod/modlwip.c
@ -1261,6 +1261,7 @@ STATIC const mp_rom_map_elem_t lwip_socket_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(lwip_socket_locals_dict, lwip_socket_locals_dict_table);

 STATIC const mp_stream_p_t lwip_socket_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = lwip_socket_read,
    .write = lwip_socket_write,
    .ioctl = lwip_socket_ioctl,
--- a/extmod/moductypes.c
+++ b/extmod/moductypes.c
@ -518,8 +518,8 @@ STATIC void uctypes_struct_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
    }
 }

-STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value) {
-    mp_obj_uctypes_struct_t *self = MP_OBJ_TO_PTR(self_in);
+STATIC mp_obj_t uctypes_struct_subscr(mp_obj_t base_in, mp_obj_t index_in, mp_obj_t value) {
+    mp_obj_uctypes_struct_t *self = mp_instance_cast_to_native_base(base_in, &uctypes_struct_type);

    if (value == MP_OBJ_NULL) {
        // delete
--- a/extmod/modussl_axtls.c
+++ b/extmod/modussl_axtls.c
@ -221,6 +221,7 @@ STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(ussl_socket_locals_dict, ussl_socket_locals_dict_table);

 STATIC const mp_stream_p_t ussl_socket_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = socket_read,
    .write = socket_write,
    .ioctl = socket_ioctl,
--- a/extmod/modussl_mbedtls.c
+++ b/extmod/modussl_mbedtls.c
@ -305,6 +305,7 @@ STATIC const mp_rom_map_elem_t ussl_socket_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(ussl_socket_locals_dict, ussl_socket_locals_dict_table);

 STATIC const mp_stream_p_t ussl_socket_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = socket_read,
    .write = socket_write,
    .ioctl = socket_ioctl,
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@ -134,6 +134,7 @@ STATIC const mp_rom_map_elem_t decompio_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(decompio_locals_dict, decompio_locals_dict_table);

 STATIC const mp_stream_p_t decompio_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = decompio_read,
 };

--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@ -331,6 +331,7 @@ STATIC const mp_rom_map_elem_t webrepl_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(webrepl_locals_dict, webrepl_locals_dict_table);

 STATIC const mp_stream_p_t webrepl_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = webrepl_read,
    .write = webrepl_write,
    .ioctl = webrepl_ioctl,
--- a/extmod/modwebsocket.c
+++ b/extmod/modwebsocket.c
@ -286,6 +286,7 @@ STATIC const mp_rom_map_elem_t websocket_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(websocket_locals_dict, websocket_locals_dict_table);

 STATIC const mp_stream_p_t websocket_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = websocket_read,
    .write = websocket_write,
    .ioctl = websocket_ioctl,
--- a/extmod/vfs.c
+++ b/extmod/vfs.c
@ -126,7 +126,7 @@ mp_import_stat_t mp_vfs_import_stat(const char *path) {
    }

    // If the mounted object has the VFS protocol, call its import_stat helper
-    const mp_vfs_proto_t *proto = mp_obj_get_type(vfs->obj)->protocol;
+    const mp_vfs_proto_t *proto = (mp_vfs_proto_t*)mp_proto_get(MP_QSTR_protocol_vfs, vfs->obj);
    if (proto != NULL) {
        return proto->import_stat(MP_OBJ_TO_PTR(vfs->obj), path_out);
    }
--- a/extmod/vfs.h
+++ b/extmod/vfs.h
@ -28,6 +28,7 @@

 #include "py/lexer.h"
 #include "py/obj.h"
+#include "py/proto.h"

 // return values of mp_vfs_lookup_path
 // ROOT is 0 so that the default current directory is the root directory
@ -47,6 +48,7 @@

 // At the moment the VFS protocol just has import_stat, but could be extended to other methods
 typedef struct _mp_vfs_proto_t {
+    MP_PROTOCOL_HEAD
    mp_import_stat_t (*import_stat)(void *self, const char *path);
 } mp_vfs_proto_t;

--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@ -488,6 +488,7 @@ STATIC const mp_rom_map_elem_t fat_vfs_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(fat_vfs_locals_dict, fat_vfs_locals_dict_table);

 STATIC const mp_vfs_proto_t fat_vfs_proto = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_vfs)
    .import_stat = fat_vfs_import_stat,
 };

--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@ -254,6 +254,7 @@ STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);

 #if MICROPY_PY_IO_FILEIO
 STATIC const mp_stream_p_t fileio_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = file_obj_read,
    .write = file_obj_write,
    .ioctl = file_obj_ioctl,
@ -272,6 +273,7 @@ const mp_obj_type_t mp_type_vfs_fat_fileio = {
 #endif

 STATIC const mp_stream_p_t textio_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = file_obj_read,
    .write = file_obj_write,
    .ioctl = file_obj_ioctl,
--- a/extmod/vfs_posix.c
+++ b/extmod/vfs_posix.c
@ -350,6 +350,7 @@ STATIC const mp_rom_map_elem_t vfs_posix_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(vfs_posix_locals_dict, vfs_posix_locals_dict_table);

 STATIC const mp_vfs_proto_t vfs_posix_proto = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_vfs)
    .import_stat = mp_vfs_posix_import_stat,
 };

--- a/extmod/vfs_posix_file.c
+++ b/extmod/vfs_posix_file.c
@ -220,6 +220,7 @@ STATIC MP_DEFINE_CONST_DICT(rawfile_locals_dict, rawfile_locals_dict_table);

 #if MICROPY_PY_IO_FILEIO
 STATIC const mp_stream_p_t fileio_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = vfs_posix_file_read,
    .write = vfs_posix_file_write,
    .ioctl = vfs_posix_file_ioctl,
@ -238,6 +239,7 @@ const mp_obj_type_t mp_type_vfs_posix_fileio = {
 #endif

 STATIC const mp_stream_p_t textio_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = vfs_posix_file_read,
    .write = vfs_posix_file_write,
    .ioctl = vfs_posix_file_ioctl,
--- a/extmod/virtpin.c
+++ b/extmod/virtpin.c
@ -25,15 +25,16 @@
 */

 #include "extmod/virtpin.h"
+#include "py/proto.h"

 int mp_virtual_pin_read(mp_obj_t pin) {
    mp_obj_base_t* s = (mp_obj_base_t*)MP_OBJ_TO_PTR(pin);
-    mp_pin_p_t *pin_p = (mp_pin_p_t*)s->type->protocol;
+    const mp_pin_p_t *pin_p = mp_proto_get(MP_QSTR_protocol_pin, s);
    return pin_p->ioctl(pin, MP_PIN_READ, 0, NULL);
 }

 void mp_virtual_pin_write(mp_obj_t pin, int value) {
    mp_obj_base_t* s = (mp_obj_base_t*)MP_OBJ_TO_PTR(pin);
-    mp_pin_p_t *pin_p = (mp_pin_p_t*)s->type->protocol;
+    const mp_pin_p_t *pin_p = mp_proto_get(MP_QSTR_protocol_pin, s);
    pin_p->ioctl(pin, MP_PIN_WRITE, value, NULL);
 }
--- a/extmod/virtpin.h
+++ b/extmod/virtpin.h
@ -27,6 +27,7 @@
 #define MICROPY_INCLUDED_EXTMOD_VIRTPIN_H

 #include "py/obj.h"
+#include "py/proto.h"

 #define MP_PIN_READ   (1)
 #define MP_PIN_WRITE  (2)
@ -35,6 +36,7 @@

 // Pin protocol
 typedef struct _mp_pin_p_t {
+    MP_PROTOCOL_HEAD
    mp_uint_t (*ioctl)(mp_obj_t obj, mp_uint_t request, uintptr_t arg, int *errcode);
 } mp_pin_p_t;

--- a/frozen/Adafruit_CircuitPython_BusDevice
+++ b/frozen/Adafruit_CircuitPython_BusDevice
@ -1 +1 @@
-Subproject commit b9280af5142fc41639229544678e23b5cca07c3a
+Subproject commit 805d41a021c70df7609da772a6f6131810e5d6ba
--- a/frozen/Adafruit_CircuitPython_CircuitPlayground
+++ b/frozen/Adafruit_CircuitPython_CircuitPlayground
@ -1 +1 @@
-Subproject commit 154b74de020764597ba49f0d1e8cc18d55b3643b
+Subproject commit 82ba9e40dfff41fdc0541636afde4936c930d86c
--- a/frozen/Adafruit_CircuitPython_Crickit
+++ b/frozen/Adafruit_CircuitPython_Crickit
@ -1 +1 @@
-Subproject commit 617bb0787f2c61283d248632a62b27be80f64b29
+Subproject commit 5534662902a223ac8562e6f999d6359e4c17dab1
--- a/frozen/Adafruit_CircuitPython_DotStar
+++ b/frozen/Adafruit_CircuitPython_DotStar
@ -1 +1 @@
-Subproject commit 409e90902ac49720c4add985e8e1a1660bbe63a0
+Subproject commit 01e89a8437c78b62d4d655c745ded57e26dc747a
--- a/frozen/Adafruit_CircuitPython_HID
+++ b/frozen/Adafruit_CircuitPython_HID
@ -1 +1 @@
-Subproject commit 89faee0eb08a6855e14f117c514fecf2dd90769d
+Subproject commit 2d1dce6ad6ca7e091fd8b5c3f102693c24af8b88
--- a/frozen/Adafruit_CircuitPython_IRRemote
+++ b/frozen/Adafruit_CircuitPython_IRRemote
@ -1 +1 @@
-Subproject commit 70865ac6e09f821b26ec727e2df300a6d9ebf6b3
+Subproject commit 8b7611a2cc076a2ac1b368c70227519f69f1e3e9
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@ -1 +1 @@
-Subproject commit bd7ddc67dc86f7ad0115f58ab80d5605739c6482
+Subproject commit 53146ab2e82c318c3c37bd76bac34035a597b311
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@ -1 +1 @@
-Subproject commit ddc74844983b35b027bd45091c7b8bb3c8d7a2d1
+Subproject commit f69fc9b47fa25ba1414eb3d5c82f05013280c0d2
--- a/frozen/Adafruit_CircuitPython_NeoPixel
+++ b/frozen/Adafruit_CircuitPython_NeoPixel
@ -1 +1 @@
-Subproject commit c0bdd8b10383725ee9293f5d88fb8d47eb1272bd
+Subproject commit ff99d55115f81899902c2c4a84fdfbea9ae83823
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@ -0,0 +1 @@
+Subproject commit dd0fe8530a2dcc64ac95bb3e116af2158dcd7cd2
--- a/frozen/Adafruit_CircuitPython_Thermistor
+++ b/frozen/Adafruit_CircuitPython_Thermistor
@ -1 +1 @@
-Subproject commit 893c5ec6a9aeef38284985074c2058e87754ad3d
+Subproject commit 2e5aedf18eb417a4120d4998ac1f387a4f600730
--- a/frozen/Adafruit_CircuitPython_seesaw
+++ b/frozen/Adafruit_CircuitPython_seesaw
@ -1 +1 @@
-Subproject commit f1171f94083ba64d153ff3f90eeb07500331d6e1
+Subproject commit ea5e445edd4441cacd207aa2d2bfd724b813a253
--- a/frozen/circuitpython-stage
+++ b/frozen/circuitpython-stage
@ -1 +1 @@
-Subproject commit 0d2d660e886de8a1b96778c865c7fa48df5f4ea6
+Subproject commit 8d5cc384058b1cb296aaeab86fb8405042d547ed
--- a/lib/mp3
+++ b/lib/mp3
@ -0,0 +1 @@
+Subproject commit c3c664bf4db6a36d11808dfcbb5dbf7cff1715b8
--- a/lib/oofatfs/ff.c
+++ b/lib/oofatfs/ff.c
@ -3382,7 +3382,11 @@ FRESULT f_read (
            if (!sect) ABORT(fs, FR_INT_ERR);
            sect += csect;
            cc = btr / SS(fs);                  /* When remaining bytes >= sector size, */
-            if (cc) {                           /* Read maximum contiguous sectors directly */
+            if (cc
+#if _FS_DISK_READ_ALIGNED
+                    && (((int)rbuff & 3) == 0)
+#endif
+                    ) {/* Read maximum contiguous sectors directly */
                if (csect + cc > fs->csize) {   /* Clip at cluster boundary */
                    cc = fs->csize - csect;
                }
--- a/lib/oofatfs/ffconf.h
+++ b/lib/oofatfs/ffconf.h
@ -343,6 +343,12 @@
 /  SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
 /  included somewhere in the scope of ff.h. */

+// Set to nonzero if buffers passed to disk_read have a word alignment
+// restriction
+#ifndef _FS_DISK_READ_ALIGNED
+#define _FS_DISK_READ_ALIGNED 0
+#endif
+
 /* #include <windows.h> // O/S definitions  */


--- a/lib/stm32lib
+++ b/lib/stm32lib
@ -1 +0,0 @@
-Subproject commit d2bcfda543d3b99361e44112aca929225bdcc07f
--- a/lib/tinyusb
+++ b/lib/tinyusb
@ -1 +1 @@
-Subproject commit 1ee9ef4f2b7c6acfab6c398a4f57ca22036958f7
+Subproject commit dda4c9a94b509238faa7b5ab5b9464c1d2e63ff0
--- a/lib/utils/buffer_helper.c
+++ b/lib/utils/buffer_helper.c
@ -26,10 +26,10 @@

 #include "lib/utils/buffer_helper.h"

-void normalize_buffer_bounds(int32_t* start, int32_t end, uint32_t* length) {
+void normalize_buffer_bounds(int32_t* start, int32_t end, size_t* length) {
    if (end < 0) {
        end += *length;
-    } else if (((uint32_t) end) > *length) {
+    } else if (((size_t) end) > *length) {
        end = *length;
    }
    if (*start < 0) {
--- a/lib/utils/buffer_helper.h
+++ b/lib/utils/buffer_helper.h
@ -28,7 +28,8 @@
 #define MICROPY_INCLUDED_LIB_UTILS_BUFFER_HELPER_H

 #include <stdint.h>
+#include <string.h>

-void normalize_buffer_bounds(int32_t* start, int32_t end, uint32_t* length);
+void normalize_buffer_bounds(int32_t* start, int32_t end, size_t* length);

 #endif  // MICROPY_INCLUDED_LIB_UTILS_BUFFER_HELPER_H
--- a/lib/utils/interrupt_char.c
+++ b/lib/utils/interrupt_char.c
@ -49,7 +49,7 @@ void mp_keyboard_interrupt(void) {

 // Check to see if we've been CTRL-C'ed by autoreload or the user.
 bool mp_hal_is_interrupted(void) {
-    return MP_STATE_VM(mp_pending_exception) == MP_OBJ_FROM_PTR(&MP_STATE_VM(mp_kbd_exception));
+    return MP_STATE_VM(mp_pending_exception) != NULL;
 }

 #endif
--- a/lib/utils/sys_stdio_mphal.c
+++ b/lib/utils/sys_stdio_mphal.c
@ -123,6 +123,7 @@ STATIC const mp_rom_map_elem_t stdio_locals_dict_table[] = {
 STATIC MP_DEFINE_CONST_DICT(stdio_locals_dict, stdio_locals_dict_table);

 STATIC const mp_stream_p_t stdio_obj_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = stdio_read,
    .write = stdio_write,
    .ioctl = stdio_ioctl,
@ -158,6 +159,7 @@ STATIC mp_uint_t stdio_buffer_write(mp_obj_t self_in, const void *buf, mp_uint_t
 }

 STATIC const mp_stream_p_t stdio_buffer_obj_stream_p = {
+    MP_PROTO_IMPLEMENT(MP_QSTR_protocol_stream)
    .read = stdio_buffer_read,
    .write = stdio_buffer_write,
    .is_text = false,
--- a/locale/ID.po
+++ b/locale/ID.po
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-05 17:52-0700\n"
+"POT-Creation-Date: 2020-01-13 18:15-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -23,6 +23,19 @@ msgid ""
 "Code done running. Waiting for reload.\n"
 msgstr ""

+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"Please file an issue with the contents of your CIRCUITPY drive at \n"
+"https://github.com/adafruit/circuitpython/issues\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"To exit, please reset the board without "
+msgstr ""
+
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
@ -52,8 +65,9 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
-#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
+#: shared-bindings/displayio/Shape.c
 msgid "%q must be >= 1"
 msgstr ""

@ -119,6 +133,10 @@ msgstr ""
 msgid "'%s' integer 0x%x does not fit in mask 0x%x"
 msgstr ""

+#: py/proto.c
+msgid "'%s' object does not support '%q'"
+msgstr ""
+
 #: py/obj.c
 #, c-format
 msgid "'%s' object does not support item assignment"
@ -217,12 +235,12 @@ msgstr ""
 msgid "A hardware interrupt channel is already in use"
 msgstr ""

-#: shared-bindings/bleio/Address.c
+#: shared-bindings/_bleio/Address.c
 #, c-format
 msgid "Address must be %d bytes long"
 msgstr ""

-#: shared-bindings/bleio/Address.c
+#: shared-bindings/_bleio/Address.c
 msgid "Address type out of range"
 msgstr ""

@ -259,6 +277,10 @@ msgstr ""
 msgid "All timers in use"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Already advertising."
+msgstr ""
+
 #: ports/nrf/common-hal/analogio/AnalogOut.c
 msgid "AnalogOut functionality not supported"
 msgstr ""
@ -284,7 +306,7 @@ msgid "Array values should be single bytes."
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when MicroPython VM not running.\n"
+msgid "Attempted heap allocation when MicroPython VM not running."
 msgstr ""

 #: main.c
@ -297,6 +319,10 @@ msgid ""
 "disable.\n"
 msgstr ""

+#: shared-module/displayio/Display.c
+msgid "Below minimum frame rate"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
 msgstr ""
@ -321,11 +347,24 @@ msgstr ""
 msgid "Brightness not adjustable"
 msgstr ""

+#: shared-bindings/_bleio/UUID.c
+#, c-format
+msgid "Buffer + offset too small %d %d %d"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 #, c-format
 msgid "Buffer incorrect size. Should be %d bytes."
 msgstr ""

+#: shared-bindings/displayio/Display.c
+msgid "Buffer is not a bytearray."
+msgstr ""
+
+#: shared-bindings/displayio/Display.c
+msgid "Buffer is too small"
+msgstr ""
+
 #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
@ -335,13 +374,17 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/PacketBuffer.c
+msgid "Buffer too large and unable to allocate"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/displayio/ParallelBus.c
 #: ports/nrf/common-hal/displayio/ParallelBus.c
 #, c-format
 msgid "Bus pin %d is already in use"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""

@ -353,13 +396,8 @@ msgstr ""
 msgid "Call super().__init__() before accessing native object."
 msgstr ""

-#: shared-bindings/_pixelbuf/PixelBuf.c
-#, c-format
-msgid "Can not use dotstar with %s"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-msgid "Can't set CCCD for local Characteristic"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+msgid "Can't set CCCD on local Characteristic"
 msgstr ""

 #: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@ -375,6 +413,10 @@ msgstr ""
 msgid "Cannot get temperature"
 msgstr ""

+#: shared-bindings/_bleio/Adapter.c
+msgid "Cannot have scan responses for extended, connectable advertisements."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "Cannot output both channels on the same pin"
 msgstr ""
@ -415,18 +457,20 @@ msgstr ""
 msgid "Cannot write without MOSI pin."
 msgstr ""

-#: shared-bindings/bleio/Service.c
-msgid "Characteristic UUID doesn't match Service UUID"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Service.c
-msgid "Characteristic already in use by another Service."
-msgstr ""
-
-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
 msgstr ""

+#: supervisor/shared/safe_mode.c
+msgid "CircuitPython core code crashed hard. Whoops!\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"CircuitPython is in safe mode because you pressed the reset button during "
+"boot. Press again to exit safe mode.\n"
+msgstr ""
+
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."
 msgstr ""
@ -451,6 +495,12 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""

+#: shared-bindings/_bleio/Connection.c
+msgid ""
+"Connection has been disconnected and can no longer be used. Create a new "
+"connection."
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
@ -459,25 +509,30 @@ msgstr ""
 msgid "Corrupt raw code"
 msgstr ""

-#: ports/nrf/common-hal/bleio/UUID.c
-#, c-format
-msgid "Could not decode ble_uuid, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "Could not initialize UART"
 msgstr ""

-#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
+#: shared-module/audiomp3/MP3Decoder.c
+msgid "Couldn't allocate decoder"
+msgstr ""
+
+#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
+#: shared-module/audiomp3/MP3Decoder.c
 msgid "Couldn't allocate first buffer"
 msgstr ""

-#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
+#: shared-module/audiomp3/MP3Decoder.c
+msgid "Couldn't allocate input buffer"
+msgstr ""
+
+#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
+#: shared-module/audiomp3/MP3Decoder.c
 msgid "Couldn't allocate second buffer"
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler.\n"
+msgid "Crash into the HardFault_Handler."
 msgstr ""

 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
@ -493,7 +548,7 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
+#: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""

@ -501,7 +556,16 @@ msgstr ""
 msgid "Destination capacity is smaller than destination_length."
 msgstr ""

+#: ports/nrf/common-hal/audiobusio/I2SOut.c
+msgid "Device in use"
+msgstr ""
+
 #: shared-bindings/displayio/Display.c
+msgid "Display must have a 16 bit colorspace."
+msgstr ""
+
+#: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""

@ -525,16 +589,25 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
 msgid "Expected a Characteristic"
 msgstr ""

-#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
-#: shared-bindings/bleio/Service.c
+#: shared-bindings/_pixelbuf/__init__.c
+msgid "Expected a PixelBuf instance"
+msgstr ""
+
+#: shared-bindings/_bleio/Characteristic.c
+msgid "Expected a Service"
+msgstr ""
+
+#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
+#: shared-bindings/_bleio/Service.c
 msgid "Expected a UUID"
 msgstr ""

-#: shared-bindings/bleio/Central.c
+#: shared-bindings/_bleio/Adapter.c
 msgid "Expected an Address"
 msgstr ""

@ -547,21 +620,11 @@ msgstr ""
 msgid "Failed sending command."
 msgstr ""

-#: ports/nrf/sd_mutex.c
+#: ports/nrf/sd.c ports/nrf/sd_mutex.c
 #, c-format
 msgid "Failed to acquire mutex, err 0x%04x"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Service.c
-#, c-format
-msgid "Failed to add characteristic, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to add service, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 msgid "Failed to allocate RX buffer"
 msgstr ""
@ -572,128 +635,31 @@ msgstr ""
 msgid "Failed to allocate RX buffer of %d bytes"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to change softdevice state"
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Failed to connect: internal error"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to configure advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
+#: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Scanner.c
-#, c-format
-msgid "Failed to continue scanning, err 0x%04x"
+#: shared-module/audiomp3/MP3Decoder.c
+msgid "Failed to parse MP3 file"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Central.c
-msgid "Failed to discover services"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to get local address"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to get softdevice state"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to notify or indicate attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read CCCD value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read gatts value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/UUID.c
-#, c-format
-msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/sd_mutex.c
+#: ports/nrf/sd.c ports/nrf/sd_mutex.c
 #, c-format
 msgid "Failed to release mutex, err 0x%04x"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to set device name, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to start advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-#, c-format
-msgid "Failed to start connecting, error 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Scanner.c
-#, c-format
-msgid "Failed to start scanning, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to stop advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write CCCD, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write gatts value, err 0x%04x"
+#: supervisor/shared/safe_mode.c
+msgid "Failed to write internal flash."
 msgstr ""

 #: py/moduerrno.c
 msgid "File exists"
 msgstr ""

-#: ports/nrf/peripherals/nrf/nvm.c
-msgid "Flash erase failed"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
-#, c-format
-msgid "Flash erase failed to start, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
-msgid "Flash write failed"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
-#, c-format
-msgid "Flash write failed to start, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Frequency captured is above capability. Capture Paused."
 msgstr ""
@ -704,6 +670,7 @@ msgid "Function requires lock"
 msgstr ""

 #: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Group already used"
 msgstr ""

@ -733,6 +700,14 @@ msgstr ""
 msgid "Input/output error"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid "Insufficient authentication"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid "Insufficient encryption"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 msgid "Invalid %q pin"
@ -759,11 +734,15 @@ msgstr ""
 msgid "Invalid buffer size"
 msgstr ""

+#: shared-bindings/_pixelbuf/PixelBuf.c
+msgid "Invalid byteorder string"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Invalid capture period. Valid range: 1 - 500"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Invalid channel count"
 msgstr ""

@ -813,11 +792,23 @@ msgstr ""
 msgid "Invalid polarity"
 msgstr ""

+#: shared-bindings/_bleio/Characteristic.c
+msgid "Invalid properties"
+msgstr ""
+
 #: shared-bindings/microcontroller/__init__.c
 msgid "Invalid run mode."
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-module/_bleio/Attribute.c
+msgid "Invalid security_mode"
+msgstr ""
+
+#: shared-bindings/audiomixer/Mixer.c
+msgid "Invalid voice"
+msgstr ""
+
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Invalid voice count"
 msgstr ""

@ -845,13 +836,6 @@ msgstr ""
 msgid "Length must be non-negative"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid ""
-"Looks like our core CircuitPython code crashed hard. Whoops!\n"
-"Please file an issue at https://github.com/adafruit/circuitpython/issues\n"
-" with the contents of your CIRCUITPY drive and this message:\n"
-msgstr ""
-
 #: shared-module/bitbangio/SPI.c
 msgid "MISO pin init failed."
 msgstr ""
@ -866,11 +850,11 @@ msgid "Maximum x value when mirrored is %d"
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "MicroPython NLR jump failed. Likely memory corruption.\n"
+msgid "MicroPython NLR jump failed. Likely memory corruption."
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "MicroPython fatal error.\n"
+msgid "MicroPython fatal error."
 msgstr ""

 #: shared-bindings/audiobusio/PDMIn.c
@ -881,7 +865,11 @@ msgstr ""
 msgid "Must be a %q subclass."
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
+#: shared-bindings/_pixelbuf/PixelBuf.c
+msgid "Negative step not supported"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/Characteristic.c
 msgid "No CCCD for this Characteristic"
 msgstr ""

@ -927,6 +915,10 @@ msgstr ""
 msgid "No hardware support on pin"
 msgstr ""

+#: shared-module/touchio/TouchIn.c
+msgid "No pulldown on pin; 1Mohm recommended"
+msgstr ""
+
 #: py/moduerrno.c
 msgid "No space left on device"
 msgstr ""
@ -935,8 +927,12 @@ msgstr ""
 msgid "No such file/directory"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: supervisor/shared/safe_mode.c
+msgid "Nordic Soft Device failure assertion."
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
 msgstr ""

@ -967,12 +963,8 @@ msgstr ""
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
-"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
-"given"
-msgstr ""
-
-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "Only slices with step=1 (aka None) are supported"
+"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
+"%d bpp given"
 msgstr ""

 #: shared-bindings/audiobusio/PDMIn.c
@ -1010,6 +1002,10 @@ msgstr ""
 msgid "Pop from an empty Ps2 buffer"
 msgstr ""

+#: shared-bindings/_bleio/Adapter.c
+msgid "Prefix buffer must be on the heap"
+msgstr ""
+
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
@ -1042,6 +1038,10 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""

+#: shared-bindings/displayio/EPaperDisplay.c
+msgid "Refresh too soon"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "Right channel unsupported"
 msgstr ""
@ -1058,20 +1058,23 @@ msgstr ""
 msgid "Running in safe mode! Not running saved code.\n"
 msgstr ""

-#: ports/atmel-samd/common-hal/busio/I2C.c
+#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "SDA or SCL needs a pull up"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Sample rate must be positive"
 msgstr ""

 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
-#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Sample rate too high. It must be less than %d"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Scan already in progess. Stop with stop_scan."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 msgid "Serializer in use"
@ -1086,11 +1089,6 @@ msgstr ""
 msgid "Slices not supported"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Adapter.c
-#, c-format
-msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
-msgstr ""
-
 #: extmod/modure.c
 msgid "Splitting with sub-captures"
 msgstr ""
@ -1106,10 +1104,7 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
-"Please increase stack size limits and press reset (after ejecting "
-"CIRCUITPY).\n"
-"If you didn't change the stack, then file an issue here with the contents of "
-"your CIRCUITPY drive:\n"
+"Please increase the stack size if you know how, or if not:"
 msgstr ""

 #: supervisor/shared/safe_mode.c
@ -1120,31 +1115,24 @@ msgstr ""

 #: supervisor/shared/safe_mode.c
 msgid ""
-"The microcontroller's power dipped. Please make sure your power supply "
-"provides\n"
+"The microcontroller's power dipped. Make sure your power supply provides\n"
 "enough power for the whole circuit and press reset (after ejecting "
 "CIRCUITPY).\n"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid ""
-"The reset button was pressed while booting CircuitPython. Press again to "
-"exit safe mode.\n"
-msgstr ""
-
-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's channel count does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's sample rate does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""

@ -1152,11 +1140,11 @@ msgstr ""
 msgid "Tile height must exactly divide bitmap height"
 msgstr ""

-#: shared-bindings/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
 msgid "Tile index out of bounds"
 msgstr ""

-#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c
 msgid "Tile value out of bounds"
 msgstr ""

@ -1164,10 +1152,6 @@ msgstr ""
 msgid "Tile width must exactly divide bitmap width"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
 msgstr ""
@ -1178,6 +1162,7 @@ msgid "Too many display busses"
 msgstr ""

 #: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Too many displays"
 msgstr ""

@ -1197,15 +1182,15 @@ msgstr ""
 msgid "USB Error"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID integer value must be 0-0xffff"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID value is not str, int or byte buffer"
 msgstr ""

@ -1236,20 +1221,45 @@ msgstr ""
 msgid "Unable to write to nvm."
 msgstr ""

-#: ports/nrf/common-hal/bleio/UUID.c
+#: ports/nrf/common-hal/_bleio/UUID.c
 msgid "Unexpected nrfx uuid type"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown gatt error: 0x%04x"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "Unknown reason."
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown security error: 0x%04x"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown soft device error: %04x"
+msgstr ""
+
 #: shared-bindings/_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid ""
+"Unspecified issue. Can be that the pairing prompt on the other device was "
+"declined or ignored."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/busio/I2C.c
 msgid "Unsupported baudrate"
 msgstr ""

-#: shared-module/displayio/Display.c
+#: shared-module/displayio/display_core.c
 msgid "Unsupported display bus type"
 msgstr ""

@ -1265,12 +1275,18 @@ msgstr ""
 msgid "Unsupported pull value."
 msgstr ""

-#: py/emitnative.c
-msgid "Viper functions don't currently support more than 4 arguments"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+msgid "Value length != required fixed length"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
-msgid "Voice index too high"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+msgid "Value length > max_length"
+msgstr ""
+
+#: py/emitnative.c
+msgid "Viper functions don't currently support more than 4 arguments"
 msgstr ""

 #: main.c
@ -1287,9 +1303,12 @@ msgid ""
 "To list built-in modules please do `help(\"modules\")`.\n"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/PacketBuffer.c
+msgid "Writes not supported on Characteristic"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You are running in safe mode which means something unanticipated happened.\n"
+msgid "You are in safe mode: something unanticipated happened.\n"
 msgstr ""

 #: supervisor/shared/safe_mode.c
@ -1355,10 +1374,6 @@ msgstr ""
 msgid "attributes not supported yet"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
-msgid "bad GATT role"
-msgstr ""
-
 #: py/builtinevex.c
 msgid "bad compile mode"
 msgstr ""
@ -1387,7 +1402,7 @@ msgstr ""
 msgid "bits must be 8"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "bits_per_sample must be 8 or 16"
 msgstr ""

@ -1430,8 +1445,7 @@ msgid "byte code not implemented"
 msgstr ""

 #: shared-bindings/_pixelbuf/PixelBuf.c
-#, c-format
-msgid "byteorder is not an instance of ByteOrder (got a %s)"
+msgid "byteorder is not a string"
 msgstr ""

 #: ports/atmel-samd/common-hal/busio/UART.c
@ -1611,10 +1625,6 @@ msgstr ""
 msgid "casting"
 msgstr ""

-#: shared-bindings/bleio/Service.c
-msgid "characteristics includes an object that is not a Characteristic"
-msgstr ""
-
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
 msgstr ""
@ -1762,7 +1772,7 @@ msgstr ""
 msgid "extra positional arguments given"
 msgstr ""

-#: shared-bindings/audiocore/WaveFile.c
+#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3Decoder.c
 #: shared-bindings/displayio/OnDiskBitmap.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
@ -1892,7 +1902,7 @@ msgstr ""
 msgid "integer required"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c shared-bindings/bleio/Scanner.c
+#: shared-bindings/_bleio/Adapter.c
 #, c-format
 msgid "interval must be in range %s-%s"
 msgstr ""
@ -1986,6 +1996,10 @@ msgstr ""
 msgid "length argument not allowed for this type"
 msgstr ""

+#: shared-bindings/audiomixer/MixerVoice.c
+msgid "level must be between 0 and 1"
+msgstr ""
+
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""
@ -2014,6 +2028,12 @@ msgstr ""
 msgid "math domain error"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+#, c-format
+msgid "max_length must be 0-%d when fixed_length is %s"
+msgstr ""
+
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
 msgstr ""
@ -2059,10 +2079,6 @@ msgstr ""
 msgid "name '%q' is not defined"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c
-msgid "name must be a string"
-msgstr ""
-
 #: py/runtime.c
 msgid "name not defined"
 msgstr ""
@ -2104,16 +2120,17 @@ msgstr ""
 msgid "no module named '%q'"
 msgstr ""

-#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
+#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
+#: shared-bindings/displayio/ParallelBus.c
+msgid "no reset pin available"
+msgstr ""
+
+#: py/runtime.c
 msgid "no such attribute"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c
-msgid "non-Service found in services"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-msgid "non-UUID found in service_uuids"
+#: ports/nrf/common-hal/_bleio/Connection.c
+msgid "non-UUID found in service_uuids_whitelist"
 msgstr ""

 #: py/compile.c
@ -2132,7 +2149,7 @@ msgstr ""
 msgid "non-keyword arg after keyword arg"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "not a 128-bit UUID"
 msgstr ""

@ -2198,6 +2215,14 @@ msgstr ""
 msgid "offset out of bounds"
 msgstr ""

+#: ports/nrf/common-hal/audiobusio/PDMIn.c
+msgid "only bit_depth=16 is supported"
+msgstr ""
+
+#: ports/nrf/common-hal/audiobusio/PDMIn.c
+msgid "only sample_rate=16000 is supported"
+msgstr ""
+
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
@ -2281,10 +2306,6 @@ msgstr ""
 msgid "rawbuf is not the same size as buf"
 msgstr ""

-#: shared-bindings/_pixelbuf/__init__.c
-msgid "readonly attribute"
-msgstr ""
-
 #: py/builtinimport.c
 msgid "relative import"
 msgstr ""
@ -2425,15 +2446,11 @@ msgstr ""
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""

-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes exactly 1 argument"
-msgstr ""
-
 #: shared-bindings/busio/UART.c
-msgid "timeout >100 (units are now seconds, not msecs)"
+msgid "timeout must be 0.0-100.0 seconds"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "timeout must be >= 0.0"
 msgstr ""

@ -2586,14 +2603,10 @@ msgstr ""
 msgid "value_count must be > 0"
 msgstr ""

-#: shared-bindings/bleio/Scanner.c
+#: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""

-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "write_args must be a list, tuple, or None"
-msgstr ""
-
 #: py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
--- a/locale/en_US.po
+++ b/locale/en_US.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-05 17:52-0700\n"
+"POT-Creation-Date: 2020-01-07 14:31-0800\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@ -23,6 +23,19 @@ msgid ""
 "Code done running. Waiting for reload.\n"
 msgstr ""

+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"Please file an issue with the contents of your CIRCUITPY drive at \n"
+"https://github.com/adafruit/circuitpython/issues\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"To exit, please reset the board without "
+msgstr ""
+
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
@ -52,8 +65,9 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
-#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
+#: shared-bindings/displayio/Shape.c
 msgid "%q must be >= 1"
 msgstr ""

@ -119,6 +133,10 @@ msgstr ""
 msgid "'%s' integer 0x%x does not fit in mask 0x%x"
 msgstr ""

+#: py/proto.c
+msgid "'%s' object does not support '%q'"
+msgstr ""
+
 #: py/obj.c
 #, c-format
 msgid "'%s' object does not support item assignment"
@ -217,12 +235,12 @@ msgstr ""
 msgid "A hardware interrupt channel is already in use"
 msgstr ""

-#: shared-bindings/bleio/Address.c
+#: shared-bindings/_bleio/Address.c
 #, c-format
 msgid "Address must be %d bytes long"
 msgstr ""

-#: shared-bindings/bleio/Address.c
+#: shared-bindings/_bleio/Address.c
 msgid "Address type out of range"
 msgstr ""

@ -259,6 +277,10 @@ msgstr ""
 msgid "All timers in use"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Already advertising."
+msgstr ""
+
 #: ports/nrf/common-hal/analogio/AnalogOut.c
 msgid "AnalogOut functionality not supported"
 msgstr ""
@ -284,7 +306,7 @@ msgid "Array values should be single bytes."
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when MicroPython VM not running.\n"
+msgid "Attempted heap allocation when MicroPython VM not running."
 msgstr ""

 #: main.c
@ -297,6 +319,10 @@ msgid ""
 "disable.\n"
 msgstr ""

+#: shared-module/displayio/Display.c
+msgid "Below minimum frame rate"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
 msgstr ""
@ -321,11 +347,24 @@ msgstr ""
 msgid "Brightness not adjustable"
 msgstr ""

+#: shared-bindings/_bleio/UUID.c
+#, c-format
+msgid "Buffer + offset too small %d %d %d"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 #, c-format
 msgid "Buffer incorrect size. Should be %d bytes."
 msgstr ""

+#: shared-bindings/displayio/Display.c
+msgid "Buffer is not a bytearray."
+msgstr ""
+
+#: shared-bindings/displayio/Display.c
+msgid "Buffer is too small"
+msgstr ""
+
 #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
@ -335,13 +374,17 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/PacketBuffer.c
+msgid "Buffer too large and unable to allocate"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/displayio/ParallelBus.c
 #: ports/nrf/common-hal/displayio/ParallelBus.c
 #, c-format
 msgid "Bus pin %d is already in use"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""

@ -353,13 +396,8 @@ msgstr ""
 msgid "Call super().__init__() before accessing native object."
 msgstr ""

-#: shared-bindings/_pixelbuf/PixelBuf.c
-#, c-format
-msgid "Can not use dotstar with %s"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-msgid "Can't set CCCD for local Characteristic"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+msgid "Can't set CCCD on local Characteristic"
 msgstr ""

 #: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@ -375,6 +413,10 @@ msgstr ""
 msgid "Cannot get temperature"
 msgstr ""

+#: shared-bindings/_bleio/Adapter.c
+msgid "Cannot have scan responses for extended, connectable advertisements."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "Cannot output both channels on the same pin"
 msgstr ""
@ -415,18 +457,20 @@ msgstr ""
 msgid "Cannot write without MOSI pin."
 msgstr ""

-#: shared-bindings/bleio/Service.c
-msgid "Characteristic UUID doesn't match Service UUID"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Service.c
-msgid "Characteristic already in use by another Service."
-msgstr ""
-
-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
 msgstr ""

+#: supervisor/shared/safe_mode.c
+msgid "CircuitPython core code crashed hard. Whoops!\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"CircuitPython is in safe mode because you pressed the reset button during "
+"boot. Press again to exit safe mode.\n"
+msgstr ""
+
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."
 msgstr ""
@ -451,6 +495,12 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""

+#: shared-bindings/_bleio/Connection.c
+msgid ""
+"Connection has been disconnected and can no longer be used. Create a new "
+"connection."
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
@ -459,25 +509,30 @@ msgstr ""
 msgid "Corrupt raw code"
 msgstr ""

-#: ports/nrf/common-hal/bleio/UUID.c
-#, c-format
-msgid "Could not decode ble_uuid, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "Could not initialize UART"
 msgstr ""

-#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
+#: shared-module/audiomp3/MP3File.c
+msgid "Couldn't allocate decoder"
+msgstr ""
+
+#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
+#: shared-module/audiomp3/MP3File.c
 msgid "Couldn't allocate first buffer"
 msgstr ""

-#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
+#: shared-module/audiomp3/MP3File.c
+msgid "Couldn't allocate input buffer"
+msgstr ""
+
+#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
+#: shared-module/audiomp3/MP3File.c
 msgid "Couldn't allocate second buffer"
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler.\n"
+msgid "Crash into the HardFault_Handler."
 msgstr ""

 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
@ -493,7 +548,7 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
+#: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""

@ -501,7 +556,16 @@ msgstr ""
 msgid "Destination capacity is smaller than destination_length."
 msgstr ""

+#: ports/nrf/common-hal/audiobusio/I2SOut.c
+msgid "Device in use"
+msgstr ""
+
 #: shared-bindings/displayio/Display.c
+msgid "Display must have a 16 bit colorspace."
+msgstr ""
+
+#: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""

@ -525,16 +589,25 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
 msgid "Expected a Characteristic"
 msgstr ""

-#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
-#: shared-bindings/bleio/Service.c
+#: shared-bindings/_pixelbuf/__init__.c
+msgid "Expected a PixelBuf instance"
+msgstr ""
+
+#: shared-bindings/_bleio/Characteristic.c
+msgid "Expected a Service"
+msgstr ""
+
+#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
+#: shared-bindings/_bleio/Service.c
 msgid "Expected a UUID"
 msgstr ""

-#: shared-bindings/bleio/Central.c
+#: shared-bindings/_bleio/Adapter.c
 msgid "Expected an Address"
 msgstr ""

@ -552,16 +625,6 @@ msgstr ""
 msgid "Failed to acquire mutex, err 0x%04x"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Service.c
-#, c-format
-msgid "Failed to add characteristic, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to add service, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 msgid "Failed to allocate RX buffer"
 msgstr ""
@ -572,59 +635,16 @@ msgstr ""
 msgid "Failed to allocate RX buffer of %d bytes"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to change softdevice state"
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Failed to connect: internal error"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to configure advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
+#: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Scanner.c
-#, c-format
-msgid "Failed to continue scanning, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-msgid "Failed to discover services"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to get local address"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to get softdevice state"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to notify or indicate attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read CCCD value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read gatts value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/UUID.c
-#, c-format
-msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
+#: shared-module/audiomp3/MP3File.c
+msgid "Failed to parse MP3 file"
 msgstr ""

 #: ports/nrf/sd_mutex.c
@ -632,68 +652,18 @@ msgstr ""
 msgid "Failed to release mutex, err 0x%04x"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to set device name, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to start advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-#, c-format
-msgid "Failed to start connecting, error 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Scanner.c
-#, c-format
-msgid "Failed to start scanning, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to stop advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write CCCD, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write gatts value, err 0x%04x"
+#: supervisor/shared/safe_mode.c
+msgid "Failed to write internal flash."
 msgstr ""

 #: py/moduerrno.c
 msgid "File exists"
 msgstr ""

-#: ports/nrf/peripherals/nrf/nvm.c
-msgid "Flash erase failed"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
-#, c-format
-msgid "Flash erase failed to start, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
+#: ports/nrf/common-hal/nvm/ByteArray.c
 msgid "Flash write failed"
 msgstr ""

-#: ports/nrf/peripherals/nrf/nvm.c
-#, c-format
-msgid "Flash write failed to start, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Frequency captured is above capability. Capture Paused."
 msgstr ""
@ -704,6 +674,7 @@ msgid "Function requires lock"
 msgstr ""

 #: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Group already used"
 msgstr ""

@ -733,6 +704,14 @@ msgstr ""
 msgid "Input/output error"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid "Insufficient authentication"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid "Insufficient encryption"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 msgid "Invalid %q pin"
@ -759,11 +738,15 @@ msgstr ""
 msgid "Invalid buffer size"
 msgstr ""

+#: shared-bindings/_pixelbuf/PixelBuf.c
+msgid "Invalid byteorder string"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Invalid capture period. Valid range: 1 - 500"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Invalid channel count"
 msgstr ""

@ -813,11 +796,23 @@ msgstr ""
 msgid "Invalid polarity"
 msgstr ""

+#: shared-bindings/_bleio/Characteristic.c
+msgid "Invalid properties"
+msgstr ""
+
 #: shared-bindings/microcontroller/__init__.c
 msgid "Invalid run mode."
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-module/_bleio/Attribute.c
+msgid "Invalid security_mode"
+msgstr ""
+
+#: shared-bindings/audiomixer/Mixer.c
+msgid "Invalid voice"
+msgstr ""
+
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Invalid voice count"
 msgstr ""

@ -845,13 +840,6 @@ msgstr ""
 msgid "Length must be non-negative"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid ""
-"Looks like our core CircuitPython code crashed hard. Whoops!\n"
-"Please file an issue at https://github.com/adafruit/circuitpython/issues\n"
-" with the contents of your CIRCUITPY drive and this message:\n"
-msgstr ""
-
 #: shared-module/bitbangio/SPI.c
 msgid "MISO pin init failed."
 msgstr ""
@ -866,11 +854,11 @@ msgid "Maximum x value when mirrored is %d"
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "MicroPython NLR jump failed. Likely memory corruption.\n"
+msgid "MicroPython NLR jump failed. Likely memory corruption."
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "MicroPython fatal error.\n"
+msgid "MicroPython fatal error."
 msgstr ""

 #: shared-bindings/audiobusio/PDMIn.c
@ -881,7 +869,11 @@ msgstr ""
 msgid "Must be a %q subclass."
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
+#: shared-bindings/_pixelbuf/PixelBuf.c
+msgid "Negative step not supported"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/Characteristic.c
 msgid "No CCCD for this Characteristic"
 msgstr ""

@ -927,6 +919,10 @@ msgstr ""
 msgid "No hardware support on pin"
 msgstr ""

+#: shared-module/touchio/TouchIn.c
+msgid "No pulldown on pin; 1Mohm recommended"
+msgstr ""
+
 #: py/moduerrno.c
 msgid "No space left on device"
 msgstr ""
@ -935,8 +931,12 @@ msgstr ""
 msgid "No such file/directory"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: supervisor/shared/safe_mode.c
+msgid "Nordic Soft Device failure assertion."
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
 msgstr ""

@ -967,12 +967,8 @@ msgstr ""
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
-"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
-"given"
-msgstr ""
-
-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "Only slices with step=1 (aka None) are supported"
+"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
+"%d bpp given"
 msgstr ""

 #: shared-bindings/audiobusio/PDMIn.c
@ -1010,6 +1006,10 @@ msgstr ""
 msgid "Pop from an empty Ps2 buffer"
 msgstr ""

+#: shared-bindings/_bleio/Adapter.c
+msgid "Prefix buffer must be on the heap"
+msgstr ""
+
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
@ -1042,6 +1042,10 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""

+#: shared-bindings/displayio/EPaperDisplay.c
+msgid "Refresh too soon"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "Right channel unsupported"
 msgstr ""
@ -1058,20 +1062,23 @@ msgstr ""
 msgid "Running in safe mode! Not running saved code.\n"
 msgstr ""

-#: ports/atmel-samd/common-hal/busio/I2C.c
+#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "SDA or SCL needs a pull up"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Sample rate must be positive"
 msgstr ""

 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
-#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Sample rate too high. It must be less than %d"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Scan already in progess. Stop with stop_scan."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 msgid "Serializer in use"
@ -1086,11 +1093,6 @@ msgstr ""
 msgid "Slices not supported"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Adapter.c
-#, c-format
-msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
-msgstr ""
-
 #: extmod/modure.c
 msgid "Splitting with sub-captures"
 msgstr ""
@ -1106,10 +1108,7 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
-"Please increase stack size limits and press reset (after ejecting "
-"CIRCUITPY).\n"
-"If you didn't change the stack, then file an issue here with the contents of "
-"your CIRCUITPY drive:\n"
+"Please increase the stack size if you know how, or if not:"
 msgstr ""

 #: supervisor/shared/safe_mode.c
@ -1120,31 +1119,24 @@ msgstr ""

 #: supervisor/shared/safe_mode.c
 msgid ""
-"The microcontroller's power dipped. Please make sure your power supply "
-"provides\n"
+"The microcontroller's power dipped. Make sure your power supply provides\n"
 "enough power for the whole circuit and press reset (after ejecting "
 "CIRCUITPY).\n"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid ""
-"The reset button was pressed while booting CircuitPython. Press again to "
-"exit safe mode.\n"
-msgstr ""
-
-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's channel count does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's sample rate does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""

@ -1152,11 +1144,11 @@ msgstr ""
 msgid "Tile height must exactly divide bitmap height"
 msgstr ""

-#: shared-bindings/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
 msgid "Tile index out of bounds"
 msgstr ""

-#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c
 msgid "Tile value out of bounds"
 msgstr ""

@ -1164,10 +1156,6 @@ msgstr ""
 msgid "Tile width must exactly divide bitmap width"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
 msgstr ""
@ -1178,6 +1166,7 @@ msgid "Too many display busses"
 msgstr ""

 #: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Too many displays"
 msgstr ""

@ -1197,15 +1186,15 @@ msgstr ""
 msgid "USB Error"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID integer value must be 0-0xffff"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID value is not str, int or byte buffer"
 msgstr ""

@ -1236,20 +1225,45 @@ msgstr ""
 msgid "Unable to write to nvm."
 msgstr ""

-#: ports/nrf/common-hal/bleio/UUID.c
+#: ports/nrf/common-hal/_bleio/UUID.c
 msgid "Unexpected nrfx uuid type"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown gatt error: 0x%04x"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "Unknown reason."
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown security error: 0x%04x"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown soft device error: %04x"
+msgstr ""
+
 #: shared-bindings/_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid ""
+"Unspecified issue. Can be that the pairing prompt on the other device was "
+"declined or ignored."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/busio/I2C.c
 msgid "Unsupported baudrate"
 msgstr ""

-#: shared-module/displayio/Display.c
+#: shared-module/displayio/display_core.c
 msgid "Unsupported display bus type"
 msgstr ""

@ -1265,12 +1279,18 @@ msgstr ""
 msgid "Unsupported pull value."
 msgstr ""

-#: py/emitnative.c
-msgid "Viper functions don't currently support more than 4 arguments"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+msgid "Value length != required fixed length"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
-msgid "Voice index too high"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+msgid "Value length > max_length"
+msgstr ""
+
+#: py/emitnative.c
+msgid "Viper functions don't currently support more than 4 arguments"
 msgstr ""

 #: main.c
@ -1287,9 +1307,12 @@ msgid ""
 "To list built-in modules please do `help(\"modules\")`.\n"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/PacketBuffer.c
+msgid "Writes not supported on Characteristic"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You are running in safe mode which means something unanticipated happened.\n"
+msgid "You are in safe mode: something unanticipated happened.\n"
 msgstr ""

 #: supervisor/shared/safe_mode.c
@ -1355,10 +1378,6 @@ msgstr ""
 msgid "attributes not supported yet"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
-msgid "bad GATT role"
-msgstr ""
-
 #: py/builtinevex.c
 msgid "bad compile mode"
 msgstr ""
@ -1387,7 +1406,7 @@ msgstr ""
 msgid "bits must be 8"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "bits_per_sample must be 8 or 16"
 msgstr ""

@ -1430,8 +1449,7 @@ msgid "byte code not implemented"
 msgstr ""

 #: shared-bindings/_pixelbuf/PixelBuf.c
-#, c-format
-msgid "byteorder is not an instance of ByteOrder (got a %s)"
+msgid "byteorder is not a string"
 msgstr ""

 #: ports/atmel-samd/common-hal/busio/UART.c
@ -1611,10 +1629,6 @@ msgstr ""
 msgid "casting"
 msgstr ""

-#: shared-bindings/bleio/Service.c
-msgid "characteristics includes an object that is not a Characteristic"
-msgstr ""
-
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
 msgstr ""
@ -1762,7 +1776,7 @@ msgstr ""
 msgid "extra positional arguments given"
 msgstr ""

-#: shared-bindings/audiocore/WaveFile.c
+#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
 #: shared-bindings/displayio/OnDiskBitmap.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
@ -1892,7 +1906,7 @@ msgstr ""
 msgid "integer required"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c shared-bindings/bleio/Scanner.c
+#: shared-bindings/_bleio/Adapter.c
 #, c-format
 msgid "interval must be in range %s-%s"
 msgstr ""
@ -1986,6 +2000,10 @@ msgstr ""
 msgid "length argument not allowed for this type"
 msgstr ""

+#: shared-bindings/audiomixer/MixerVoice.c
+msgid "level must be between 0 and 1"
+msgstr ""
+
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""
@ -2014,6 +2032,12 @@ msgstr ""
 msgid "math domain error"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+#, c-format
+msgid "max_length must be 0-%d when fixed_length is %s"
+msgstr ""
+
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
 msgstr ""
@ -2059,10 +2083,6 @@ msgstr ""
 msgid "name '%q' is not defined"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c
-msgid "name must be a string"
-msgstr ""
-
 #: py/runtime.c
 msgid "name not defined"
 msgstr ""
@ -2104,16 +2124,17 @@ msgstr ""
 msgid "no module named '%q'"
 msgstr ""

-#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
+#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
+#: shared-bindings/displayio/ParallelBus.c
+msgid "no reset pin available"
+msgstr ""
+
+#: py/runtime.c
 msgid "no such attribute"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c
-msgid "non-Service found in services"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-msgid "non-UUID found in service_uuids"
+#: ports/nrf/common-hal/_bleio/Connection.c
+msgid "non-UUID found in service_uuids_whitelist"
 msgstr ""

 #: py/compile.c
@ -2132,7 +2153,7 @@ msgstr ""
 msgid "non-keyword arg after keyword arg"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "not a 128-bit UUID"
 msgstr ""

@ -2198,6 +2219,14 @@ msgstr ""
 msgid "offset out of bounds"
 msgstr ""

+#: ports/nrf/common-hal/audiobusio/PDMIn.c
+msgid "only bit_depth=16 is supported"
+msgstr ""
+
+#: ports/nrf/common-hal/audiobusio/PDMIn.c
+msgid "only sample_rate=16000 is supported"
+msgstr ""
+
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
@ -2281,10 +2310,6 @@ msgstr ""
 msgid "rawbuf is not the same size as buf"
 msgstr ""

-#: shared-bindings/_pixelbuf/__init__.c
-msgid "readonly attribute"
-msgstr ""
-
 #: py/builtinimport.c
 msgid "relative import"
 msgstr ""
@ -2425,15 +2450,11 @@ msgstr ""
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""

-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes exactly 1 argument"
-msgstr ""
-
 #: shared-bindings/busio/UART.c
-msgid "timeout >100 (units are now seconds, not msecs)"
+msgid "timeout must be 0.0-100.0 seconds"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "timeout must be >= 0.0"
 msgstr ""

@ -2586,14 +2607,10 @@ msgstr ""
 msgid "value_count must be > 0"
 msgstr ""

-#: shared-bindings/bleio/Scanner.c
+#: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""

-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "write_args must be a list, tuple, or None"
-msgstr ""
-
 #: py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
--- a/locale/en_x_pirate.po
+++ b/locale/en_x_pirate.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-05 17:52-0700\n"
+"POT-Creation-Date: 2020-01-07 14:31-0800\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: \n"
 "Language-Team: @sommersoft, @MrCertainly\n"
@ -25,6 +25,19 @@ msgstr ""
 "\n"
 "Captin's orders are complete. Holdin' fast fer reload.\n"

+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"Please file an issue with the contents of your CIRCUITPY drive at \n"
+"https://github.com/adafruit/circuitpython/issues\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"\n"
+"To exit, please reset the board without "
+msgstr ""
+
 #: py/obj.c
 msgid "  File \"%q\""
 msgstr ""
@ -54,8 +67,9 @@ msgstr ""
 msgid "%q indices must be integers, not %s"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
-#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
+#: shared-bindings/displayio/Shape.c
 msgid "%q must be >= 1"
 msgstr ""

@ -121,6 +135,10 @@ msgstr ""
 msgid "'%s' integer 0x%x does not fit in mask 0x%x"
 msgstr ""

+#: py/proto.c
+msgid "'%s' object does not support '%q'"
+msgstr ""
+
 #: py/obj.c
 #, c-format
 msgid "'%s' object does not support item assignment"
@ -219,12 +237,12 @@ msgstr ""
 msgid "A hardware interrupt channel is already in use"
 msgstr "Avast! A hardware interrupt channel be used already"

-#: shared-bindings/bleio/Address.c
+#: shared-bindings/_bleio/Address.c
 #, c-format
 msgid "Address must be %d bytes long"
 msgstr ""

-#: shared-bindings/bleio/Address.c
+#: shared-bindings/_bleio/Address.c
 msgid "Address type out of range"
 msgstr ""

@ -261,6 +279,10 @@ msgstr ""
 msgid "All timers in use"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Already advertising."
+msgstr ""
+
 #: ports/nrf/common-hal/analogio/AnalogOut.c
 msgid "AnalogOut functionality not supported"
 msgstr ""
@ -286,7 +308,7 @@ msgid "Array values should be single bytes."
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "Attempted heap allocation when MicroPython VM not running.\n"
+msgid "Attempted heap allocation when MicroPython VM not running."
 msgstr ""

 #: main.c
@ -301,6 +323,10 @@ msgstr ""
 "Auto-reload be on. Put yer files on USB to weigh anchor, er' bring'er about "
 "t' the REPL t' scuttle.\n"

+#: shared-module/displayio/Display.c
+msgid "Below minimum frame rate"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Bit clock and word select must share a clock unit"
 msgstr ""
@ -325,11 +351,24 @@ msgstr ""
 msgid "Brightness not adjustable"
 msgstr ""

+#: shared-bindings/_bleio/UUID.c
+#, c-format
+msgid "Buffer + offset too small %d %d %d"
+msgstr ""
+
 #: shared-module/usb_hid/Device.c
 #, c-format
 msgid "Buffer incorrect size. Should be %d bytes."
 msgstr ""

+#: shared-bindings/displayio/Display.c
+msgid "Buffer is not a bytearray."
+msgstr ""
+
+#: shared-bindings/displayio/Display.c
+msgid "Buffer is too small"
+msgstr ""
+
 #: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Buffer length %d too big. It must be less than %d"
@ -339,13 +378,17 @@ msgstr ""
 msgid "Buffer must be at least length 1"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/PacketBuffer.c
+msgid "Buffer too large and unable to allocate"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/displayio/ParallelBus.c
 #: ports/nrf/common-hal/displayio/ParallelBus.c
 #, c-format
 msgid "Bus pin %d is already in use"
 msgstr "Belay that! Bus pin %d already be in use"

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "Byte buffer must be 16 bytes."
 msgstr ""

@ -357,13 +400,8 @@ msgstr ""
 msgid "Call super().__init__() before accessing native object."
 msgstr ""

-#: shared-bindings/_pixelbuf/PixelBuf.c
-#, c-format
-msgid "Can not use dotstar with %s"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-msgid "Can't set CCCD for local Characteristic"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+msgid "Can't set CCCD on local Characteristic"
 msgstr ""

 #: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
@ -379,6 +417,10 @@ msgstr ""
 msgid "Cannot get temperature"
 msgstr ""

+#: shared-bindings/_bleio/Adapter.c
+msgid "Cannot have scan responses for extended, connectable advertisements."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "Cannot output both channels on the same pin"
 msgstr ""
@ -419,18 +461,20 @@ msgstr ""
 msgid "Cannot write without MOSI pin."
 msgstr ""

-#: shared-bindings/bleio/Service.c
-msgid "Characteristic UUID doesn't match Service UUID"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Service.c
-msgid "Characteristic already in use by another Service."
-msgstr ""
-
-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "CharacteristicBuffer writing not provided"
 msgstr ""

+#: supervisor/shared/safe_mode.c
+msgid "CircuitPython core code crashed hard. Whoops!\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"CircuitPython is in safe mode because you pressed the reset button during "
+"boot. Press again to exit safe mode.\n"
+msgstr ""
+
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."
 msgstr ""
@ -455,6 +499,12 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""

+#: shared-bindings/_bleio/Connection.c
+msgid ""
+"Connection has been disconnected and can no longer be used. Create a new "
+"connection."
+msgstr ""
+
 #: py/persistentcode.c
 msgid "Corrupt .mpy file"
 msgstr ""
@ -463,25 +513,30 @@ msgstr ""
 msgid "Corrupt raw code"
 msgstr ""

-#: ports/nrf/common-hal/bleio/UUID.c
-#, c-format
-msgid "Could not decode ble_uuid, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c
 msgid "Could not initialize UART"
 msgstr ""

-#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
+#: shared-module/audiomp3/MP3File.c
+msgid "Couldn't allocate decoder"
+msgstr ""
+
+#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
+#: shared-module/audiomp3/MP3File.c
 msgid "Couldn't allocate first buffer"
 msgstr ""

-#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
+#: shared-module/audiomp3/MP3File.c
+msgid "Couldn't allocate input buffer"
+msgstr ""
+
+#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
+#: shared-module/audiomp3/MP3File.c
 msgid "Couldn't allocate second buffer"
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "Crash into the HardFault_Handler.\n"
+msgid "Crash into the HardFault_Handler."
 msgstr ""

 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
@ -497,7 +552,7 @@ msgstr ""
 msgid "Data chunk must follow fmt chunk"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
+#: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Data too large for advertisement packet"
 msgstr ""

@ -505,7 +560,16 @@ msgstr ""
 msgid "Destination capacity is smaller than destination_length."
 msgstr ""

+#: ports/nrf/common-hal/audiobusio/I2SOut.c
+msgid "Device in use"
+msgstr ""
+
 #: shared-bindings/displayio/Display.c
+msgid "Display must have a 16 bit colorspace."
+msgstr ""
+
+#: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Display rotation must be in 90 degree increments"
 msgstr ""

@ -529,16 +593,25 @@ msgstr ""
 msgid "Expected a %q"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
 msgid "Expected a Characteristic"
 msgstr ""

-#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
-#: shared-bindings/bleio/Service.c
+#: shared-bindings/_pixelbuf/__init__.c
+msgid "Expected a PixelBuf instance"
+msgstr ""
+
+#: shared-bindings/_bleio/Characteristic.c
+msgid "Expected a Service"
+msgstr ""
+
+#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
+#: shared-bindings/_bleio/Service.c
 msgid "Expected a UUID"
 msgstr ""

-#: shared-bindings/bleio/Central.c
+#: shared-bindings/_bleio/Adapter.c
 msgid "Expected an Address"
 msgstr ""

@ -556,16 +629,6 @@ msgstr ""
 msgid "Failed to acquire mutex, err 0x%04x"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Service.c
-#, c-format
-msgid "Failed to add characteristic, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to add service, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 msgid "Failed to allocate RX buffer"
 msgstr ""
@ -576,59 +639,16 @@ msgstr ""
 msgid "Failed to allocate RX buffer of %d bytes"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to change softdevice state"
+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Failed to connect: internal error"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to configure advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
+#: ports/nrf/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Scanner.c
-#, c-format
-msgid "Failed to continue scanning, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-msgid "Failed to discover services"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to get local address"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Adapter.c
-msgid "Failed to get softdevice state"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to notify or indicate attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read CCCD value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to read gatts value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/UUID.c
-#, c-format
-msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
+#: shared-module/audiomp3/MP3File.c
+msgid "Failed to parse MP3 file"
 msgstr ""

 #: ports/nrf/sd_mutex.c
@ -636,68 +656,18 @@ msgstr ""
 msgid "Failed to release mutex, err 0x%04x"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to set device name, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to start advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-#, c-format
-msgid "Failed to start connecting, error 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Scanner.c
-#, c-format
-msgid "Failed to start scanning, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Peripheral.c
-#, c-format
-msgid "Failed to stop advertising, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write CCCD, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write attribute value, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Characteristic.c
-#, c-format
-msgid "Failed to write gatts value, err 0x%04x"
+#: supervisor/shared/safe_mode.c
+msgid "Failed to write internal flash."
 msgstr ""

 #: py/moduerrno.c
 msgid "File exists"
 msgstr ""

-#: ports/nrf/peripherals/nrf/nvm.c
-msgid "Flash erase failed"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
-#, c-format
-msgid "Flash erase failed to start, err 0x%04x"
-msgstr ""
-
-#: ports/nrf/peripherals/nrf/nvm.c
+#: ports/nrf/common-hal/nvm/ByteArray.c
 msgid "Flash write failed"
 msgstr ""

-#: ports/nrf/peripherals/nrf/nvm.c
-#, c-format
-msgid "Flash write failed to start, err 0x%04x"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Frequency captured is above capability. Capture Paused."
 msgstr ""
@ -708,6 +678,7 @@ msgid "Function requires lock"
 msgstr ""

 #: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Group already used"
 msgstr ""

@ -737,6 +708,14 @@ msgstr ""
 msgid "Input/output error"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid "Insufficient authentication"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid "Insufficient encryption"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 msgid "Invalid %q pin"
@ -763,11 +742,15 @@ msgstr ""
 msgid "Invalid buffer size"
 msgstr ""

+#: shared-bindings/_pixelbuf/PixelBuf.c
+msgid "Invalid byteorder string"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
 msgid "Invalid capture period. Valid range: 1 - 500"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Invalid channel count"
 msgstr ""

@ -817,11 +800,23 @@ msgstr ""
 msgid "Invalid polarity"
 msgstr ""

+#: shared-bindings/_bleio/Characteristic.c
+msgid "Invalid properties"
+msgstr ""
+
 #: shared-bindings/microcontroller/__init__.c
 msgid "Invalid run mode."
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-module/_bleio/Attribute.c
+msgid "Invalid security_mode"
+msgstr ""
+
+#: shared-bindings/audiomixer/Mixer.c
+msgid "Invalid voice"
+msgstr ""
+
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Invalid voice count"
 msgstr ""

@ -849,13 +844,6 @@ msgstr ""
 msgid "Length must be non-negative"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid ""
-"Looks like our core CircuitPython code crashed hard. Whoops!\n"
-"Please file an issue at https://github.com/adafruit/circuitpython/issues\n"
-" with the contents of your CIRCUITPY drive and this message:\n"
-msgstr ""
-
 #: shared-module/bitbangio/SPI.c
 msgid "MISO pin init failed."
 msgstr ""
@ -870,11 +858,11 @@ msgid "Maximum x value when mirrored is %d"
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "MicroPython NLR jump failed. Likely memory corruption.\n"
+msgid "MicroPython NLR jump failed. Likely memory corruption."
 msgstr ""

 #: supervisor/shared/safe_mode.c
-msgid "MicroPython fatal error.\n"
+msgid "MicroPython fatal error."
 msgstr ""

 #: shared-bindings/audiobusio/PDMIn.c
@ -885,7 +873,11 @@ msgstr ""
 msgid "Must be a %q subclass."
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
+#: shared-bindings/_pixelbuf/PixelBuf.c
+msgid "Negative step not supported"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/Characteristic.c
 msgid "No CCCD for this Characteristic"
 msgstr ""

@ -931,6 +923,10 @@ msgstr ""
 msgid "No hardware support on pin"
 msgstr ""

+#: shared-module/touchio/TouchIn.c
+msgid "No pulldown on pin; 1Mohm recommended"
+msgstr ""
+
 #: py/moduerrno.c
 msgid "No space left on device"
 msgstr ""
@ -939,8 +935,12 @@ msgstr ""
 msgid "No such file/directory"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: supervisor/shared/safe_mode.c
+msgid "Nordic Soft Device failure assertion."
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "Not connected"
 msgstr ""

@ -971,12 +971,8 @@ msgstr ""
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
-"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
-"given"
-msgstr ""
-
-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "Only slices with step=1 (aka None) are supported"
+"Only monochrome, indexed 4bpp or 8bpp, and 16bpp or greater BMPs supported: "
+"%d bpp given"
 msgstr ""

 #: shared-bindings/audiobusio/PDMIn.c
@ -1014,6 +1010,10 @@ msgstr ""
 msgid "Pop from an empty Ps2 buffer"
 msgstr ""

+#: shared-bindings/_bleio/Adapter.c
+msgid "Prefix buffer must be on the heap"
+msgstr ""
+
 #: main.c
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
@ -1046,6 +1046,10 @@ msgstr ""
 msgid "Read-only object"
 msgstr ""

+#: shared-bindings/displayio/EPaperDisplay.c
+msgid "Refresh too soon"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "Right channel unsupported"
 msgstr ""
@ -1062,20 +1066,23 @@ msgstr "Runnin' in safe mode! Auto-reload be off.\n"
 msgid "Running in safe mode! Not running saved code.\n"
 msgstr "Runnin' in safe mode! Nay runnin' saved code.\n"

-#: ports/atmel-samd/common-hal/busio/I2C.c
+#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
 msgid "SDA or SCL needs a pull up"
 msgstr ""

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "Sample rate must be positive"
 msgstr ""

 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
-#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c
 #, c-format
 msgid "Sample rate too high. It must be less than %d"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Adapter.c
+msgid "Scan already in progess. Stop with stop_scan."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 #: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
 msgid "Serializer in use"
@ -1090,11 +1097,6 @@ msgstr ""
 msgid "Slices not supported"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Adapter.c
-#, c-format
-msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
-msgstr ""
-
 #: extmod/modure.c
 msgid "Splitting with sub-captures"
 msgstr ""
@ -1110,10 +1112,7 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
-"Please increase stack size limits and press reset (after ejecting "
-"CIRCUITPY).\n"
-"If you didn't change the stack, then file an issue here with the contents of "
-"your CIRCUITPY drive:\n"
+"Please increase the stack size if you know how, or if not:"
 msgstr ""

 #: supervisor/shared/safe_mode.c
@ -1124,31 +1123,24 @@ msgstr ""

 #: supervisor/shared/safe_mode.c
 msgid ""
-"The microcontroller's power dipped. Please make sure your power supply "
-"provides\n"
+"The microcontroller's power dipped. Make sure your power supply provides\n"
 "enough power for the whole circuit and press reset (after ejecting "
 "CIRCUITPY).\n"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid ""
-"The reset button was pressed while booting CircuitPython. Press again to "
-"exit safe mode.\n"
-msgstr ""
-
-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's bits_per_sample does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's channel count does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's sample rate does not match the mixer's"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
+#: shared-module/audiomixer/MixerVoice.c
 msgid "The sample's signedness does not match the mixer's"
 msgstr ""

@ -1156,11 +1148,11 @@ msgstr ""
 msgid "Tile height must exactly divide bitmap height"
 msgstr ""

-#: shared-bindings/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
 msgid "Tile index out of bounds"
 msgstr ""

-#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
+#: shared-bindings/displayio/TileGrid.c
 msgid "Tile value out of bounds"
 msgstr ""

@ -1168,10 +1160,6 @@ msgstr ""
 msgid "Tile width must exactly divide bitmap width"
 msgstr ""

-#: supervisor/shared/safe_mode.c
-msgid "To exit, please reset the board without "
-msgstr ""
-
 #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
 msgid "Too many channels in sample."
 msgstr ""
@ -1182,6 +1170,7 @@ msgid "Too many display busses"
 msgstr ""

 #: shared-bindings/displayio/Display.c
+#: shared-bindings/displayio/EPaperDisplay.c
 msgid "Too many displays"
 msgstr ""

@ -1201,15 +1190,15 @@ msgstr ""
 msgid "USB Error"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID integer value must be 0-0xffff"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "UUID value is not str, int or byte buffer"
 msgstr ""

@ -1240,20 +1229,45 @@ msgstr ""
 msgid "Unable to write to nvm."
 msgstr ""

-#: ports/nrf/common-hal/bleio/UUID.c
+#: ports/nrf/common-hal/_bleio/UUID.c
 msgid "Unexpected nrfx uuid type"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown gatt error: 0x%04x"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid "Unknown reason."
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown security error: 0x%04x"
+msgstr ""
+
+#: ports/nrf/common-hal/_bleio/__init__.c
+#, c-format
+msgid "Unknown soft device error: %04x"
+msgstr ""
+
 #: shared-bindings/_pixelbuf/PixelBuf.c
 #, c-format
 msgid "Unmatched number of items on RHS (expected %d, got %d)."
 msgstr ""

+#: ports/nrf/common-hal/_bleio/__init__.c
+msgid ""
+"Unspecified issue. Can be that the pairing prompt on the other device was "
+"declined or ignored."
+msgstr ""
+
 #: ports/atmel-samd/common-hal/busio/I2C.c
 msgid "Unsupported baudrate"
 msgstr ""

-#: shared-module/displayio/Display.c
+#: shared-module/displayio/display_core.c
 msgid "Unsupported display bus type"
 msgstr ""

@ -1269,12 +1283,18 @@ msgstr ""
 msgid "Unsupported pull value."
 msgstr ""

-#: py/emitnative.c
-msgid "Viper functions don't currently support more than 4 arguments"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+msgid "Value length != required fixed length"
 msgstr ""

-#: shared-module/audiocore/Mixer.c
-msgid "Voice index too high"
+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+msgid "Value length > max_length"
+msgstr ""
+
+#: py/emitnative.c
+msgid "Viper functions don't currently support more than 4 arguments"
 msgstr ""

 #: main.c
@ -1291,9 +1311,12 @@ msgid ""
 "To list built-in modules please do `help(\"modules\")`.\n"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/PacketBuffer.c
+msgid "Writes not supported on Characteristic"
+msgstr ""
+
 #: supervisor/shared/safe_mode.c
-msgid ""
-"You are running in safe mode which means something unanticipated happened.\n"
+msgid "You are in safe mode: something unanticipated happened.\n"
 msgstr ""

 #: supervisor/shared/safe_mode.c
@ -1359,10 +1382,6 @@ msgstr ""
 msgid "attributes not supported yet"
 msgstr ""

-#: ports/nrf/common-hal/bleio/Characteristic.c
-msgid "bad GATT role"
-msgstr ""
-
 #: py/builtinevex.c
 msgid "bad compile mode"
 msgstr ""
@ -1391,7 +1410,7 @@ msgstr ""
 msgid "bits must be 8"
 msgstr "pieces must be of 8"

-#: shared-bindings/audiocore/Mixer.c
+#: shared-bindings/audiomixer/Mixer.c
 msgid "bits_per_sample must be 8 or 16"
 msgstr ""

@ -1434,8 +1453,7 @@ msgid "byte code not implemented"
 msgstr ""

 #: shared-bindings/_pixelbuf/PixelBuf.c
-#, c-format
-msgid "byteorder is not an instance of ByteOrder (got a %s)"
+msgid "byteorder is not a string"
 msgstr ""

 #: ports/atmel-samd/common-hal/busio/UART.c
@ -1615,10 +1633,6 @@ msgstr ""
 msgid "casting"
 msgstr ""

-#: shared-bindings/bleio/Service.c
-msgid "characteristics includes an object that is not a Characteristic"
-msgstr ""
-
 #: shared-bindings/_stage/Text.c
 msgid "chars buffer too small"
 msgstr ""
@ -1766,7 +1780,7 @@ msgstr ""
 msgid "extra positional arguments given"
 msgstr ""

-#: shared-bindings/audiocore/WaveFile.c
+#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
 #: shared-bindings/displayio/OnDiskBitmap.c
 msgid "file must be a file opened in byte mode"
 msgstr ""
@ -1896,7 +1910,7 @@ msgstr ""
 msgid "integer required"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c shared-bindings/bleio/Scanner.c
+#: shared-bindings/_bleio/Adapter.c
 #, c-format
 msgid "interval must be in range %s-%s"
 msgstr ""
@ -1990,6 +2004,10 @@ msgstr ""
 msgid "length argument not allowed for this type"
 msgstr ""

+#: shared-bindings/audiomixer/MixerVoice.c
+msgid "level must be between 0 and 1"
+msgstr ""
+
 #: py/objarray.c
 msgid "lhs and rhs should be compatible"
 msgstr ""
@ -2018,6 +2036,12 @@ msgstr ""
 msgid "math domain error"
 msgstr ""

+#: ports/nrf/common-hal/_bleio/Characteristic.c
+#: ports/nrf/common-hal/_bleio/Descriptor.c
+#, c-format
+msgid "max_length must be 0-%d when fixed_length is %s"
+msgstr ""
+
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
 msgstr ""
@ -2063,10 +2087,6 @@ msgstr ""
 msgid "name '%q' is not defined"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c
-msgid "name must be a string"
-msgstr ""
-
 #: py/runtime.c
 msgid "name not defined"
 msgstr ""
@ -2108,16 +2128,17 @@ msgstr ""
 msgid "no module named '%q'"
 msgstr ""

-#: py/runtime.c shared-bindings/_pixelbuf/__init__.c
+#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
+#: shared-bindings/displayio/ParallelBus.c
+msgid "no reset pin available"
+msgstr ""
+
+#: py/runtime.c
 msgid "no such attribute"
 msgstr ""

-#: shared-bindings/bleio/Peripheral.c
-msgid "non-Service found in services"
-msgstr ""
-
-#: ports/nrf/common-hal/bleio/Central.c
-msgid "non-UUID found in service_uuids"
+#: ports/nrf/common-hal/_bleio/Connection.c
+msgid "non-UUID found in service_uuids_whitelist"
 msgstr ""

 #: py/compile.c
@ -2136,7 +2157,7 @@ msgstr ""
 msgid "non-keyword arg after keyword arg"
 msgstr ""

-#: shared-bindings/bleio/UUID.c
+#: shared-bindings/_bleio/UUID.c
 msgid "not a 128-bit UUID"
 msgstr ""

@ -2202,6 +2223,14 @@ msgstr ""
 msgid "offset out of bounds"
 msgstr ""

+#: ports/nrf/common-hal/audiobusio/PDMIn.c
+msgid "only bit_depth=16 is supported"
+msgstr ""
+
+#: ports/nrf/common-hal/audiobusio/PDMIn.c
+msgid "only sample_rate=16000 is supported"
+msgstr ""
+
 #: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
 #: shared-bindings/nvm/ByteArray.c
 msgid "only slices with step=1 (aka None) are supported"
@ -2285,10 +2314,6 @@ msgstr ""
 msgid "rawbuf is not the same size as buf"
 msgstr ""

-#: shared-bindings/_pixelbuf/__init__.c
-msgid "readonly attribute"
-msgstr ""
-
 #: py/builtinimport.c
 msgid "relative import"
 msgstr ""
@ -2429,15 +2454,11 @@ msgstr ""
 msgid "time.struct_time() takes a 9-sequence"
 msgstr ""

-#: shared-bindings/time/__init__.c
-msgid "time.struct_time() takes exactly 1 argument"
-msgstr ""
-
 #: shared-bindings/busio/UART.c
-msgid "timeout >100 (units are now seconds, not msecs)"
+msgid "timeout must be 0.0-100.0 seconds"
 msgstr ""

-#: shared-bindings/bleio/CharacteristicBuffer.c
+#: shared-bindings/_bleio/CharacteristicBuffer.c
 msgid "timeout must be >= 0.0"
 msgstr ""

@ -2590,14 +2611,10 @@ msgstr ""
 msgid "value_count must be > 0"
 msgstr ""

-#: shared-bindings/bleio/Scanner.c
+#: shared-bindings/_bleio/Adapter.c
 msgid "window must be <= interval"
 msgstr ""

-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "write_args must be a list, tuple, or None"
-msgstr ""
-
 #: py/objstr.c
 msgid "wrong number of arguments"
 msgstr ""
--- a/locale/es.po
+++ b/locale/es.po
--- a/locale/fil.po
+++ b/locale/fil.po
--- a/locale/fr.po
+++ b/locale/fr.po
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
--- a/locale/ko.po
+++ b/locale/ko.po
--- a/locale/pl.po
+++ b/locale/pl.po
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
--- a/main.c
+++ b/main.c
@ -69,6 +69,11 @@
 #include "shared-module/board/__init__.h"
 #endif

+#if CIRCUITPY_BLEIO
+#include "shared-bindings/_bleio/__init__.h"
+#include "supervisor/shared/bluetooth.h"
+#endif
+
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
    mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
    if (lex == NULL) {
@ -199,7 +204,7 @@ void cleanup_after_vm(supervisor_allocation* heap) {

 bool run_code_py(safe_mode_t safe_mode) {
    bool serial_connected_at_start = serial_connected();
-    #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS
+    #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
    if (serial_connected_at_start) {
        serial_write("\n");
        if (autoreload_is_enabled()) {
@ -253,12 +258,13 @@ bool run_code_py(safe_mode_t safe_mode) {
    }

    bool serial_connected_before_animation = false;
+    #if CIRCUITPY_DISPLAYIO
+    bool refreshed_epaper_display = false;
+    #endif
    rgb_status_animation_t animation;
    prep_rgb_status_animation(&result, found_main, safe_mode, &animation);
    while (true) {
-        #ifdef MICROPY_VM_HOOK_LOOP
-            MICROPY_VM_HOOK_LOOP
-        #endif
+        RUN_BACKGROUND_TASKS;
        if (reload_requested) {
            reload_requested = false;
            return true;
@ -290,6 +296,13 @@ bool run_code_py(safe_mode_t safe_mode) {
        }
        serial_connected_before_animation = serial_connected();

+        // Refresh the ePaper display if we have one. That way it'll show an error message.
+        #if CIRCUITPY_DISPLAYIO
+        if (!refreshed_epaper_display) {
+            refreshed_epaper_display = maybe_refresh_epaperdisplay();
+        }
+        #endif
+
        tick_rgb_status_animation(&animation);
    }
 }
@ -429,6 +442,10 @@ int __attribute__((used)) main(void) {
    // Start serial and HID after giving boot.py a chance to tweak behavior.
    serial_init();

+    #if CIRCUITPY_BLEIO
+    supervisor_start_bluetooth();
+    #endif
+
    // Boot script is finished, so now go into REPL/main mode.
    int exit_code = PYEXEC_FORCED_EXIT;
    bool skip_repl = true;
@ -465,9 +482,13 @@ void gc_collect(void) {
    displayio_gc_collect();
    #endif

+    #if CIRCUITPY_BLEIO
+    common_hal_bleio_gc_collect();
+    #endif
+
    // This naively collects all object references from an approximate stack
    // range.
-    gc_collect_root((void**)sp, ((uint32_t)&_estack - sp) / sizeof(uint32_t));
+    gc_collect_root((void**)sp, ((uint32_t)port_stack_get_top() - sp) / sizeof(uint32_t));
    gc_collect_end();
 }

--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@ -122,7 +122,16 @@ else
  ifdef CFLAGS_INLINE_LIMIT
    CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT)
  endif
+
  CFLAGS += -flto -flto-partition=none
+
+  ifeq ($(CIRCUITPY_SMALL_BUILD),1)
+    CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20
+  endif
+
+  ifdef CFLAGS_BOARD
+    CFLAGS += $(CFLAGS_BOARD)
+  endif
 endif

 CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT)
@ -148,7 +157,7 @@ endif



-LDFLAGS = $(CFLAGS) -nostartfiles -fshort-enums -Wl,-nostdlib -Wl,-T,$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
+LDFLAGS = $(CFLAGS) -nostartfiles -fshort-enums -Wl,-nostdlib -Wl,-T,$(GENERATED_LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nano.specs
 LIBS := -lgcc -lc

 # Use toolchain libm if we're not using our own.
@ -224,7 +233,7 @@ SRC_C = \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/option/ccsbcs.c \
 	lib/timeutils/timeutils.c \
-	lib/tinyusb/src/portable/microchip/$(CHIP_FAMILY)/dcd_$(CHIP_FAMILY).c \
+	lib/tinyusb/src/portable/microchip/samd/dcd_samd.c \
 	lib/utils/buffer_helper.c \
 	lib/utils/context_manager_helpers.c \
 	lib/utils/interrupt_char.c \
@ -289,14 +298,20 @@ SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \
                          $(addprefix common-hal/, $(SRC_COMMON_HAL))

 SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \
-                             $(addprefix shared-module/, $(SRC_SHARED_MODULE))
+                             $(addprefix shared-module/, $(SRC_SHARED_MODULE)) \
+                             $(addprefix shared-module/, $(SRC_SHARED_MODULE_INTERNAL))
+
+# There may be duplicates between SRC_COMMON_HAL_EXPANDED and SRC_SHARED_MODULE_EXPANDED,
+# because a few modules have files both in common-hal/ and shared-modules/.
+# Doing a $(sort ...) removes duplicates as part of sorting.
+SRC_COMMON_HAL_SHARED_MODULE_EXPANDED = $(sort $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED))
+

 SRC_S = supervisor/$(CHIP_FAMILY)_cpu.s

 OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_ASF:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
-OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
+OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
 ifeq ($(INTERNAL_LIBM),1)
 OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
 endif
@ -309,10 +324,10 @@ SRC_QSTR_PREPROCESSOR += peripherals/samd/$(CHIP_FAMILY)/clocks.c

 all: $(BUILD)/firmware.bin $(BUILD)/firmware.uf2

-$(BUILD)/firmware.elf: $(OBJ)
+$(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
 	$(STEPECHO) "LINK $@"
-	$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
-	$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(LD_FILE)
+	$(Q)$(CC) -o $@ $(LDFLAGS) $(OBJ) -Wl,--start-group $(LIBS) -Wl,--end-group
+	$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)

 $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 	$(STEPECHO) "Create $@"
--- a/ports/atmel-samd/asf4_conf/samd51/hpl_dac_config.h
+++ b/ports/atmel-samd/asf4_conf/samd51/hpl_dac_config.h
@ -51,7 +51,7 @@
 // <i> This defines the current in output buffer according to conversion rate
 // <id> dac0_arch_cctrl
 #ifndef CONF_DAC0_CCTRL
-#define CONF_DAC0_CCTRL 1
+#define CONF_DAC0_CCTRL 0
 #endif

 // <q> Run in standby
@ -90,7 +90,7 @@
 // <i> This defines the current in output buffer according to conversion rate
 // <id> dac1_arch_cctrl
 #ifndef CONF_DAC1_CCTRL
-#define CONF_DAC1_CCTRL 1
+#define CONF_DAC1_CCTRL 0
 #endif

 // <q> Run in standby
--- a/ports/atmel-samd/asf4_conf/samd51/hpl_gclk_config.h
+++ b/ports/atmel-samd/asf4_conf/samd51/hpl_gclk_config.h
@ -1,8 +1,9 @@
 // Circuit Python SAMD51 clock tree:
-// DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5
+// DFLL48M (with USBCRM on to sync with external USB ref) -> GCLK1, GCLK5, GCLK6
 //   GCLK1 (48MHz) -> 48 MHz peripherals
-//   GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0, DAC peripherals
+//   GCLK5 (48 MHz divided down to 2 MHz) -> DPLL0
 //     DPLL0 (multiplied up to 120 MHz) -> GCLK0, GCLK4 (output for monitoring)
+//   GCLK6 (48 MHz divided down to 12 MHz) -> DAC

 // We'd like to use XOSC32K as a ref for DFLL48M on boards with a 32kHz crystal,
 // but haven't figured that out yet.
@ -472,7 +473,7 @@
 // <i> Indicates whether generic clock 6 configuration is enabled or not
 // <id> enable_gclk_gen_6
 #ifndef CONF_GCLK_GENERATOR_6_CONFIG
-#define CONF_GCLK_GENERATOR_6_CONFIG 0
+#define CONF_GCLK_GENERATOR_6_CONFIG 1
 #endif

 // <h> Generic Clock Generator Control
@ -488,7 +489,7 @@
 // <i> This defines the clock source for generic clock generator 6
 // <id> gclk_gen_6_oscillator
 #ifndef CONF_GCLK_GEN_6_SOURCE
-#define CONF_GCLK_GEN_6_SOURCE GCLK_GENCTRL_SRC_XOSC1
+#define CONF_GCLK_GEN_6_SOURCE GCLK_GENCTRL_SRC_DFLL
 #endif

 // <q> Run in Standby
@ -523,14 +524,14 @@
 // <i> Indicates whether Improve Duty Cycle is enabled or not
 // <id> gclk_arch_gen_6_idc
 #ifndef CONF_GCLK_GEN_6_IDC
-#define CONF_GCLK_GEN_6_IDC 0
+#define CONF_GCLK_GEN_6_IDC 1
 #endif

 // <q> Generic Clock Generator Enable
 // <i> Indicates whether Generic Clock Generator Enable is enabled or not
 // <id> gclk_arch_gen_6_enable
 #ifndef CONF_GCLK_GEN_6_GENEN
-#define CONF_GCLK_GEN_6_GENEN 0
+#define CONF_GCLK_GEN_6_GENEN 1
 #endif
 // </h>

@ -538,7 +539,7 @@
 //<o> Generic clock generator 6 division <0x0000-0xFFFF>
 // <id> gclk_gen_6_div
 #ifndef CONF_GCLK_GEN_6_DIV
-#define CONF_GCLK_GEN_6_DIV 1
+#define CONF_GCLK_GEN_6_DIV 4
 #endif
 // </h>
 // </e>
--- a/ports/atmel-samd/asf4_conf/samd51/peripheral_clk_config.h
+++ b/ports/atmel-samd/asf4_conf/samd51/peripheral_clk_config.h
@ -73,7 +73,7 @@
 // <id> dac_gclk_selection
 // <i> Select the clock source for DAC.
 #ifndef CONF_GCLK_DAC_SRC
-#define CONF_GCLK_DAC_SRC GCLK_PCHCTRL_GEN_GCLK5_Val
+#define CONF_GCLK_DAC_SRC GCLK_PCHCTRL_GEN_GCLK6_Val
 #endif

 /**
--- a/ports/atmel-samd/audio_dma.c
+++ b/ports/atmel-samd/audio_dma.c
@ -35,19 +35,43 @@
 #include "py/mpstate.h"
 #include "py/runtime.h"

+#if CIRCUITPY_AUDIOIO || CIRCUITPY_AUDIOBUSIO
+
 static audio_dma_t* audio_dma_state[AUDIO_DMA_CHANNEL_COUNT];

 // This cannot be in audio_dma_state because it's volatile.
 static volatile bool audio_dma_pending[AUDIO_DMA_CHANNEL_COUNT];

-uint8_t find_free_audio_dma_channel(void) {
+static bool audio_dma_allocated[AUDIO_DMA_CHANNEL_COUNT];
+
+uint8_t audio_dma_allocate_channel(void) {
    uint8_t channel;
    for (channel = 0; channel < AUDIO_DMA_CHANNEL_COUNT; channel++) {
-        if (!dma_channel_enabled(channel)) {
+        if (!audio_dma_allocated[channel]) {
+            audio_dma_allocated[channel] = true;
            return channel;
        }
    }
-    return channel;
+    return channel; // i.e., return failure
+}
+
+void audio_dma_free_channel(uint8_t channel) {
+    assert(channel < AUDIO_DMA_CHANNEL_COUNT);
+    assert(audio_dma_allocated[channel]);
+    audio_dma_disable_channel(channel);
+    audio_dma_allocated[channel] = false;
+}
+
+void audio_dma_disable_channel(uint8_t channel) {
+    if (channel >= AUDIO_DMA_CHANNEL_COUNT)
+        return;
+    dma_disable_channel(channel);
+}
+
+void audio_dma_enable_channel(uint8_t channel) {
+    if (channel >= AUDIO_DMA_CHANNEL_COUNT)
+        return;
+    dma_enable_channel(channel);
 }

 void audio_dma_convert_signed(audio_dma_t* dma, uint8_t* buffer, uint32_t buffer_length,
@ -153,7 +177,7 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t* dma,
                              bool output_signed,
                              uint32_t output_register_address,
                              uint8_t dma_trigger_source) {
-    uint8_t dma_channel = find_free_audio_dma_channel();
+    uint8_t dma_channel = audio_dma_allocate_channel();
    if (dma_channel >= AUDIO_DMA_CHANNEL_COUNT) {
        return AUDIO_DMA_DMA_BUSY;
    }
@ -252,16 +276,20 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t* dma,
    }

    dma_configure(dma_channel, dma_trigger_source, true);
-    dma_enable_channel(dma_channel);
+    audio_dma_enable_channel(dma_channel);

    return AUDIO_DMA_OK;
 }

 void audio_dma_stop(audio_dma_t* dma) {
-    dma_disable_channel(dma->dma_channel);
-    disable_event_channel(dma->event_channel);
-    MP_STATE_PORT(playing_audio)[dma->dma_channel] = NULL;
-
+    uint8_t channel = dma->dma_channel;
+    if (channel < AUDIO_DMA_CHANNEL_COUNT) {
+        audio_dma_disable_channel(channel);
+        disable_event_channel(dma->event_channel);
+        MP_STATE_PORT(playing_audio)[channel] = NULL;
+        audio_dma_state[channel] = NULL;
+        audio_dma_free_channel(dma->dma_channel);
+    }
    dma->dma_channel = AUDIO_DMA_CHANNEL_COUNT;
 }

@ -290,7 +318,8 @@ void audio_dma_reset(void) {
    for (uint8_t i = 0; i < AUDIO_DMA_CHANNEL_COUNT; i++) {
        audio_dma_state[i] = NULL;
        audio_dma_pending[i] = false;
-        dma_disable_channel(i);
+        audio_dma_allocated[i] = false;
+        audio_dma_disable_channel(i);
        dma_descriptor(i)->BTCTRL.bit.VALID = false;
        MP_STATE_PORT(playing_audio)[i] = NULL;
    }
@ -333,3 +362,4 @@ void audio_dma_background(void) {
        audio_dma_pending[i] = false;
    }
 }
+#endif
--- a/ports/atmel-samd/audio_dma.h
+++ b/ports/atmel-samd/audio_dma.h
@ -64,7 +64,8 @@ uint8_t audiosample_channel_count(mp_obj_t sample_obj);
 void audio_dma_init(audio_dma_t* dma);
 void audio_dma_reset(void);

-uint8_t find_free_audio_dma_channel(void);
+uint8_t audio_dma_allocate_channel(void);
+void audio_dma_free_channel(uint8_t channel);

 // This sets everything up but doesn't start the timer.
 // Sample is the python object for the sample to play.
@ -83,6 +84,9 @@ audio_dma_result audio_dma_setup_playback(audio_dma_t* dma,
                                          bool output_signed,
                                          uint32_t output_register_address,
                                          uint8_t dma_trigger_source);
+
+void audio_dma_disable_channel(uint8_t channel);
+void audio_dma_enable_channel(uint8_t channel);
 void audio_dma_stop(audio_dma_t* dma);
 bool audio_dma_get_playing(audio_dma_t* dma);
 void audio_dma_pause(audio_dma_t* dma);
--- a/ports/atmel-samd/background.c
+++ b/ports/atmel-samd/background.c
@ -28,6 +28,7 @@
 #include "audio_dma.h"
 #include "tick.h"
 #include "supervisor/filesystem.h"
+#include "supervisor/shared/tick.h"
 #include "supervisor/usb.h"

 #include "py/runtime.h"
@ -44,6 +45,23 @@ bool stack_ok_so_far = true;

 static bool running_background_tasks = false;

+#ifdef MONITOR_BACKGROUND_TASKS
+// PB03 is physical pin "SCL" on the Metro M4 express
+// so you can't use this code AND an i2c peripheral
+// at the same time unless you change this
+STATIC void start_background_task(void) {
+    REG_PORT_DIRSET1 = (1<<3);
+    REG_PORT_OUTSET1 = (1<<3);
+}
+
+STATIC void finish_background_task(void) {
+    REG_PORT_OUTCLR1 = (1<<3);
+}
+#else
+STATIC void start_background_task(void) {}
+STATIC void finish_background_task(void) {}
+#endif
+
 void background_tasks_reset(void) {
    running_background_tasks = false;
 }
@ -53,14 +71,17 @@ void run_background_tasks(void) {
    if (running_background_tasks) {
        return;
    }
+
+    start_background_task();
+
    assert_heap_ok();
    running_background_tasks = true;

-    #if (defined(SAMD21) && defined(PIN_PA02)) || defined(SAMD51)
+    #if CIRCUITPY_AUDIOIO || CIRCUITPY_AUDIOBUSIO
    audio_dma_background();
    #endif
    #if CIRCUITPY_DISPLAYIO
-    displayio_refresh_displays();
+    displayio_background();
    #endif

    #if CIRCUITPY_NETWORK
@ -71,9 +92,10 @@ void run_background_tasks(void) {
    running_background_tasks = false;
    assert_heap_ok();

-    last_finished_tick = ticks_ms;
+    last_finished_tick = supervisor_ticks_ms64();
+    finish_background_task();
 }

 bool background_tasks_ok(void) {
-    return ticks_ms - last_finished_tick < 1000;
+    return supervisor_ticks_ms64() - last_finished_tick < 1000;
 }
--- a/ports/atmel-samd/bindings/samd/Clock.c
+++ b/ports/atmel-samd/bindings/samd/Clock.c
@ -163,3 +163,263 @@ const mp_obj_type_t samd_clock_type = {
    .print = samd_clock_print,
    .locals_dict = (mp_obj_t)&samd_clock_locals_dict,
 };
+
+#ifdef SAMD21
+
+#ifdef SAMD21_EXPOSE_ALL_CLOCKS
+CLOCK_SOURCE(XOSC);
+CLOCK_SOURCE(GCLKIN);
+CLOCK_SOURCE(GCLKGEN1);
+CLOCK_SOURCE(OSCULP32K);
+#endif
+CLOCK_SOURCE(OSC32K);
+CLOCK_SOURCE(XOSC32K);
+#ifdef SAMD21_EXPOSE_ALL_CLOCKS
+CLOCK_SOURCE(OSC8M);
+CLOCK_SOURCE(DFLL48M);
+CLOCK_SOURCE(DPLL96M);
+
+CLOCK_GCLK_(SYSCTRL, DFLL48);
+CLOCK_GCLK_(SYSCTRL, FDPLL);
+CLOCK_GCLK_(SYSCTRL, FDPLL32K);
+CLOCK_GCLK(WDT);
+#endif
+CLOCK_GCLK(RTC);
+#ifdef SAMD21_EXPOSE_ALL_CLOCKS
+CLOCK_GCLK(EIC);
+CLOCK_GCLK(USB);
+CLOCK_GCLK_(EVSYS, 0);
+CLOCK_GCLK_(EVSYS, 1);
+CLOCK_GCLK_(EVSYS, 2);
+CLOCK_GCLK_(EVSYS, 3);
+CLOCK_GCLK_(EVSYS, 4);
+CLOCK_GCLK_(EVSYS, 5);
+CLOCK_GCLK_(EVSYS, 6);
+CLOCK_GCLK_(EVSYS, 7);
+CLOCK_GCLK_(EVSYS, 8);
+CLOCK_GCLK_(EVSYS, 9);
+CLOCK_GCLK_(EVSYS, 10);
+CLOCK_GCLK_(EVSYS, 11);
+CLOCK(SERCOMx_SLOW, 1, 19);
+CLOCK_GCLK_(SERCOM0, CORE);
+CLOCK_GCLK_(SERCOM1, CORE);
+CLOCK_GCLK_(SERCOM2, CORE);
+CLOCK_GCLK_(SERCOM3, CORE);
+CLOCK_GCLK_(SERCOM4, CORE);
+CLOCK_GCLK_(SERCOM5, CORE);
+CLOCK(TCC0_TCC1, 1, 26);
+CLOCK(TCC2_TCC3, 1, 27);
+CLOCK(TC4_TC5, 1, 28);
+CLOCK(TC6_TC7, 1, 29);
+CLOCK_GCLK(ADC);
+CLOCK_GCLK_(AC, DIG);
+CLOCK_GCLK_(AC, ANA);
+CLOCK_GCLK(DAC);
+CLOCK_GCLK(PTC);
+CLOCK_GCLK_(I2S, 0);
+CLOCK_GCLK_(I2S, 1);
+
+CLOCK(SYSTICK, 2, 0);
+#endif
+
+STATIC const mp_rom_map_elem_t samd_clock_global_dict_table[] = {
+#ifdef SAMD21_EXPOSE_ALL_CLOCKS
+    CLOCK_ENTRY(XOSC),
+    CLOCK_ENTRY(GCLKIN),
+    CLOCK_ENTRY(GCLKGEN1),
+    CLOCK_ENTRY(OSCULP32K),
+#endif
+    CLOCK_ENTRY(OSC32K),
+    CLOCK_ENTRY(XOSC32K),
+#ifdef SAMD21_EXPOSE_ALL_CLOCKS
+    CLOCK_ENTRY(OSC8M),
+    CLOCK_ENTRY(DFLL48M),
+    CLOCK_ENTRY(DPLL96M),
+    CLOCK_ENTRY_(SYSCTRL, DFLL48),
+    CLOCK_ENTRY_(SYSCTRL, FDPLL),
+    CLOCK_ENTRY_(SYSCTRL, FDPLL32K),
+    CLOCK_ENTRY(WDT),
+#endif
+    CLOCK_ENTRY(RTC),
+#ifdef SAMD21_EXPOSE_ALL_CLOCKS
+    CLOCK_ENTRY(EIC),
+    CLOCK_ENTRY(USB),
+    CLOCK_ENTRY_(EVSYS, 0),
+    CLOCK_ENTRY_(EVSYS, 1),
+    CLOCK_ENTRY_(EVSYS, 2),
+    CLOCK_ENTRY_(EVSYS, 3),
+    CLOCK_ENTRY_(EVSYS, 4),
+    CLOCK_ENTRY_(EVSYS, 5),
+    CLOCK_ENTRY_(EVSYS, 6),
+    CLOCK_ENTRY_(EVSYS, 7),
+    CLOCK_ENTRY_(EVSYS, 8),
+    CLOCK_ENTRY_(EVSYS, 9),
+    CLOCK_ENTRY_(EVSYS, 10),
+    CLOCK_ENTRY_(EVSYS, 11),
+    CLOCK_ENTRY(SERCOMx_SLOW),
+    CLOCK_ENTRY_(SERCOM0, CORE),
+    CLOCK_ENTRY_(SERCOM1, CORE),
+    CLOCK_ENTRY_(SERCOM2, CORE),
+    CLOCK_ENTRY_(SERCOM3, CORE),
+    CLOCK_ENTRY_(SERCOM4, CORE),
+    CLOCK_ENTRY_(SERCOM5, CORE),
+    CLOCK_ENTRY(TCC0_TCC1),
+    CLOCK_ENTRY(TCC2_TCC3),
+    CLOCK_ENTRY(TC4_TC5),
+    CLOCK_ENTRY(TC6_TC7),
+    CLOCK_ENTRY(ADC),
+    CLOCK_ENTRY_(AC, DIG),
+    CLOCK_ENTRY_(AC, ANA),
+    CLOCK_ENTRY(DAC),
+    CLOCK_ENTRY(PTC),
+    CLOCK_ENTRY_(I2S, 0),
+    CLOCK_ENTRY_(I2S, 1),
+
+    CLOCK_ENTRY(SYSTICK),
+#endif
+};
+MP_DEFINE_CONST_DICT(samd_clock_globals, samd_clock_global_dict_table);
+
+#endif // SAMD21
+
+#ifdef SAMD51
+
+
+
+#include <instance/can0.h>
+#include <instance/can1.h>
+#include <instance/i2s.h>
+#include <instance/sdhc1.h>
+#include <instance/sercom6.h>
+#include <instance/sercom7.h>
+#include <instance/tcc4.h>
+
+CLOCK_SOURCE(XOSC0);
+CLOCK_SOURCE(XOSC1);
+CLOCK_SOURCE(GCLKIN);
+CLOCK_SOURCE(GCLKGEN1);
+CLOCK_SOURCE(OSCULP32K);
+CLOCK_SOURCE(XOSC32K);
+CLOCK_SOURCE(DFLL);
+CLOCK_SOURCE(DPLL0);
+CLOCK_SOURCE(DPLL1);
+
+CLOCK_GCLK_(OSCCTRL, DFLL48);
+CLOCK_GCLK_(OSCCTRL, FDPLL0);
+CLOCK_GCLK_(OSCCTRL, FDPLL1);
+CLOCK_GCLK_(OSCCTRL, FDPLL032K); // GCLK_OSCCTRL_FDPLL1_32K, GCLK_SDHC0_SLOW, GCLK_SDHC1_SLOW, GCLK_SERCOM[0..7]_SLOW
+CLOCK_GCLK(EIC);
+CLOCK_GCLK_(FREQM, MSR);
+// 6: GCLK_FREQM_REF
+CLOCK_GCLK_(SERCOM0, CORE);
+CLOCK_GCLK_(SERCOM1, CORE);
+CLOCK(TC0_TC1, 1, 9);
+CLOCK_GCLK(USB);
+CLOCK_GCLK_(EVSYS, 0);
+CLOCK_GCLK_(EVSYS, 1);
+CLOCK_GCLK_(EVSYS, 2);
+CLOCK_GCLK_(EVSYS, 3);
+CLOCK_GCLK_(EVSYS, 4);
+CLOCK_GCLK_(EVSYS, 5);
+CLOCK_GCLK_(EVSYS, 6);
+CLOCK_GCLK_(EVSYS, 7);
+CLOCK_GCLK_(EVSYS, 8);
+CLOCK_GCLK_(EVSYS, 9);
+CLOCK_GCLK_(EVSYS, 10);
+CLOCK_GCLK_(EVSYS, 11);
+CLOCK_GCLK_(SERCOM2, CORE);
+CLOCK_GCLK_(SERCOM3, CORE);
+CLOCK(TCC0_TCC1, 1, 25);
+CLOCK(TC2_TC3, 1, 26);
+CLOCK_GCLK(CAN0);
+CLOCK_GCLK(CAN1);
+CLOCK(TCC2_TCC3, 1, 29);
+CLOCK(TC4_TC5, 1, 30);
+// CLOCK_GCLK(PDEC);
+// CLOCK_GCLK(AC);
+// CLOCK_GCLK(CCL);
+CLOCK_GCLK_(SERCOM4, CORE);
+CLOCK_GCLK_(SERCOM5, CORE);
+CLOCK_GCLK_(SERCOM6, CORE);
+CLOCK_GCLK_(SERCOM7, CORE);
+CLOCK_GCLK(TCC4);
+CLOCK(TC6_TC7, 1, 39);
+CLOCK_GCLK(ADC0);
+CLOCK_GCLK(ADC1);
+CLOCK_GCLK(DAC);
+CLOCK_GCLK_(I2S, 0);
+CLOCK_GCLK_(I2S, 1);
+// CLOCK_GCLK(SDHC0);
+// CLOCK_GCLK(SDHC1);
+// 47: GCLK_CM4_TRACE
+
+CLOCK(SYSTICK, 2, 0);
+CLOCK(CPU, 2, 1);
+CLOCK(RTC, 2, 2);
+
+
+STATIC const mp_rom_map_elem_t samd_clock_global_dict_table[] = {
+    CLOCK_ENTRY(XOSC0),
+    CLOCK_ENTRY(XOSC1),
+    CLOCK_ENTRY(GCLKIN),
+    CLOCK_ENTRY(GCLKGEN1),
+    CLOCK_ENTRY(OSCULP32K),
+    CLOCK_ENTRY(XOSC32K),
+    CLOCK_ENTRY(DFLL),
+    CLOCK_ENTRY(DPLL0),
+    CLOCK_ENTRY(DPLL1),
+
+    CLOCK_ENTRY_(OSCCTRL, DFLL48),
+    CLOCK_ENTRY_(OSCCTRL, FDPLL0),
+    CLOCK_ENTRY_(OSCCTRL, FDPLL1),
+    CLOCK_ENTRY_(OSCCTRL, FDPLL032K),
+    CLOCK_ENTRY(EIC),
+    CLOCK_ENTRY_(FREQM, MSR),
+    CLOCK_ENTRY_(SERCOM0, CORE),
+    CLOCK_ENTRY_(SERCOM1, CORE),
+    CLOCK_ENTRY(TC0_TC1),
+    CLOCK_ENTRY(USB),
+    CLOCK_ENTRY_(EVSYS, 0),
+    CLOCK_ENTRY_(EVSYS, 1),
+    CLOCK_ENTRY_(EVSYS, 2),
+    CLOCK_ENTRY_(EVSYS, 3),
+    CLOCK_ENTRY_(EVSYS, 4),
+    CLOCK_ENTRY_(EVSYS, 5),
+    CLOCK_ENTRY_(EVSYS, 6),
+    CLOCK_ENTRY_(EVSYS, 7),
+    CLOCK_ENTRY_(EVSYS, 8),
+    CLOCK_ENTRY_(EVSYS, 9),
+    CLOCK_ENTRY_(EVSYS, 10),
+    CLOCK_ENTRY_(EVSYS, 11),
+    CLOCK_ENTRY_(SERCOM2, CORE),
+    CLOCK_ENTRY_(SERCOM3, CORE),
+    CLOCK_ENTRY(TCC0_TCC1),
+    CLOCK_ENTRY(TC2_TC3),
+    CLOCK_ENTRY(CAN0),
+    CLOCK_ENTRY(CAN1),
+    CLOCK_ENTRY(TCC2_TCC3),
+    CLOCK_ENTRY(TC4_TC5),
+    // CLOCK_ENTRY(PDEC),
+    // CLOCK_ENTRY(AC),
+    // CLOCK_ENTRY(CCL),
+    CLOCK_ENTRY_(SERCOM4, CORE),
+    CLOCK_ENTRY_(SERCOM5, CORE),
+    CLOCK_ENTRY_(SERCOM6, CORE),
+    CLOCK_ENTRY_(SERCOM7, CORE),
+    CLOCK_ENTRY(TCC4),
+    CLOCK_ENTRY(TC6_TC7),
+    CLOCK_ENTRY(ADC0),
+    CLOCK_ENTRY(ADC1),
+    CLOCK_ENTRY(DAC),
+    CLOCK_ENTRY_(I2S, 0),
+    CLOCK_ENTRY_(I2S, 1),
+    // CLOCK_ENTRY(SDHC0),
+    // CLOCK_ENTRY(SDHC1),
+
+    CLOCK_ENTRY(SYSTICK),
+    CLOCK_ENTRY(CPU),
+    CLOCK_ENTRY(RTC),
+};
+MP_DEFINE_CONST_DICT(samd_clock_globals, samd_clock_global_dict_table);
+
+#endif // SAMD51
--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.h
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.h
@ -7,10 +7,6 @@

 #define MICROPY_HW_LED_STATUS   (&pin_PB23)

-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA09)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA08)

--- a/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x2341
 USB_PID = 0x8053
 USB_PRODUCT = "Arduino MKR1300"
--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.h
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.h
@ -5,10 +5,6 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)

-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA09)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA08)

--- a/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x239A
 USB_PID = 0x8050
 USB_PRODUCT = "Arduino MKRZero"
--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.h
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.h
@ -10,10 +10,6 @@
 #define MICROPY_PORT_B        (PORT_PB03)
 #define MICROPY_PORT_C        (0)

-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)

--- a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x2341
 USB_PID = 0x824D
 USB_PRODUCT = "Arduino Zero"
--- a/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.h
+++ b/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.h
@ -5,6 +5,7 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)

+// No microcontroller.nvm
 #define CIRCUITPY_INTERNAL_NVM_SIZE 0

 #define DEFAULT_I2C_BUS_SCL (&pin_PA08)
@ -17,8 +18,6 @@
 #define DEFAULT_UART_BUS_RX (&pin_PA01)
 #define DEFAULT_UART_BUS_TX (&pin_PA00)

-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000)
-
 #define IGNORE_PIN_PA03     1
 #define IGNORE_PIN_PA12     1
 #define IGNORE_PIN_PA13     1
--- a/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x1209
 USB_PID = 0xBAB3
 USB_PRODUCT = "Bast Pro Mini M0"
--- a/ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.h
+++ b/ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.h
@ -3,7 +3,6 @@

 #define CIRCUITPY_MCU_FAMILY samd51

-
 #define MICROPY_HW_LED_STATUS   (&pin_PA22)

 // These are pins not to reset.
@ -14,14 +13,6 @@
 #define MICROPY_PORT_C (0)
 #define MICROPY_PORT_D (0)

-#define AUTORESET_DELAY_MS 500
-
-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code
-#define CIRCUITPY_INTERNAL_NVM_SIZE 8192
-
-#define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define DEFAULT_I2C_BUS_SCL (&pin_PA23)
 #define DEFAULT_I2C_BUS_SDA (&pin_PA22)

--- a/ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd51x19-bootloader-external-flash.ld
 USB_VID = 0x04D8
 USB_PID = 0xEDB3
 USB_PRODUCT = "Programmable USB Hub"
@ -14,5 +13,3 @@ LONGINT_IMPL = MPZ

 # No I2S on SAMD51G
 CIRCUITPY_AUDIOBUSIO = 0
-# No touch on SAMD51 yet
-CIRCUITPY_TOUCHIO = 0
--- a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.h
+++ b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.h
@ -7,14 +7,10 @@
 #define MICROPY_PORT_B        (0)
 #define MICROPY_PORT_C        (0)

-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
 #define DEFAULT_SPI_BUS_SCK (&pin_PA19)
 #define DEFAULT_SPI_BUS_MOSI (&pin_PA18)
 #define DEFAULT_SPI_BUS_MISO (&pin_PA22)

-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define IGNORE_PIN_PA00     1
 #define IGNORE_PIN_PA01     1
 #define IGNORE_PIN_PA02     1
--- a/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader.ld
 USB_VID = 0x1209
 USB_PID = 0xBAB2
 USB_PRODUCT = "CatWAN USBStick"
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
@ -22,17 +22,14 @@

 #define SPEAKER_ENABLE_PIN    (&pin_PA30)

-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1

 // Explanation of how a user got into safe mode.
 #define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"

+// Increase stack size slightly due to CPX library import nesting
+#define CIRCUITPY_DEFAULT_STACK_SIZE  (4504)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB02)

--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x239A
 USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express"
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@ -22,17 +22,14 @@

 #define SPEAKER_ENABLE_PIN    (&pin_PA30)

-// If you change this, then make sure to update the linker scripts as well to
-// make sure you don't overwrite code.
-#define CIRCUITPY_INTERNAL_NVM_SIZE 256
-
-#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - CIRCUITPY_INTERNAL_NVM_SIZE)
-
 #define CALIBRATE_CRYSTALLESS 1

 // Explanation of how a user got into safe mode.
 #define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"

+// Increase stack size slightly due to CPX library import nesting
+#define CIRCUITPY_DEFAULT_STACK_SIZE  (4504)
+
 #define DEFAULT_I2C_BUS_SCL (&pin_PB03)
 #define DEFAULT_I2C_BUS_SDA (&pin_PB02)

--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@ -1,4 +1,3 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash-crystalless.ld
 USB_VID = 0x239A
 USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express with Crickit libraries"
@ -14,9 +13,10 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 # Turn off features and optimizations for Crickit build to make room for additional frozen libs.
 LONGINT_IMPL = NONE
 CIRCUITPY_DISPLAYIO = 0
-CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_FREQUENCYIO = 0
+CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_PIXELBUF = 0

 SUPEROPT_GC = 0
 CFLAGS_INLINE_LIMIT = 55
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/board.c
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/board.c
@ -0,0 +1,65 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <string.h>
+
+#include "boards/board.h"
+#include "common-hal/microcontroller/Pin.h"
+#include "hal/include/hal_gpio.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
+#include "shared-bindings/neopixel_write/__init__.h"
+
+void board_init(void)
+{
+}
+
+// Check the status of the two buttons on CircuitPlayground Express. If both are
+// pressed, then boot into user safe mode.
+bool board_requests_safe_mode(void) {
+    gpio_set_pin_function(PIN_PA14, GPIO_PIN_FUNCTION_OFF);
+    gpio_set_pin_direction(PIN_PA14, GPIO_DIRECTION_IN);
+    gpio_set_pin_pull_mode(PIN_PA14, GPIO_PULL_DOWN);
+
+    gpio_set_pin_function(PIN_PA28, GPIO_PIN_FUNCTION_OFF);
+    gpio_set_pin_direction(PIN_PA28, GPIO_DIRECTION_IN);
+    gpio_set_pin_pull_mode(PIN_PA28, GPIO_PULL_DOWN);
+    bool safe_mode = gpio_get_pin_level(PIN_PA14) &&
+        gpio_get_pin_level(PIN_PA28);
+    reset_pin_number(PIN_PA14);
+    reset_pin_number(PIN_PA28);
+    return safe_mode;
+}
+
+void reset_board(void) {
+    uint8_t empty[30];
+    memset(empty, 0, 30);
+    digitalio_digitalinout_obj_t neopixel_pin;
+    common_hal_digitalio_digitalinout_construct(&neopixel_pin, &pin_PB23);
+    common_hal_digitalio_digitalinout_switch_to_output(&neopixel_pin, false,
+        DRIVE_MODE_PUSH_PULL);
+    common_hal_neopixel_write(&neopixel_pin, empty, 30);
+    common_hal_digitalio_digitalinout_deinit(&neopixel_pin);
+}
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
@ -0,0 +1,47 @@
+#define MICROPY_HW_BOARD_NAME "Adafruit CircuitPlayground Express with displayio"
+#define MICROPY_HW_MCU_NAME "samd21g18"
+
+#define MICROPY_HW_LED_STATUS   (&pin_PA17)
+
+// Don't allow touch on A0 (PA02), because it's connected to the speaker.
+#define PA02_NO_TOUCH       (true)
+
+// Salae reads 12mhz which is the limit even though we set it to the safer 8mhz.
+#define SPI_FLASH_BAUDRATE  (8000000)
+
+// On-board flash
+#define SPI_FLASH_MOSI_PIN          &pin_PA20
+#define SPI_FLASH_MISO_PIN          &pin_PA16
+#define SPI_FLASH_SCK_PIN           &pin_PA21
+#define SPI_FLASH_CS_PIN            &pin_PB22
+
+// These are pins not to reset.
+#define MICROPY_PORT_A        (0)
+#define MICROPY_PORT_B        (0)
+#define MICROPY_PORT_C        (0)
+
+#define SPEAKER_ENABLE_PIN    (&pin_PA30)
+
+#define CALIBRATE_CRYSTALLESS 1
+
+// Explanation of how a user got into safe mode.
+#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up"
+
+// Increase stack size slightly due to CPX library import nesting.
+#define CIRCUITPY_DEFAULT_STACK_SIZE  (4504)  // divisible by 8
+
+#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
+#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_PA05)
+#define DEFAULT_SPI_BUS_MOSI (&pin_PA07)
+#define DEFAULT_SPI_BUS_MISO (&pin_PA06)
+
+#define DEFAULT_UART_BUS_RX (&pin_PB09)
+#define DEFAULT_UART_BUS_TX (&pin_PB08)
+
+// USB is always used internally so skip the pin objects for it.
+#define IGNORE_PIN_PA24     1
+#define IGNORE_PIN_PA25     1
+
+#define MICROPY_PY_URE 0
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@ -0,0 +1,30 @@
+USB_VID = 0x239A
+USB_PID = 0x8019
+USB_PRODUCT = "CircuitPlayground Express with displayio"
+USB_MANUFACTURER = "Adafruit Industries LLC"
+
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
+SPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICE_COUNT = 2
+EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
+
+# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
+LONGINT_IMPL = NONE
+CIRCUITPY_BITBANGIO = 0
+CIRCUITPY_FREQUENCYIO = 0
+CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_PIXELBUF = 0
+CIRCUITPY_GAMEPAD = 0
+CIRCUITPY_RTC = 0
+
+SUPEROPT_GC = 0
+CFLAGS_INLINE_LIMIT = 55
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`Subproject commit dd0fe8530a2dcc64ac95bb3e116af2158dcd7cd2`
				`@ -0,0 +1 @@`
				`Subproject commit c3c664bf4db6a36d11808dfcbb5dbf7cff1715b8`
				`@ -1 +0,0 @@`
				`Subproject commit d2bcfda543d3b99361e44112aca929225bdcc07f`