diff --git a/.devcontainer/Readme.md b/.devcontainer/Readme.md index 00acbb57863e3..7a8975192bc4c 100644 --- a/.devcontainer/Readme.md +++ b/.devcontainer/Readme.md @@ -1,31 +1,46 @@ -Build CircuitPython in a Github-Devcontainer -============================================ +Build CircuitPython in a Github-Codespace +========================================= -To build CircuitPython within a Github-Devcontainer, you need to perform +To build CircuitPython within a Github codespace, you need to perform the following steps. - 1. checkout the code to a devcontainer - - - click on the green "<> Code"-button - - select the Codespaces-tab - - choose "+ new with options..." from the "..."-menu - - in the following screen select the branch and then - - select ".devcontainer/cortex-m/devcontainer.json" instead - of "Default Codespaces configuration" - - update region as necessary - - finally, click on the green "Create codespace" button - - 2. Your codespace is created. Cloning the images is quite fast, but - preparing it for CircuitPython-development takes about 10 minutes. - Note that this is a one-time task. + 1. checkout the code to a codespace + + - click on the green "<> Code"-button + - select the Codespaces-tab + - choose "+ new with options..." from the "..."-menu + - in the following screen select the branch and then + - select the port instead of "Default project configuration" + (unsupported: ports not using cortex-m or esp-idf)\ + ![](./codespace_options.png) + - update region as necessary + - finally, click on the green "Create codespace" button + + 2. Your codespace is created. Cloning the image and the repo is quite fast, + but preparing it for CircuitPython-development takes about 10 minutes. + But this is a one-time task: once created, your codespace exists + until you explicitly delete it or until it times out (default: 30 days).\ + (Technical note: due to a bug in codespace creation, the setup is + triggered from `$HOME/.bashrc` and runs in the background). 3. During creation, you can run the command - `tail -f /workspaces/.codespaces/.persistedshare/creation.log` - to see what is going on. + `tail -f /workspaces/install_build_env.log.active` + to see what is going on. Once finished the log file is available + as `/workspaces/install_build_env.log`. - 4. To actually build CircuitPython, run + 4. To actually build CircuitPython, open a new terminal and run e.g. cd ports/raspberrypi make -j $(nproc) BOARD=whatever TRANSLATION=xx_XX - This takes about 2m40s. + This takes about 2m40s. The new terminal is necessary since the + setup of the build environment also changes `$HOME/.bashrc` and + sets important environment variables in that file. + +As a normal user, you have 120 CPU-hours and 15GB per month free. Since +the smallest machine has two CPUs, you effectively have 60 hours active +time available. + +All scripts are in `circuitpython/.devcontainer` and can also be executed +manually which should usually not be necessary. With small changes, they +should also work on a Linux-PC or laptop. diff --git a/.devcontainer/cortex-m/devcontainer.json b/.devcontainer/atmel-samd/devcontainer.json similarity index 70% rename from .devcontainer/cortex-m/devcontainer.json rename to .devcontainer/atmel-samd/devcontainer.json index ee8aeb1ea0fd1..c646ab47384c5 100644 --- a/.devcontainer/cortex-m/devcontainer.json +++ b/.devcontainer/atmel-samd/devcontainer.json @@ -1,10 +1,11 @@ // For format details, see https://aka.ms/devcontainer.json. For config options, see the // README at: https://github.com/devcontainers/templates/tree/main/src/universal { - "name": "CircuitPython Cortex-M Build-Environment (base: Default Linux Universal)", - "image": "mcr.microsoft.com/devcontainers/universal:2-linux", - "postCreateCommand": ".devcontainer/cortex-m/on-create.sh", - "remoteEnv": { "PATH": "/workspaces/gcc-arm-none-eabi/bin:${containerEnv:PATH}" } + "name": "atmel-samd", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "cortex-m", + "CP_PORT": "atmel-samd" } // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/.devcontainer/codespace_options.png b/.devcontainer/codespace_options.png new file mode 100644 index 0000000000000..39502d9bd0800 Binary files /dev/null and b/.devcontainer/codespace_options.png differ diff --git a/.devcontainer/common_tools.sh b/.devcontainer/common_tools.sh new file mode 100755 index 0000000000000..14cf76c3fe22d --- /dev/null +++ b/.devcontainer/common_tools.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# common_tools.sh: install tools and requirements for CircuitPython +# +# This script installs tools common to all builds. +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- + +REPO_ROOT="/workspaces/circuitpython" + +echo -e "[common_tools.sh] starting install" +cd "$REPO_ROOT" + +# --- repositories and tools ------------------------------------------------ + +echo -e "[common_tools.sh] adding pybricks/ppa" +sudo add-apt-repository -y ppa:pybricks/ppa +echo -e "[common_tools.sh] installing uncrustify and mtools" +sudo apt-get -y install uncrustify mtools + +# dosfstools >= 4.2 needed, standard repo only has 4.1 +echo -e "[common_tools.sh] downloading and installing dosfstools" +wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz +tar -xzf dosfstools-4.2.tar.gz +(cd dosfstools-4.2/ + ./configure + make -j $(nproc) + sudo make install +) +rm -fr dosfstools-4.2 dosfstools-4.2.tar.gz + +# --- circuitpython setup -------------------------------------------------- + +# additional python requirements +echo -e "[common_tools.sh] pip-installing requirements" +pip install --upgrade -r requirements-dev.txt +pip install --upgrade -r requirements-doc.txt + +# add pre-commit +echo -e "[common_tools.sh] installing pre-commit" +pre-commit install diff --git a/.devcontainer/cortex-m-toolchain.sh b/.devcontainer/cortex-m-toolchain.sh new file mode 100755 index 0000000000000..de1ccde62742a --- /dev/null +++ b/.devcontainer/cortex-m-toolchain.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# cortex-m-toolchain.sh: install toolchain for CircuitPython +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- + +echo -e "[cortex-m-toolchain.sh] starting install" + +# --- tooling -------------------------------------------------------------- + +echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi toolchain" +cd /workspaces + +wget -qO gcc-arm-none-eabi.tar.xz \ + https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz + +tar -xJf gcc-arm-none-eabi.tar.xz +ln -s arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi +rm -f gcc-arm-none-eabi.tar.xz + +echo -e "[cortex-m-toolchain.sh] update PATH in environment" +echo -e "\nexport PATH=/workspaces/gcc-arm-none-eabi/bin:$PATH" >> $HOME/.bashrc diff --git a/.devcontainer/cortex-m/on-create.sh b/.devcontainer/cortex-m/on-create.sh deleted file mode 100755 index 3db1ff3f38c44..0000000000000 --- a/.devcontainer/cortex-m/on-create.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash -# ----------------------------------------------------------------------------- -# on-create.sh: postCreateCommand-hook for devcontainer.json (Cortex-M build) -# -# Author: Bernhard Bablok -# -# ----------------------------------------------------------------------------- - -echo -e "[on-create.sh] downloading and installing gcc-arm-non-eabi toolchain" -cd /workspaces -wget -qO gcc-arm-none-eabi.tar.bz2 https://adafru.it/Pid -tar -xjf gcc-arm-none-eabi.tar.bz2 -ln -s gcc-arm-none-eabi-10-2020-q4-major gcc-arm-none-eabi -rm -f /workspaces/gcc-arm-none-eabi.tar.bz2 -export PATH=/workspaces/gcc-arm-none-eabi/bin:$PATH - -# add repository and install tools -echo -e "[on-create.sh] adding pybricks/ppa" -sudo add-apt-repository -y ppa:pybricks/ppa -echo -e "[on-create.sh] installing uncrustify and mtools" -sudo apt-get -y install uncrustify mtools - -# dosfstools >= 4.2 needed, standard repo only has 4.1 -echo -e "[on-create.sh] downloading and installing dosfstools" -wget https://github.com/dosfstools/dosfstools/releases/download/v4.2/dosfstools-4.2.tar.gz -tar -xzf dosfstools-4.2.tar.gz -cd dosfstools-4.2/ -./configure -make -j $(nproc) -sudo make install -cd /workspaces -rm -fr /workspaces/dosfstools-4.2 /workspaces/dosfstools-4.2.tar.gz - -# prepare source-code tree -cd /workspaces/circuitpython/ -echo -e "[on-create.sh] fetching submodules" -make fetch-all-submodules -echo -e "[on-create.sh] fetching tags" -git fetch --tags --recurse-submodules=no --shallow-since="2021-07-01" https://github.com/adafruit/circuitpython HEAD - -# additional python requirements -echo -e "[on-create.sh] pip-installing requirements" -pip install --upgrade -r requirements-dev.txt -pip install --upgrade -r requirements-doc.txt - -# add pre-commit -echo -e "[on-create.sh] installing pre-commit" -pre-commit install - -# create cross-compiler -echo -e "[on-create.sh] building mpy-cross" -make -j $(nproc) -C mpy-cross # time: about 36 sec - -# that's it! -echo -e "[on-create.sh] setup complete" - -#commands to actually build CP: -#cd ports/raspberrypi -#time make -j $(nproc) BOARD=pimoroni_tufty2040 TRANSLATION=de_DE diff --git a/.devcontainer/cxd56/devcontainer.json b/.devcontainer/cxd56/devcontainer.json new file mode 100644 index 0000000000000..250bc24b7276e --- /dev/null +++ b/.devcontainer/cxd56/devcontainer.json @@ -0,0 +1,24 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "cxd56", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "cortex-m", + "CP_PORT": "cxd56" } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.devcontainer/esp-idf-toolchain.sh b/.devcontainer/esp-idf-toolchain.sh new file mode 100755 index 0000000000000..433d37f0ccdc7 --- /dev/null +++ b/.devcontainer/esp-idf-toolchain.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# esp-idf-toolchain.sh: install toolchain for CircuitPython +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- +REPO_ROOT="/workspaces/circuitpython" + +echo -e "[esp-idf-toolchain.sh] starting install" + +# --- tooling -------------------------------------------------------------- + +echo -e "[esp-idf-toolchain.sh] fetch packages" +sudo apt-get update +sudo apt-get -y install ninja-build cmake libusb-1.0-0 + +# --- esp-idf -------------------------------------------------------------- + +echo -e "[esp-idf-toolchain.sh] installing esp-idf" +cd "$REPO_ROOT/ports/espressif" +esp-idf/install.sh +source esp-idf/export.sh + +# --- re-install our packages in venv created by export.sh ----------------- + +echo -e "[esp-idf-toolchain.sh] updating python-packages" +cd "$REPO_ROOT" +pip3 install --upgrade -r requirements-dev.txt +pip3 install --upgrade -r requirements-doc.txt + +# --- and again install esp-idf (needs other versions) ---------------------- + +echo -e "[esp-idf-toolchain.sh] installing esp-idf (2nd iteration)" +cd "$REPO_ROOT/ports/espressif" +esp-idf/install.sh + +# --- update $HOME/.bashrc -------------------------------------------------- + +echo -e "[esp-idf-toolchain.sh] update environment in .bashrc" + +echo -e "\nsource $REPO_ROOT/ports/espressif/esp-idf/export.sh &> /dev/null\n" >> "$HOME"/.bashrc diff --git a/.devcontainer/espressif/devcontainer.json b/.devcontainer/espressif/devcontainer.json new file mode 100644 index 0000000000000..83dc698428634 --- /dev/null +++ b/.devcontainer/espressif/devcontainer.json @@ -0,0 +1,24 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "espressif", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "esp-idf", + "CP_PORT": "espressif" } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.devcontainer/fetch-port-submodules.sh b/.devcontainer/fetch-port-submodules.sh new file mode 100755 index 0000000000000..573396dd23b02 --- /dev/null +++ b/.devcontainer/fetch-port-submodules.sh @@ -0,0 +1,19 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# fetch-port-submodules.sh: fetch port specific submodules +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- + +REPO_ROOT="/workspaces/circuitpython" +cd "$REPO_ROOT" + +if [ -z "$CP_PORT" ]; then + echo -e "[fetch-port-submodules.sh] CP_PORT not set. Cannot fetch submodules!" + exit 3 +fi + +cd "ports/$CP_PORT" +echo -e "[fetch-port-submodules.sh] fetching necessary submodules" +make fetch-port-submodules diff --git a/.devcontainer/install_build_env.sh b/.devcontainer/install_build_env.sh new file mode 100755 index 0000000000000..6653b68c43a17 --- /dev/null +++ b/.devcontainer/install_build_env.sh @@ -0,0 +1,64 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# install_build_env.sh: install build-environment for CircuitPython +# +# Normally, this should run directly as postCreateCommand during container +# creation. Due to an unresolved bug on how Github-codespaces creates a clone, +# this script is started from $HOME/.bashrc instead. +# +# The script delegates parts to other scripts for reuse across toolchains. +# This has the added benefit that they can be called independently later again +# if necessary. +# +# The scripts expect the environment-variables CP_TOOLCHAIN and CP_PORT to be set +# to valid values. This is normally done from within +# .devcontainer//devcontainer.json +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- +REPO_ROOT="/workspaces/circuitpython" + +# --- install exit-handler for cleanup -------------------------------------- + +on_exit() { + rc=$? + if [ -f /workspaces/install_build_env.log.active ]; then + mv /workspaces/install_build_env.log.active /workspaces/install_build_env.log + fi + rm -rf /tmp/install_build_env + exit $rc +} + +# --- test prerequisites for installation ------------------------------------ + +while ! test -f /workspaces/post_create.finished; do + echo -e "[install_build_env.sh] waiting for /workspaces/post_create.finished ..." + sleep 1 +done + +if [ -f /workspaces/install_build_env.log ]; then + echo -e "[install_build_env.sh] installation already done" + exit 0 +elif ! mkdir /tmp/install_build_env 2>/dev/null; then + # mkdir is atomic, so we know we are already running + echo -e "[install_build_env.sh] install already running with PID $(cat /tmp/install_build_env/pid.txt)" + exit 0 +else + echo -e "$$" > /tmp/install_build_env/pid.txt + trap 'on_exit' EXIT +fi + +echo -e "[install_build_env.sh] starting install" + +# --- delegate install steps to other scripts ------------------------------- +( +"$REPO_ROOT/.devcontainer/fetch-port-submodules.sh" || exit 3 +"$REPO_ROOT/.devcontainer/common_tools.sh" || exit 3 +"$REPO_ROOT/.devcontainer/$CP_TOOLCHAIN-toolchain.sh" || exit 3 +"$REPO_ROOT/.devcontainer/make-mpy-cross.sh" || exit 3 +echo -e "Setup complete!\nStart a new terminal and build CircuitPython!\n" +) |& tee /workspaces/install_build_env.log.active + +echo -e "[install_build_env.sh] Setup complete!" +exit 0 diff --git a/.devcontainer/make-mpy-cross.sh b/.devcontainer/make-mpy-cross.sh new file mode 100755 index 0000000000000..bc24635465f59 --- /dev/null +++ b/.devcontainer/make-mpy-cross.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# make-mpy-cross.sh: fetch tags and prereqs, then build mpy-cross +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- + +REPO_ROOT="/workspaces/circuitpython" +cd "$REPO_ROOT" + +# fetch tags and tools for mpy-cross +echo -e "[make-mpy-cross.sh] fetching tags" +make fetch-tags +echo -e "[make-mpy-cross.sh] fetching prerequisites" +python3 tools/ci_fetch_deps.py mpy-cross + +# create cross-compiler +echo -e "[make-mpy-cross.sh] building mpy-cross" +if ! make -j $(nproc) -C mpy-cross; then # time: about 36 sec + echo -e "[make-mpy-cross.sh] make mpy-cross failed" + exit 3 +fi +exit 0 diff --git a/.devcontainer/mimxrt10xx/devcontainer.json b/.devcontainer/mimxrt10xx/devcontainer.json new file mode 100644 index 0000000000000..3b529770af04a --- /dev/null +++ b/.devcontainer/mimxrt10xx/devcontainer.json @@ -0,0 +1,24 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "mimxrt10xx", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "cortex-m", + "CP_PORT": "mimxrt10xx" } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.devcontainer/post_create.sh b/.devcontainer/post_create.sh new file mode 100755 index 0000000000000..f7fea3e44fefd --- /dev/null +++ b/.devcontainer/post_create.sh @@ -0,0 +1,36 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# post_create.sh: postCreateCommand-command writing to $HOME/.bashrc +# +# Author: Bernhard Bablok +# +# ----------------------------------------------------------------------------- + +echo -e "[post_create.sh] starting postCreateCommand $0\n" +echo -e "[post_create.sh] PWD=$PWD\n" + +cat >> $HOME/.bashrc << "EOF" + +if [ -f /workspaces/install_build_env.log ]; then + # setup already done + echo "CircuitPython build-environment ready for $CP_TOOLCHAIN/$CP_PORT" + echo "To start a build run:" + echo " cd ports/$CP_PORT" + echo " time make -j $(nproc) BOARD=your_board_name TRANSLATION=de_DE" +elif [ -f /workspaces/install_build_env.log.active ]; then + echo "Initial setup of build environment in progress, please wait." + echo "Use 'tail -f /workspaces/install_build_env.log.active' to monitor progress." + echo "After successful installation, start a new terminal to build CircuitPython." +else + echo "Starting initial setup of build environment, please wait" + nohup /workspaces/circuitpython/.devcontainer/install_build_env.sh >> $HOME/nohup.out & + echo "Use 'tail -f /workspaces/install_build_env.log.active' to monitor progress." + echo "After successful installation, start a new terminal to build CircuitPython." +fi + +EOF +touch /workspaces/post_create.finished + +# --- that's it! ------------------------------------------------------------ + +echo -e "[post_create.sh] setup complete\n" diff --git a/.devcontainer/raspberrypi/devcontainer.json b/.devcontainer/raspberrypi/devcontainer.json new file mode 100644 index 0000000000000..07f718f48733e --- /dev/null +++ b/.devcontainer/raspberrypi/devcontainer.json @@ -0,0 +1,24 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "raspberrypi", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "cortex-m", + "CP_PORT": "raspberrypi" } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.devcontainer/silabs/devcontainer.json b/.devcontainer/silabs/devcontainer.json new file mode 100644 index 0000000000000..922cef8fe0ccd --- /dev/null +++ b/.devcontainer/silabs/devcontainer.json @@ -0,0 +1,24 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "silabs", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "cortex-m", + "CP_PORT": "silabs" } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.devcontainer/stm/devcontainer.json b/.devcontainer/stm/devcontainer.json new file mode 100644 index 0000000000000..1d811ced1c329 --- /dev/null +++ b/.devcontainer/stm/devcontainer.json @@ -0,0 +1,24 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the +// README at: https://github.com/devcontainers/templates/tree/main/src/universal +{ + "name": "stm", + "image": "mcr.microsoft.com/devcontainers/universal:2", + "postCreateCommand": ".devcontainer/post_create.sh", + "remoteEnv": { "CP_TOOLCHAIN": "cortex-m", + "CP_PORT": "stm" } + + // Features to add to the dev container. More info: https://containers.dev/features. + // "features": {}, + + // Use 'forwardPorts' to make a list of ports inside the container available locally. + // "forwardPorts": [], + + // Use 'postCreateCommand' to run commands after the container is created. + // "postCreateCommand": "uname -a", + + // Configure tool-specific properties. + // "customizations": {}, + + // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. + // "remoteUser": "root" +} diff --git a/.github/actions/deps/ports/action.yml b/.github/actions/deps/ports/action.yml index 8125de2acc487..2412c475c01a5 100644 --- a/.github/actions/deps/ports/action.yml +++ b/.github/actions/deps/ports/action.yml @@ -31,6 +31,6 @@ runs: if: steps.board-to-port.outputs.port == 'litex' uses: ./.github/actions/deps/ports/litex - - name: Set up nrf - if: steps.board-to-port.outputs.port == 'nrf' - uses: ./.github/actions/deps/ports/nrf + - name: Set up nordic + if: steps.board-to-port.outputs.port == 'nordic' + uses: ./.github/actions/deps/ports/nordic diff --git a/.github/actions/deps/ports/nrf/action.yml b/.github/actions/deps/ports/nordic/action.yml similarity index 93% rename from .github/actions/deps/ports/nrf/action.yml rename to .github/actions/deps/ports/nordic/action.yml index d977c937b3dc7..5f08b17ca7a68 100644 --- a/.github/actions/deps/ports/nrf/action.yml +++ b/.github/actions/deps/ports/nordic/action.yml @@ -1,4 +1,4 @@ -name: Fetch nrf port deps +name: Fetch nordic port deps runs: using: composite diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09eb0ebcada09..03cecae231d52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -278,8 +278,8 @@ jobs: run: make -j4 -C ports/atmel-samd BOARD=feather_m0_express TRANSLATION=zh_Latn_pinyin - name: build samd51 run: make -j4 -C ports/atmel-samd BOARD=feather_m4_express TRANSLATION=es - - name: build nrf - run: make -j4 -C ports/nrf BOARD=feather_nrf52840_express TRANSLATION=fr + - name: build nordic + run: make -j4 -C ports/nordic BOARD=feather_nrf52840_express TRANSLATION=fr - name: build stm run: make -j4 -C ports/stm BOARD=feather_stm32f405_express TRANSLATION=pt_BR # I gave up trying to do esp builds on windows when I saw diff --git a/.gitmodules b/.gitmodules index 8934f17d7cb61..bf521b6c94d7d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -63,8 +63,8 @@ [submodule "frozen/Adafruit_CircuitPython_Crickit"] path = frozen/Adafruit_CircuitPython_Crickit url = https://github.com/adafruit/Adafruit_CircuitPython_Crickit -[submodule "ports/nrf/nrfx"] - path = ports/nrf/nrfx +[submodule "ports/nordic/nrfx"] + path = ports/nordic/nrfx url = https://github.com/adafruit/nrfx.git [submodule "lib/tinyusb"] path = lib/tinyusb diff --git a/BUILDING.md b/BUILDING.md index c5b4c5ae9bcc4..34cd544d73658 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -57,7 +57,7 @@ Examples: cd ports/atmel-samd make BOARD=circuitplayground_express - cd ports/nrf + cd ports/nordic make BOARD=circuitplayground_bluefruit If you aren't sure what boards exist, have a peek in the boards subdirectory of your port. diff --git a/Makefile b/Makefile index 2d6a032b9872b..ffbd813c80689 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS) # the i18n builder cannot share the environment and doctrees with the others I18NSPHINXOPTS = $(BASEOPTS) -TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/espressif ports/mimxrt10xx ports/nrf ports/raspberrypi ports/stm py shared-bindings shared-module supervisor +TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/espressif ports/mimxrt10xx ports/nordic ports/raspberrypi ports/stm py shared-bindings shared-module supervisor # Paths to exclude from TRANSLATE_SOURCES # Each must be preceded by "-path"; if any wildcards, enclose in quotes. # Separate by "-o" (Find's "or" operand) @@ -284,7 +284,7 @@ update-frozen-libraries: @echo "Updating all frozen libraries to latest tagged version." cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done -one-of-each: samd21 litex mimxrt10xx nrf stm +one-of-each: samd21 litex mimxrt10xx nordic stm samd21: $(MAKE) -C ports/atmel-samd BOARD=trinket_m0 @@ -301,13 +301,13 @@ litex: mimxrt10xx: $(MAKE) -C ports/mimxrt10xx BOARD=feather_mimxrt1011 -nrf: - $(MAKE) -C ports/nrf BOARD=feather_nrf52840_express +nordic: + $(MAKE) -C ports/nordic BOARD=feather_nrf52840_express stm: $(MAKE) -C ports/stm BOARD=feather_stm32f405_express -clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nrf clean-stm +clean-one-of-each: clean-samd21 clean-samd51 clean-espressif clean-litex clean-mimxrt10xx clean-nordic clean-stm clean-samd21: $(MAKE) -C ports/atmel-samd BOARD=trinket_m0 clean @@ -324,8 +324,8 @@ clean-litex: clean-mimxrt10xx: $(MAKE) -C ports/mimxrt10xx BOARD=feather_mimxrt1011 clean -clean-nrf: - $(MAKE) -C ports/nrf BOARD=feather_nrf52840_express clean +clean-nordic: + $(MAKE) -C ports/nordic BOARD=feather_nrf52840_express clean clean-stm: $(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean diff --git a/README.rst b/README.rst index 9175cfb4a2903..3c169a96ed36d 100644 --- a/README.rst +++ b/README.rst @@ -231,7 +231,7 @@ cxd56 stable espressif ``ESP32`` beta | ``ESP32-C3`` beta | ``ESP32-S2`` stable | ``ESP32-S3`` beta litex alpha mimxrt10xx alpha -nrf stable +nordic stable raspberrypi stable silabs (efr32) alpha stm ``F4`` stable | ``others`` beta diff --git a/conf.py b/conf.py index 83041272c3b24..d8cf528a3081f 100644 --- a/conf.py +++ b/conf.py @@ -210,12 +210,12 @@ def autoapi_prepare_jinja_env(jinja_env): "ports/minimal", "ports/mimxrt10xx/peripherals", "ports/mimxrt10xx/sdk", - "ports/nrf/device", - "ports/nrf/bluetooth", - "ports/nrf/modules", - "ports/nrf/nrfx", - "ports/nrf/peripherals", - "ports/nrf/usb", + "ports/nordic/device", + "ports/nordic/bluetooth", + "ports/nordic/modules", + "ports/nordic/nrfx", + "ports/nordic/peripherals", + "ports/nordic/usb", "ports/raspberrypi/sdk", "ports/raspberrypi/lib", "ports/silabs/gecko_sdk", diff --git a/docs/library/collections.rst b/docs/library/collections.rst index 7cc6d9989b6a0..e400158c99cfd 100644 --- a/docs/library/collections.rst +++ b/docs/library/collections.rst @@ -14,33 +14,58 @@ hold/accumulate various objects. Classes ------- -.. class:: deque(iterable, maxlen[, flags]) +.. class:: deque(iterable, maxlen[, flag]) - Deques (double-ended queues) are a list-like container that support O(1) - appends and pops from either side of the deque. New deques are created - using the following arguments: + Deques (pronounced "deck" and short for "double-ended queue") are fixed length + list-like containers that support O(1) appends and pops from either side of the + deque. New deques are created using the following arguments: - - *iterable* must be the empty tuple, and the new deque is created empty. + - *iterable* must be specified as an empty or non-empty iterable. + If the iterable is empty, the new deque is created empty. If the + iterable is not empty, the new deque is created with the items + from the iterable. - *maxlen* must be specified and the deque will be bounded to this maximum length. Once the deque is full, any new items added will discard items from the opposite end. - - The optional *flags* can be 1 to check for overflow when adding items. + - *flag* is optional and can be set to 1 to check for overflow when + adding items. If the deque is full and overflow checking is enabled, + an IndexError will be raised when adding items. - As well as supporting ``bool`` and ``len``, deque objects have the following - methods: + Deque objects have the following methods: .. method:: deque.append(x) Add *x* to the right side of the deque. Raises IndexError if overflow checking is enabled and there is no more room left. + .. method:: deque.appendleft(x) + + Add *x* to the left side of the deque. + Raises IndexError if overflow checking is enabled and there is no more room left. + + .. method:: deque.pop() + + Remove and return an item from the right side of the deque. + Raises IndexError if no items are present. + .. method:: deque.popleft() Remove and return an item from the left side of the deque. Raises IndexError if no items are present. + .. method:: deque.extend(iterable) + + Extend the right side of the deque by appending items from the *iterable* argument. + Raises IndexError if overflow checking is enabled and there is no more room left + for all of the items in *iterable*. + + In addition to the above, deques support iteration, ``bool``, ``len(d)``, ``reversed(d)``, + membership testing with the ``in`` operator, and subscript references like ``d[0]``. + Note: Indexed access is O(1) at both ends but slows to O(n) in the middle of the deque, + so for fast random access use a ``list`` instead. + .. function:: namedtuple(name, fields) This is factory function to create a new namedtuple type with a specific diff --git a/docs/shared_bindings_matrix.py b/docs/shared_bindings_matrix.py index 6a72fe40f322b..cd5b09b6bdf27 100644 --- a/docs/shared_bindings_matrix.py +++ b/docs/shared_bindings_matrix.py @@ -38,7 +38,7 @@ "espressif", "litex", "mimxrt10xx", - "nrf", + "nordic", "raspberrypi", "silabs", "stm", @@ -78,6 +78,7 @@ "keypad.KeyMatrix": "CIRCUITPY_KEYPAD_KEYMATRIX", "keypad.Keys": "CIRCUITPY_KEYPAD_KEYS", "keypad.ShiftRegisterKeys": "CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS", + "keypad_demux.DemuxKeyMatrix": "CIRCUITPY_KEYPAD_DEMUX", "os.getenv": "CIRCUITPY_OS_GETENV", "select": "MICROPY_PY_SELECT_SELECT", "sys": "CIRCUITPY_SYS", diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst index 6112dd3e0eea3..02159083034d4 100644 --- a/docs/supported_ports.rst +++ b/docs/supported_ports.rst @@ -4,9 +4,10 @@ Supported Ports CircuitPython supports a number of microcontroller families. Support quality for each varies depending on the active contributors for each port. -Adafruit sponsored developers are actively contributing to atmel-samd, mimxrt10xx, nrf and stm -ports. They also maintain the other ports in order to ensure the boards build. Additional testing -is limited. +Adafruit sponsored developers are actively contributing to atmel-samd, mimxrt10xx, nordic, +raspberrypi, and stm ports. +They also maintain the other ports in order to ensure the boards build. +Additional testing is limited. .. toctree:: :maxdepth: 2 @@ -17,7 +18,7 @@ is limited. ../ports/espressif/README ../ports/litex/README ../ports/mimxrt10xx/README - ../ports/nrf/README + ../ports/nordic/README ../ports/raspberrypi/README ../ports/silabs/README ../ports/stm/README diff --git a/docs/workflows.md b/docs/workflows.md index 875b4c900966f..727cc5401caf8 100644 --- a/docs/workflows.md +++ b/docs/workflows.md @@ -35,7 +35,7 @@ a reset into bootloader.) ## BLE -The BLE workflow is enabled for nRF boards. By default, to prevent malicious access, it is disabled. +The BLE workflow is enabled for Nordic boards. By default, to prevent malicious access, it is disabled. To connect to the BLE workflow, press the reset button while the status led blinks blue quickly after the safe mode blinks. The board will restart and broadcast the file transfer service UUID (`0xfebb`) along with the board's [Creation IDs](https://github.com/creationid/creators). This diff --git a/lib/adafruit_floppy b/lib/adafruit_floppy index e36a6127b957a..a20190fb04d14 160000 --- a/lib/adafruit_floppy +++ b/lib/adafruit_floppy @@ -1 +1 @@ -Subproject commit e36a6127b957ab2f602e031ba3583de9c571582e +Subproject commit a20190fb04d14197dcc2b578d54ce0ba9223f525 diff --git a/lib/tinyusb b/lib/tinyusb index 15775727e7e29..60764de56461e 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 15775727e7e29cf6b4d748f01d9457479f8f6899 +Subproject commit 60764de56461edbf1e8bafe4e73fdc97ec3d2e6e diff --git a/locale/ID.po b/locale/ID.po index 89e5cad451f2e..d85f6f388ab3c 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -93,7 +93,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -239,7 +239,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -464,7 +464,7 @@ msgid "Address must be %d bytes long" msgstr "Alamat harus sepanjang %d byte" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -479,7 +479,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Semua perangkat I2C sedang digunakan" @@ -489,17 +489,17 @@ msgstr "Semua perangkat I2C sedang digunakan" msgid "All RX FIFOs in use" msgstr "Semua RX FIFO sedang digunakan" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Semua perangkat SPI sedang digunakan" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Semua perangkat UART sedang digunakan" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -511,6 +511,7 @@ msgstr "" msgid "All event channels in use" msgstr "Semua channel event sedang digunakan" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -530,15 +531,16 @@ msgstr "Semua timer untuk pin ini sedang digunakan" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Semua timer sedang digunakan" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Sudah disebarkan." @@ -681,7 +683,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -724,7 +726,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Tidak dapat mengatur CCCD pada Karakteristik lokal" @@ -746,12 +748,12 @@ msgstr "Tidak dapat menghapus nilai" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Tidak bisa mendapatkan pull pada saat mode output" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Tidak bisa mendapatkan suhu" @@ -786,7 +788,7 @@ msgstr "Tidak dapat menentukan RTS atau CTS dalam mode RS485" msgid "Cannot subclass slice" msgstr "Tidak dapat membuat subkelas dari irisan" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -846,7 +848,7 @@ msgid "DAC already in use" msgstr "DAC sudah digunakan" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin harus byte disejajarkan" @@ -859,12 +861,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Data terlalu besar untuk paket advertisment" @@ -880,7 +882,7 @@ msgstr "Kapasitas tujuan lebih kecil dari destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Perangkat sedang digunakan" @@ -929,7 +931,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Penyebaran yang diperluas dengan respon pindai tidak didukung." @@ -945,7 +947,7 @@ msgstr "" msgid "Failed sending command." msgstr "Gagal mengirim perintah." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Gagal memperoleh mutex, err 0x%04x" @@ -976,11 +978,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Gagal terhubung: kesalahan internal" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Gagal terhubung: habis waktu" @@ -988,7 +990,7 @@ msgstr "Gagal terhubung: habis waktu" msgid "Failed to parse MP3 file" msgstr "Gagal mengurai file MP3" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Gagal melepaskan mutex, err 0x%04x" @@ -1120,11 +1122,11 @@ msgstr "" msgid "Input/output error" msgstr "Kesalahan input/output" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Otentikasi tidak cukup" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Enkripsi tidak cukup" @@ -1200,7 +1202,7 @@ msgid "Invalid ADC Unit value" msgstr "Nilai Unit ADC tidak valid" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1380,7 +1382,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1390,7 +1393,7 @@ msgid "No %q pin" msgstr "Tidak pin %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Tidak ada CCCD untuk Karakteristik ini" @@ -1469,7 +1472,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1498,7 +1501,7 @@ msgstr "Penghitung waktu tidak tersedia" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1507,7 +1510,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Tidak terhubung" @@ -1532,7 +1535,7 @@ msgid "" msgstr "" "Objek telah dideinisialisasi dan tidak dapat lagi digunakan. Buat objek baru." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Parity ganjil tidak didukung" @@ -1603,7 +1606,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1781,7 +1784,7 @@ msgid "RNG Init Error" msgstr "Kesalahan Init RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1886,7 +1889,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -2003,7 +2006,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2025,7 +2028,7 @@ msgid "Too many displays" msgstr "Terlalu banyak tampilan" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2141,7 +2144,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Tipe urf nrfx tak sesuai" @@ -2165,7 +2168,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Kesalahan gatt tidak dikenal: 0x%04x" @@ -2175,7 +2178,7 @@ msgstr "Kesalahan gatt tidak dikenal: 0x%04x" msgid "Unknown reason." msgstr "Alasan yang tidak diketahui." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Kesalahan keamanan tidak dikenal: 0x%04x" @@ -2185,7 +2188,7 @@ msgstr "Kesalahan keamanan tidak dikenal: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2201,7 +2204,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Jumlah item pada RHS tidak cocok (diharapkan %d, didapatkan %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2231,15 +2234,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Panjang nilai != Panjang tetap yang dibutuhkan" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Panjang nilai > max_length" @@ -2255,7 +2258,7 @@ msgstr "Tegangan baca habis waktu" msgid "WARNING: Your code filename has two extensions\n" msgstr "PERINGATAN: Nama file kode anda mempunyai dua ekstensi\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2282,7 +2285,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Menulis tidak didukung pada Karakteristik" @@ -2336,7 +2339,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2923,7 +2926,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "error = 0x%08lX" @@ -3413,8 +3416,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3574,7 +3577,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3586,7 +3589,7 @@ msgstr "argumen non-default mengikuti argumen standar(default)" msgid "non-hex digit found" msgstr "digit non-hex ditemukan" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3692,7 +3695,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3709,7 +3712,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3821,7 +3824,7 @@ msgstr "Muncul dari PulseIn yang kosong" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4041,14 +4044,23 @@ msgstr "sintaksis error pada pendeskripsi uctypes" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 7985794d67c6c..cb370d0ede9cc 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -90,7 +90,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -236,7 +236,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -461,7 +461,7 @@ msgid "Address must be %d bytes long" msgstr "" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -476,7 +476,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "" @@ -486,17 +486,17 @@ msgstr "" msgid "All RX FIFOs in use" msgstr "" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -508,6 +508,7 @@ msgstr "" msgid "All event channels in use" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -527,15 +528,16 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "" @@ -676,7 +678,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -719,7 +721,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "" @@ -741,12 +743,12 @@ msgstr "" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "" @@ -779,7 +781,7 @@ msgstr "" msgid "Cannot subclass slice" msgstr "" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -838,7 +840,7 @@ msgid "DAC already in use" msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" @@ -851,12 +853,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "" @@ -872,7 +874,7 @@ msgstr "" msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "" @@ -921,7 +923,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -937,7 +939,7 @@ msgstr "" msgid "Failed sending command." msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "" @@ -968,11 +970,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "" @@ -980,7 +982,7 @@ msgstr "" msgid "Failed to parse MP3 file" msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "" @@ -1112,11 +1114,11 @@ msgstr "" msgid "Input/output error" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "" @@ -1192,7 +1194,7 @@ msgid "Invalid ADC Unit value" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1372,7 +1374,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1382,7 +1385,7 @@ msgid "No %q pin" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1461,7 +1464,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1490,7 +1493,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1499,7 +1502,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "" @@ -1523,7 +1526,7 @@ msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "" @@ -1590,7 +1593,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1763,7 +1766,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1866,7 +1869,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -1983,7 +1986,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2005,7 +2008,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2121,7 +2124,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2145,7 +2148,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2155,7 +2158,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2165,7 +2168,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2181,7 +2184,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2209,15 +2212,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2233,7 +2236,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2260,7 +2263,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2314,7 +2317,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2901,7 +2904,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3391,8 +3394,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3552,7 +3555,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3564,7 +3567,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3670,7 +3673,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3687,7 +3690,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3799,7 +3802,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4019,14 +4022,23 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/cs.po b/locale/cs.po index 24e893976b1d8..7fdf26cd6ee56 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -101,7 +101,7 @@ msgstr "%q a %q musí být rozdílné" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -247,7 +247,7 @@ msgstr "%q je mimo hranice" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -472,7 +472,7 @@ msgid "Address must be %d bytes long" msgstr "Adresa musí být %d bajtů dlouhá" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Adresní rozsah není povolen" @@ -487,7 +487,7 @@ msgstr "Všechny CAN periferie jsou používány" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Všechny I2C periferie jsou používány" @@ -497,17 +497,17 @@ msgstr "Všechny I2C periferie jsou používány" msgid "All RX FIFOs in use" msgstr "Všechny RX FIFO jsou používány" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Všechny SPI periferie jsou používány" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Všechny UART periferie jsou používány" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Všechny kanály jsou používány" @@ -519,6 +519,7 @@ msgstr "Všechny DMA kanály jsou používány" msgid "All event channels in use" msgstr "Všechny kanály událostí jsou již používány" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -538,15 +539,16 @@ msgstr "Všechny časovače pro tento pin jsou používány" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Všechny časovače jsou používány" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Již propagujeme." @@ -689,7 +691,7 @@ msgstr "Buffer příliš malý" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -735,7 +737,7 @@ msgstr "" "Lze nastavit alarm na maximálně dvou pinech ve stavu low při hlubokém spánku." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Nelze nastavit CCCD na místní charakteristiku" @@ -757,12 +759,12 @@ msgstr "Nelze odstranit hodnoty" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Nelze získat ve výstupním režimu" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Nelze získat teplotu (°C)" @@ -795,7 +797,7 @@ msgstr "Nelze určit RTS nebo CTS v režimu RS485" msgid "Cannot subclass slice" msgstr "Nelze použít řez podtřídy" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "Nelze probudit hranou na pinu, pouze úrovní" @@ -855,7 +857,7 @@ msgid "DAC already in use" msgstr "DAC se již používá" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Datový pin 0 musí být zarovnán na bajty" @@ -868,12 +870,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Data nejsou podporována s cíleným oznamováním" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Data jsou příliš velká pro propagovaný paket" @@ -890,7 +892,7 @@ msgstr "Cílová kapacita je menší než destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Zařízení je používáno" @@ -939,7 +941,7 @@ msgid "Expected a kind of %q" msgstr "Očekáván typ %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -955,7 +957,7 @@ msgstr "FFT je implementován pouze pro lineární pole" msgid "Failed sending command." msgstr "Nepodařilo se odeslat příkaz." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nepodařilo se získat mutex, err 0x%04x" @@ -986,11 +988,11 @@ msgid "Failed to buffer the sample" msgstr "Nepodařilo se nabufferovat sample" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Připojení se nezdařilo: interní chyba" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Nepodařilo se připojit: časový limit" @@ -998,7 +1000,7 @@ msgstr "Nepodařilo se připojit: časový limit" msgid "Failed to parse MP3 file" msgstr "Soubor MP3 se nepodařilo analyzovat" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Nepodařilo se uvolnit mutex, err 0x%04x" @@ -1132,11 +1134,11 @@ msgstr "Vstup trval příliš dlouho" msgid "Input/output error" msgstr "Chyba vstupu/výstupu" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Nedostatečná autentizace" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Nedostatečné šifrování" @@ -1212,7 +1214,7 @@ msgid "Invalid ADC Unit value" msgstr "Neplatná hodnota jednotky ADC" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Chybný BLE parametr" @@ -1392,7 +1394,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1402,7 +1405,7 @@ msgid "No %q pin" msgstr "Žádný %q pin" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Žádné CCCD pro tuto charakteristiku" @@ -1481,7 +1484,7 @@ msgstr "V programu není výstup" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "SDA nebo SCL zřejmě nemá pull up; zkontroluj zapojení" @@ -1510,7 +1513,7 @@ msgstr "Není k dispozici žádný časovač" msgid "No usb host port initialized" msgstr "Žádný USB host port není inicializován" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Nordic system firmware - nedostatek paměti" @@ -1519,7 +1522,7 @@ msgid "Not a valid IP string" msgstr "Nevalidní IP string" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Nepřipojený" @@ -1544,7 +1547,7 @@ msgid "" msgstr "" "Objekt byl deinicializován a nelze jej dále používat. Vytvořte nový objekt." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "" @@ -1613,7 +1616,7 @@ msgid "Only one address is allowed" msgstr "Je povolena pouze jedna adresa" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Lze nastavit pouze jeden alarm typu alarm.time" @@ -1788,7 +1791,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1891,7 +1894,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Scan již probíhá. Lze zastavit pomocí stop_scan." @@ -2008,7 +2011,7 @@ msgid "Time is in the past." msgstr "Čas je v minulosti." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Časový limit je příliš dlouhý: maximální limit je %d vteřin" @@ -2031,7 +2034,7 @@ msgid "Too many displays" msgstr "Příliš mnoho displejů" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "Velikost dat k zápisu je větší než %q" @@ -2147,7 +2150,7 @@ msgstr "Není možné zapisovat do paměti jen pro čtení" msgid "Unable to write to sleep_memory." msgstr "Nelze zapsat do sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2171,7 +2174,7 @@ msgstr "Neznámý chybový kód %d" msgid "Unknown failure %d" msgstr "Neznámé selhání %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2181,7 +2184,7 @@ msgstr "" msgid "Unknown reason." msgstr "Neznámý důvod." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Neznámá bezpečnostní chyba: 0x%04x" @@ -2191,7 +2194,7 @@ msgstr "Neznámá bezpečnostní chyba: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Neznámá chyba firmwaru na %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Neznámá chyba firmwaru: %04x" @@ -2207,7 +2210,7 @@ msgstr "Neznámá chyba firmwaru: %d" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2235,15 +2238,15 @@ msgstr "Aktualizace selhala" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2259,7 +2262,7 @@ msgstr "Časový limit čtení napětí vypršel" msgid "WARNING: Your code filename has two extensions\n" msgstr "UPOZORNĚNÍ: Název souboru vašeho kódu má dvě koncovky\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "WatchDogTimer nelze deaktivovat v režimu RESET" @@ -2291,7 +2294,7 @@ msgid "Woken up by alarm.\n" msgstr "Probuzen alarmem.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2345,7 +2348,7 @@ msgstr "Při spuštění jsi stiskl tlačítko VOLUME." msgid "You pressed the central button at start up." msgstr "Při spuštění jsi stiskl středové tlačítko." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Při spuštění jsi stiskl tlačítko doleva." @@ -2932,7 +2935,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "epoch_time není podporován na této desce" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3422,8 +3425,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3583,7 +3586,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3595,7 +3598,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "nenulový timeout musí být > 0.01" @@ -3701,7 +3704,7 @@ msgstr "offset musí být >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3718,7 +3721,7 @@ msgstr "pouze ndarraye mohou být spojeny" msgid "only oversample=64 is supported" msgstr "je podporován pouze oversampling 64" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3830,7 +3833,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4050,14 +4053,23 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "timeout překročil maximální podporovanou hodnotu" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "timeout musí být < 655.35 s" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 63e836b29b827..f9c197930d24f 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -102,7 +102,7 @@ msgstr "%q und %q müssen unterschiedlich sein" msgid "%q and %q must share a clock unit" msgstr "%q und %q müssen eine Uhreneinheit teilen" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" "%q und %q können nicht geändert werden, sobald der Modus auf %q gesetzt ist" @@ -250,7 +250,7 @@ msgstr "%q außerhalb der Grenzen" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -476,7 +476,7 @@ msgid "Address must be %d bytes long" msgstr "Die Adresse muss %d Bytes lang sein" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Adressbereich nicht erlaubt" @@ -491,7 +491,7 @@ msgstr "Alle CAN-Schnittstellen sind in Benutzung" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Alle I2C-Peripheriegeräte sind in Benutzung" @@ -501,17 +501,17 @@ msgstr "Alle I2C-Peripheriegeräte sind in Benutzung" msgid "All RX FIFOs in use" msgstr "Alle RX FIFOs sind in Benutzung" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Alle SPI-Peripheriegeräte sind in Benutzung" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Alle UART-Peripheriegeräte sind in Benutzung" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Alle Kanäle werden verwendet" @@ -523,6 +523,7 @@ msgstr "All DMA-Kanäle in Verwendung" msgid "All event channels in use" msgstr "Alle Event-Kanäle werden benutzt" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -542,15 +543,16 @@ msgstr "Alle Timer für diesen Pin werden bereits benutzt" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Alle Timer werden benutzt" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Bereits am Anbieten (advertising)." @@ -693,7 +695,7 @@ msgstr "Puffer ist zu klein" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -738,7 +740,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "Kann nur auf zwei Pins Alarm als low aus Deep Sleep auslösen." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "CCCD kann nicht auf lokales Merkmal eingestellt werden" @@ -760,12 +762,12 @@ msgstr "Kann Werte nicht löschen" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Pull up im Ausgabemodus nicht möglich" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Kann Temperatur nicht holen" @@ -799,7 +801,7 @@ msgstr "RTS oder CTS können im RS485-Modus nicht angegeben werden" msgid "Cannot subclass slice" msgstr "Slice kann keine sub-klasse sein" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "Kann nicht durch Flanke an Pin geweckt werden, sondern nur durch Pegel" @@ -860,7 +862,7 @@ msgid "DAC already in use" msgstr "DAC wird schon benutzt" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin muss am Byte ausgerichtet sein" @@ -873,12 +875,12 @@ msgid "Data format error (may be broken data)" msgstr "Datenformatfehler (Möglicherweise beschädigte Daten)" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Daten werden nicht mit direkter Ankündigung unsterstützt" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Zu vielen Daten für das advertisement packet" @@ -894,7 +896,7 @@ msgstr "Die Zielkapazität ist kleiner als destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Gerät in Benutzung" @@ -945,7 +947,7 @@ msgid "Expected a kind of %q" msgstr "Erwartete eine Art von %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" "Erweiterte Ankündigung (advertising) mit Scan-Antwort wird nicht unterstützt." @@ -962,7 +964,7 @@ msgstr "FFT ist nur für lineare Arrays implementiert" msgid "Failed sending command." msgstr "Kommando nicht gesendet." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Mutex konnte nicht akquiriert werden. Status: 0x%04x" @@ -993,11 +995,11 @@ msgid "Failed to buffer the sample" msgstr "Pufferung des Sample fehlgeschlagen" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Verbindung fehlgeschlagen: interner Fehler" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Verbindung nicht erfolgreich: timeout" @@ -1005,7 +1007,7 @@ msgstr "Verbindung nicht erfolgreich: timeout" msgid "Failed to parse MP3 file" msgstr "MP3-Datei konnte nicht analysiert werden" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Mutex konnte nicht freigegeben werden. Status: 0x%04x" @@ -1143,11 +1145,11 @@ msgstr "Input benötigt zu lange" msgid "Input/output error" msgstr "Eingabe-/Ausgabefehler" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Unzureichende Authentifizierung" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Unzureichende Verschlüsselung" @@ -1223,7 +1225,7 @@ msgid "Invalid ADC Unit value" msgstr "Ungültiger ADC-Einheitenwert" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Ungültiges BLE Parameter" @@ -1403,7 +1405,8 @@ msgstr "Kein Speicher mehr für Nible vorhanden" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1413,7 +1416,7 @@ msgid "No %q pin" msgstr "Kein %q-Pin" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Kein CCCD für diese Charakteristik" @@ -1492,7 +1495,7 @@ msgstr "Kein Aus in Programm" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "Kein Pull-up gefunden an SDA oder SCL; Verkabelung prüfen" @@ -1521,7 +1524,7 @@ msgstr "Kein Timer verfügbar" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Nordic System-Firmware kein Speicher verfügbar" @@ -1530,7 +1533,7 @@ msgid "Not a valid IP string" msgstr "Kein gültiger IP-String" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Nicht verbunden" @@ -1556,7 +1559,7 @@ msgstr "" "Objekt wurde deinitialisiert und kann nicht mehr verwendet werden. Erstelle " "ein neues Objekt." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Eine ungerade Parität wird nicht unterstützt" @@ -1627,7 +1630,7 @@ msgid "Only one address is allowed" msgstr "Nur eine Adresse ist erlaubt" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Nur ein alarm.time Alarm kann gesetzt werden" @@ -1808,7 +1811,7 @@ msgid "RNG Init Error" msgstr "RNG-Init-Fehler" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1911,7 +1914,7 @@ msgid "Scale dimensions must divide by 3" msgstr "Maßstabs-Abmeßungen müssen durch 3 teilbar sein" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Scan läuft schon. Stoppen mit stop_scan." @@ -2034,7 +2037,7 @@ msgid "Time is in the past." msgstr "Zeit liegt in der Vergangenheit." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2057,7 +2060,7 @@ msgid "Too many displays" msgstr "Zu viele displays" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "Gesamte zu schreibende Datenmenge ist größer als %q" @@ -2173,7 +2176,7 @@ msgstr "schreibgeschützter Speicher kann nicht beschrieben werden" msgid "Unable to write to sleep_memory." msgstr "Schreiben in sleep_memory nicht möglich." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Unerwarteter nrfx uuid-Typ" @@ -2197,7 +2200,7 @@ msgstr "Unbekannter Fehlercode %d" msgid "Unknown failure %d" msgstr "Unbekannter Fehler %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Unbekannter Gatt-Fehler: 0x%04x" @@ -2207,7 +2210,7 @@ msgstr "Unbekannter Gatt-Fehler: 0x%04x" msgid "Unknown reason." msgstr "Unbekannter Grund." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Unbekannter Sicherheitsfehler: 0x%04x" @@ -2217,7 +2220,7 @@ msgstr "Unbekannter Sicherheitsfehler: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Unbekannter System-Firmware-Fehler bei %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Unbekannter Systemfirmware Fehler: %04x" @@ -2235,7 +2238,7 @@ msgstr "" "Nicht übereinstimmende Anzahl von Elementen auf der rechten Seite (erwartet " "%d, %d erhalten)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2265,15 +2268,15 @@ msgstr "Update fehlgeschlagen" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Länge des Wertes != Erforderliche feste Länge" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Länge des Wertes > max_length" @@ -2290,7 +2293,7 @@ msgid "WARNING: Your code filename has two extensions\n" msgstr "" "WARNUNG: Der Dateiname deines Programms hat zwei Dateityperweiterungen\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" "WatchDogTimer kann nicht deinitialisiert werden, wenn der Modus auf RESET " @@ -2324,7 +2327,7 @@ msgid "Woken up by alarm.\n" msgstr "Aufgeweckt durch Alarm.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Schreiben für diese Charakteristik nicht unterstützt" @@ -2378,7 +2381,7 @@ msgstr "Der VOLUME-Knopf wurde beim Starten gedrückt." msgid "You pressed the central button at start up." msgstr "Der zentrale Knopf wurde beim Starten gedrückt." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Der linke Knopf wurde beim Starten gedrückt." @@ -2977,7 +2980,7 @@ msgstr "Ende des Formats bei der Suche nach einem Konvertierungsspezifizierer" msgid "epoch_time not supported on this board" msgstr "epoch_time wird auf diesem Board nicht unterstützt" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "Fehler = 0x%08lX" @@ -3473,8 +3476,8 @@ msgid "matrix is not positive definite" msgstr "Matrix ist nicht positiv definitiv" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length muss 0-%d sein, wenn fixed_length %s ist" @@ -3634,7 +3637,7 @@ msgid "no such attribute" msgstr "kein solches Attribut" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "Nicht-UUID in service_uuids_whitelist gefunden" @@ -3646,7 +3649,7 @@ msgstr "ein non-default argument folgt auf ein default argument" msgid "non-hex digit found" msgstr "eine nicht-hex zahl wurde gefunden" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "Timeout ungleich Null muss > 0,01 sein" @@ -3755,7 +3758,7 @@ msgid "offset must be non-negative and no greater than buffer length" msgstr "" "Offset muss nicht negativ sein und darf nicht größer als die Pufferlänge sein" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "nur eine bit_depth=16 wird unterstützt" @@ -3772,7 +3775,7 @@ msgstr "nur ndarrays können aneinandergehängt werden" msgid "only oversample=64 is supported" msgstr "nur oversample=64 wird unterstützt" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "nur eine sample_rate=16000 wird unterstützt" @@ -3887,7 +3890,7 @@ msgstr "pop von einem leeren PulseIn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4107,14 +4110,23 @@ msgstr "Syntaxfehler in uctypes Deskriptor" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "Das Zeitlimit hat den maximal zulässigen Wert überschritten" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "timeout muss kleiner als 655.35 Sekunden sein" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "Zeitlimit beim warten auf v1 Karte" diff --git a/locale/el.po b/locale/el.po index 6dd2a60fdbb59..c250697172dc1 100644 --- a/locale/el.po +++ b/locale/el.po @@ -105,7 +105,7 @@ msgstr "%q και %q πρεπει να είναι διαφορετικά" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -251,7 +251,7 @@ msgstr "%q εκτός ορίων" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -476,7 +476,7 @@ msgid "Address must be %d bytes long" msgstr "Η διεύθυνση πρέπει να είναι %d bytes μεγάλη" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Εμβέλεια διευθύνσεων δεν επιτρέπεται" @@ -491,7 +491,7 @@ msgstr "Όλα τα περιφεριακά CAN είναι σε χρήση" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Όλα τα I2C περιφεριακά ειναι σε χρήση" @@ -501,17 +501,17 @@ msgstr "Όλα τα I2C περιφεριακά ειναι σε χρήση" msgid "All RX FIFOs in use" msgstr "Όλα τα RX FIFOs είναι σε χρήση" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Όλα τα SPI περιφεριακά είναι σε χρήση" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Όλα τα UART περιφεριακά ειναι σε χρήση" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Όλα τα κανάλια είναι σε χρήση" @@ -523,6 +523,7 @@ msgstr "Όλα τα κανάλια dma είναι σε χρήση" msgid "All event channels in use" msgstr "Όλα τα κανάλια συμβάντων είναι σε χρήση" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -542,15 +543,16 @@ msgstr "Όλοι οι χρονιστές για αυτό το pin χρησιμο #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Όλοι οι χρονιστές βρίσκονται σε χρήση" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Ήδη διαφημίζουμε." @@ -693,7 +695,7 @@ msgstr "Buffer πολύ μικρός" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -737,7 +739,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "Μπορεί να γίνει alarm μόνο σε δύο low pins σε βαθύ ύπνο." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Δεν μπορεί να οριστεί CCCD σε τοπικό Characteristic" @@ -760,12 +762,12 @@ msgstr "Δεν μπορούν να διαγραφούν οι τιμές" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Δεν γίνεται να διαβαστεί το pull όσο είναι σε output mode" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Δεν μπορεί να διαβαστεί η θερμοκρασία" @@ -800,7 +802,7 @@ msgstr "Δεν μπορεί να οριστεί RTS ή CTS σε RS485 mode" msgid "Cannot subclass slice" msgstr "Δεν γίνεται υποκατηγορία ενός slice" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "Δεν γίνεται αφύπνηση σε pin edge, αλλά μόνο σε level" @@ -861,7 +863,7 @@ msgid "DAC already in use" msgstr "DAC είναι ήδη σε χρήση" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Το Data 0 pin πρέπει να είναι byte aligned" @@ -874,12 +876,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Δεν υποστηρίζονται δεδομένα με κατευθυνόμενη διαφήμιση" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Τα δεδομένα είναι πολύ μεγάλα για πακέτο διαφημίσεων" @@ -896,7 +898,7 @@ msgstr "" msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Συσκευή σε χρήση" @@ -947,7 +949,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -963,7 +965,7 @@ msgstr "" msgid "Failed sending command." msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "" @@ -994,11 +996,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "" @@ -1006,7 +1008,7 @@ msgstr "" msgid "Failed to parse MP3 file" msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "" @@ -1138,11 +1140,11 @@ msgstr "" msgid "Input/output error" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "" @@ -1218,7 +1220,7 @@ msgid "Invalid ADC Unit value" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1398,7 +1400,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1408,7 +1411,7 @@ msgid "No %q pin" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1487,7 +1490,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1516,7 +1519,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1525,7 +1528,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "" @@ -1549,7 +1552,7 @@ msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "" @@ -1616,7 +1619,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1791,7 +1794,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1894,7 +1897,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -2011,7 +2014,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2033,7 +2036,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2149,7 +2152,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2173,7 +2176,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2183,7 +2186,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2193,7 +2196,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2209,7 +2212,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2237,15 +2240,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2261,7 +2264,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2288,7 +2291,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2342,7 +2345,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2929,7 +2932,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3419,8 +3422,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3580,7 +3583,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3592,7 +3595,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3698,7 +3701,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3715,7 +3718,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3827,7 +3830,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4047,14 +4050,23 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index 967d147057b98..b6e761bd91b27 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -103,7 +103,7 @@ msgstr "%q and %q must be different" msgid "%q and %q must share a clock unit" msgstr "%q and %q must share a clock unit" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -249,7 +249,7 @@ msgstr "%q out of bounds" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -474,7 +474,7 @@ msgid "Address must be %d bytes long" msgstr "Address must be %d bytes long" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Address range not allowed" @@ -489,7 +489,7 @@ msgstr "All CAN peripherals are in use" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "All I2C peripherals are in use" @@ -499,17 +499,17 @@ msgstr "All I2C peripherals are in use" msgid "All RX FIFOs in use" msgstr "All RX FIFOs in use" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "All SPI peripherals are in use" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "All UART peripherals are in use" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "All channels in use" @@ -521,6 +521,7 @@ msgstr "All DMA channels in use" msgid "All event channels in use" msgstr "All event channels in use" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -540,15 +541,16 @@ msgstr "All timers for this pin are in use" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "All timers in use" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Already advertising." @@ -691,7 +693,7 @@ msgstr "Buffer too small" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -734,7 +736,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "Can only alarm on two low pins from deep sleep." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Can't set CCCD on local Characteristic" @@ -756,12 +758,12 @@ msgstr "Cannot delete values" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Cannot get pull while in output mode" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Cannot get temperature" @@ -794,7 +796,7 @@ msgstr "Cannot specify RTS or CTS in RS485 mode" msgid "Cannot subclass slice" msgstr "Cannot subclass slice" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "Cannot wake on pin edge, only level" @@ -855,7 +857,7 @@ msgid "DAC already in use" msgstr "DAC already in use" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin must be byte aligned" @@ -868,12 +870,12 @@ msgid "Data format error (may be broken data)" msgstr "Data format error (may be broken data)" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Data not supported with directed advertising" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Data too large for advertisement packet" @@ -889,7 +891,7 @@ msgstr "Destination capacity is smaller than destination_length." msgid "Device error or wrong termination of input stream" msgstr "Device error or wrong termination of input stream" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Device in use" @@ -938,7 +940,7 @@ msgid "Expected a kind of %q" msgstr "Expected a kind of %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Extended advertisements with scan response not supported." @@ -954,7 +956,7 @@ msgstr "FFT is implemented for linear arrays only" msgid "Failed sending command." msgstr "Failed sending command." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Failed to acquire mutex, err 0x%04x" @@ -986,11 +988,11 @@ msgid "Failed to buffer the sample" msgstr "Failed to buffer the sample" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Failed to connect: internal error" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Failed to connect: timeout" @@ -998,7 +1000,7 @@ msgstr "Failed to connect: timeout" msgid "Failed to parse MP3 file" msgstr "Failed to parse MP3 file" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Failed to release mutex, err 0x%04x" @@ -1131,11 +1133,11 @@ msgstr "Input taking too long" msgid "Input/output error" msgstr "Input/output error" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Insufficient authentication" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Insufficient encryption" @@ -1211,7 +1213,7 @@ msgid "Invalid ADC Unit value" msgstr "Invalid ADC unit value" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Invalid BLE parameter" @@ -1391,7 +1393,8 @@ msgstr "Nimble out of memory" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1401,7 +1404,7 @@ msgid "No %q pin" msgstr "No %q pin" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "No CCCD for this Characteristic" @@ -1480,7 +1483,7 @@ msgstr "No out in program" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "No pull up found on SDA or SCL; check your wiring" @@ -1509,7 +1512,7 @@ msgstr "No timer available" msgid "No usb host port initialized" msgstr "No USB host port initialised" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Nordic system firmware out of memory" @@ -1518,7 +1521,7 @@ msgid "Not a valid IP string" msgstr "Not a valid IP string" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Not connected" @@ -1543,7 +1546,7 @@ msgid "" msgstr "" "Object has been deinitialised and can no longer be used. Create a new object." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Odd parity is not supported" @@ -1613,7 +1616,7 @@ msgid "Only one address is allowed" msgstr "Only one address is allowed" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Only one alarm.time alarm can be set" @@ -1789,7 +1792,7 @@ msgid "RNG Init Error" msgstr "RNG init Error" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1892,7 +1895,7 @@ msgid "Scale dimensions must divide by 3" msgstr "Scale dimensions must divide by 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Scan already in progress. Stop with stop_scan." @@ -2011,7 +2014,7 @@ msgid "Time is in the past." msgstr "Time is in the past." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Timeout is too long: Maximum timeout length is %d seconds" @@ -2033,7 +2036,7 @@ msgid "Too many displays" msgstr "Too many displays" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "Total data to write is larger than %q" @@ -2149,7 +2152,7 @@ msgstr "Unable to write to read-only memory" msgid "Unable to write to sleep_memory." msgstr "Unable to write to sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Unexpected nrfx uuid type" @@ -2173,7 +2176,7 @@ msgstr "Unknown error code %d" msgid "Unknown failure %d" msgstr "Unknown failure %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Unknown gatt error: 0x%04x" @@ -2183,7 +2186,7 @@ msgstr "Unknown gatt error: 0x%04x" msgid "Unknown reason." msgstr "Unknown reason." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Unknown security error: 0x%04x" @@ -2193,7 +2196,7 @@ msgstr "Unknown security error: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Unknown system firmware error at %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Unknown system firmware error: %04x" @@ -2209,7 +2212,7 @@ msgstr "Unknown system firmware error: %d" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Unmatched number of items on RHS (expected %d, got %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2239,15 +2242,15 @@ msgstr "Update failed" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Value length != required fixed length" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Value length > max_length" @@ -2263,7 +2266,7 @@ msgstr "Voltage read timed out" msgid "WARNING: Your code filename has two extensions\n" msgstr "WARNING: Your code filename has two extensions\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "WatchDogTimer cannot be deinitialised once mode is set to RESET" @@ -2295,7 +2298,7 @@ msgid "Woken up by alarm.\n" msgstr "Woken up by alarm.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Writes not supported on Characteristic" @@ -2349,7 +2352,7 @@ msgstr "You pressed the VOLUME button at start up." msgid "You pressed the central button at start up." msgstr "You pressed the central button at start up." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "You pressed the left button at start up." @@ -2939,7 +2942,7 @@ msgstr "end of format while looking for conversion specifier" msgid "epoch_time not supported on this board" msgstr "epoch_time not supported on this board" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "error = 0x%08lX" @@ -3429,8 +3432,8 @@ msgid "matrix is not positive definite" msgstr "matrix is not positive definite" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length must be 0-%d when fixed_length is %s" @@ -3590,7 +3593,7 @@ msgid "no such attribute" msgstr "no such attribute" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "non-UUID found in service_uuids_whitelist" @@ -3602,7 +3605,7 @@ msgstr "non-default argument follows default argument" msgid "non-hex digit found" msgstr "non-hex digit found" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "non-zero timeout must be > 0.01" @@ -3708,7 +3711,7 @@ msgstr "offset must be >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "offset must be non-negative and not greater than buffer length" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "only bit_depth=16 is supported" @@ -3725,7 +3728,7 @@ msgstr "only ndarrays can be concatenated" msgid "only oversample=64 is supported" msgstr "only oversample=64 is supported" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "only sample_rate=16000 is supported" @@ -3837,7 +3840,7 @@ msgstr "pop from an empty PulseIn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4057,14 +4060,23 @@ msgstr "syntax error in uctypes descriptor" msgid "ticks interval overflow" msgstr "ticks interval overflow" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "timeout duration exceeded the maximum supported value" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "timeout must be < 655.35 secs" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "timeout waiting for v1 card" diff --git a/locale/es.po b/locale/es.po index 9bada67684753..f70d342389da6 100644 --- a/locale/es.po +++ b/locale/es.po @@ -105,7 +105,7 @@ msgstr "%q y %q deben ser diferentes" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -251,7 +251,7 @@ msgstr "%q fuera de limites" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -476,7 +476,7 @@ msgid "Address must be %d bytes long" msgstr "La dirección debe tener %d bytes de longitud" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Rango de dirección no permitido" @@ -491,7 +491,7 @@ msgstr "Todos los periféricos CAN están en uso" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Todos los periféricos I2C están en uso" @@ -501,17 +501,17 @@ msgstr "Todos los periféricos I2C están en uso" msgid "All RX FIFOs in use" msgstr "Todos los FIFOs de RX en uso" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Todos los periféricos SPI están en uso" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Todos los periféricos UART están en uso" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Todos los canales están en uso" @@ -523,6 +523,7 @@ msgstr "Todos los canales DMA en uso" msgid "All event channels in use" msgstr "Todos los canales de eventos están en uso" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -544,15 +545,16 @@ msgstr "Todos los timers para este pin están en uso" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Todos los timers en uso" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Ya se encuentra publicando." @@ -696,7 +698,7 @@ msgstr "Buffer demasiado pequeño" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -741,7 +743,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "Solo puede alerta en dos low pines viniendo de deep sleep." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "No se puede configurar CCCD en la característica local" @@ -763,12 +765,12 @@ msgstr "No se puede eliminar valores" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "No puede ser pull mientras este en modo de salida" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "No se puede obtener la temperatura" @@ -803,7 +805,7 @@ msgstr "No se puede especificar RTS o CTS en modo RS485" msgid "Cannot subclass slice" msgstr "No se puede manejar la partición en una subclase" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "No puede ser despertado en transición de pin, only nivel" @@ -864,7 +866,7 @@ msgid "DAC already in use" msgstr "DAC ya está siendo utilizado" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "El pin Data 0 debe estar alineado a bytes" @@ -877,12 +879,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Datos sin capacidad de anuncio dirigido" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Data es muy grande para el paquete de anuncio" @@ -899,7 +901,7 @@ msgstr "Capacidad de destino es mas pequeña que destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Dispositivo en uso" @@ -948,7 +950,7 @@ msgid "Expected a kind of %q" msgstr "Esperando un tipo %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "No se admiten anuncios extendidos con respuesta de escaneo." @@ -964,7 +966,7 @@ msgstr "FFT solo esta implementado para arrays lineales" msgid "Failed sending command." msgstr "Fallo enviando comando." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "No se puede adquirir el mutex, error 0x%04x" @@ -995,11 +997,11 @@ msgid "Failed to buffer the sample" msgstr "Fallo al hacer el búfer de la muestra" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Error al conectar: error interno" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Error al conectar: tiempo de espera agotado" @@ -1007,7 +1009,7 @@ msgstr "Error al conectar: tiempo de espera agotado" msgid "Failed to parse MP3 file" msgstr "Error al analizar el archivo MP3" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "No se puede liberar el mutex, err 0x%04x" @@ -1151,11 +1153,11 @@ msgstr "La entrada está durando mucho tiempo" msgid "Input/output error" msgstr "error Input/output" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Autenticación insuficiente" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Cifrado insuficiente" @@ -1231,7 +1233,7 @@ msgid "Invalid ADC Unit value" msgstr "Valor de unidad de ADC no válido" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Parámetro BLE invalido" @@ -1411,7 +1413,8 @@ msgstr "Nimble sin memoria" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1421,7 +1424,7 @@ msgid "No %q pin" msgstr "Sin pin %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "No hay CCCD para esta característica" @@ -1500,7 +1503,7 @@ msgstr "No hay out en el programa" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "No se encontró pull up en SDA or SCL; verifique su cableado" @@ -1529,7 +1532,7 @@ msgstr "No hay temporizador disponible" msgid "No usb host port initialized" msgstr "No hay ningún puerto USB host inicializado" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "El firmware del sistema Nordic no tiene memoria" @@ -1538,7 +1541,7 @@ msgid "Not a valid IP string" msgstr "No es una cadena de IP válida" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "No conectado" @@ -1564,7 +1567,7 @@ msgstr "" "El objeto se ha desinicializado y ya no se puede utilizar. Crea un nuevo " "objeto." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Paridad impar no soportada" @@ -1635,7 +1638,7 @@ msgid "Only one address is allowed" msgstr "Solamente una dirección es permitida" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Solamente una alarma alarm.time puede ser establecida" @@ -1815,7 +1818,7 @@ msgid "RNG Init Error" msgstr "Error de inicialización de RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1919,7 +1922,7 @@ msgid "Scale dimensions must divide by 3" msgstr "Las dimensiones de escala debe ser divisibles por 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Escaneo en progreso. Usa stop_scan para detenerlo." @@ -2039,7 +2042,7 @@ msgid "Time is in the past." msgstr "Tiempo suministrado esta en el pasado." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2064,7 +2067,7 @@ msgid "Too many displays" msgstr "Muchos displays" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "La cantidad total de datos es mas grande que %q" @@ -2180,7 +2183,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "Imposible de escribir en sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Tipo de uuid nrfx inesperado" @@ -2204,7 +2207,7 @@ msgstr "Código de error desconocido %d" msgid "Unknown failure %d" msgstr "Fallo desconocido %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Error de gatt desconocido: 0x%04x" @@ -2214,7 +2217,7 @@ msgstr "Error de gatt desconocido: 0x%04x" msgid "Unknown reason." msgstr "Razón desconocida." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Error de seguridad desconocido: 0x%04x" @@ -2224,7 +2227,7 @@ msgstr "Error de seguridad desconocido: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Error del sistema firmware desconocido en %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Error desconocido en el firmware sistema: %04x" @@ -2240,7 +2243,7 @@ msgstr "Error del sistema de firmware desconocido: %d" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Número incomparable de elementos en RHS (%d esperado,%d obtenido)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2270,15 +2273,15 @@ msgstr "La actualización fallo" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Tamaño del valor != del tamaño fijo requerido" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Tamaño de valor > max_length" @@ -2294,7 +2297,7 @@ msgstr "Tiempo de espera agotado para lectura de voltaje" msgid "WARNING: Your code filename has two extensions\n" msgstr "ADVERTENCIA: El nombre de archivo de tu código tiene dos extensiones\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" "WatchDogTimer no se puede desinicializar luego de definirse en modo RESET" @@ -2327,7 +2330,7 @@ msgid "Woken up by alarm.\n" msgstr "Despertado por la alarma.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Escrituras no admitidas en Characteristic" @@ -2381,7 +2384,7 @@ msgstr "Usted presionó el botón de volumen al iniciar." msgid "You pressed the central button at start up." msgstr "Usted presionó el botón central al iniciar." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Usted presionó el botón izquierdo al iniciar." @@ -2975,7 +2978,7 @@ msgstr "el final del formato mientras se busca el especificador de conversión" msgid "epoch_time not supported on this board" msgstr "epoch_time no esta soportado en esta tarjeta" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "error = 0x%08lX" @@ -3466,8 +3469,8 @@ msgid "matrix is not positive definite" msgstr "matrix no es definida positiva" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length debe ser 0-%d cuando fixed_length es %s" @@ -3628,7 +3631,7 @@ msgid "no such attribute" msgstr "no hay tal atributo" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "no UUID encontrado en service_uuids_whitelist" @@ -3640,7 +3643,7 @@ msgstr "argumento no predeterminado sigue argumento predeterminado" msgid "non-hex digit found" msgstr "digito non-hex encontrado" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "el tiempo de espera non-zero deber ser > 0.01" @@ -3747,7 +3750,7 @@ msgstr "offset debe ser >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "offset debe ser non-negative y no mayo que la longitud del buffer" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "solo se admite bit_depth=16" @@ -3764,7 +3767,7 @@ msgstr "solamente ndarrays pueden ser concatenadas" msgid "only oversample=64 is supported" msgstr "solamente oversample=64 esta soportado" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "solo se admite sample_rate=16000" @@ -3876,7 +3879,7 @@ msgstr "pop de un PulseIn vacío" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4096,15 +4099,24 @@ msgstr "error de sintaxis en el descriptor uctypes" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" "la duración de tiempo de espera ha excedido la capacidad máxima del valor" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "timeout debe ser < 655.35 segundos" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "tiempo de espera agotado esperando por tarjeta v1" diff --git a/locale/fil.po b/locale/fil.po index 31bf27004351c..ab05962a9b602 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -91,7 +91,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -237,7 +237,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -463,7 +463,7 @@ msgid "Address must be %d bytes long" msgstr "ang palette ay dapat 32 bytes ang haba" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -478,7 +478,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Lahat ng I2C peripherals ginagamit" @@ -488,18 +488,18 @@ msgstr "Lahat ng I2C peripherals ginagamit" msgid "All RX FIFOs in use" msgstr "" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Lahat ng SPI peripherals ay ginagamit" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c #, fuzzy msgid "All UART peripherals are in use" msgstr "Lahat ng I2C peripherals ginagamit" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -511,6 +511,7 @@ msgstr "" msgid "All event channels in use" msgstr "Lahat ng event channels ginagamit" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -530,15 +531,16 @@ msgstr "Lahat ng timers para sa pin na ito ay ginagamit" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Lahat ng timer ginagamit" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "" @@ -681,7 +683,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, fuzzy, c-format msgid "Bus pin %d is already in use" @@ -725,7 +727,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "" @@ -747,12 +749,12 @@ msgstr "Hindi mabura ang values" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Hindi makakakuha ng pull habang nasa output mode" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c #, fuzzy msgid "Cannot get temperature" msgstr "Hindi makuha ang temperatura. status 0x%02x" @@ -786,7 +788,7 @@ msgstr "" msgid "Cannot subclass slice" msgstr "Hindi magawa ang sublcass slice" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -845,7 +847,7 @@ msgid "DAC already in use" msgstr "Ginagamit na ang DAC" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #, fuzzy msgid "Data 0 pin must be byte aligned" msgstr "graphic ay dapat 2048 bytes ang haba" @@ -859,12 +861,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, fuzzy msgid "Data too large for advertisement packet" msgstr "Hindi makasya ang data sa loob ng advertisement packet" @@ -882,7 +884,7 @@ msgstr "" msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "" @@ -931,7 +933,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -947,7 +949,7 @@ msgstr "" msgid "Failed sending command." msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, fuzzy, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nabigo sa pag kuha ng mutex, status: 0x%08lX" @@ -978,11 +980,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "" @@ -990,7 +992,7 @@ msgstr "" msgid "Failed to parse MP3 file" msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, fuzzy, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Nabigo sa pagrelease ng mutex, status: 0x%08lX" @@ -1122,11 +1124,11 @@ msgstr "" msgid "Input/output error" msgstr "May mali sa Input/Output" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "" @@ -1202,7 +1204,7 @@ msgid "Invalid ADC Unit value" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1382,7 +1384,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1392,7 +1395,7 @@ msgid "No %q pin" msgstr "Walang %q pin" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1471,7 +1474,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1500,7 +1503,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1509,7 +1512,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c #, fuzzy msgid "Not connected" @@ -1536,7 +1539,7 @@ msgstr "" "Object ay deinitialized at hindi na magagamit. Lumikha ng isang bagong " "Object." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Odd na parity ay hindi supportado" @@ -1603,7 +1606,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1776,7 +1779,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1879,7 +1882,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -1996,7 +1999,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2018,7 +2021,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2134,7 +2137,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c #, fuzzy msgid "Unexpected nrfx uuid type" msgstr "hindi inaasahang indent" @@ -2159,7 +2162,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2169,7 +2172,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2179,7 +2182,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2195,7 +2198,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2224,15 +2227,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2248,7 +2251,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "BABALA: Ang pangalan ng file ay may dalawang extension\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2275,7 +2278,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2329,7 +2332,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2926,7 +2929,7 @@ msgstr "sa huli ng format habang naghahanap sa conversion specifier" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3419,8 +3422,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3580,7 +3583,7 @@ msgid "no such attribute" msgstr "walang ganoon na attribute" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3592,7 +3595,7 @@ msgstr "non-default argument sumusunod sa default argument" msgid "non-hex digit found" msgstr "non-hex digit nahanap" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3698,7 +3701,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3715,7 +3718,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3827,7 +3830,7 @@ msgstr "pop mula sa walang laman na PulseIn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4047,14 +4050,23 @@ msgstr "may pagkakamali sa sintaks sa uctypes descriptor" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/fr.po b/locale/fr.po index 8a139ba10542f..8b83a47ac5aa3 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -106,7 +106,7 @@ msgstr "%q et %q doivent être différents" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -252,7 +252,7 @@ msgstr "%q est hors intervalle" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -480,7 +480,7 @@ msgid "Address must be %d bytes long" msgstr "L'adresse doit être longue de %d octets" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Plage d'adresses non autorisée" @@ -495,7 +495,7 @@ msgstr "Tous les périphériques CAN sont utilisés" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Tous les périphériques I2C sont utilisés" @@ -505,17 +505,17 @@ msgstr "Tous les périphériques I2C sont utilisés" msgid "All RX FIFOs in use" msgstr "Tout les RX FIFOs sont utilisé" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Tous les périphériques SPI sont utilisés" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Tous les périphériques UART sont utilisés" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Tout les canaux sont utilisés" @@ -527,6 +527,7 @@ msgstr "Toutes les canals DMA sont utilisées" msgid "All event channels in use" msgstr "Tous les canaux d'événements sont utilisés" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -546,15 +547,16 @@ msgstr "Tous les minuteurs pour cette broche sont utilisés" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Tous les minuteurs sont utilisés" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "S'annonce déjà." @@ -697,7 +699,7 @@ msgstr "Tampon trop court" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -744,7 +746,7 @@ msgstr "" "profond." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Impossible de définir CCCD sur une caractéristique locale" @@ -767,12 +769,12 @@ msgstr "Impossible de supprimer les valeurs" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Ne peut être tiré ('pull') en mode sortie ('output')" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Impossible de lire la température" @@ -808,7 +810,7 @@ msgstr "Impossible de spécifier RTS ou CTS en mode RS485" msgid "Cannot subclass slice" msgstr "On ne peut faire de sous-classes de tranches" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" "Impossible de réveiller via une bordure d'une broche, seulement via un niveau" @@ -872,7 +874,7 @@ msgid "DAC already in use" msgstr "DAC déjà utilisé" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "La broche 'Data 0' doit être aligné sur l'octet" @@ -885,12 +887,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Les données ne sont pas supportées avec les annonces directes" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Données trop volumineuses pour un paquet d'avertissement" @@ -907,7 +909,7 @@ msgstr "La capacité de destination est plus petite que 'destination_length'." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Appareil utilisé" @@ -957,7 +959,7 @@ msgid "Expected a kind of %q" msgstr "Argument de type %q attendu" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" "Les avertissement étendues avec analyse de réponse ne sont pas supportées." @@ -974,7 +976,7 @@ msgstr "FFT n'est implémenté que pour les arrays linéaires" msgid "Failed sending command." msgstr "Échec de l'envoi de la commande." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Echec de l'obtention de mutex, err 0x%04x" @@ -1007,11 +1009,11 @@ msgid "Failed to buffer the sample" msgstr "Échec du tamponage de l'échantillon" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Impossible de se connecter : erreur interne" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Impossible de se connecter: délai dépassé" @@ -1019,7 +1021,7 @@ msgstr "Impossible de se connecter: délai dépassé" msgid "Failed to parse MP3 file" msgstr "Impossible d'analyser le fichier MP3" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Impossible de libérer mutex, err 0x%04x" @@ -1160,11 +1162,11 @@ msgstr "L'entrée prend trop de temps" msgid "Input/output error" msgstr "Erreur d'entrée/sortie" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Authentification insuffisante" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Chiffrement insuffisant" @@ -1240,7 +1242,7 @@ msgid "Invalid ADC Unit value" msgstr "Valeur d'unité ADC non valide" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Paramètre BLE invalide" @@ -1429,7 +1431,8 @@ msgstr "Nimble n'a plus de mémoire" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1439,7 +1442,7 @@ msgid "No %q pin" msgstr "Pas de broche %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Pas de CCCD pour cette caractéristique" @@ -1518,7 +1521,7 @@ msgstr "Aucun out dans le programme" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "Aucun pull up trouvé sur SDA ou SCL; vérifiez votre câblage" @@ -1547,7 +1550,7 @@ msgstr "Aucun minuteur disponible" msgid "No usb host port initialized" msgstr "Pas de port usb hôte initialisé" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Logiciel système Nordic n'a plus de mémoire" @@ -1556,7 +1559,7 @@ msgid "Not a valid IP string" msgstr "Chaîne IP non valide" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Non connecté" @@ -1582,7 +1585,7 @@ msgstr "" "L'objet a été dés-initialisé et ne peut plus être utilisé. Créez un nouvel " "objet." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Parité impaire non supportée" @@ -1653,7 +1656,7 @@ msgid "Only one address is allowed" msgstr "Seulement une adresse est autorisée" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Seule une alarme alarm.time peut être définie" @@ -1833,7 +1836,7 @@ msgid "RNG Init Error" msgstr "Erreur d'initialisation du RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1936,7 +1939,7 @@ msgid "Scale dimensions must divide by 3" msgstr "La dimension d'échelle doit être un multiple de 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Scan déjà en cours. Arrêtez-le avec stop_scan." @@ -2056,7 +2059,7 @@ msgid "Time is in the past." msgstr "L'heure est dans le passé." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Le délai est trop long : le délai maximal est de %d secondes" @@ -2078,7 +2081,7 @@ msgid "Too many displays" msgstr "Trop d'affichages" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "Quantité de données à écrire est plus que %q" @@ -2197,7 +2200,7 @@ msgstr "Impossible d'écrire sur la mémoire en lecture seule" msgid "Unable to write to sleep_memory." msgstr "Écriture impossible vers sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Type inattendu pour l'uuid nrfx" @@ -2221,7 +2224,7 @@ msgstr "Code d'erreur inconnu %d" msgid "Unknown failure %d" msgstr "Échec inconnu %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Erreur gatt inconnue : 0x%04x" @@ -2231,7 +2234,7 @@ msgstr "Erreur gatt inconnue : 0x%04x" msgid "Unknown reason." msgstr "Raison inconnue." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Erreur de sécurité inconnue : 0x%04x" @@ -2241,7 +2244,7 @@ msgstr "Erreur de sécurité inconnue : 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Erreur du logiciel système inconnue à %s:%d : %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Faute inconnue du logiciel système : %04x" @@ -2258,7 +2261,7 @@ msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" "Pas de correspondance du nombres d'éléments à droite (attendu %d, obtenu %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2288,15 +2291,15 @@ msgstr "Mise-à-jour échouée" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Longueur de valeur != Longueur fixe requise" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Longueur de la valeur > max_length" @@ -2312,7 +2315,7 @@ msgstr "La lecture de la tension a expiré" msgid "WARNING: Your code filename has two extensions\n" msgstr "ATTENTION : le nom de fichier de votre code a deux extensions\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" "WatchDogTimer ne peut pas être dés-initialisé une fois que le mode est réglé " @@ -2346,7 +2349,7 @@ msgid "Woken up by alarm.\n" msgstr "Réveil par alarme.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Écritures non supporté vers les Characteristic" @@ -2400,7 +2403,7 @@ msgstr "Vous avez appuyé le bouton VOLUME au démarrage." msgid "You pressed the central button at start up." msgstr "Vous avez appuyé le bouton central au démarrage." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Vous avez appuyé le bouton gauche au démarrage." @@ -3000,7 +3003,7 @@ msgstr "fin de format en cherchant une spécification de conversion" msgid "epoch_time not supported on this board" msgstr "epoch_time n'est pas supporté sur ce panneau" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "erreur = 0x%08lX" @@ -3496,8 +3499,8 @@ msgid "matrix is not positive definite" msgstr "la matrice n'est pas définie positive" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length doit être 0-%d lorsque fixed_length est %s" @@ -3657,7 +3660,7 @@ msgid "no such attribute" msgstr "pas de tel attribut" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "non UUID trouvé dans service_uuids_whitelist" @@ -3670,7 +3673,7 @@ msgstr "" msgid "non-hex digit found" msgstr "chiffre non-héxadécimale trouvé" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "le délai non-zéro doit être > 0.01" @@ -3778,7 +3781,7 @@ msgid "offset must be non-negative and no greater than buffer length" msgstr "" "offset ne doit pas être négatif, et pas plus grand que la taille du tampon" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "seul bit_depth = 16 est pris en charge" @@ -3795,7 +3798,7 @@ msgstr "seuls les ndarrays peuvent être concaténés" msgid "only oversample=64 is supported" msgstr "seul oversample=64 supporté" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "seul sample_rate = 16000 est pris en charge" @@ -3908,7 +3911,7 @@ msgstr "'pop' d'une entrée PulseIn vide" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4128,14 +4131,23 @@ msgstr "erreur de syntaxe dans le descripteur d'uctypes" msgid "ticks interval overflow" msgstr "débordement de l'intervale des ticks" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "le délai d'expiration a dépassé la valeur maximale prise en charge" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "le délai (timeout) doit être < 655.35 secondes" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "délai d'expiration dépassé en attendant une carte v1" diff --git a/locale/hi.po b/locale/hi.po index 61f117a2b7be0..cb5fda556fc56 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -92,7 +92,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -238,7 +238,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -463,7 +463,7 @@ msgid "Address must be %d bytes long" msgstr "" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -478,7 +478,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "" @@ -488,17 +488,17 @@ msgstr "" msgid "All RX FIFOs in use" msgstr "" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -510,6 +510,7 @@ msgstr "" msgid "All event channels in use" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -529,15 +530,16 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "" @@ -678,7 +680,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -721,7 +723,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "" @@ -743,12 +745,12 @@ msgstr "" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "" @@ -781,7 +783,7 @@ msgstr "" msgid "Cannot subclass slice" msgstr "" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -840,7 +842,7 @@ msgid "DAC already in use" msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" @@ -853,12 +855,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "" @@ -874,7 +876,7 @@ msgstr "" msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "" @@ -923,7 +925,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -939,7 +941,7 @@ msgstr "" msgid "Failed sending command." msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "" @@ -970,11 +972,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "" @@ -982,7 +984,7 @@ msgstr "" msgid "Failed to parse MP3 file" msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "" @@ -1114,11 +1116,11 @@ msgstr "" msgid "Input/output error" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "" @@ -1194,7 +1196,7 @@ msgid "Invalid ADC Unit value" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1374,7 +1376,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1384,7 +1387,7 @@ msgid "No %q pin" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1463,7 +1466,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1492,7 +1495,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1501,7 +1504,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "" @@ -1525,7 +1528,7 @@ msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "" @@ -1592,7 +1595,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1765,7 +1768,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1868,7 +1871,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -1985,7 +1988,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2007,7 +2010,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2123,7 +2126,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2147,7 +2150,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2157,7 +2160,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2167,7 +2170,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2183,7 +2186,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2211,15 +2214,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2235,7 +2238,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2262,7 +2265,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2316,7 +2319,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2903,7 +2906,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3393,8 +3396,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3554,7 +3557,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3566,7 +3569,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3672,7 +3675,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3689,7 +3692,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3801,7 +3804,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4021,14 +4024,23 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 7813b0866668b..ae516669f31a5 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -94,7 +94,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -240,7 +240,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -465,7 +465,7 @@ msgid "Address must be %d bytes long" msgstr "L'indirizzo deve essere lungo %d byte" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -480,7 +480,7 @@ msgstr "Tutte le periferiche CAN sono in uso" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Tutte le periferiche I2C sono in uso" @@ -490,18 +490,18 @@ msgstr "Tutte le periferiche I2C sono in uso" msgid "All RX FIFOs in use" msgstr "Tutte le RX FIFO sono in uso" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Tutte le periferiche SPI sono in uso" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c #, fuzzy msgid "All UART peripherals are in use" msgstr "Tutte le periferiche I2C sono in uso" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -513,6 +513,7 @@ msgstr "" msgid "All event channels in use" msgstr "Tutti i canali eventi utilizati" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -532,15 +533,16 @@ msgstr "Tutti i timer per questo pin sono in uso" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Tutti i timer utilizzati" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "" @@ -683,7 +685,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -726,7 +728,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "" @@ -748,12 +750,12 @@ msgstr "Impossibile cancellare valori" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "non si può tirare quando nella modalita output" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c #, fuzzy msgid "Cannot get temperature" msgstr "Impossibile leggere la temperatura. status: 0x%02x" @@ -787,7 +789,7 @@ msgstr "" msgid "Cannot subclass slice" msgstr "Impossibile subclasare slice" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -846,7 +848,7 @@ msgid "DAC already in use" msgstr "DAC già in uso" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #, fuzzy msgid "Data 0 pin must be byte aligned" msgstr "graphic deve essere lunga 2048 byte" @@ -860,12 +862,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, fuzzy msgid "Data too large for advertisement packet" msgstr "Impossibile inserire dati nel pacchetto di advertisement." @@ -882,7 +884,7 @@ msgstr "La capacità di destinazione è più piccola di destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "" @@ -931,7 +933,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -947,7 +949,7 @@ msgstr "" msgid "Failed sending command." msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Impossibile acquisire il mutex, err 0x%04x" @@ -978,11 +980,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "" @@ -990,7 +992,7 @@ msgstr "" msgid "Failed to parse MP3 file" msgstr "" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Impossibile rilasciare il mutex, err 0x%04x" @@ -1122,11 +1124,11 @@ msgstr "" msgid "Input/output error" msgstr "Errore input/output" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "" @@ -1202,7 +1204,7 @@ msgid "Invalid ADC Unit value" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1382,7 +1384,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1392,7 +1395,7 @@ msgid "No %q pin" msgstr "Nessun pin %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1471,7 +1474,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1500,7 +1503,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1509,7 +1512,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c #, fuzzy msgid "Not connected" @@ -1536,7 +1539,7 @@ msgstr "" "L'oggetto è stato deinizializzato e non può essere più usato. Crea un nuovo " "oggetto." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, fuzzy msgid "Odd parity is not supported" msgstr "operazione I2C non supportata" @@ -1604,7 +1607,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1778,7 +1781,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1881,7 +1884,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -1998,7 +2001,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2020,7 +2023,7 @@ msgid "Too many displays" msgstr "Troppi schermi" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2136,7 +2139,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c #, fuzzy msgid "Unexpected nrfx uuid type" msgstr "indentazione inaspettata" @@ -2161,7 +2164,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2171,7 +2174,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2181,7 +2184,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2197,7 +2200,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2226,15 +2229,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2250,7 +2253,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "ATTENZIONE: Il nome del sorgente ha due estensioni\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2277,7 +2280,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2331,7 +2334,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2927,7 +2930,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "errore = 0x%08lX" @@ -3421,8 +3424,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3582,7 +3585,7 @@ msgid "no such attribute" msgstr "attributo inesistente" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3594,7 +3597,7 @@ msgstr "argomento non predefinito segue argmoento predfinito" msgid "non-hex digit found" msgstr "trovata cifra non esadecimale" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3702,7 +3705,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3719,7 +3722,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3833,7 +3836,7 @@ msgstr "pop sun un PulseIn vuoto" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4053,14 +4056,23 @@ msgstr "errore di sintassi nel descrittore uctypes" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/ja.po b/locale/ja.po index e9150d935249c..a02492e43b07a 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -103,7 +103,7 @@ msgstr "%qと%qが必ず異なるのは必要" msgid "%q and %q must share a clock unit" msgstr "%q と %q はクロックユニットを共有する必要があります" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -251,7 +251,7 @@ msgstr "%q が境界外" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -476,7 +476,7 @@ msgid "Address must be %d bytes long" msgstr "アドレスは、%dバイト長でなければなりません" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -491,7 +491,7 @@ msgstr "全てのCAN周辺機器が使用中" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "全てのI2C周辺機器が使用中" @@ -501,17 +501,17 @@ msgstr "全てのI2C周辺機器が使用中" msgid "All RX FIFOs in use" msgstr "全てのRX FIFOが使用中" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "全てのSPI周辺機器が使用中" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "全てのUART周辺機器が使用中" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -523,6 +523,7 @@ msgstr "" msgid "All event channels in use" msgstr "全てのイベントチャネルが使用中" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -542,15 +543,16 @@ msgstr "このピン用の全てのタイマが使用中" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "全てのタイマーが使用中" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "すでにアドバータイズ中" @@ -693,7 +695,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -738,7 +740,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "ローカルのCharacteristicにはCCCDを設定できません" @@ -760,12 +762,12 @@ msgstr "値を削除できません" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "出力モード時はpullを取得できません" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "温度を取得できません" @@ -798,7 +800,7 @@ msgstr "RS485モードにRTSまたはCTSを指定できません" msgid "Cannot subclass slice" msgstr "sliceをサブクラス化することはできません" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -857,7 +859,7 @@ msgid "DAC already in use" msgstr "DACはすでに使用中" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 ピンは、バイト整列されていなければなりません" @@ -870,12 +872,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "データが、アドバタイズメントパケットには大きすぎます" @@ -891,7 +893,7 @@ msgstr "宛先バッファがdestination_lengthより小さい" msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "デバイス使用中" @@ -940,7 +942,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -956,7 +958,7 @@ msgstr "" msgid "Failed sending command." msgstr "コマンド送信に失敗" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "ミューテックスの取得に失敗。エラー 0x%04x" @@ -987,11 +989,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "接続失敗: 内部エラー" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "接続失敗: タイムアウト" @@ -999,7 +1001,7 @@ msgstr "接続失敗: タイムアウト" msgid "Failed to parse MP3 file" msgstr "MP3ファイルのパーズに失敗" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "ミューテックスの開放に失敗。エラー 0x%04x" @@ -1131,11 +1133,11 @@ msgstr "" msgid "Input/output error" msgstr "入力/出力エラー" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "認証が不十分" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "暗号化が不十分" @@ -1211,7 +1213,7 @@ msgid "Invalid ADC Unit value" msgstr "不正なADCユニット値" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1391,7 +1393,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1401,7 +1404,7 @@ msgid "No %q pin" msgstr "%qピンがありません" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1480,7 +1483,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1509,7 +1512,7 @@ msgstr "利用できるタイマーなし" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1518,7 +1521,7 @@ msgid "Not a valid IP string" msgstr "不正なIP文字列です" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "接続されていません" @@ -1544,7 +1547,7 @@ msgstr "" "オブジェクトは解放済みでもう使われていません。新しいオブジェクトを作成してく" "ださい" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "奇数パリティには対応していません" @@ -1611,7 +1614,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1787,7 +1790,7 @@ msgid "RNG Init Error" msgstr "乱数生成器の初期化エラー" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1890,7 +1893,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -2007,7 +2010,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "タイムアウトが長すぎです。最大のタイムアウト長は%d秒" @@ -2029,7 +2032,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2146,7 +2149,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "想定されていないnrfx UUID型" @@ -2170,7 +2173,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "不明なGATTエラー: 0x%04x" @@ -2180,7 +2183,7 @@ msgstr "不明なGATTエラー: 0x%04x" msgid "Unknown reason." msgstr "理由不明" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "不明なセキュリティエラー: 0x%04x" @@ -2190,7 +2193,7 @@ msgstr "不明なセキュリティエラー: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2206,7 +2209,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "右辺の要素数が一致しません (expected %d, got %d)" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2234,15 +2237,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2258,7 +2261,7 @@ msgstr "電圧読み取りがタイムアウト" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2285,7 +2288,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2339,7 +2342,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2930,7 +2933,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "error = 0x1%08lX" @@ -3421,8 +3424,8 @@ msgid "matrix is not positive definite" msgstr "正定値行列ではありません" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3582,7 +3585,7 @@ msgid "no such attribute" msgstr "指定の属性はありません" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3594,7 +3597,7 @@ msgstr "デフォルト引数の後に通常の引数は置けません" msgid "non-hex digit found" msgstr "16進数以外の桁があります" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3700,7 +3703,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "bit_depth=16のみ対応しています" @@ -3717,7 +3720,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3829,7 +3832,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4049,14 +4052,23 @@ msgstr "uctypedディスクリプタの構文エラー" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "タイムアウト長は対応する最大値を超えています" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "v1カードの待機がタイムアウト" diff --git a/locale/ko.po b/locale/ko.po index bc049e7783740..670921208f4b3 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -103,7 +103,7 @@ msgstr "%q와 %q는 달라야 합니다" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -256,7 +256,7 @@ msgstr "%q가 경계를 벗어남" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -493,7 +493,7 @@ msgid "Address must be %d bytes long" msgstr "주소 길이는 % d 바이트 여야합니다" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "주소 범위가 허용되지 않습니다" @@ -509,7 +509,7 @@ msgstr "모든 CAN 주변 기기가 사용 중입니다" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "사용 중인 모든 I2C주변 기기" @@ -520,17 +520,17 @@ msgstr "사용 중인 모든 I2C주변 기기" msgid "All RX FIFOs in use" msgstr "모든 RX FIFOs가 사용 중입니다" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "사용중인 모든 SPI주변 기기" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "사용중인 모든 UART주변 기기" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "모든 채널이 사용중입니다" @@ -543,6 +543,7 @@ msgstr "모든 dma채널이 사용 중입니다" msgid "All event channels in use" msgstr "모든 이벤트 채널이 사용 중입니다" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -564,15 +565,16 @@ msgstr "핀의 모든 타이머가 사용 중입니다" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "모든 타이머가 사용 중입니다" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, fuzzy msgid "Already advertising." msgstr "이미 광고 중입니다." @@ -720,7 +722,7 @@ msgstr "버퍼가 너무 작습니다" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -764,7 +766,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "로컬 특성에 CCCD를 설정할 수 없습니다" @@ -786,12 +788,12 @@ msgstr "값을 삭제할 수 없습니다" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "출력 모드에서는 끌어올 수 없습니다" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "온도 데이터를 수신 할 수 없습니다" @@ -824,7 +826,7 @@ msgstr "RS485 모드에서는 RTS 또는 CTS를 지정할 수 없습니다" msgid "Cannot subclass slice" msgstr "" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c #, fuzzy msgid "Cannot wake on pin edge, only level" msgstr "핀의 에지에서 깨울 수 없고, 레벨에서만 깨울 수 있습니다" @@ -885,7 +887,7 @@ msgid "DAC already in use" msgstr "DAC가 현재 사용 중입니다" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "데이터 0 핀은 바이트 정렬되어야 합니다" @@ -898,12 +900,12 @@ msgid "Data format error (may be broken data)" msgstr "데이터 형식 오류(손상된 데이터일 수 있습니다)" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "직접 광고에서는 데이터가 지원되지 않습니다" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "광고 (브로드 캐스트) 패킷에 대한 데이터가 너무 큽니다" @@ -920,7 +922,7 @@ msgstr "대상 용량이 destination_length보다 작습니다." msgid "Device error or wrong termination of input stream" msgstr "장치 오류 또는 입력 스트림의 잘못된 종료" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "사용 중인 장치" @@ -969,7 +971,7 @@ msgid "Expected a kind of %q" msgstr "%q 유형이 필요합니다" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, fuzzy msgid "Extended advertisements with scan response not supported." msgstr "검색 응답이 있는 확장 광고는 지원되지 않습니다." @@ -986,7 +988,7 @@ msgstr "FFT는 선형 배열에 대해서만 구현됩니다" msgid "Failed sending command." msgstr "명령을 보내는 것에 실패했습니다." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "뮤텍스 획득에 실패했습니다, 오류 0x%04x" @@ -1019,11 +1021,11 @@ msgid "Failed to buffer the sample" msgstr "샘플 버퍼링에 실패했습니다" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "연결에 실패했습니다: 내부 오류" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "연결에 실패했습니다: 시간 초과" @@ -1031,7 +1033,7 @@ msgstr "연결에 실패했습니다: 시간 초과" msgid "Failed to parse MP3 file" msgstr "MP3 파일 분석에 실패했습니다" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "뮤텍스 해제에 실패했습니다, 오류 0x%04x" @@ -1166,11 +1168,11 @@ msgstr "입력이 너무 오래 걸린다" msgid "Input/output error" msgstr "입력/출력 오류" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "불충분한 인증" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "불충분한 암호화" @@ -1246,7 +1248,7 @@ msgid "Invalid ADC Unit value" msgstr "잘못된 ADC 단위 값" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "잘못된 BLE 파라미터" @@ -1430,7 +1432,8 @@ msgstr "빠른 메모리 부족" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1440,7 +1443,7 @@ msgid "No %q pin" msgstr "%q 핀이 없습니다" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "이 특성에 대한 CCCD가 없습니다" @@ -1522,7 +1525,7 @@ msgstr "프로그램에 출력이 없습니다" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "SDA 또는 SCL에서 풀업을 찾을 수 없습니다; 케이블 연결을 확인하십시오" @@ -1551,7 +1554,7 @@ msgstr "사용 가능한 타이머가 없습니다" msgid "No usb host port initialized" msgstr "usb 호스트 포트가 초기화되지 않았습니다" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Nordic 시스템 펌웨어에 메모리가 부족합니다" @@ -1560,7 +1563,7 @@ msgid "Not a valid IP string" msgstr "유효한 IP 문자열이 아닙니다" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "연결되지 않았습니다" @@ -1586,7 +1589,7 @@ msgid "" msgstr "" "개체가 초기화 해제되어 더 이사 사용될 수 없습니다. 새로운 개체를 만드십시오." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "홀수 패리티는 지원되지 않습니다" @@ -1657,7 +1660,7 @@ msgid "Only one address is allowed" msgstr "오직 하나의 주소만 허용됩니다" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1842,7 +1845,7 @@ msgid "RNG Init Error" msgstr "RNG 초기화 오류" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1945,7 +1948,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -2062,7 +2065,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2084,7 +2087,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2201,7 +2204,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2225,7 +2228,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2235,7 +2238,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2245,7 +2248,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2261,7 +2264,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2289,15 +2292,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2313,7 +2316,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2340,7 +2343,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2394,7 +2397,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2981,7 +2984,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3471,8 +3474,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3632,7 +3635,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3644,7 +3647,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3750,7 +3753,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3767,7 +3770,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3879,7 +3882,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4099,14 +4102,23 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 07f57a86c6395..fad65cb266843 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -90,7 +90,7 @@ msgstr "" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -236,7 +236,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -461,7 +461,7 @@ msgid "Address must be %d bytes long" msgstr "Adres moet %d bytes lang zijn" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -476,7 +476,7 @@ msgstr "Alle CAN-peripherals zijn in gebruik" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Alle I2C peripherals zijn in gebruik" @@ -486,17 +486,17 @@ msgstr "Alle I2C peripherals zijn in gebruik" msgid "All RX FIFOs in use" msgstr "Alle RX FIFO's zijn in gebruik" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Alle SPI peripherals zijn in gebruik" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Alle UART peripherals zijn in gebruik" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -508,6 +508,7 @@ msgstr "" msgid "All event channels in use" msgstr "Alle event kanalen zijn in gebruik" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -527,15 +528,16 @@ msgstr "Alle timers voor deze pin zijn in gebruik" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Alle timers zijn in gebruik" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Advertising is al bezig." @@ -678,7 +680,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -721,7 +723,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Kan CCCD niet toewijzen aan lokaal Characteristic" @@ -743,12 +745,12 @@ msgstr "Kan waardes niet verwijderen" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "get pull kan niet gedurende output mode" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Kan de temperatuur niet verkrijgen" @@ -782,7 +784,7 @@ msgstr "Kan RTS of CTS niet specificeren in RS485 modus" msgid "Cannot subclass slice" msgstr "Kan slice niet subclasseren" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -843,7 +845,7 @@ msgid "DAC already in use" msgstr "DAC al in gebruik" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin moet byte uitgelijnd zijn" @@ -856,12 +858,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Data te groot voor advertisement pakket" @@ -877,7 +879,7 @@ msgstr "Bestemming grootte is kleiner dan destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Apparaat al in gebruik" @@ -926,7 +928,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Extended advertisements met scan antwoord niet ondersteund." @@ -942,7 +944,7 @@ msgstr "FFT is alleen geïmplementeerd voor lineaire arrays" msgid "Failed sending command." msgstr "Commando verzenden mislukt." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Fout tijdens verkrijgen mutex, err 0x%04x" @@ -973,11 +975,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Verbinding mislukt: interne fout" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Verbinding mislukt: timeout" @@ -985,7 +987,7 @@ msgstr "Verbinding mislukt: timeout" msgid "Failed to parse MP3 file" msgstr "Mislukt om MP3 bestand te ontleden" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Mislukt mutex los te laten, err 0x%04x" @@ -1117,11 +1119,11 @@ msgstr "Invoer duurt te lang" msgid "Input/output error" msgstr "Input/Output fout" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Onvoldoende authenticatie" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Onvoldoende encryptie" @@ -1197,7 +1199,7 @@ msgid "Invalid ADC Unit value" msgstr "Ongeldige ADC Unit waarde" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1377,7 +1379,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1387,7 +1390,7 @@ msgid "No %q pin" msgstr "Geen %q pin" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Geen CCCD voor deze Characteristic" @@ -1466,7 +1469,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1495,7 +1498,7 @@ msgstr "Geen timer beschikbaar" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1504,7 +1507,7 @@ msgid "Not a valid IP string" msgstr "Geen geldige IP string" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Niet verbonden" @@ -1530,7 +1533,7 @@ msgstr "" "Object is gedeïnitialiseerd en kan niet meer gebruikt worden. Creëer een " "nieuw object." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Oneven pariteit is niet ondersteund" @@ -1601,7 +1604,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1779,7 +1782,7 @@ msgid "RNG Init Error" msgstr "RNG Init Fout" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1882,7 +1885,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -1999,7 +2002,7 @@ msgid "Time is in the past." msgstr "Tijdstip ligt in het verleden." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Time-out is te lang. Maximale time-out lengte is %d seconden" @@ -2021,7 +2024,7 @@ msgid "Too many displays" msgstr "Teveel beeldschermen" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2137,7 +2140,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "Kan niet naar sleep_memory schrijven." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Onverwacht mrfx uuid type" @@ -2161,7 +2164,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Onbekende gatt fout: 0x%04x" @@ -2171,7 +2174,7 @@ msgstr "Onbekende gatt fout: 0x%04x" msgid "Unknown reason." msgstr "Onbekende reden." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Onbekende veiligheidsfout: 0x%04x" @@ -2181,7 +2184,7 @@ msgstr "Onbekende veiligheidsfout: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2197,7 +2200,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Niet overeenkomend aantal RHS items (verwachtte %d, kreeg %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2227,15 +2230,15 @@ msgstr "Update Mislukt" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Waarde lengte != vereist vaste lengte" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Waarde length > max_length" @@ -2251,7 +2254,7 @@ msgstr "Voltage lees time-out" msgid "WARNING: Your code filename has two extensions\n" msgstr "WAARSCHUWING: De bestandsnaam van de code heeft twee extensies\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" "WatchDogTimer kan niet worden gedeïnitialiseerd zodra de modus in ingesteld " @@ -2280,7 +2283,7 @@ msgid "Woken up by alarm.\n" msgstr "Gewekt door alarm.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Schrijven niet ondersteund op Characteristic" @@ -2334,7 +2337,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2924,7 +2927,7 @@ msgstr "einde van format terwijl zoekend naar conversie-specifier" msgid "epoch_time not supported on this board" msgstr "epoch_time niet ondersteund op dit bord" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "fout = 0x%08lX" @@ -3417,8 +3420,8 @@ msgid "matrix is not positive definite" msgstr "matrix is niet positief-definiet" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length moet 0-%d zijn als fixed_length %s is" @@ -3578,7 +3581,7 @@ msgid "no such attribute" msgstr "niet zo'n attribuut" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "niet-UUID gevonden in service_uuids_whitelist" @@ -3590,7 +3593,7 @@ msgstr "niet-standaard argument volgt op een standaard argument" msgid "non-hex digit found" msgstr "er werd een niet-hexadecimaal cijfer gevonden" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3696,7 +3699,7 @@ msgstr "compensatie moet groter of gelijk 0 zijn" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "alleen bit_depth=16 wordt ondersteund" @@ -3713,7 +3716,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "alleen sample_rate=16000 wordt ondersteund" @@ -3825,7 +3828,7 @@ msgstr "pop van een lege PulseIn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4045,14 +4048,23 @@ msgstr "syntaxisfout in uctypes aanduiding" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "time-outduur is groter dan de ondersteunde maximale waarde" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "timeout bij wachten op v1 kaart" diff --git a/locale/pl.po b/locale/pl.po index 31627370b83ab..5c2fd1e4a5db3 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -98,7 +98,7 @@ msgstr "%q and %q muszą być różne" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -244,7 +244,7 @@ msgstr "%q poza dopuszczalnym zakresem" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -469,7 +469,7 @@ msgid "Address must be %d bytes long" msgstr "Adres musi mieć %d bajtów" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -484,7 +484,7 @@ msgstr "" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Wszystkie peryferia I2C w użyciu" @@ -494,17 +494,17 @@ msgstr "Wszystkie peryferia I2C w użyciu" msgid "All RX FIFOs in use" msgstr "" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Wszystkie peryferia SPI w użyciu" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Wszystkie peryferia UART w użyciu" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "" @@ -516,6 +516,7 @@ msgstr "" msgid "All event channels in use" msgstr "Wszystkie kanały zdarzeń w użyciu" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -535,15 +536,16 @@ msgstr "Wszystkie timery tej nóżki w użyciu" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Wszystkie timery w użyciu" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "" @@ -686,7 +688,7 @@ msgstr "Nie wystarczający rozmiar bufora" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -731,7 +733,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Nie można ustawić CCCD na charakterystykę lokalną" @@ -753,12 +755,12 @@ msgstr "Nie można usunąć" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Nie ma podciągnięcia w trybie wyjścia" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Nie można odczytać temperatury" @@ -793,7 +795,7 @@ msgstr "Nie można określić RTS ani CTS w trybie RS485" msgid "Cannot subclass slice" msgstr "Nie można dziedziczyć ze slice" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -854,7 +856,7 @@ msgid "DAC already in use" msgstr "DAC w użyciu" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Nóżka data 0 musi być wyrównana do bajtu" @@ -867,12 +869,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Zbyt dużo danych pakietu rozgłoszeniowego" @@ -888,7 +890,7 @@ msgstr "Pojemność celu mniejsza od destination_length." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Urządzenie w użyciu" @@ -937,7 +939,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -953,7 +955,7 @@ msgstr "" msgid "Failed sending command." msgstr "Nie udało się wysłać polecenia." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Nie udało się uzyskać blokady, błąd 0x%04x" @@ -986,11 +988,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Nie udało się połączyć: błąd wewnętrzny" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Nie udało się połączyć: upłynął limit czasu" @@ -998,7 +1000,7 @@ msgstr "Nie udało się połączyć: upłynął limit czasu" msgid "Failed to parse MP3 file" msgstr "Nie można przeanalizować pliku MP3" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Nie udało się zwolnić blokady, błąd 0x%04x" @@ -1136,11 +1138,11 @@ msgstr "" msgid "Input/output error" msgstr "Błąd I/O" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Niewystarczające uwierzytelnienie" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Niewystarczające szyfrowanie" @@ -1216,7 +1218,7 @@ msgid "Invalid ADC Unit value" msgstr "Nieprawidłowa wartość jednostki ADC" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "" @@ -1396,7 +1398,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1406,7 +1409,7 @@ msgid "No %q pin" msgstr "Brak nóżki %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Brak CCCD dla tej cechy" @@ -1485,7 +1488,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1514,7 +1517,7 @@ msgstr "Brak dostępnego timera" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1523,7 +1526,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Nie podłączono" @@ -1547,7 +1550,7 @@ msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "Obiekt został zwolniony i nie można go już używać. Utwórz nowy obiekt." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Nieparzysta parzystość nie jest wspierana" @@ -1616,7 +1619,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1793,7 +1796,7 @@ msgid "RNG Init Error" msgstr "Błąd inicjalizacji RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1896,7 +1899,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -2013,7 +2016,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2035,7 +2038,7 @@ msgid "Too many displays" msgstr "Zbyt wiele wyświetlaczy" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2151,7 +2154,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Nieoczekiwany typ nrfx uuid" @@ -2175,7 +2178,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2185,7 +2188,7 @@ msgstr "" msgid "Unknown reason." msgstr "Powód nieznany." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Nieznany błąd bezpieczeństwa: 0x%04x" @@ -2195,7 +2198,7 @@ msgstr "Nieznany błąd bezpieczeństwa: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2211,7 +2214,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Zła liczba obiektów po prawej stronie (oczekiwano %d, jest %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2241,15 +2244,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Długość wartości ! = Wymagana stała długość" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Długość wartości > max_length" @@ -2265,7 +2268,7 @@ msgstr "Upłynął limit czasu odczytu napięcia" msgid "WARNING: Your code filename has two extensions\n" msgstr "UWAGA: Nazwa pliku ma dwa rozszerzenia\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2292,7 +2295,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2346,7 +2349,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2934,7 +2937,7 @@ msgstr "koniec formatu przy szukaniu specyfikacji konwersji" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "błąd = 0x%08lX" @@ -3425,8 +3428,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "maksymalna długość musi wynosić 0-%d, gdy stała długość wynosi %s" @@ -3586,7 +3589,7 @@ msgid "no such attribute" msgstr "nie ma takiego atrybutu" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3598,7 +3601,7 @@ msgstr "argument z wartością domyślną przed argumentem bez" msgid "non-hex digit found" msgstr "cyfra nieszesnastkowa" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3704,7 +3707,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "obsługiwane jest tylko bit_depth=16" @@ -3721,7 +3724,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "obsługiwane jest tylko sample_rate=16000" @@ -3833,7 +3836,7 @@ msgstr "pop z pustego PulseIn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4053,14 +4056,23 @@ msgstr "błąd składni w deskryptorze uctypes" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 66bc915760875..5cd7ff9ca6b29 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2024-03-11 09:56+0000\n" +"PO-Revision-Date: 2024-03-23 14:30+0000\n" "Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" @@ -103,7 +103,7 @@ msgstr "%q e %q devem ser diferentes" msgid "%q and %q must share a clock unit" msgstr "%q e %q devem compartilhar uma unidade de clock" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "%q não pode ser alterado quando o modo é definido como %q" @@ -249,7 +249,7 @@ msgstr "%q fora dos limites" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -476,7 +476,7 @@ msgid "Address must be %d bytes long" msgstr "O endereço deve ter %d bytes de comprimento" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Intervalo de endereços não permitido" @@ -491,7 +491,7 @@ msgstr "Todos os periféricos CAN estão em uso" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Todos os periféricos I2C estão em uso" @@ -501,17 +501,17 @@ msgstr "Todos os periféricos I2C estão em uso" msgid "All RX FIFOs in use" msgstr "Todos os FIFOs RX estão em uso" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Todos os periféricos SPI estão em uso" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Todos os periféricos UART estão em uso" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Todos os canais estão em uso" @@ -523,6 +523,7 @@ msgstr "Todos os canais dma estão em uso" msgid "All event channels in use" msgstr "Todos os canais de eventos em uso" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -542,15 +543,16 @@ msgstr "Todos os temporizadores para este pino estão em uso" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Todos os temporizadores em uso" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Já está anunciando." @@ -693,7 +695,7 @@ msgstr "Buffer pequeno demais" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -739,7 +741,7 @@ msgstr "" "O alarme só é possível nos dois pinos com sinal baixo a partir do deep sleep." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Não é possível definir o CCCD com a característica local" @@ -761,12 +763,12 @@ msgstr "Não é possível excluir valores" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Não é possível obter (pull) enquanto estiver no modo saída" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Não é possível obter a temperatura" @@ -801,7 +803,7 @@ msgstr "Não é possível definir o RTS ou CTS no modo RS485" msgid "Cannot subclass slice" msgstr "Não é possível subclassificar a fatia" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "Não é possível acordar na borda do pino, nível apenas" @@ -861,7 +863,7 @@ msgid "DAC already in use" msgstr "DAC em uso" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "O pino de dados 0 deve ser alinhado por bytes" @@ -874,12 +876,12 @@ msgid "Data format error (may be broken data)" msgstr "Erro no formato dos dados (os dados podem estar truncados)" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Os dados não são compatíveis com publicidade direcionada" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Os dados são grandes demais para o pacote de publicidade" @@ -896,7 +898,7 @@ msgid "Device error or wrong termination of input stream" msgstr "" "Erro no dispositivo ou houve um encerramento incorreto do fluxo de entrada" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Dispositivo em uso" @@ -945,7 +947,7 @@ msgid "Expected a kind of %q" msgstr "Era esperado uma espécie de %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Anúncios estendidos não compatíveis com a resposta da varredura." @@ -961,7 +963,7 @@ msgstr "O FFT é implementado apenas para matrizes lineares" msgid "Failed sending command." msgstr "Falha ao enviar comando." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Houve uma falha na aquisição do mutex, err 0x%04x" @@ -994,11 +996,11 @@ msgid "Failed to buffer the sample" msgstr "Houve uma falha ao fazer uma memória prévia (buffer) da amostra" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Falha ao conectar: erro interno" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Falha ao conectar: tempo limite" @@ -1006,7 +1008,7 @@ msgstr "Falha ao conectar: tempo limite" msgid "Failed to parse MP3 file" msgstr "Falha ao analisar o arquivo MP3" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Houve uma falha ao liberar o mutex, err 0x%04x" @@ -1147,11 +1149,11 @@ msgstr "A entrada está demorando demais" msgid "Input/output error" msgstr "Erro de entrada/saída" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Autenticação insuficiente" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Criptografia insuficiente" @@ -1227,7 +1229,7 @@ msgid "Invalid ADC Unit value" msgstr "Valor inválido da unidade ADC" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Parâmetro BLE inválido" @@ -1407,7 +1409,8 @@ msgstr "Ágil fora da memória" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1417,7 +1420,7 @@ msgid "No %q pin" msgstr "Sem pin %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Não há nenhum CCCD para esta característica" @@ -1496,7 +1499,7 @@ msgstr "Sem saída no programa" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1527,7 +1530,7 @@ msgstr "Não há um temporizador disponível" msgid "No usb host port initialized" msgstr "Nenhuma porta do host usb foi inicializada" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "O firmware do sistema nórdico está sem memória" @@ -1536,7 +1539,7 @@ msgid "Not a valid IP string" msgstr "Não é uma sequência válida de IP" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Não Conectado" @@ -1561,7 +1564,7 @@ msgid "" msgstr "" "Objeto foi desinicializado e não pode ser mais usaado. Crie um novo objeto." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "A paridade ímpar não é compatível" @@ -1633,7 +1636,7 @@ msgid "Only one address is allowed" msgstr "Apenas um endereço é permitido" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Apenas um alarme alarm.time pode ser definido" @@ -1815,7 +1818,7 @@ msgid "RNG Init Error" msgstr "Houve um erro na inicialização do RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1918,7 +1921,7 @@ msgid "Scale dimensions must divide by 3" msgstr "As dimensões da escala devem ser poder ser divididas por 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Digitalização já em andamento. Pare com stop_scan." @@ -2038,7 +2041,7 @@ msgid "Time is in the past." msgstr "O tempo está no passado." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2064,7 +2067,7 @@ msgid "Too many displays" msgstr "Exibições demais" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "O total dos dados que serão escritos é maior do que %q" @@ -2181,7 +2184,7 @@ msgstr "Não foi possível escrever na memória de somente leitura" msgid "Unable to write to sleep_memory." msgstr "Não foi possível escrever no sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Tipo uuid nrfx inesperado" @@ -2205,7 +2208,7 @@ msgstr "Código de erro desconhecido %d" msgid "Unknown failure %d" msgstr "Falha desconhecida %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Erro gatt desconhecido: 0x%04x" @@ -2215,7 +2218,7 @@ msgstr "Erro gatt desconhecido: 0x%04x" msgid "Unknown reason." msgstr "Motivo desconhecido." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Erro de segurança desconhecido: 0x%04x" @@ -2225,7 +2228,7 @@ msgstr "Erro de segurança desconhecido: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Ocorreu um erro desconhecido no firmware do sistema em %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Erro desconhecido do firmware: %04x" @@ -2241,7 +2244,7 @@ msgstr "Ocorreu um erro desconhecido no firmware do sistema: %d" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Quantidade inigualável de itens no RHS (%d esperado, obteve %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2271,15 +2274,15 @@ msgstr "A atualização falou" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Comprimento do valor != comprimento fixo necessário" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "O comprimento do valor é > max_length" @@ -2295,7 +2298,7 @@ msgstr "O tempo limite de leitura da tensão expirou" msgid "WARNING: Your code filename has two extensions\n" msgstr "AVISO: Seu arquivo de código tem duas extensões\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" "O WatchDogTimer não pode ser não-inicializado uma vez que o modo é definido " @@ -2329,7 +2332,7 @@ msgid "Woken up by alarm.\n" msgstr "Foi despertado através do alarme.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "A escrita não é compatível na Característica" @@ -2358,7 +2361,7 @@ msgstr "Você pressionou o botão BOOT na inicialização" #: ports/espressif/boards/adafruit_feather_esp32c6_4mbflash_nopsram/mpconfigboard.h #: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h msgid "You pressed the BOOT button at start up." -msgstr "" +msgstr "Você pressionou o botão BOOT ao iniciar." #: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h msgid "You pressed the GPIO0 button at start up." @@ -2383,7 +2386,7 @@ msgstr "Você pressionou o botão VOLUME na inicialização." msgid "You pressed the central button at start up." msgstr "Você pressionou o botão central na inicialização." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Você pressionou o botão esquerdo na inicialização." @@ -2979,7 +2982,7 @@ msgstr "final de formato enquanto procura pelo especificador de conversão" msgid "epoch_time not supported on this board" msgstr "O epoch_time não é compatível com esta placa" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "erro = 0x%08lX" @@ -3473,8 +3476,8 @@ msgid "matrix is not positive definite" msgstr "a matriz não é definitiva positiva" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "o max_length deve ser 0-%d quando Fixed_length for %s" @@ -3636,7 +3639,7 @@ msgid "no such attribute" msgstr "não há tal atributo" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "um não UUID foi encontrado na lista service_uuids_whitelist" @@ -3648,7 +3651,7 @@ msgstr "o argumento não predefinido segue o argumento predefinido" msgid "non-hex digit found" msgstr "um dígito não hexadecimal foi encontrado" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "o tempo limite não zero deve ser > 0.01" @@ -3754,7 +3757,7 @@ msgstr "o offset deve ser >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "o offset deve ser positivo e não maior do que o comprimento do buffer" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "apenas bit_depth = 16 é compatível" @@ -3771,7 +3774,7 @@ msgstr "somente os ndarrays podem ser concatenados" msgid "only oversample=64 is supported" msgstr "apenas oversample=64 é compatível" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "apenas sample_rate = 16000 é compatível" @@ -3888,7 +3891,7 @@ msgstr "pop a partir de um PulseIn vazio" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4108,14 +4111,23 @@ msgstr "houve um erro de sintaxe no descritor uctypes" msgid "ticks interval overflow" msgstr "estouro do intervalo de ticks" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "a duração do tempo limite excedeu o valor máximo suportado" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "o tempo limite deve ser < 655.35 seg" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "o tempo limite na espera pelo cartão v1" diff --git a/locale/ru.po b/locale/ru.po index dccf2fb242da3..aa0dca71bb6ef 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -105,7 +105,7 @@ msgstr "%q и %q должны быть разными" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -253,7 +253,7 @@ msgstr "%q за пределом" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -480,7 +480,7 @@ msgid "Address must be %d bytes long" msgstr "Адрес должен быть длиной %d байт" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Диапазон адресов не разрешен" @@ -495,7 +495,7 @@ msgstr "Все периферийные устройства CAN уже испо #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Все периферийные устройства I2C уже используются" @@ -505,17 +505,17 @@ msgstr "Все периферийные устройства I2C уже испо msgid "All RX FIFOs in use" msgstr "Все RX FIFO уже используются" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Все периферийные устройства SPI уже используются" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Все периферийные устройства UART уже используются" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Все каналы уже используются" @@ -527,6 +527,7 @@ msgstr "Все используемые каналы dma" msgid "All event channels in use" msgstr "Все каналы событий уже используются" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -546,15 +547,16 @@ msgstr "Все таймеры для этого пина уже использу #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Все таймеры уже используются" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Уже реклама." @@ -698,7 +700,7 @@ msgstr "Слишком маленький буфер" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -744,7 +746,7 @@ msgstr "" "Из глубокого сна может сигнализировать только по двум низким контактам." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Невозможно установить CCCD для локальной характеристики" @@ -766,12 +768,12 @@ msgstr "Невозможно удалить значения" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Невозможно получить pull в режиме вывода" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Невозможно получить температуру" @@ -806,7 +808,7 @@ msgstr "Невозможно указать RTS или CTS в режиме RS485 msgid "Cannot subclass slice" msgstr "Невозможно создать подкласс среза" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" "Невозможно проснуться по изменению логического уровня, только по уровню" @@ -868,7 +870,7 @@ msgid "DAC already in use" msgstr "DAC уже используется" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Пин data 0 должен быть байтово выровнен" @@ -881,12 +883,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Данные не поддерживаются направленным объявлением" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Данные слишком велики для пакета объявления" @@ -904,7 +906,7 @@ msgstr "Емкость места назначения меньше длины msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Устройство используется" @@ -954,7 +956,7 @@ msgid "Expected a kind of %q" msgstr "Ожидаемый вид %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Расширенные объявления с ответом сканирования не поддерживаются." @@ -970,7 +972,7 @@ msgstr "FFT реализовано только для линейных масс msgid "Failed sending command." msgstr "Не удалось отправить команду." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Не удалось получить mutex, ошибка 0x%04x" @@ -1004,11 +1006,11 @@ msgid "Failed to buffer the sample" msgstr "Не удалось выполнить буферизацию образца" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Не удалось подключиться: внутренняя ошибка" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Не удалось подключиться: таймаут" @@ -1016,7 +1018,7 @@ msgstr "Не удалось подключиться: таймаут" msgid "Failed to parse MP3 file" msgstr "Не удалось распарсить файл MP3" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Не удалось освободить mutex, ошибка 0x%04x" @@ -1158,11 +1160,11 @@ msgstr "Ввод занимает слишком много времени" msgid "Input/output error" msgstr "Ошибка ввода/вывода" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Неполная аутентификация" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Недостаточное шифрование" @@ -1238,7 +1240,7 @@ msgid "Invalid ADC Unit value" msgstr "Недопустимое значение единицы ADC" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Недопустимый параметр BLE" @@ -1420,7 +1422,8 @@ msgstr "Изображение памяти" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1430,7 +1433,7 @@ msgid "No %q pin" msgstr "Нет пина %q" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Для этой характеристики нет CCCD" @@ -1509,7 +1512,7 @@ msgstr "В программе отсутствует вывод" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "На SDA или SCL не обнаружено подтягивания; проверь свою проводку" @@ -1538,7 +1541,7 @@ msgstr "Нет доступного таймера" msgid "No usb host port initialized" msgstr "Порт USB-хоста не инициализирован" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Скандинавская система прошивки из памяти" @@ -1547,7 +1550,7 @@ msgid "Not a valid IP string" msgstr "Недействительная строка IP" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Не подключено" @@ -1573,7 +1576,7 @@ msgstr "" "Объект был деинициализирован и больше не может быть использован. Создайте " "новый объект." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Нечетная четность не поддерживается" @@ -1644,7 +1647,7 @@ msgid "Only one address is allowed" msgstr "Разрешен только один адрес" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Можно установить только один будильник" @@ -1823,7 +1826,7 @@ msgid "RNG Init Error" msgstr "Ошибка инициализации RNG" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1926,7 +1929,7 @@ msgid "Scale dimensions must divide by 3" msgstr "Размеры шкалы необходимо разделить на 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Сканирование уже выполняется. Остановитесь на stop_scan." @@ -2048,7 +2051,7 @@ msgid "Time is in the past." msgstr "Время в прошлом." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Таймаут слишком длинный: максимальная длина таймаута %d секунд" @@ -2070,7 +2073,7 @@ msgid "Too many displays" msgstr "Слишком много дисплеев" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "Общее количество данных для записи превышает %q" @@ -2187,7 +2190,7 @@ msgstr "Невозможно записать в постоянную памят msgid "Unable to write to sleep_memory." msgstr "Невозможно записать в Sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Неожиданный тип nrfx uuid" @@ -2211,7 +2214,7 @@ msgstr "Неизвестный код ошибки %d" msgid "Unknown failure %d" msgstr "Неизвестный сбой %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Неизвестная ошибка gatt: 0x%04x" @@ -2221,7 +2224,7 @@ msgstr "Неизвестная ошибка gatt: 0x%04x" msgid "Unknown reason." msgstr "Причина неизвестна." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Неизвестная ошибка безопасности: 0x%04x" @@ -2231,7 +2234,7 @@ msgstr "Неизвестная ошибка безопасности: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Неизвестная системная ошибка прошивки на %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Неизвестная системная ошибка прошивки: %04x" @@ -2248,7 +2251,7 @@ msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" "Непревзойденное количество элементов на RHS (ожидалось %d, получено %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2278,15 +2281,15 @@ msgstr "Ошибка обновления" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Длина значения! = требуемая фиксированная длина" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Длина значения > максимальная_длина" @@ -2302,7 +2305,7 @@ msgstr "Истекло время ожидания считывания напр msgid "WARNING: Your code filename has two extensions\n" msgstr "ВНИМАНИЕ: Имя файла кода имеет два расширения\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" "Сторожевой таймер не может быть деинициализирован, если установлен режим " @@ -2336,7 +2339,7 @@ msgid "Woken up by alarm.\n" msgstr "Проснулся по тревоге.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Запись не поддерживается в Характеристика" @@ -2390,7 +2393,7 @@ msgstr "Вы нажали кнопку ГРОМКОСТЬ при запуске. msgid "You pressed the central button at start up." msgstr "Вы нажали центральную кнопку при запуске." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Вы нажали левую кнопку при запуске." @@ -2999,7 +3002,7 @@ msgstr "конец формата при поиске спецификатора msgid "epoch_time not supported on this board" msgstr "epoch_time не поддерживается на этой плате" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "ошибка = 0x%08lX" @@ -3498,8 +3501,8 @@ msgid "matrix is not positive definite" msgstr "матрица не является положительно определенной" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "максимальная_длина должна быть 0-%d когда фиксированная длина %s" @@ -3662,7 +3665,7 @@ msgid "no such attribute" msgstr "нет такого атрибута" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "не-UUID найден в сервисе_uuids_белый список" @@ -3676,7 +3679,7 @@ msgstr "" msgid "non-hex digit found" msgstr "Ненайдена шестнадцатеричная цифра" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "Ненулевое время ожидания должно быть > 0,01" @@ -3782,7 +3785,7 @@ msgstr "Смещение должно быть >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "Смещение должно быть неотрицательным и не превышать длину буфера" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "поддерживается только бит_глубина=16" @@ -3799,7 +3802,7 @@ msgstr "только массивы ndarrays могут быть объедин msgid "only oversample=64 is supported" msgstr "поддерживается только выборка = 64" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "только образец_рейт=16000 поддерживается" @@ -3912,7 +3915,7 @@ msgstr "вытолкнуть из пустого импульсного вход #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4136,15 +4139,24 @@ msgstr "Синтаксическая ошибка в дескрипторе UCTY msgid "ticks interval overflow" msgstr "клещей интервал перегрузка" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" "Продолжительность таймаута превысила максимальное поддерживаемое значение" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "таймаут должен быть < 655.35 сек" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "Таймаут в ожидании карты v1" diff --git a/locale/sv.po b/locale/sv.po index 61de44bb43408..d40015f44f3b8 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -102,7 +102,7 @@ msgstr "%q och %q måste vara olika" msgid "%q and %q must share a clock unit" msgstr "%q och %q måste dela klockenhet" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -250,7 +250,7 @@ msgstr "%q är utanför gränserna" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -475,7 +475,7 @@ msgid "Address must be %d bytes long" msgstr "Adressen måste vara %d byte lång" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "Adressintervallet är inte tillåtet" @@ -490,7 +490,7 @@ msgstr "All CAN-kringutrustning används" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "All I2C-kringutrustning används" @@ -500,17 +500,17 @@ msgstr "All I2C-kringutrustning används" msgid "All RX FIFOs in use" msgstr "Alla RX FIFO i bruk" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "All SPI-kringutrustning används" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Alla UART-kringutrustning används" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Alla kanaler används" @@ -522,6 +522,7 @@ msgstr "Alla dma-kanaler används" msgid "All event channels in use" msgstr "Alla händelsekanaler används" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -541,15 +542,16 @@ msgstr "Alla timers för denna pinne är i bruk" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Alla timers används" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Annonserar redan." @@ -692,7 +694,7 @@ msgstr "Buffert för liten" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -736,7 +738,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "Kan bara larma från djup sömn på två låga pinnar." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Kan inte ställa in CCCD på lokal karaktäristik" @@ -758,12 +760,12 @@ msgstr "Kan inte radera värden" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Kan inte ange pull i output-läge" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Kan inte hämta temperatur" @@ -797,7 +799,7 @@ msgstr "Det går inte att specificera RTS eller CTS i RS485-läget" msgid "Cannot subclass slice" msgstr "Det går inte att subklassa slice" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "Kan inte vakna på pin edge, bara nivå" @@ -858,7 +860,7 @@ msgid "DAC already in use" msgstr "DAC används redan" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Datapinne 0 måste vara bytejusterad" @@ -871,12 +873,12 @@ msgid "Data format error (may be broken data)" msgstr "Dataformatfel (kan var felaktig data)" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "Data stöds inte med riktad annonsering" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Data för stor för annonseringspaket" @@ -892,7 +894,7 @@ msgstr "Målkapaciteten är mindre än destination_length." msgid "Device error or wrong termination of input stream" msgstr "Enhetsfel eller felaktig terminator av inström" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Enheten används redan" @@ -942,7 +944,7 @@ msgid "Expected a kind of %q" msgstr "Förväntade en typ av %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Utökad annonsering i kombination med skanningssvar stöds inte." @@ -958,7 +960,7 @@ msgstr "FTT är enbart implementerad för linjära matriser" msgid "Failed sending command." msgstr "Det gick inte att skicka kommandot." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Det gick inte att förvärva mutex, fel 0x%04x" @@ -991,11 +993,11 @@ msgid "Failed to buffer the sample" msgstr "Det gick inte att buffra samplingen" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Det gick inte att ansluta: internt fel" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Det gick inte att ansluta: timeout" @@ -1003,7 +1005,7 @@ msgstr "Det gick inte att ansluta: timeout" msgid "Failed to parse MP3 file" msgstr "Det gick inte att tolka MP3-filen" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Det gick inte att frigöra mutex, fel 0x%04x" @@ -1139,11 +1141,11 @@ msgstr "Indata tar för lång tid" msgid "Input/output error" msgstr "Indata-/utdatafel" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Otillräcklig autentisering" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Otillräcklig kryptering" @@ -1219,7 +1221,7 @@ msgid "Invalid ADC Unit value" msgstr "Ogiltigt ADC-enhetsvärde" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Ogiltig BLE-parameter" @@ -1399,7 +1401,8 @@ msgstr "Nimble har inget minne kvar" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1409,7 +1412,7 @@ msgid "No %q pin" msgstr "Ingen %q-pinne" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Ingen CCCD för denna karaktäristik" @@ -1488,7 +1491,7 @@ msgstr "Inget out i programmet" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "Ingen pull-up hittades på SDA eller SCL; kontrollera inkopplingen" @@ -1517,7 +1520,7 @@ msgstr "Ingen timer tillgänglig" msgid "No usb host port initialized" msgstr "Ingen usb värdport initialiserad" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "Nordic systemfirmware fick slut på minne" @@ -1526,7 +1529,7 @@ msgid "Not a valid IP string" msgstr "Inte en giltig IP-sträng" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Inte ansluten" @@ -1552,7 +1555,7 @@ msgstr "" "Objektet har deinitialiserats och kan inte längre användas. Skapa ett nytt " "objekt." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Udda paritet stöds inte" @@ -1622,7 +1625,7 @@ msgid "Only one address is allowed" msgstr "Endast en adress är tillåten" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "Endast ett alarm.time-larm kan ställas in" @@ -1800,7 +1803,7 @@ msgid "RNG Init Error" msgstr "RNG Init-fel" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1903,7 +1906,7 @@ msgid "Scale dimensions must divide by 3" msgstr "Skaldimension måste vara delbar med 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Skanning pågår redan. Stoppa med stop_scan." @@ -2022,7 +2025,7 @@ msgid "Time is in the past." msgstr "Tid har passerats." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Åtgärden tog för lång tid: Max väntetid är %d sekunder" @@ -2044,7 +2047,7 @@ msgid "Too many displays" msgstr "För många displayer" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "Totala data att skriva är större än %q" @@ -2160,7 +2163,7 @@ msgstr "Kan inte skriva till skrivskyddat minne" msgid "Unable to write to sleep_memory." msgstr "Det gick inte att skriva till sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Oväntad nrfx uuid-typ" @@ -2184,7 +2187,7 @@ msgstr "Okänd felkod %d" msgid "Unknown failure %d" msgstr "Okänt fel %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Okänt gatt-fel: 0x%04x" @@ -2194,7 +2197,7 @@ msgstr "Okänt gatt-fel: 0x%04x" msgid "Unknown reason." msgstr "Okänd anledning." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Okänt säkerhetsfel: 0x%04x" @@ -2204,7 +2207,7 @@ msgstr "Okänt säkerhetsfel: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "Okänt fel i systemets firmware vid %s:%d: %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "Okänt systemfirmwarefel: %04x" @@ -2220,7 +2223,7 @@ msgstr "Okänt fel i systemets firmware: %d" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "Omatchat antal på RHS (förväntat %d, fick %d)." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2250,15 +2253,15 @@ msgstr "Uppdateringen misslyckades" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Värdets längde ! = krävd fast längd" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Värdets längd > max_length" @@ -2274,7 +2277,7 @@ msgstr "Avläsning av spänning tog för lång tid" msgid "WARNING: Your code filename has two extensions\n" msgstr "VARNING: Ditt filnamn för kod har två tillägg\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "WatchDogTimer kan inte avinitialiseras när läget är inställt på RESET" @@ -2306,7 +2309,7 @@ msgid "Woken up by alarm.\n" msgstr "Vaknade av larm.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Skrivning stöds inte på karaktäristik" @@ -2360,7 +2363,7 @@ msgstr "Du tryckte ned VOLYM-knappen vid start." msgid "You pressed the central button at start up." msgstr "Du tryckte ned mittknappen vid start." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "Du tryckte ned vänster knapp vid start." @@ -2952,7 +2955,7 @@ msgstr "slut på format vid sökning efter konverteringsspecificerare" msgid "epoch_time not supported on this board" msgstr "epoch_time stöds inte av detta kort" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "fel = 0x%08lX" @@ -3444,8 +3447,8 @@ msgid "matrix is not positive definite" msgstr "matrisen är inte positiv bestämd" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length måste vara 0-%d när fixed_length är %s" @@ -3605,7 +3608,7 @@ msgid "no such attribute" msgstr "inget sådant attribut" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "icke-UUID hittades i service_uuids_whitelist" @@ -3617,7 +3620,7 @@ msgstr "icke-standard argument följer standard argument" msgid "non-hex digit found" msgstr "icke-hexnummer hittade" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "Icke-noll timeout måste vara > 0.01" @@ -3723,7 +3726,7 @@ msgstr "offset måste vara >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "offset måste vara icke-negativt och inte längre än buffertlängd" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "bara bit_depth=16 stöds" @@ -3740,7 +3743,7 @@ msgstr "endast ndarrays kan sammanfogas" msgid "only oversample=64 is supported" msgstr "endast oversample=64 stöds" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "enbart sample_rate=16000 stöds" @@ -3852,7 +3855,7 @@ msgstr "pop från en tom PulseIn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4072,14 +4075,23 @@ msgstr "syntaxfel i uctypes deskriptor" msgid "ticks interval overflow" msgstr "Överskridet tickintervall" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "timeout-längd överskred det maximala värde som stöds" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "timeout måste vara < 655,35 sekunder" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "timeout för v1-kort" diff --git a/locale/tr.po b/locale/tr.po index 495000417c5b8..b62d4d0a925ca 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -98,7 +98,7 @@ msgstr "%q ve %q farklı olmalılar" msgid "%q and %q must share a clock unit" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -244,7 +244,7 @@ msgstr "%q sınırların dışında" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -469,7 +469,7 @@ msgid "Address must be %d bytes long" msgstr "Adres %d byte uzunluğunda olmalıdır" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "" @@ -484,7 +484,7 @@ msgstr "Tüm CAN çevre birimleri kullanımda" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "Tüm I2C çevre birimleri kullanımda" @@ -494,17 +494,17 @@ msgstr "Tüm I2C çevre birimleri kullanımda" msgid "All RX FIFOs in use" msgstr "Tüm RX FIFO'ları kullanımda" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "Tüm SPI çevre birimleri kullanımda" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "Tüm UART çevre birimleri kullanımda" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "Tüm kanallar kullanımda" @@ -516,6 +516,7 @@ msgstr "" msgid "All event channels in use" msgstr "Tüm olay kanalları kullanımda" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -535,15 +536,16 @@ msgstr "Bu pin için tüm zamanlayıcılar kullanımda" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "Tüm zamanlayıcılar kullanımda" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Halihazırda duyuruluyor." @@ -686,7 +688,7 @@ msgstr "" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -729,7 +731,7 @@ msgid "Can only alarm on two low pins from deep sleep." msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "" @@ -751,12 +753,12 @@ msgstr "Değerler silinemez" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Çıkış modundayken çekme alınamıyor" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Isı okunamadı" @@ -790,7 +792,7 @@ msgstr "RS485 modunda RTS veya CTS belirtilemez" msgid "Cannot subclass slice" msgstr "" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "" @@ -849,7 +851,7 @@ msgid "DAC already in use" msgstr "DAC zaten kullanımda" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pini bite hizalı olmalı" @@ -862,12 +864,12 @@ msgid "Data format error (may be broken data)" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "" @@ -883,7 +885,7 @@ msgstr "Hedef kapasitesi, hedef_uzunluğundan daha küçük." msgid "Device error or wrong termination of input stream" msgstr "" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Cihaz kullanımda" @@ -932,7 +934,7 @@ msgid "Expected a kind of %q" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "" @@ -948,7 +950,7 @@ msgstr "FFT yalnızca doğrusal diziler için uygulanır" msgid "Failed sending command." msgstr "Komut gönderilemedi." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Muteks alınamadı, err 0x%04x" @@ -979,11 +981,11 @@ msgid "Failed to buffer the sample" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Bağlantı kurulamadı: internal error" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Bağlantı kurulamadı: timeout" @@ -991,7 +993,7 @@ msgstr "Bağlantı kurulamadı: timeout" msgid "Failed to parse MP3 file" msgstr "MP3 dosyası ayrıştırılamadı" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Muteks serbest bırakılamadı, err 0x%04x" @@ -1127,11 +1129,11 @@ msgstr "Giriş çok uzun sürüyor" msgid "Input/output error" msgstr "Giriş/çıkış hatası" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Yetersiz kimlik doğrulama" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Yetersiz şifreleme" @@ -1207,7 +1209,7 @@ msgid "Invalid ADC Unit value" msgstr "Geçersiz ADC Ünite değeri" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "Geçersiz BLE parametresi" @@ -1388,7 +1390,8 @@ msgstr "" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1398,7 +1401,7 @@ msgid "No %q pin" msgstr "%q pini yok" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "" @@ -1477,7 +1480,7 @@ msgstr "" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "" @@ -1506,7 +1509,7 @@ msgstr "" msgid "No usb host port initialized" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "" @@ -1515,7 +1518,7 @@ msgid "Not a valid IP string" msgstr "" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "" @@ -1539,7 +1542,7 @@ msgid "" "Object has been deinitialized and can no longer be used. Create a new object." msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "" @@ -1606,7 +1609,7 @@ msgid "Only one address is allowed" msgstr "" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "" @@ -1782,7 +1785,7 @@ msgid "RNG Init Error" msgstr "" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "" @@ -1885,7 +1888,7 @@ msgid "Scale dimensions must divide by 3" msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "" @@ -2002,7 +2005,7 @@ msgid "Time is in the past." msgstr "" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "" @@ -2024,7 +2027,7 @@ msgid "Too many displays" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "" @@ -2140,7 +2143,7 @@ msgstr "" msgid "Unable to write to sleep_memory." msgstr "" -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "" @@ -2164,7 +2167,7 @@ msgstr "" msgid "Unknown failure %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "" @@ -2174,7 +2177,7 @@ msgstr "" msgid "Unknown reason." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "" @@ -2184,7 +2187,7 @@ msgstr "" msgid "Unknown system firmware error at %s:%d: %d" msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "" @@ -2200,7 +2203,7 @@ msgstr "" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2228,15 +2231,15 @@ msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "" @@ -2252,7 +2255,7 @@ msgstr "" msgid "WARNING: Your code filename has two extensions\n" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "" @@ -2279,7 +2282,7 @@ msgid "Woken up by alarm.\n" msgstr "" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "" @@ -2333,7 +2336,7 @@ msgstr "" msgid "You pressed the central button at start up." msgstr "" -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "" @@ -2920,7 +2923,7 @@ msgstr "" msgid "epoch_time not supported on this board" msgstr "" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "" @@ -3410,8 +3413,8 @@ msgid "matrix is not positive definite" msgstr "" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "" @@ -3571,7 +3574,7 @@ msgid "no such attribute" msgstr "" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "" @@ -3583,7 +3586,7 @@ msgstr "" msgid "non-hex digit found" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "" @@ -3689,7 +3692,7 @@ msgstr "" msgid "offset must be non-negative and no greater than buffer length" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "" @@ -3706,7 +3709,7 @@ msgstr "" msgid "only oversample=64 is supported" msgstr "" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "" @@ -3818,7 +3821,7 @@ msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4038,14 +4041,23 @@ msgstr "" msgid "ticks interval overflow" msgstr "" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index f7155c67d366f..62cc4f44f6b75 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -104,7 +104,7 @@ msgstr "%q hé %q bìxū bùtóng" msgid "%q and %q must share a clock unit" msgstr "%q hé %q bìxū gòngxiǎng yígè shízhōng dānyuán" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "%q cannot be changed once mode is set to %q" msgstr "" @@ -251,7 +251,7 @@ msgstr "%q chāo chū jiè xiàn" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/stm/common-hal/pulseio/PulseIn.c py/argcheck.c #: shared-bindings/canio/Match.c shared-bindings/time/__init__.c @@ -476,7 +476,7 @@ msgid "Address must be %d bytes long" msgstr "dìzhǐ chángdù bìxū shì %d zìjié" #: ports/espressif/common-hal/memorymap/AddressRange.c -#: ports/nrf/common-hal/memorymap/AddressRange.c +#: ports/nordic/common-hal/memorymap/AddressRange.c #: ports/raspberrypi/common-hal/memorymap/AddressRange.c msgid "Address range not allowed" msgstr "bù yǔn xǔ de dì zhǐ fàn wéi" @@ -491,7 +491,7 @@ msgstr "suǒyǒu CAN wàishè dōu zài shǐyòng zhōng" #: ports/espressif/common-hal/busio/I2C.c #: ports/espressif/common-hal/i2ctarget/I2CTarget.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/nordic/common-hal/busio/I2C.c msgid "All I2C peripherals are in use" msgstr "suǒyǒu I2C wàishè dōu zài shǐyòng zhōng" @@ -501,17 +501,17 @@ msgstr "suǒyǒu I2C wàishè dōu zài shǐyòng zhōng" msgid "All RX FIFOs in use" msgstr "suǒyǒu RX FIFO dōu zài shǐyòng zhōng" -#: ports/espressif/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c +#: ports/espressif/common-hal/busio/SPI.c ports/nordic/common-hal/busio/SPI.c msgid "All SPI peripherals are in use" msgstr "suǒyǒu SPI wàishè dōu zài shǐyòng zhōng" -#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/espressif/common-hal/busio/UART.c ports/nordic/common-hal/busio/UART.c msgid "All UART peripherals are in use" msgstr "suǒyǒu UART wàishè dōu zài shǐyòng zhōng" -#: ports/nrf/common-hal/countio/Counter.c -#: ports/nrf/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/rotaryio/IncrementalEncoder.c +#: ports/nordic/common-hal/countio/Counter.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/rotaryio/IncrementalEncoder.c msgid "All channels in use" msgstr "suǒyǒu píndào dōu zài shǐyòng zhōng" @@ -523,6 +523,7 @@ msgstr "suǒyǒu Zhíjiē nèicún fǎngwèn dōu zài shǐyòng zhōng" msgid "All event channels in use" msgstr "suǒyǒu shìjiàn píndào dōu zài shǐyòng zhōng" +#: ports/raspberrypi/common-hal/floppyio/__init__.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c #: ports/raspberrypi/common-hal/usb_host/Port.c @@ -542,15 +543,16 @@ msgstr "cǐ yǐnjiǎo de suǒyǒu jìshíqì dōu zài shǐyòng zhōng" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c #: ports/cxd56/common-hal/pulseio/PulseOut.c -#: ports/nrf/common-hal/audiopwmio/PWMAudioOut.c -#: ports/nrf/common-hal/pulseio/PulseIn.c ports/nrf/peripherals/nrf/timers.c +#: ports/nordic/common-hal/audiopwmio/PWMAudioOut.c +#: ports/nordic/common-hal/pulseio/PulseIn.c +#: ports/nordic/peripherals/nrf/timers.c #: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c #: ports/stm/peripherals/timers.c msgid "All timers in use" msgstr "suǒyǒu jìshí qì dōu zài shǐyòng zhōng" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Already advertising." msgstr "Mùqián zhèngzài guǎngbō." @@ -693,7 +695,7 @@ msgstr "huǎnchōngqū tàixiǎo" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c #: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" @@ -739,7 +741,7 @@ msgstr "" "Zhǐ néng cóng shēndù shuìmián zhōng de liǎng gè dī yǐn jiǎo shàng bàojǐng." #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "Can't set CCCD on local Characteristic" msgstr "Wúfǎ jiāng CCCD shèzhì wéi běndì tèzhēng" @@ -761,12 +763,12 @@ msgstr "Wúfǎ jiāng zhí shānchú" #: ports/atmel-samd/common-hal/digitalio/DigitalInOut.c #: ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c -#: ports/nrf/common-hal/digitalio/DigitalInOut.c +#: ports/nordic/common-hal/digitalio/DigitalInOut.c #: ports/raspberrypi/common-hal/digitalio/DigitalInOut.c msgid "Cannot get pull while in output mode" msgstr "Zài shūchū móshì xià wúfǎ huòqǔ shànglā huò xiàlā zhuàngtài" -#: ports/nrf/common-hal/microcontroller/Processor.c +#: ports/nordic/common-hal/microcontroller/Processor.c msgid "Cannot get temperature" msgstr "Wúfǎ huòqǔ wēndù" @@ -799,7 +801,7 @@ msgstr "wúfǎ zài RS485 móshì xià zhǐdìng RTS huò CTS" msgid "Cannot subclass slice" msgstr "bùnéng zǐlèihuà qiēpiàn" -#: ports/nrf/common-hal/alarm/pin/PinAlarm.c +#: ports/nordic/common-hal/alarm/pin/PinAlarm.c msgid "Cannot wake on pin edge, only level" msgstr "wúfǎ shǐyòng biānyuán huànxǐng, zhǐnéng shǐyòng diànpíng" @@ -858,7 +860,7 @@ msgid "DAC already in use" msgstr "DAC zhèngzài bèi shǐyòng" #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "shù jù 0 yǐn jiǎo bì xū shì zì jié duì qí de" @@ -871,12 +873,12 @@ msgid "Data format error (may be broken data)" msgstr "shùjù géshì cuòwù (kěnéngshì shùjù sǔnhuài)" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data not supported with directed advertising" msgstr "wèi xiàng guǎng gào tí gòng zhī zhù de shù jù" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Data too large for advertisement packet" msgstr "Guǎnggào bāo de shùjù tài dà" @@ -893,7 +895,7 @@ msgstr "Mùbiāo róngliàng xiǎoyú mùdì de_chángdù." msgid "Device error or wrong termination of input stream" msgstr "shèbèi cuòwù huò shū rùliú cuòwù zhōngzhǐ" -#: ports/nrf/common-hal/audiobusio/I2SOut.c +#: ports/nordic/common-hal/audiobusio/I2SOut.c msgid "Device in use" msgstr "Zhèngzài shǐyòng de shèbèi" @@ -943,7 +945,7 @@ msgid "Expected a kind of %q" msgstr "yù qī yì zhǒng %q" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Extended advertisements with scan response not supported." msgstr "Bù zhīchí dài yǒu sǎomiáo xiǎngyìng de kuòzhǎn guǎngbò." @@ -959,7 +961,7 @@ msgstr "FFT jǐn shì yòng yú yī wéi shù zǔ" msgid "Failed sending command." msgstr "Fāsòng mìnglìng shībài." -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to acquire mutex, err 0x%04x" msgstr "Wúfǎ huòdé mutex, err 0x%04x" @@ -992,11 +994,11 @@ msgid "Failed to buffer the sample" msgstr "wèi néng huǎn chōng yàng běn" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: internal error" msgstr "Liánjiē shībài: Nèibù cuòwù" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Failed to connect: timeout" msgstr "Liánjiē shībài: Chāoshí" @@ -1004,7 +1006,7 @@ msgstr "Liánjiē shībài: Chāoshí" msgid "Failed to parse MP3 file" msgstr "Wúfǎ jiěxī MP3 wénjiàn" -#: ports/nrf/sd_mutex.c +#: ports/nordic/sd_mutex.c #, c-format msgid "Failed to release mutex, err 0x%04x" msgstr "Wúfǎ shìfàng mutex, err 0x%04x" @@ -1145,11 +1147,11 @@ msgstr "Shūrù shíjiānguò zhǎng" msgid "Input/output error" msgstr "Shūrù/shūchū cuòwù" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient authentication" msgstr "Rènzhèng bùzú" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Insufficient encryption" msgstr "Jiāmì bùzú" @@ -1225,7 +1227,7 @@ msgid "Invalid ADC Unit value" msgstr "Wúxiào de ADC dānwèi zhí" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Invalid BLE parameter" msgstr "wú xiào BLE cān shù" @@ -1405,7 +1407,8 @@ msgstr "líng huó de bǎi tuō jì yì" #: ports/espressif/common-hal/busio/SPI.c #: ports/espressif/common-hal/busio/UART.c #: ports/mimxrt10xx/common-hal/busio/SPI.c -#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c +#: ports/mimxrt10xx/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c #: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c #: shared-bindings/i2cdisplaybus/I2CDisplayBus.c @@ -1415,7 +1418,7 @@ msgid "No %q pin" msgstr "Wèi zhǎodào %q yǐn jiǎo" #: ports/espressif/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Characteristic.c msgid "No CCCD for this Characteristic" msgstr "Zhège tèzhēng méiyǒu CCCD" @@ -1494,7 +1497,7 @@ msgstr "chéng xù zhōng wèi tuì chū" #: ports/atmel-samd/common-hal/busio/I2C.c #: ports/espressif/common-hal/busio/I2C.c -#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c +#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c #: ports/raspberrypi/common-hal/busio/I2C.c msgid "No pull up found on SDA or SCL; check your wiring" msgstr "zài SDA huò SCL shàng wèi zhǎo dào shàng lā; jiǎn chá nín de xiàn lù" @@ -1523,7 +1526,7 @@ msgstr "Méiyǒu jìshí qì" msgid "No usb host port initialized" msgstr "wèi chūshǐhuà USB zhǔjī duānkǒu" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "Nordic system firmware out of memory" msgstr "běi ōu xì tǒng gù jiàn chū nèi cún" @@ -1532,7 +1535,7 @@ msgid "Not a valid IP string" msgstr "Wúxiào de IP zìfú chuàn" #: ports/espressif/common-hal/_bleio/__init__.c -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #: shared-bindings/_bleio/CharacteristicBuffer.c msgid "Not connected" msgstr "Wèi liánjiē" @@ -1557,7 +1560,7 @@ msgid "" msgstr "" "Duìxiàng yǐjīng bèi shānchú, wúfǎ zài shǐyòng. Chuàngjiàn yīgè xīn duìxiàng." -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c msgid "Odd parity is not supported" msgstr "Bù zhīchí jīshù" @@ -1628,7 +1631,7 @@ msgid "Only one address is allowed" msgstr "zhǐ yǔn xǔ yí gè dì zhǐ" #: ports/atmel-samd/common-hal/alarm/time/TimeAlarm.c -#: ports/nrf/common-hal/alarm/time/TimeAlarm.c +#: ports/nordic/common-hal/alarm/time/TimeAlarm.c #: ports/stm/common-hal/alarm/time/TimeAlarm.c msgid "Only one alarm.time alarm can be set" msgstr "zhǐ néng shèzhì yīgè nào líng shíjiān nào líng" @@ -1806,7 +1809,7 @@ msgid "RNG Init Error" msgstr "RNG chūshǐhuà cuòwù" #: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c -#: ports/nrf/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c msgid "RS485" msgstr "RS485" @@ -1909,7 +1912,7 @@ msgid "Scale dimensions must divide by 3" msgstr "bǐ lì chǐ cùn bì xū chú yǐ 3" #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "Scan already in progress. Stop with stop_scan." msgstr "Sǎomiáo yǐ zài jìnxíng zhōng. Shǐyòng stop_scan tíngzhǐ." @@ -2028,7 +2031,7 @@ msgid "Time is in the past." msgstr "shí jiān yǐ jīng guò qù." #: ports/espressif/common-hal/_bleio/Adapter.c -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c #, c-format msgid "Timeout is too long: Maximum timeout length is %d seconds" msgstr "Chāoshí shíjiān tài zhǎng: Zuìdà chāoshí shíjiān wèi%d miǎo" @@ -2050,7 +2053,7 @@ msgid "Too many displays" msgstr "Xiǎnshì tài duō" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Total data to write is larger than %q" msgstr "yào biān xiě de zǒng shù jù dà yú %q" @@ -2166,7 +2169,7 @@ msgstr "wúfǎ xiěrù zhǐdú nèicún" msgid "Unable to write to sleep_memory." msgstr "wú fǎ xiě rù sleep_memory." -#: ports/nrf/common-hal/_bleio/UUID.c +#: ports/nordic/common-hal/_bleio/UUID.c msgid "Unexpected nrfx uuid type" msgstr "Yìwài de nrfx uuid lèixíng" @@ -2190,7 +2193,7 @@ msgstr "Wèizhī cuòwù dàimǎ %d" msgid "Unknown failure %d" msgstr "wèi zhī gù zhàng %d" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown gatt error: 0x%04x" msgstr "Wèizhī de gatt cuòwù: 0x%04x" @@ -2200,7 +2203,7 @@ msgstr "Wèizhī de gatt cuòwù: 0x%04x" msgid "Unknown reason." msgstr "Yuányīn bùmíng." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown security error: 0x%04x" msgstr "Wèizhī de ānquán cuòwù: 0x%04x" @@ -2210,7 +2213,7 @@ msgstr "Wèizhī de ānquán cuòwù: 0x%04x" msgid "Unknown system firmware error at %s:%d: %d" msgstr "%s:%d: %d shí chū xiàn wèi zhī xì tǒng gù jiàn cuò wù" -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c #, c-format msgid "Unknown system firmware error: %04x" msgstr "wèi zhī xì tǒng gù jiàn cuò wù: %04x" @@ -2226,7 +2229,7 @@ msgstr "wèi zhī de xì tǒng gù jiàn cuò wù: %d" msgid "Unmatched number of items on RHS (expected %d, got %d)." msgstr "RHS (yùqí %d, huòdé %d) shàng wèi pǐpèi de xiàngmù." -#: ports/nrf/common-hal/_bleio/__init__.c +#: ports/nordic/common-hal/_bleio/__init__.c msgid "" "Unspecified issue. Can be that the pairing prompt on the other device was " "declined or ignored." @@ -2256,15 +2259,15 @@ msgstr "gēng xīn shī bài" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length != required fixed length" msgstr "Zhí chángdù != Suǒ xū de gùdìng chángdù" #: ports/espressif/common-hal/_bleio/Characteristic.c #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c msgid "Value length > max_length" msgstr "Zhí chángdù > zuìdà chángdù" @@ -2280,7 +2283,7 @@ msgstr "Diànyā dòu qǔ chāoshí" msgid "WARNING: Your code filename has two extensions\n" msgstr "Jǐnggào: Nǐ de dàimǎ wénjiàn míng yǒu liǎng gè kuòzhǎn míng\n" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET" msgstr "Yīdàn jiāng móshì shèzhì wèi RESET, jiù wúfǎ chūshǐhuà WatchDog Timer" @@ -2312,7 +2315,7 @@ msgid "Woken up by alarm.\n" msgstr "bèi jǐng bào chǎo xǐng.\n" #: ports/espressif/common-hal/_bleio/PacketBuffer.c -#: ports/nrf/common-hal/_bleio/PacketBuffer.c +#: ports/nordic/common-hal/_bleio/PacketBuffer.c msgid "Writes not supported on Characteristic" msgstr "Tèzhēng bù zhīchí xiě rù" @@ -2366,7 +2369,7 @@ msgstr "nín zài qǐ dòng shí àn xià le yīn liàng àn niǔ." msgid "You pressed the central button at start up." msgstr "nín zài qǐ dòng shí àn xià le zhōng yāng àn niǔ." -#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h +#: ports/nordic/boards/aramcon2_badge/mpconfigboard.h msgid "You pressed the left button at start up." msgstr "nín zài qǐ dòng shí àn xià le zuǒ àn niǔ." @@ -2959,7 +2962,7 @@ msgstr "xúnzhǎo zhuǎnhuàn biāozhù géshì de jiéshù" msgid "epoch_time not supported on this board" msgstr "epoch_time bǎn bù zhī chí cǐ bǎn běn" -#: ports/nrf/common-hal/busio/UART.c +#: ports/nordic/common-hal/busio/UART.c #, c-format msgid "error = 0x%08lX" msgstr "cuòwù = 0x%08lX" @@ -3450,8 +3453,8 @@ msgid "matrix is not positive definite" msgstr "jǔzhèn bùshì zhèngdìng de" #: ports/espressif/common-hal/_bleio/Descriptor.c -#: ports/nrf/common-hal/_bleio/Characteristic.c -#: ports/nrf/common-hal/_bleio/Descriptor.c +#: ports/nordic/common-hal/_bleio/Characteristic.c +#: ports/nordic/common-hal/_bleio/Descriptor.c #, c-format msgid "max_length must be 0-%d when fixed_length is %s" msgstr "max_length bìxū shì 0-%d, dāng fixed_length shì %s" @@ -3611,7 +3614,7 @@ msgid "no such attribute" msgstr "méiyǒu cǐ shǔxìng" #: ports/espressif/common-hal/_bleio/Connection.c -#: ports/nrf/common-hal/_bleio/Connection.c +#: ports/nordic/common-hal/_bleio/Connection.c msgid "non-UUID found in service_uuids_whitelist" msgstr "Zài service_uuids bái míngdān zhōng zhǎodào fēi UUID" @@ -3623,7 +3626,7 @@ msgstr "bùshì mòrèn cānshù zūnxún mòrèn cānshù" msgid "non-hex digit found" msgstr "zhǎodào fēi shíliù jìn zhì shùzì" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "non-zero timeout must be > 0.01" msgstr "fēi líng chāo shí bì xū > 0.01" @@ -3729,7 +3732,7 @@ msgstr "piān yí liàng bì xū >= 0" msgid "offset must be non-negative and no greater than buffer length" msgstr "piān yí liàng bì xū wéi fēi fù shù qiě bù dà yú huǎn chōng qū cháng dù" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only bit_depth=16 is supported" msgstr "Jǐn zhīchí wèi shēndù = 16" @@ -3746,7 +3749,7 @@ msgstr "zhǐ néng lián jiē ndarray (shù zì)" msgid "only oversample=64 is supported" msgstr "jǐn zhī chí guò cǎi yàng =64" -#: ports/nrf/common-hal/audiobusio/PDMIn.c +#: ports/nordic/common-hal/audiobusio/PDMIn.c #: ports/stm/common-hal/audiobusio/PDMIn.c msgid "only sample_rate=16000 is supported" msgstr "Jǐn zhīchí cǎiyàng lǜ = 16000" @@ -3858,7 +3861,7 @@ msgstr "cóng kōng mài chōng tán chū" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c #: ports/cxd56/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/nordic/common-hal/pulseio/PulseIn.c #: ports/raspberrypi/common-hal/pulseio/PulseIn.c #: ports/stm/common-hal/pulseio/PulseIn.c py/objdict.c py/objlist.c py/objset.c #: shared-bindings/ps2io/Ps2.c @@ -4081,14 +4084,23 @@ msgstr "uctypes miáoshù fú zhōng de yǔfǎ cuòwù" msgid "ticks interval overflow" msgstr "fēnshí jiàngé yìchū" -#: ports/nrf/common-hal/watchdog/WatchDogTimer.c +#: ports/nordic/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" msgstr "chāoshí shíjiān chāoguò zuìdà zhīchí zhí" -#: ports/nrf/common-hal/_bleio/Adapter.c +#: ports/nordic/common-hal/_bleio/Adapter.c msgid "timeout must be < 655.35 secs" msgstr "chāo shí bì xū < 655.35 miǎo" +#: ports/raspberrypi/common-hal/floppyio/__init__.c +msgid "timeout waiting for flux" +msgstr "" + +#: ports/raspberrypi/common-hal/floppyio/__init__.c +#: shared-module/floppyio/__init__.c +msgid "timeout waiting for index pulse" +msgstr "" + #: shared-module/sdcardio/SDCard.c msgid "timeout waiting for v1 card" msgstr "děngdài v1 kǎ chāoshí" diff --git a/main.c b/main.c index 0305922cd1eac..1544cc77cac9a 100644 --- a/main.c +++ b/main.c @@ -50,9 +50,9 @@ #include "supervisor/cpu.h" #include "supervisor/filesystem.h" #include "supervisor/port.h" -#include "supervisor/serial.h" #include "supervisor/shared/reload.h" #include "supervisor/shared/safe_mode.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/stack.h" #include "supervisor/shared/status_leds.h" #include "supervisor/shared/tick.h" diff --git a/ports/nrf/common-hal/audiobusio/__init__.c b/ports/atmel-samd/common-hal/floppyio/__init__.c similarity index 100% rename from ports/nrf/common-hal/audiobusio/__init__.c rename to ports/atmel-samd/common-hal/floppyio/__init__.c diff --git a/ports/atmel-samd/common-hal/supervisor/Runtime.c b/ports/atmel-samd/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/atmel-samd/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/atmel-samd/mpconfigport.mk b/ports/atmel-samd/mpconfigport.mk index 1e18fee5f8133..73656d01573a5 100644 --- a/ports/atmel-samd/mpconfigport.mk +++ b/ports/atmel-samd/mpconfigport.mk @@ -11,6 +11,8 @@ CIRCUITPY_ROTARYIO_SOFTENCODER = 1 CIRCUITPY_OPTIMIZE_PROPERTY_FLASH_SIZE ?= 1 CIRCUITPY_LTO = 1 +CIRCUITPY_KEYPAD_DEMUX ?= 0 + ###################################################################### # Put samd21-only choices here. diff --git a/ports/broadcom/common-hal/supervisor/Runtime.h b/ports/broadcom/common-hal/supervisor/Runtime.h deleted file mode 100644 index 0622a83a241fa..0000000000000 --- a/ports/broadcom/common-hal/supervisor/Runtime.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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. - */ - -#ifndef MICROPY_INCLUDED_BROADCOM_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_BROADCOM_COMMON_HAL_SUPERVISOR_RUNTIME_H - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_BROADCOM_COMMON_HAL_SUPERVISOR_RUNTIME_H diff --git a/ports/cxd56/common-hal/supervisor/Runtime.c b/ports/cxd56/common-hal/supervisor/Runtime.c deleted file mode 100644 index 6ecdc2581eb0b..0000000000000 --- a/ports/cxd56/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright 2019 Sony Semiconductor Solutions Corporation - * - * 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 "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile index 7eff93736b21d..8490cbd8fa408 100644 --- a/ports/espressif/Makefile +++ b/ports/espressif/Makefile @@ -97,6 +97,7 @@ INC += \ -isystem esp-idf/components/esp_adc/include \ -isystem esp-idf/components/esp_adc/$(IDF_TARGET)/include \ -isystem esp-idf/components/esp_app_format/include \ + -isystem esp-idf/components/esp_bootloader_format/include \ -isystem esp-idf/components/esp_common/include \ -isystem esp-idf/components/esp_event/include \ -isystem esp-idf/components/esp_hw_support/include \ @@ -110,12 +111,15 @@ INC += \ -isystem esp-idf/components/esp_system/include \ -isystem esp-idf/components/esp_timer/include \ -isystem esp-idf/components/esp_wifi/include \ + -isystem esp-idf/components/freertos/config/include \ + -isystem esp-idf/components/freertos/config/include/freertos \ + -isystem esp-idf/components/freertos/config/$(IDF_TARGET_ARCH)/include \ -isystem esp-idf/components/freertos/esp_additions/include \ -isystem esp-idf/components/freertos/esp_additions/include/freertos \ - -isystem esp-idf/components/freertos/esp_additions/arch/$(IDF_TARGET_ARCH)/include \ -isystem esp-idf/components/freertos/FreeRTOS-Kernel/include \ -isystem esp-idf/components/freertos/FreeRTOS-Kernel/include/freertos \ -isystem esp-idf/components/freertos/FreeRTOS-Kernel/portable/$(IDF_TARGET_ARCH)/include \ + -isystem esp-idf/components/freertos/FreeRTOS-Kernel/portable/$(IDF_TARGET_ARCH)/include/freertos \ -isystem esp-idf/components/hal/include \ -isystem esp-idf/components/hal/$(IDF_TARGET)/include \ -isystem esp-idf/components/hal/platform_port/include \ @@ -134,6 +138,7 @@ INC += \ -isystem esp-idf/components/soc/include \ -isystem esp-idf/components/soc/$(IDF_TARGET)/include \ -isystem esp-idf/components/spi_flash/include \ + -isystem esp-idf/components/usb/include \ -isystem esp-idf/components/ulp/ulp_fsm/include \ -isystem esp-idf/components/ulp/ulp_riscv/include \ -isystem esp-idf/components/ulp/ulp_common/include \ @@ -498,6 +503,9 @@ endif ifneq ($(CIRCUITPY_PARALLELDISPLAYBUS),0) ESP_IDF_COMPONENTS_LINK += esp_lcd endif +ifneq ($(CIRCUITPY_USB),0) + ESP_IDF_COMPONENTS_LINK += usb +endif ESP_IDF_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/$(component)/lib$(component).a) @@ -579,7 +587,7 @@ esp-idf-stamp: $(BUILD)/esp-idf/config/sdkconfig.h $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp $(IDF_CMAKE_TARGETS) $(STEPECHO) "LINK $@" - $(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--print-memory-usage -Wl,--start-group $(ESP_IDF_COMPONENTS_EXPANDED) $(BINARY_BLOBS) $(MBEDTLS_COMPONENTS_LINK_EXPANDED) $(LIBS) -Wl,--end-group -u newlib_include_pthread_impl -u ld_include_highint_hdl -u __cxx_fatal_exception + $(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--print-memory-usage -Wl,--start-group $(ESP_IDF_COMPONENTS_EXPANDED) $(BINARY_BLOBS) $(MBEDTLS_COMPONENTS_LINK_EXPANDED) $(LIBS) -Wl,--end-group -u newlib_include_pthread_impl -u ld_include_highint_hdl -u __cxx_fatal_exception -u esp_app_desc $(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_info.py $(STEPECHO) "Create $@" diff --git a/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk b/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk index 7659cd160a297..65c872cf74b89 100644 --- a/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk +++ b/ports/espressif/boards/adafruit_qualia_s3_rgb666/mpconfigboard.mk @@ -11,6 +11,6 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_PSRAM_SIZE = 8MB CIRCUITPY_ESP_PSRAM_MODE = opi -CIRCUITPY_ESP_PSRAM_FREQ = 120m +CIRCUITPY_ESP_PSRAM_FREQ = 80m CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1 diff --git a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk index 5325937258740..10e362399f55e 100644 --- a/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32_eye/mpconfigboard.mk @@ -13,6 +13,7 @@ CIRCUITPY_ESP_PSRAM_FREQ = 40m CIRCUITPY_CANIO = 0 CIRCUITPY_NEOPIXEL_WRITE = 0 +CIRCUITPY_PIXELBUF = 0 CIRCUITPY_PS2IO = 0 CIRCUITPY_ROTARYIO = 0 CIRCUITPY_TOUCHIO = 0 diff --git a/ports/espressif/boards/espressif_esp32s3_lcd_ev/mpconfigboard.mk b/ports/espressif/boards/espressif_esp32s3_lcd_ev/mpconfigboard.mk index 4cc459c9265e5..4b4084930d9a2 100644 --- a/ports/espressif/boards/espressif_esp32s3_lcd_ev/mpconfigboard.mk +++ b/ports/espressif/boards/espressif_esp32s3_lcd_ev/mpconfigboard.mk @@ -11,7 +11,7 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB CIRCUITPY_ESP_PSRAM_SIZE = 8MB CIRCUITPY_ESP_PSRAM_MODE = opi -CIRCUITPY_ESP_PSRAM_FREQ = 120m +CIRCUITPY_ESP_PSRAM_FREQ = 80m CIRCUITPY_DOTCLOCKFRAMEBUFFER = 1 UF2_BOOTLOADER = 0 diff --git a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk index 9da52eb8129a1..ff0ac29e2f21f 100644 --- a/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk +++ b/ports/espressif/boards/firebeetle2_esp32s3/mpconfigboard.mk @@ -11,6 +11,6 @@ CIRCUITPY_ESP_FLASH_SIZE = 16MB CIRCUITPY_ESP_PSRAM_SIZE = 8MB CIRCUITPY_ESP_PSRAM_MODE = opi -CIRCUITPY_ESP_PSRAM_FREQ = 120m +CIRCUITPY_ESP_PSRAM_FREQ = 80m FROZEN_MPY_DIRS += $(TOP)/frozen/CircuitPython_AXP313A diff --git a/ports/espressif/boards/m5stack_cores3/board.c b/ports/espressif/boards/m5stack_cores3/board.c new file mode 100644 index 0000000000000..968384624fa90 --- /dev/null +++ b/ports/espressif/boards/m5stack_cores3/board.c @@ -0,0 +1,256 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 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 "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/busio/SPI.h" +#include "shared-bindings/busio/I2C.h" +#include "shared-bindings/fourwire/FourWire.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" +#include "shared-bindings/board/__init__.h" + +fourwire_fourwire_obj_t board_display_obj; + +#define DELAY 0x80 +#define AXP2101_I2C_ADDRESS 0x34 +#define AW9523B_I2C_ADDRESS 0x58 + +uint8_t display_init_sequence[] = { + 0x01, DELAY, 0x80, // Software reset then delay 0x80 (128ms) + 0xC8, 0x03, 0xFF, 0x93, 0x42, // Turn on the external command + 0xC0, 0x02, 0x12, 0x12, // Power Control 1 + 0xC1, 0x01, 0x03, // Power Control 2 + 0xC5, 0x01, 0xF2, // VCOM Control 1 + 0xB0, 0x01, 0xE0, // RGB Interface SYNC Mode + 0xF6, 0x03, 0x01, 0x00, 0x00, // Interface control + 0XE0, 0x0F, 0x00, 0x0C, 0x11, 0x04, 0x11, 0x08, 0x37, 0x89, 0x4C, 0x06, 0x0C, 0x0A, 0x2E, 0x34, 0x0F, // Positive Gamma Correction + 0xE1, 0x0F, 0x00, 0x0B, 0x11, 0x05, 0x13, 0x09, 0x33, 0x67, 0x48, 0x07, 0x0E, 0x0B, 0x2E, 0x33, 0x0F, // Negative Gamma Correction + 0xB6, 0x04, 0x08, 0x82, 0x1D, 0x04, // Display Function Control + 0x3A, 0x01, 0x55, // COLMOD: Pixel Format Set 16 bit + 0x21, 0x00, // Display inversion ON + 0x36, 0x01, 0x08, // Memory Access Control: RGB order + 0x11, DELAY, 0x78, // Exit Sleep then delay 0x78 (120ms) + 0x29, DELAY, 0x78, // Display on then delay 0x78 (120ms) +}; + +static bool display_init(void) { + busio_spi_obj_t *spi = common_hal_board_create_spi(0); + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + bus->base.type = &fourwire_fourwire_type; + + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO35, // DC + &pin_GPIO3, // CS + NULL, // RST + 40000000, // baudrate + 0, // polarity + 0 // phase + ); + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 320, // width (after rotation) + 240, // height (after rotation) + 0, // column start + 0, // row start + 0, // rotation + 16, // color depth + false, // grayscale + false, // pixels in a byte share a row. Only valid for depths < 8 + 1, // bytes per cell. Only valid for depths < 8 + false, // reverse_pixels_in_byte. Only valid for depths < 8 + true, // reverse_pixels_in_word + MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command + MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command + MIPI_COMMAND_WRITE_MEMORY_START, // write memory command + display_init_sequence, + sizeof(display_init_sequence), + NULL, // backlight pin + NO_BRIGHTNESS_COMMAND, + 1.0f, // brightness + false, // single_byte_bounds + false, // data_as_commands + true, // auto_refresh + 61, // native_frames_per_second + true, // backlight_on_high + false, // SH1107_addressing + 50000 // backlight pwm frequency + ); + + return true; +} + +static bool axp2101_init(busio_i2c_obj_t *i2c) { + int rc; + uint8_t write_buf[2]; + + // 0x90 = 0b1011_1001 // LDOS ON/OFF control 0 + write_buf[0] = 0x90; + write_buf[1] = 0b10111001; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x92, 0x0D // ALDO1 set to 1.8v for AW88298 + write_buf[0] = 0x92; + write_buf[1] = 0x0D; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x93, 0x1C // ALDO2 set to 3.3v for ES7210 + write_buf[0] = 0x93; + write_buf[1] = 0x1C; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x94, 0x1C // ALDO3 set to 3.3v for camera + write_buf[0] = 0x94; + write_buf[1] = 0x1C; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x95, 0x1C // ALDO3 set to 3.3v for TF card slot + write_buf[0] = 0x95; + write_buf[1] = 0x1C; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x99, 0x18 // DLDO1 set to 2.9v for TFT backlight + write_buf[0] = 0x99; + write_buf[1] = 0x18; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x27, 0x00 // PowerKey Hold=1sec / PowerOff=4sec + write_buf[0] = 0x27; + write_buf[1] = 0x00; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x69, 0x11 // CHGLED setting + write_buf[0] = 0x69; + write_buf[1] = 0x11; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x10, 0x30 // PMU common config + write_buf[0] = 0x10; + write_buf[1] = 0x30; + rc = common_hal_busio_i2c_write(i2c, AXP2101_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + return true; +} + +static bool aw9523b_init(busio_i2c_obj_t *i2c) { + int rc; + uint8_t write_buf[2]; + + // 0x02 = 0b0000_0111 // AW_RST, BUD_OUT_EN, TOUCH_RST + write_buf[0] = 0x02; + write_buf[1] = 0b00000111; + rc = common_hal_busio_i2c_write(i2c, AW9523B_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x03 = 0b1000_0011 // BOOST_EN, CAM_RST, LCD_RST + write_buf[0] = 0x03; + write_buf[1] = 0b10000011; + rc = common_hal_busio_i2c_write(i2c, AW9523B_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x04 = 0b0001_1000 // Set TF_SW, ES_INT as input + write_buf[0] = 0x04; + write_buf[1] = 0b00011000; + rc = common_hal_busio_i2c_write(i2c, AW9523B_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x05 = 0b0000_1100 // Set AW_INT, TOUCH_INT as input + write_buf[0] = 0x05; + write_buf[1] = 0b00001100; + rc = common_hal_busio_i2c_write(i2c, AW9523B_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + // 0x11 = 0b0001_0000 // Set P0 outputs in push pull mode + write_buf[0] = 0x11; + write_buf[1] = 0b00010000; + rc = common_hal_busio_i2c_write(i2c, AW9523B_I2C_ADDRESS, write_buf, sizeof(write_buf)); + if (rc != 0) { + return false; + } + + return true; +} + +void board_init(void) { + busio_i2c_obj_t *internal_i2c = common_hal_board_create_i2c(0); + + if (!axp2101_init(internal_i2c)) { + mp_printf(&mp_plat_print, "could not initialize AXP2101"); + return; + } + + if (!aw9523b_init(internal_i2c)) { + mp_printf(&mp_plat_print, "could not initialize AW9523B"); + return; + } + + if (!display_init()) { + mp_printf(&mp_plat_print, "could not initialize the display"); + return; + } +} diff --git a/ports/atmel-samd/common-hal/supervisor/__init__.c b/ports/espressif/boards/m5stack_cores3/mpconfigboard.h old mode 100755 new mode 100644 similarity index 66% rename from ports/atmel-samd/common-hal/supervisor/__init__.c rename to ports/espressif/boards/m5stack_cores3/mpconfigboard.h index 6dca35fb5aeb1..7ac086411af09 --- a/ports/atmel-samd/common-hal/supervisor/__init__.c +++ b/ports/espressif/boards/m5stack_cores3/mpconfigboard.h @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2018 Michael Schroeder + * Copyright (c) 2019 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 @@ -24,17 +24,18 @@ * THE SOFTWARE. */ +// Micropython setup -#include "py/obj.h" +#define MICROPY_HW_BOARD_NAME "M5Stack CoreS3" +#define MICROPY_HW_MCU_NAME "ESP32S3" -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" +#define CIRCUITPY_BOARD_I2C (2) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO11, .sda = &pin_GPIO12}, \ + {.scl = &pin_GPIO1, .sda = &pin_GPIO2}} +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO37) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO35) -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; +#define DEFAULT_UART_BUS_RX (&pin_GPIO18) +#define DEFAULT_UART_BUS_TX (&pin_GPIO17) diff --git a/ports/espressif/boards/m5stack_cores3/mpconfigboard.mk b/ports/espressif/boards/m5stack_cores3/mpconfigboard.mk new file mode 100644 index 0000000000000..ee83760dca48a --- /dev/null +++ b/ports/espressif/boards/m5stack_cores3/mpconfigboard.mk @@ -0,0 +1,28 @@ +USB_VID = 0x303A +USB_PID = 0x811A + +USB_PRODUCT = "M5Stack Core S3" +USB_MANUFACTURER = "M5Stack" + +IDF_TARGET = esp32s3 + +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB + +CIRCUITPY_ESP_PSRAM_SIZE = 8MB +CIRCUITPY_ESP_PSRAM_MODE = qio +CIRCUITPY_ESP_PSRAM_FREQ = 80m + +CIRCUITPY_ESPCAMERA = 1 +CIRCUITPY_PARALLELDISPLAYBUS = 0 + +OPTIMIZATION_FLAGS = -Os + +# Include these Python libraries in firmware. +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests diff --git a/ports/espressif/boards/m5stack_cores3/pins.c b/ports/espressif/boards/m5stack_cores3/pins.c new file mode 100644 index 0000000000000..f9a85269ac10c --- /dev/null +++ b/ports/espressif/boards/m5stack_cores3/pins.c @@ -0,0 +1,94 @@ +#include "py/objtuple.h" +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +STATIC const mp_rom_obj_tuple_t camera_data_tuple = { + {&mp_type_tuple}, + 8, + { + MP_ROM_PTR(&pin_GPIO39), + MP_ROM_PTR(&pin_GPIO40), + MP_ROM_PTR(&pin_GPIO41), + MP_ROM_PTR(&pin_GPIO42), + MP_ROM_PTR(&pin_GPIO15), + MP_ROM_PTR(&pin_GPIO16), + MP_ROM_PTR(&pin_GPIO48), + MP_ROM_PTR(&pin_GPIO47), + } +}; + +CIRCUITPY_BOARD_BUS_SINGLETON(porta_i2c, i2c, 1) + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // M5 Bus (except I2S & PORT B) + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_D44), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_PORTC_RX), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_D18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_PORTA_SDA), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_D43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_PORTC_TX), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_D17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_PORTA_SCL), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_GPIO7) }, + + // Port B + { MP_ROM_QSTR(MP_QSTR_PORTB_IN), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_PORTB_OUT), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_GPIO9) }, + + // I2S + { MP_ROM_QSTR(MP_QSTR_I2S_BIT_CLOCK), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_I2S_WORD_SELECT), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_IS2_DATA), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_IS2_MASTER_CLOCK), MP_ROM_PTR(&pin_GPIO0) }, + + // Camera + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA), MP_ROM_PTR(&camera_data_tuple) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA9), MP_ROM_PTR(&pin_GPIO47) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA8), MP_ROM_PTR(&pin_GPIO48) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA7), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA6), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA5), MP_ROM_PTR(&pin_GPIO42) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA4), MP_ROM_PTR(&pin_GPIO41) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA3), MP_ROM_PTR(&pin_GPIO40) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_DATA2), MP_ROM_PTR(&pin_GPIO39) }, + + { MP_ROM_QSTR(MP_QSTR_CAMERA_VSYNC), MP_ROM_PTR(&pin_GPIO46) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_HREF), MP_ROM_PTR(&pin_GPIO38) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_PCLK), MP_ROM_PTR(&pin_GPIO45) }, + { MP_ROM_QSTR(MP_QSTR_CAMERA_XCLK), MP_ROM_PTR(&pin_GPIO2) }, + + // Display + { MP_ROM_QSTR(MP_QSTR_TFT_CS), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_TFT_DC), MP_ROM_PTR(&pin_GPIO35) }, + + // Misc + { MP_ROM_QSTR(MP_QSTR_I2C_INTERRUPT), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_SDCARD_CS), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_PORTA_I2C), MP_ROM_PTR(&board_porta_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)} +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/m5stack_cores3/sdkconfig b/ports/espressif/boards/m5stack_cores3/sdkconfig new file mode 100644 index 0000000000000..97f4eab3f9c11 --- /dev/null +++ b/ports/espressif/boards/m5stack_cores3/sdkconfig @@ -0,0 +1,15 @@ +# +# Espressif IoT Development Framework Configuration +# +# +# Component config +# +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="m5stack-cores3" +# end of LWIP + +# end of Component config + +# end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk b/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk index d95ea0ccfbcd4..e17f5061d9e85 100644 --- a/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk +++ b/ports/espressif/boards/m5stack_timer_camera_x/mpconfigboard.mk @@ -9,4 +9,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 4MB CIRCUITPY_ESP_PSRAM_SIZE = 8MB CIRCUITPY_ESP_PSRAM_MODE = opi -CIRCUITPY_ESP_PSRAM_FREQ = 120m +CIRCUITPY_ESP_PSRAM_FREQ = 80m diff --git a/ports/cxd56/common-hal/supervisor/Runtime.h b/ports/espressif/boards/makergo_esp32c3_supermini/board.c old mode 100755 new mode 100644 similarity index 77% rename from ports/cxd56/common-hal/supervisor/Runtime.h rename to ports/espressif/boards/makergo_esp32c3_supermini/board.c index f4669c6ab3059..164430c88c922 --- a/ports/cxd56/common-hal/supervisor/Runtime.h +++ b/ports/espressif/boards/makergo_esp32c3_supermini/board.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright 2019 Sony Semiconductor Solutions Corporation + * Copyright (c) 2020 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 @@ -24,13 +24,6 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_CXD56_COMMON_HAL_SUPERVISOR_RUNTIME_H +#include "supervisor/board.h" -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_SUPERVISOR_RUNTIME_H +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.h b/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.h new file mode 100644 index 0000000000000..6767e713f7937 --- /dev/null +++ b/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.h @@ -0,0 +1,42 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2019 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. + */ + +// Board setup + +#define MICROPY_HW_BOARD_NAME "Maker Go ESP32C3 Supermini" +#define MICROPY_HW_MCU_NAME "ESP32-C3" + +// Status LED +#define MICROPY_HW_LED_STATUS (&pin_GPIO8) + +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}} + +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO9, .sda = &pin_GPIO8}} + +#define CIRCUITPY_BOARD_SPI (1) +#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO4, .mosi = &pin_GPIO6, .miso = &pin_GPIO5}} diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk b/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk new file mode 100644 index 0000000000000..d82f62df37791 --- /dev/null +++ b/ports/espressif/boards/makergo_esp32c3_supermini/mpconfigboard.mk @@ -0,0 +1,10 @@ +CIRCUITPY_CREATOR_ID = 0x19981000 +CIRCUITPY_CREATION_ID = 0x00BB0001 + +IDF_TARGET = esp32c3 + +CIRCUITPY_ESP_FLASH_MODE=dio +CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +CIRCUITPY_ESP_USB_SERIAL_JTAG = 1 diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/pins.c b/ports/espressif/boards/makergo_esp32c3_supermini/pins.c new file mode 100644 index 0000000000000..9138dc4f54114 --- /dev/null +++ b/ports/espressif/boards/makergo_esp32c3_supermini/pins.c @@ -0,0 +1,46 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // GPIO + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_IO1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_IO2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_IO3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_IO5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_IO20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + + // LED + { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO8) }, + + // SPI + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO5) }, + + // I2C + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO9) }, + + // Button + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) }, + + // Uart + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, + + // Objects + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/makergo_esp32c3_supermini/sdkconfig b/ports/espressif/boards/makergo_esp32c3_supermini/sdkconfig new file mode 100644 index 0000000000000..dc7f10a362f92 --- /dev/null +++ b/ports/espressif/boards/makergo_esp32c3_supermini/sdkconfig @@ -0,0 +1,15 @@ +# +# Espressif IoT Development Framework Configuration +# +# +# Component config +# +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="makergo-esp32c3-supermini" +# end of LWIP + +# end of Component config + +# end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk index 6088f067d1068..5656781fcef43 100644 --- a/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_serial/mpconfigboard.mk @@ -9,10 +9,13 @@ CIRCUITPY_ESP_FLASH_MODE = qio CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_FLASH_SIZE = 4MB +CIRCUITPY_AESIO = 0 +CIRCUITPY_CODEOP = 0 CIRCUITPY_ESPCAMERA = 0 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib -CIRCUITPY_ESPCAMERA = 0 + +CIRCUITPY_MESSAGE_COMPRESSION_LEVEL = 9 diff --git a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk index 63be68d57cbea..691da625e0358 100644 --- a/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk +++ b/ports/espressif/boards/mixgo_ce_udisk/mpconfigboard.mk @@ -9,10 +9,13 @@ CIRCUITPY_ESP_FLASH_MODE = qio CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_FLASH_SIZE = 4MB +CIRCUITPY_AESIO = 0 +CIRCUITPY_CODEOP = 0 CIRCUITPY_ESPCAMERA = 0 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ConnectionManager FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/mixgo_cp_lib/mixgoce_lib -CIRCUITPY_ESPCAMERA = 0 + +CIRCUITPY_MESSAGE_COMPRESSION_LEVEL = 9 diff --git a/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.h b/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.h index 80100be4212cc..ae1e2a14ef13f 100644 --- a/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.h +++ b/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.h @@ -31,10 +31,11 @@ #define MICROPY_HW_NEOPIXEL (&pin_GPIO1) +#define CIRCUITPY_I2C_ALLOW_INTERNAL_PULL_UP 1 -#define DEFAULT_I2C_BUS_SCL (&pin_GPIO40) -#define DEFAULT_I2C_BUS_SDA (&pin_GPIO39) - +#define CIRCUITPY_BOARD_I2C (2) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO40, .sda = &pin_GPIO39}, \ + {.scl = &pin_GPIO42, .sda = &pin_GPIO45}} #define DEFAULT_SPI_BUS_SCK (&pin_GPIO36) #define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35) #define DEFAULT_SPI_BUS_MISO (&pin_GPIO37) @@ -42,4 +43,8 @@ #define DEFAULT_UART_BUS_RX (&pin_GPIO44) #define DEFAULT_UART_BUS_TX (&pin_GPIO43) -#define DOUBLE_TAP_PIN (&pin_GPIO0) +#define CIRCUITPY_BOARD_SPI (1) +#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO36, .mosi = &pin_GPIO35, .miso = &pin_GPIO37}} + +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO43, .rx = &pin_GPIO44}} diff --git a/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk b/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk index 6fd3e18dd8c4d..a8c32ae88dfea 100644 --- a/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk +++ b/ports/espressif/boards/sensebox_mcu_esp32s2/mpconfigboard.mk @@ -11,6 +11,8 @@ CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESPCAMERA = 0 +CIRCUITPY_REQUIRE_I2C_PULLUPS = 0 +CIRCUITPY_I2C_ALLOW_STRAPPING_PINS = 1 # Include these Python libraries in firmware. FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/espressif/boards/sunton_esp32_2424S012/board.c b/ports/espressif/boards/sunton_esp32_2424S012/board.c new file mode 100644 index 0000000000000..11dc4ad37b112 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2424S012/board.c @@ -0,0 +1,173 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 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 "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" + +#define DELAY 0x80 + +/* All init code scraped from Adafruit_GC9A01A driver */ +#define GC9A01A_SWRESET 0x01 ///< Software Reset (maybe, not documented) +#define GC9A01A_INREGEN1 0xFE ///< Inter register enable 1 +#define GC9A01A_INREGEN2 0xEF ///< Inter register enable 2 +#define GC9A01A_MADCTL 0x36 ///< Memory Access Control +#define GC9A01A_COLMOD 0x3A ///< Pixel Format Set +#define GC9A01A1_POWER2 0xC3 ///< Power Control 2 +#define GC9A01A1_POWER3 0xC4 ///< Power Control 3 +#define GC9A01A1_POWER4 0xC9 ///< Power Control 4 +#define GC9A01A_GAMMA1 0xF0 ///< Set gamma 1 +#define GC9A01A_GAMMA2 0xF1 ///< Set gamma 2 +#define GC9A01A_GAMMA3 0xF2 ///< Set gamma 3 +#define GC9A01A_GAMMA4 0xF3 ///< Set gamma 4 +#define GC9A01A_TEON 0x35 ///< Tearing Effect Line ON +#define GC9A01A_INVON 0x21 ///< Display Inversion ON +#define GC9A01A_SLPOUT 0x11 ///< Sleep Out +#define GC9A01A_DISPON 0x29 ///< Display ON +#define GC9A01A_FRAMERATE 0xE8 ///< Frame rate control + +#define MADCTL_MX 0x40 ///< Right to left +#define MADCTL_BGR 0x08 ///< Blue-Green-Red pixel order + +uint8_t display_init_sequence[] = { + GC9A01A_SWRESET, DELAY, 150, + GC9A01A_INREGEN2, 0, + 0xEB, 1, 0x14, + GC9A01A_INREGEN1, 0, + GC9A01A_INREGEN2, 0, + 0xEB, 1, 0x14, + 0x84, 1, 0x40, + 0x85, 1, 0xFF, + 0x86, 1, 0xFF, + 0x87, 1, 0xFF, + 0x88, 1, 0x0A, + 0x89, 1, 0x21, + 0x8A, 1, 0x00, + 0x8B, 1, 0x80, + 0x8C, 1, 0x01, + 0x8D, 1, 0x01, + 0x8E, 1, 0xFF, + 0x8F, 1, 0xFF, + 0xB6, 2, 0x00, 0x00, + GC9A01A_MADCTL, 1, MADCTL_MX | MADCTL_BGR, + GC9A01A_COLMOD, 1, 0x05, + 0x90, 4, 0x08, 0x08, 0x08, 0x08, + 0xBD, 1, 0x06, + 0xBC, 1, 0x00, + 0xFF, 3, 0x60, 0x01, 0x04, + GC9A01A1_POWER2, 1, 0x13, + GC9A01A1_POWER3, 1, 0x13, + GC9A01A1_POWER4, 1, 0x22, + 0xBE, 1, 0x11, + 0xE1, 2, 0x10, 0x0E, + 0xDF, 3, 0x21, 0x0c, 0x02, + GC9A01A_GAMMA1, 6, 0x45, 0x09, 0x08, 0x08, 0x26, 0x2A, + GC9A01A_GAMMA2, 6, 0x43, 0x70, 0x72, 0x36, 0x37, 0x6F, + GC9A01A_GAMMA3, 6, 0x45, 0x09, 0x08, 0x08, 0x26, 0x2A, + GC9A01A_GAMMA4, 6, 0x43, 0x70, 0x72, 0x36, 0x37, 0x6F, + 0xED, 2, 0x1B, 0x0B, + 0xAE, 1, 0x77, + 0xCD, 1, 0x63, + // Unsure what this line (from manufacturer's boilerplate code) is + // meant to do, but users reported issues, seems to work OK without: + // 0x70, 9, 0x07, 0x07, 0x04, 0x0E, 0x0F, 0x09, 0x07, 0x08, 0x03, // ? + GC9A01A_FRAMERATE, 1, 0x34, + 0x62, 12, 0x18, 0x0D, 0x71, 0xED, 0x70, 0x70, 0x18, 0x0F, 0x71, 0xEF, 0x70, 0x70, + 0x63, 12, 0x18, 0x11, 0x71, 0xF1, 0x70, 0x70, 0x18, 0x13, 0x71, 0xF3, 0x70, 0x70, + 0x64, 7, 0x28, 0x29, 0xF1, 0x01, 0xF1, 0x00, 0x07, + 0x66, 10, 0x3C, 0x00, 0xCD, 0x67, 0x45, 0x45, 0x10, 0x00, 0x00, 0x00, + 0x67, 10, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x01, 0x54, 0x10, 0x32, 0x98, + 0x74, 7, 0x10, 0x85, 0x80, 0x00, 0x00, 0x4E, 0x00, + 0x98, 2, 0x3e, 0x07, + GC9A01A_TEON, 0, + GC9A01A_INVON, 0, + GC9A01A_SLPOUT, DELAY, 10, // Exit sleep + GC9A01A_DISPON, DELAY, 150, // Display on +}; + +static void display_init(void) { + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + busio_spi_obj_t *spi = &bus->inline_bus; + common_hal_busio_spi_construct( + spi, + &pin_GPIO6, // CLK + &pin_GPIO7, // MOSI + NULL, // MISO not connected + false // Not half-duplex + ); + common_hal_busio_spi_never_reset(spi); + bus->base.type = &fourwire_fourwire_type; + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO2, // DC + &pin_GPIO10, // CS + NULL, // RST + 80000000, // baudrate + 0, // polarity + 0 // phase + ); + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 240, // width (after rotation) + 240, // height (after rotation) + 0, // column start + 0, // row start + 0, // rotation + 16, // color depth + false, // grayscale + false, // pixels in a byte share a row. Only valid for depths < 8 + 1, // bytes per cell. Only valid for depths < 8 + false, // reverse_pixels_in_byte. Only valid for depths < 8 + true, // reverse_pixels_in_word + MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command + MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command + MIPI_COMMAND_WRITE_MEMORY_START, // write memory command + display_init_sequence, + sizeof(display_init_sequence), + &pin_GPIO3, // backlight pin + NO_BRIGHTNESS_COMMAND, + 1.0f, // brightness + false, // single_byte_bounds + false, // data_as_commands + true, // auto_refresh + 60, // native_frames_per_second + true, // backlight_on_high + false, // SH1107_addressing + 5000 // backlight pwm frequency + ); +} + +void board_init(void) { + // Display + display_init(); +} +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/broadcom/common-hal/supervisor/__init__.c b/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.h similarity index 67% rename from ports/broadcom/common-hal/supervisor/__init__.c rename to ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.h index 6dca35fb5aeb1..6c28072dd8eb3 100644 --- a/ports/broadcom/common-hal/supervisor/__init__.c +++ b/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.h @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2018 Michael Schroeder + * Copyright (c) 2019 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 @@ -24,17 +24,16 @@ * THE SOFTWARE. */ +// Board setup -#include "py/obj.h" +#define MICROPY_HW_BOARD_NAME "Sunton ESP32-2424S012" +#define MICROPY_HW_MCU_NAME "ESP32-C3FN4" -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" +#define CIRCUITPY_BOARD_I2C (1) +#define CIRCUITPY_BOARD_I2C_PIN {{.scl = &pin_GPIO5, .sda = &pin_GPIO4}} +#define CIRCUITPY_BOARD_SPI (1) +#define CIRCUITPY_BOARD_SPI_PIN {{.clock = &pin_GPIO6, .mosi = &pin_GPIO7, .miso = &pin_GPIO2}} -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; +#define CIRCUITPY_BOARD_UART (1) +#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}} diff --git a/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk new file mode 100644 index 0000000000000..716a01084c118 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2424S012/mpconfigboard.mk @@ -0,0 +1,10 @@ +CIRCUITPY_CREATOR_ID = 0x19991000 +CIRCUITPY_CREATION_ID = 0x00AA0002 + +IDF_TARGET = esp32c3 + +CIRCUITPY_ESP_FLASH_MODE=qio +CIRCUITPY_ESP_FLASH_FREQ=80m +CIRCUITPY_ESP_FLASH_SIZE=4MB + +CIRCUITPY_ESP_USB_SERIAL_JTAG = 1 diff --git a/ports/espressif/boards/sunton_esp32_2424S012/pins.c b/ports/espressif/boards/sunton_esp32_2424S012/pins.c new file mode 100644 index 0000000000000..d46896c4bd5b7 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2424S012/pins.c @@ -0,0 +1,42 @@ +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // User button + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON0), MP_ROM_PTR(&pin_GPIO9) }, + + // IO8. This is on the schematic linked to a 10k pull up and "S1" + // No further indication of what "S1" is or what this pin is for + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + + // I2C + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO5) }, + + // Touch (CST816) + { MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH_RST), MP_ROM_PTR(&pin_GPIO1) }, + + // SPI + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO6) }, + + // Display (GC9A01) + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO3) }, + + // UART + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO21) }, + + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/sunton_esp32_2424S012/sdkconfig b/ports/espressif/boards/sunton_esp32_2424S012/sdkconfig new file mode 100644 index 0000000000000..5b7c8255a9763 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2424S012/sdkconfig @@ -0,0 +1,15 @@ +# +# Espressif IoT Development Framework Configuration +# +# +# Component config +# +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="sunton-esp32-2424S012" +# end of LWIP + +# end of Component config + +# end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/boards/sunton_esp32_2432S028/board.c b/ports/espressif/boards/sunton_esp32_2432S028/board.c new file mode 100644 index 0000000000000..5d7d97330b620 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2432S028/board.c @@ -0,0 +1,127 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 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 "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/board/__init__.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" +#include "components/driver/gpio/include/driver/gpio.h" +#include "components/hal/include/hal/gpio_hal.h" +#include "common-hal/microcontroller/Pin.h" + + +uint8_t display_init_sequence[] = { + 0x01, 0x80, 0x80, // # Software reset then delay 0x80 (128ms) + 0xEF, 0x03, 0x03, 0x80, 0x02, + 0xCF, 0x03, 0x00, 0xC1, 0x30, + 0xED, 0x04, 0x64, 0x03, 0x12, 0x81, + 0xE8, 0x03, 0x85, 0x00, 0x78, + 0xCB, 0x05, 0x39, 0x2C, 0x00, 0x34, 0x02, + 0xF7, 0x01, 0x20, + 0xEA, 0x02, 0x00, 0x00, + 0xc0, 0x01, 0x23, // # Power control VRH[5:0] + 0xc1, 0x01, 0x10, // # Power control SAP[2:0];BT[3:0] + 0xc5, 0x02, 0x3e, 0x28, // # VCM control + 0xc7, 0x01, 0x86, // # VCM control2 + 0x36, 0x01, 0x38, // # Memory Access Control + 0x37, 0x01, 0x00, // # Vertical scroll zero + 0x3a, 0x01, 0x55, // # COLMOD: Pixel Format Set + 0xb1, 0x02, 0x00, 0x18, // # Frame Rate Control (In Normal Mode/Full Colors) + 0xb6, 0x03, 0x08, 0x82, 0x27, // # Display Function Control + 0xF2, 0x01, 0x00, // # 3Gamma Function Disable + 0x26, 0x01, 0x01, // # Gamma curve selected + 0xe0, 0x0f, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, 0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 0x0E, 0x09, 0x00, // # Set Gamma + 0xe1, 0x0f, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F, // # Set Gamma + 0x11, 0x80, 0x48, // # Exit Sleep then delay + 0x29, 0x80, 0x78, // # Display on then delay 0x78 (120ms) +}; + +static void display_init(void) { + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + busio_spi_obj_t *spi = &bus->inline_bus; + common_hal_busio_spi_construct(spi, &pin_GPIO14, &pin_GPIO13, &pin_GPIO12, false); + common_hal_busio_spi_never_reset(spi); + + bus->base.type = &fourwire_fourwire_type; + common_hal_fourwire_fourwire_construct(bus, + spi, + &pin_GPIO2, // TFT_DC Command or data + &pin_GPIO15, // TFT_CS Chip select + NULL, // TFT_RST Reset + 6000000, // Baudrate + 0, // Polarity + 0); // Phase + + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + common_hal_busdisplay_busdisplay_construct(display, + bus, + 320, // Width + 240, // Height + 0, // column start + 0, // row start + 0, // rotation + 16, // Color depth + false, // Grayscale + false, // pixels in a byte share a row. Only valid for depths < 8 + 1, // bytes per cell. Only valid for depths < 8 + false, // reverse_pixels_in_byte. Only valid for depths < 8 + true, // reverse_pixels_in_word + MIPI_COMMAND_SET_COLUMN_ADDRESS, // Set column command + MIPI_COMMAND_SET_PAGE_ADDRESS, // Set row command + MIPI_COMMAND_WRITE_MEMORY_START, // Write memory command + display_init_sequence, + sizeof(display_init_sequence), + &pin_GPIO21, // backlight pin + NO_BRIGHTNESS_COMMAND, + 1.0f, // brightness + false, // single_byte_bounds + false, // data_as_commands + true, // auto_refresh + 60, // native_frames_per_second + true, // backlight_on_high + false, // SH1107_addressing + 50000); // backlight pwm frequency +} + +void board_init(void) { + display_init(); +} + +bool espressif_board_reset_pin_number(gpio_num_t pin_number) { + // Pull the speaker pin low to reduce noise on reset + if (pin_number == 26) { + // Turn on TFT + gpio_set_direction(pin_number, GPIO_MODE_DEF_OUTPUT); + gpio_set_level(pin_number, false); + return true; + } + return false; +} + +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/broadcom/common-hal/supervisor/Runtime.c b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.h similarity index 59% rename from ports/broadcom/common-hal/supervisor/Runtime.c rename to ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.h index f827651781f10..eba915e8c44a1 100644 --- a/ports/broadcom/common-hal/supervisor/Runtime.c +++ b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.h @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2018 Michael Schroeder + * Copyright (c) 2022 Dan Halbert 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 @@ -24,14 +24,23 @@ * THE SOFTWARE. */ -#include -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" +// Micropython setup -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} +#define MICROPY_HW_BOARD_NAME "sunton_esp32_2432S028" +#define MICROPY_HW_MCU_NAME "ESP32" +#define MICROPY_HW_LED_STATUS (&pin_GPIO17) + +#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0) -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO27) +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO22) + +#define CIRCUITPY_BOARD_SPI (3) +#define CIRCUITPY_BOARD_SPI_PIN { \ + {.clock = &pin_GPIO18, .mosi = &pin_GPIO23, .miso = &pin_GPIO19}, /*SD*/ \ + {.clock = &pin_GPIO25, .mosi = &pin_GPIO32, .miso = &pin_GPIO39}, /*TOUCH*/ \ + {.clock = &pin_GPIO14, .mosi = &pin_GPIO13, .miso = &pin_GPIO12}, /*LCD*/ \ } + +#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1) +#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3) diff --git a/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk new file mode 100644 index 0000000000000..a37e9420d6ae5 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2432S028/mpconfigboard.mk @@ -0,0 +1,10 @@ +CIRCUITPY_CREATOR_ID = 0x19991000 +CIRCUITPY_CREATION_ID = 0x00AA0001 + +IDF_TARGET = esp32 + +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 4MB + +CIRCUITPY_ESPCAMERA = 0 diff --git a/ports/espressif/boards/sunton_esp32_2432S028/pins.c b/ports/espressif/boards/sunton_esp32_2432S028/pins.c new file mode 100644 index 0000000000000..4004cf0bb1ce7 --- /dev/null +++ b/ports/espressif/boards/sunton_esp32_2432S028/pins.c @@ -0,0 +1,65 @@ +#include "shared-bindings/board/__init__.h" +#include "shared-module/displayio/__init__.h" + +CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 0) +CIRCUITPY_BOARD_BUS_SINGLETON(touch_spi, spi, 1) +CIRCUITPY_BOARD_BUS_SINGLETON(lcd_spi, spi, 2) + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // Boot button + { MP_ROM_QSTR(MP_QSTR_BOOT0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + + // RGB LED + { MP_ROM_QSTR(MP_QSTR_LED_GREEN), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_LED_RED), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_LED_BLUE), MP_ROM_PTR(&pin_GPIO17) }, + + // CDS Light sensor (Not present on all boards) + { MP_ROM_QSTR(MP_QSTR_LDR), MP_ROM_PTR(&pin_GPIO34) }, + + // Speaker pin + { MP_ROM_QSTR(MP_QSTR_SPEAKER), MP_ROM_PTR(&pin_GPIO26) }, + + // User available GPIO + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, // P3 Pin 4, shared with backlight + { MP_ROM_QSTR(MP_QSTR_IO22), MP_ROM_PTR(&pin_GPIO22) }, // P3 Pin 3, i2c_scl + { MP_ROM_QSTR(MP_QSTR_IO27), MP_ROM_PTR(&pin_GPIO27) }, // CN1 Pin 3, i2c_sda + { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) }, // P3 Pin 2, input only + + // i2c + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO22) }, + + // TF card slot + { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO5) }, + + // ILI9341 dsplay (spi) + { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_LCD_MISO), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_LCD_SCK), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_LCD_BCKL), MP_ROM_PTR(&pin_GPIO21) }, + + // XPT2046 touch (spi) + { MP_ROM_QSTR(MP_QSTR_TOUCH_MOSI), MP_ROM_PTR(&pin_GPIO32) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH_MISO), MP_ROM_PTR(&pin_GPIO39) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH_SCK), MP_ROM_PTR(&pin_GPIO25) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH_CS), MP_ROM_PTR(&pin_GPIO33) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH_INT), MP_ROM_PTR(&pin_GPIO36) }, + + // objects + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_sd_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_LCD_SPI), MP_ROM_PTR(&board_lcd_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_TOUCH_SPI), MP_ROM_PTR(&board_touch_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) }, + +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/nrf/common-hal/audiopwmio/__init__.c b/ports/espressif/boards/sunton_esp32_2432S028/sdkconfig similarity index 100% rename from ports/nrf/common-hal/audiopwmio/__init__.c rename to ports/espressif/boards/sunton_esp32_2432S028/sdkconfig diff --git a/ports/espressif/boards/waveshare_esp32_s3_geek/board.c b/ports/espressif/boards/waveshare_esp32_s3_geek/board.c new file mode 100644 index 0000000000000..2f26716d01673 --- /dev/null +++ b/ports/espressif/boards/waveshare_esp32_s3_geek/board.c @@ -0,0 +1,117 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2020 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 "supervisor/board.h" +#include "mpconfigboard.h" +#include "shared-bindings/busio/SPI.h" +#include "shared-bindings/fourwire/FourWire.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-module/displayio/__init__.h" +#include "shared-module/displayio/mipi_constants.h" +#include "shared-bindings/board/__init__.h" + +fourwire_fourwire_obj_t board_display_obj; + + + +// display init sequence according to https://github.com/adafruit/Adafruit_CircuitPython_ST7789 +uint8_t display_init_sequence[] = { + 0x01, 0x80, 0x96, // _SWRESET and Delay 150ms + 0x11, 0x80, 0xFF, // _SLPOUT and Delay 500ms + 0x3A, 0x81, 0x55, 0x0A, // _COLMOD and Delay 10ms + 0x36, 0x01, 0x08, // _MADCTL + 0x21, 0x80, 0x0A, // _INVON Hack and Delay 10ms + 0x13, 0x80, 0x0A, // _NORON and Delay 10ms + 0x36, 0x01, 0xC0, // _MADCTL + 0x29, 0x80, 0xFF, // _DISPON and Delay 500ms +}; + +static void display_init(void) { + + busio_spi_obj_t *spi = common_hal_board_create_spi(0); + fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; + + common_hal_busio_spi_construct( + spi, + &pin_GPIO12, // CLK + &pin_GPIO11, // MOSI + NULL, // MISO not connected + false); // Not half-duplex + + + bus->base.type = &fourwire_fourwire_type; + + common_hal_fourwire_fourwire_construct( + bus, + spi, + &pin_GPIO8, // TFT_DC + &pin_GPIO10, // TFT_CS + &pin_GPIO9, // TFT_RST + 50000000, // Baudrate + 0, // Polarity + 0 // Phase + + ); + + busdisplay_busdisplay_obj_t *display = &allocate_display()->display; + display->base.type = &busdisplay_busdisplay_type; + + common_hal_busdisplay_busdisplay_construct( + display, + bus, + 240, // Width + 135, // Height + 53, // column start + 40, // row start + 270, // rotation + 16, // Color depth + false, // Grayscale + false, // Pixels in a byte share a row + 1, // bytes per cell + false, // reverse_pixels_in_byte + true, // reverse_pixels_in_word + MIPI_COMMAND_SET_COLUMN_ADDRESS, // set column command + MIPI_COMMAND_SET_PAGE_ADDRESS, // set row command + MIPI_COMMAND_WRITE_MEMORY_START, // write memory command + display_init_sequence, + sizeof(display_init_sequence), + &pin_GPIO7, // backlight pin + NO_BRIGHTNESS_COMMAND, + 1.0f, // brightness + false, // single_byte_bounds + false, // data_as_commands + true, // auto_refresh + 60, // native_frames_per_second + true, // backlight_on_high + false, // SH1107_addressing + 1000 // backlight pwm frequency + ); +} + +void board_init(void) { + display_init(); +} diff --git a/ports/espressif/common-hal/supervisor/__init__.c b/ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.h similarity index 70% rename from ports/espressif/common-hal/supervisor/__init__.c rename to ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.h index 6dca35fb5aeb1..06d22bd397650 100644 --- a/ports/espressif/common-hal/supervisor/__init__.c +++ b/ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.h @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2018 Michael Schroeder + * Copyright (c) 2019 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 @@ -24,17 +24,17 @@ * THE SOFTWARE. */ +// Micropython setup -#include "py/obj.h" +#define MICROPY_HW_BOARD_NAME "Waveshare ESP32-S3-GEEK" +#define MICROPY_HW_MCU_NAME "ESP32S3" -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" +#define DEFAULT_UART_BUS_RX (&pin_GPIO44) +#define DEFAULT_UART_BUS_TX (&pin_GPIO43) +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO17) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO16) -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37) diff --git a/ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.mk b/ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.mk new file mode 100644 index 0000000000000..629029e7ed469 --- /dev/null +++ b/ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.mk @@ -0,0 +1,15 @@ +USB_VID = 0x303a +USB_PID = 0x81ea +USB_PRODUCT = "ESP32-S3-GEEK" +USB_MANUFACTURER = "Waveshare Electronics" + +IDF_TARGET = esp32s3 + +CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_FREQ = 80m +CIRCUITPY_ESP_FLASH_SIZE = 16MB + +CIRCUITPY_ESP_PSRAM_SIZE = 2MB +CIRCUITPY_ESP_PSRAM_MODE = qio +CIRCUITPY_ESP_PSRAM_FREQ = 80m +CIRCUITPY_BUILD_EXTENSIONS = bin,uf2 diff --git a/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c b/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c new file mode 100644 index 0000000000000..679bc8274e46e --- /dev/null +++ b/ports/espressif/boards/waveshare_esp32_s3_geek/pins.c @@ -0,0 +1,78 @@ +#include "shared-bindings/board/__init__.h" + +#include "shared-module/displayio/__init__.h" +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + + // Boot button (can also be used as regular button) + { MP_ROM_QSTR(MP_QSTR_IO0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO0) }, + // GPIO + { MP_ROM_QSTR(MP_QSTR_IO6), MP_ROM_PTR(&pin_GPIO6) }, + // 7-12 LCD + // LCD Backlight + { MP_ROM_QSTR(MP_QSTR_IO7), MP_ROM_PTR(&pin_GPIO7) }, + // LCD DC + { MP_ROM_QSTR(MP_QSTR_IO8), MP_ROM_PTR(&pin_GPIO8) }, + // LCD RST + { MP_ROM_QSTR(MP_QSTR_IO9), MP_ROM_PTR(&pin_GPIO9) }, + // LCD CS + { MP_ROM_QSTR(MP_QSTR_CS), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_IO10), MP_ROM_PTR(&pin_GPIO10) }, + // LCD MOSI + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_IO11), MP_ROM_PTR(&pin_GPIO11) }, + // LCD SCK + { MP_ROM_QSTR(MP_QSTR_CLK), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) }, + + // GPIO + { MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) }, + // GPIO + { MP_ROM_QSTR(MP_QSTR_IO14), MP_ROM_PTR(&pin_GPIO14) }, + // 16-17 I2C + { MP_ROM_QSTR(MP_QSTR_IO16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_IO17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_IO18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_IO33), MP_ROM_PTR(&pin_GPIO33) }, + // 34-38 SD + { MP_ROM_QSTR(MP_QSTR_IO34), MP_ROM_PTR(&pin_GPIO34) }, + { MP_ROM_QSTR(MP_QSTR_IO35), MP_ROM_PTR(&pin_GPIO35) }, + { MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) }, + { MP_ROM_QSTR(MP_QSTR_IO37), MP_ROM_PTR(&pin_GPIO37) }, + { MP_ROM_QSTR(MP_QSTR_IO38), MP_ROM_PTR(&pin_GPIO38) }, + + // 43-44 UART + { MP_ROM_QSTR(MP_QSTR_IO43), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_IO44), MP_ROM_PTR(&pin_GPIO44) }, + + // UART + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO43) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO44) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, + + // I2C + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + + // SD Card + { MP_ROM_QSTR(MP_QSTR_SD_SCK), MP_ROM_PTR(&pin_GPIO36)}, + { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO35)}, + { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO37)}, + { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_GPIO34)}, + { MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_spi_obj) }, + // Pin 38 is for the SDIO interface, and therefore not included in the SPI object + + // LCD + { MP_ROM_QSTR(MP_QSTR_LCD_MOSI), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CLK), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_LCD_CS), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) }, + +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/espressif/boards/waveshare_esp32_s3_geek/sdkconfig b/ports/espressif/boards/waveshare_esp32_s3_geek/sdkconfig new file mode 100644 index 0000000000000..f5ef79768114c --- /dev/null +++ b/ports/espressif/boards/waveshare_esp32_s3_geek/sdkconfig @@ -0,0 +1,15 @@ +# +# Espressif IoT Development Framework Configuration +# +# +# Component config +# +# +# LWIP +# +CONFIG_LWIP_LOCAL_HOSTNAME="espressif-esp32s3" +# end of LWIP + +# end of Component config + +# end of Espressif IoT Development Framework Configuration diff --git a/ports/espressif/common-hal/busio/I2C.c b/ports/espressif/common-hal/busio/I2C.c index a7b1cab9067de..56b4aecf6b76b 100644 --- a/ports/espressif/common-hal/busio/I2C.c +++ b/ports/espressif/common-hal/busio/I2C.c @@ -40,9 +40,15 @@ void common_hal_busio_i2c_construct(busio_i2c_obj_t *self, // support I2C on these pins. // // 46 is also input-only so it'll never work. + #if CIRCUITPY_I2C_ALLOW_STRAPPING_PINS + if (scl->number == 46 || sda->number == 46) { + raise_ValueError_invalid_pins(); + } + #else if (scl->number == 45 || scl->number == 46 || sda->number == 45 || sda->number == 46) { raise_ValueError_invalid_pins(); } + #endif #if CIRCUITPY_REQUIRE_I2C_PULLUPS // Test that the pins are in a high state. (Hopefully indicating they are pulled up.) diff --git a/ports/espressif/common-hal/busio/UART.c b/ports/espressif/common-hal/busio/UART.c index 1770f88bd1ff5..41f30b23f7f41 100644 --- a/ports/espressif/common-hal/busio/UART.c +++ b/ports/espressif/common-hal/busio/UART.c @@ -151,11 +151,11 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self, uart_config.flow_ctrl = UART_HW_FLOWCTRL_CTS; } - if (receiver_buffer_size <= UART_FIFO_LEN) { - receiver_buffer_size = UART_FIFO_LEN + 8; + if (receiver_buffer_size <= UART_HW_FIFO_LEN(self->uart_num)) { + receiver_buffer_size = UART_HW_FIFO_LEN(self->uart_num) + 8; } - uart_config.rx_flow_ctrl_thresh = UART_FIFO_LEN - 8; + uart_config.rx_flow_ctrl_thresh = UART_HW_FIFO_LEN(self->uart_num) - 8; // Install the driver before we change the settings. if (uart_driver_install(self->uart_num, receiver_buffer_size, 0, 20, &self->event_queue, 0) != ESP_OK || uart_set_mode(self->uart_num, mode) != ESP_OK) { diff --git a/ports/espressif/common-hal/supervisor/Runtime.c b/ports/espressif/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/espressif/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/espressif/common-hal/supervisor/Runtime.h b/ports/espressif/common-hal/supervisor/Runtime.h deleted file mode 100644 index 5783b41d04c2b..0000000000000 --- a/ports/espressif/common-hal/supervisor/Runtime.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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. - */ - -#ifndef MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SUPERVISOR_RUNTIME_H - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_ESPRESSIF_COMMON_HAL_SUPERVISOR_RUNTIME_H diff --git a/ports/espressif/common-hal/wifi/Radio.c b/ports/espressif/common-hal/wifi/Radio.c index 32827426b6b85..0ebf3c35a128b 100644 --- a/ports/espressif/common-hal/wifi/Radio.c +++ b/ports/espressif/common-hal/wifi/Radio.c @@ -378,7 +378,9 @@ wifi_radio_error_t common_hal_wifi_radio_connect(wifi_radio_obj_t *self, uint8_t if ((bits & WIFI_DISCONNECTED_BIT) != 0) { if ( (self->last_disconnect_reason == WIFI_REASON_AUTH_FAIL) || - (self->last_disconnect_reason == WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT) + (self->last_disconnect_reason == WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT) || + (self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND_W_COMPATIBLE_SECURITY) || + (self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD) ) { return WIFI_RADIO_ERROR_AUTH_FAIL; } else if (self->last_disconnect_reason == WIFI_REASON_NO_AP_FOUND) { diff --git a/ports/espressif/esp-camera b/ports/espressif/esp-camera index 8f3f2cc8cfb2e..d529ebdffb841 160000 --- a/ports/espressif/esp-camera +++ b/ports/espressif/esp-camera @@ -1 +1 @@ -Subproject commit 8f3f2cc8cfb2e4371870b0c5a974d40468114a9e +Subproject commit d529ebdffb84131b1aadaec32a7373b319b70391 diff --git a/ports/espressif/esp-idf b/ports/espressif/esp-idf index c3e368f96933e..722fba96a17fb 160000 --- a/ports/espressif/esp-idf +++ b/ports/espressif/esp-idf @@ -1 +1 @@ -Subproject commit c3e368f96933e10d0d70f497c9127dee3034c2ab +Subproject commit 722fba96a17fba2809434e01d65b6ce88ec4ca2e diff --git a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults index 8efa47508e8c4..0a8c65ff886f8 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-esp32s2.defaults @@ -39,6 +39,7 @@ CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y # CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=4 CONFIG_ESP_WIFI_RX_BA_WIN=4 +# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set # end of Wi-Fi # diff --git a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults index 74502488dc31c..16f5b990386a1 100644 --- a/ports/espressif/esp-idf-config/sdkconfig-opt.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig-opt.defaults @@ -11,7 +11,7 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y # Compiler options # CONFIG_COMPILER_OPTIMIZATION_SIZE=y -CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT=y # end of Compiler options diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults index 947dc710bec2f..6dfa5539be63d 100644 --- a/ports/espressif/esp-idf-config/sdkconfig.defaults +++ b/ports/espressif/esp-idf-config/sdkconfig.defaults @@ -36,12 +36,23 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=16384 # CONFIG_ESP_DEBUG_OCDAWARE is not set # end of ESP System Settings + # # Wi-Fi # # CONFIG_ESP_WIFI_NVS_ENABLED is not set # end of Wi-Fi +# +# FreeRTOS +# + +# +# Kernel +# +CONFIG_FREERTOS_HZ=1000 +# end of Kernel + # # LWIP # @@ -108,6 +119,7 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y # # CONFIG_SPI_FLASH_YIELD_DURING_ERASE is not set CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE is not set # end of SPI Flash driver # diff --git a/ports/espressif/mpconfigport.mk b/ports/espressif/mpconfigport.mk index bfc22b74f883a..cf689d97d5cac 100644 --- a/ports/espressif/mpconfigport.mk +++ b/ports/espressif/mpconfigport.mk @@ -56,15 +56,19 @@ CIRCUITPY_USB = 0 else ifeq ($(IDF_TARGET),esp32c3) # Modules CIRCUITPY_ALARM = 0 -CIRCUITPY_AUDIOBUSIO = 0 CIRCUITPY_BLEIO ?= 0 -CIRCUITPY_COUNTIO = 0 CIRCUITPY_ESPCAMERA = 0 CIRCUITPY_ESPULP = 0 -CIRCUITPY_FREQUENCYIO = 0 CIRCUITPY_MEMORYMAP = 0 + +# No I80 support from the IDF CIRCUITPY_PARALLELDISPLAYBUS = 0 + +# No PCNT peripheral +CIRCUITPY_FREQUENCYIO = 0 +CIRCUITPY_COUNTIO = 0 CIRCUITPY_ROTARYIO = 0 + CIRCUITPY_TOUCHIO ?= 1 CIRCUITPY_TOUCHIO_USE_NATIVE = 0 # Features @@ -74,13 +78,18 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1 else ifeq ($(IDF_TARGET),esp32c6) # Modules CIRCUITPY_ALARM = 0 -CIRCUITPY_AUDIOBUSIO = 0 CIRCUITPY_BLEIO ?= 0 CIRCUITPY_ESPCAMERA = 0 CIRCUITPY_ESPULP = 0 CIRCUITPY_MEMORYMAP = 0 -CIRCUITPY_PARALLELDISPLAYBUS = 0 CIRCUITPY_RGBMATRIX = 0 + +# No space for this +CIRCUITPY_AUDIOBUSIO = 0 + +# No I80 support from the IDF +CIRCUITPY_PARALLELDISPLAYBUS = 0 + CIRCUITPY_TOUCHIO ?= 1 CIRCUITPY_TOUCHIO_USE_NATIVE = 0 # Features @@ -90,16 +99,15 @@ CIRCUITPY_ESP_USB_SERIAL_JTAG ?= 1 else ifeq ($(IDF_TARGET),esp32h2) # Modules CIRCUITPY_ALARM = 0 -# Turn off analogio because calibration is currently supported. -# https://github.com/espressif/esp-idf/issues/11038 -CIRCUITPY_ANALOGIO = 0 -CIRCUITPY_AUDIOBUSIO = 0 CIRCUITPY_BLEIO ?= 1 CIRCUITPY_ESPCAMERA = 0 CIRCUITPY_ESPULP = 0 CIRCUITPY_MEMORYMAP = 0 -CIRCUITPY_PARALLELDISPLAYBUS = 0 CIRCUITPY_RGBMATRIX = 0 + +# No I80 support from the IDF +CIRCUITPY_PARALLELDISPLAYBUS = 0 + CIRCUITPY_TOUCHIO ?= 1 CIRCUITPY_TOUCHIO_USE_NATIVE = 0 CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0 diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c index 4c1f50fd59f2b..7aaf1332d782d 100644 --- a/ports/espressif/supervisor/port.c +++ b/ports/espressif/supervisor/port.c @@ -32,7 +32,7 @@ #include "supervisor/port.h" #include "supervisor/filesystem.h" #include "supervisor/shared/reload.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "py/mpprint.h" #include "py/runtime.h" @@ -407,7 +407,7 @@ void reset_to_bootloader(void) { } void reset_cpu(void) { - #ifndef CONFIG_IDF_TARGET_ARCH_RISCV + #if CIRCUITPY_DEBUG esp_backtrace_print(100); #endif esp_restart(); diff --git a/ports/espressif/supervisor/serial.c b/ports/espressif/supervisor/serial.c index 7b0166f5b16d8..3e5e6196c6c05 100644 --- a/ports/espressif/supervisor/serial.c +++ b/ports/espressif/supervisor/serial.c @@ -25,7 +25,7 @@ */ #include "py/mpconfig.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #if CIRCUITPY_ESP_USB_SERIAL_JTAG && CIRCUITPY_CONSOLE_UART #error CIRCUITPY_ESP_USB_SERIAL_JTAG and CIRCUITPY_CONSOLE_UART cannot both be enabled. @@ -59,11 +59,11 @@ char port_serial_read(void) { return -1; } -bool port_serial_bytes_available(void) { +uint32_t port_serial_bytes_available(void) { #if CIRCUITPY_ESP_USB_SERIAL_JTAG return usb_serial_jtag_bytes_available(); #else - return false; + return 0; #endif } diff --git a/ports/espressif/supervisor/usb.c b/ports/espressif/supervisor/usb.c index ad4c95033389d..0f4f7579424ac 100644 --- a/ports/espressif/supervisor/usb.c +++ b/ports/espressif/supervisor/usb.c @@ -32,7 +32,9 @@ #include "shared/readline/readline.h" #include "hal/gpio_ll.h" -#include "hal/usb_hal.h" + +#include "esp_err.h" +#include "esp_private/usb_phy.h" #include "soc/usb_periph.h" #include "driver/gpio.h" @@ -60,6 +62,8 @@ StackType_t usb_device_stack[USBD_STACK_SIZE]; StaticTask_t usb_device_taskdef; +static usb_phy_handle_t phy_hdl; + // USB Device Driver task // This top level thread process all usb events and invoke callbacks STATIC void usb_device_task(void *param) { @@ -76,37 +80,13 @@ STATIC void usb_device_task(void *param) { } } -static void configure_pins(usb_hal_context_t *usb) { - /* usb_periph_iopins currently configures USB_OTG as USB Device. - * Introduce additional parameters in usb_hal_context_t when adding support - * for USB Host. - */ - for (const usb_iopin_dsc_t *iopin = usb_periph_iopins; iopin->pin != -1; ++iopin) { - if ((usb->use_external_phy) || (iopin->ext_phy_only == 0)) { - gpio_pad_select_gpio(iopin->pin); - if (iopin->is_output) { - gpio_matrix_out(iopin->pin, iopin->func, false, false); - } else { - gpio_matrix_in(iopin->pin, iopin->func, false); - gpio_pad_input_enable(iopin->pin); - } - gpio_pad_unhold(iopin->pin); - } - } - if (!usb->use_external_phy) { - gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3); - gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3); - } -} - void init_usb_hardware(void) { - periph_module_reset(PERIPH_USB_MODULE); - periph_module_enable(PERIPH_USB_MODULE); - usb_hal_context_t hal = { - .use_external_phy = false // use built-in PHY + // Configure USB PHY + usb_phy_config_t phy_conf = { + .controller = USB_PHY_CTRL_OTG, + .otg_mode = USB_OTG_MODE_DEVICE, }; - usb_hal_init(&hal); - configure_pins(&hal); + usb_new_phy(&phy_conf, &phy_hdl); // Pin the USB task to the same core as CircuitPython. This way we leave // the other core for networking. diff --git a/ports/espressif/supervisor/usb_serial_jtag.c b/ports/espressif/supervisor/usb_serial_jtag.c index 957ae60c91920..a626b1ee5c310 100644 --- a/ports/espressif/supervisor/usb_serial_jtag.c +++ b/ports/espressif/supervisor/usb_serial_jtag.c @@ -42,7 +42,7 @@ STATIC ringbuf_t ringbuf; STATIC uint8_t buf[128]; STATIC volatile bool connected; -#if CIRCUITPY_ESP_USB_SERIAL_JTAG && !CONFIG_ESP_PHY_ENABLE_USB +#if CIRCUITPY_ESP_USB_SERIAL_JTAG && defined(SOC_WIFI_PHY_NEEDS_USB_WORKAROUND) && !defined(CONFIG_ESP_PHY_ENABLE_USB) #error "CONFIG_ESP_PHY_ENABLE_USB must be enabled in sdkconfig" #endif @@ -121,8 +121,8 @@ char usb_serial_jtag_read_char(void) { return c; } -bool usb_serial_jtag_bytes_available(void) { - return ringbuf_num_filled(&ringbuf) > 0 || usb_serial_jtag_ll_rxfifo_data_available(); +uint32_t usb_serial_jtag_bytes_available(void) { + return ringbuf_num_filled(&ringbuf) + usb_serial_jtag_ll_rxfifo_data_available(); } void usb_serial_jtag_write(const char *text, uint32_t length) { diff --git a/ports/espressif/supervisor/usb_serial_jtag.h b/ports/espressif/supervisor/usb_serial_jtag.h index 4f88e7492107f..020deab5eddda 100644 --- a/ports/espressif/supervisor/usb_serial_jtag.h +++ b/ports/espressif/supervisor/usb_serial_jtag.h @@ -29,5 +29,5 @@ void usb_serial_jtag_init(void); bool usb_serial_jtag_connected(void); char usb_serial_jtag_read_char(void); -bool usb_serial_jtag_bytes_available(void); +uint32_t usb_serial_jtag_bytes_available(void); void usb_serial_jtag_write(const char *text, uint32_t length); diff --git a/ports/espressif/tools/update_sdkconfig.py b/ports/espressif/tools/update_sdkconfig.py index c977174cf1ad4..827fac7ca4bc9 100644 --- a/ports/espressif/tools/update_sdkconfig.py +++ b/ports/espressif/tools/update_sdkconfig.py @@ -56,6 +56,7 @@ "CONFIG_BT_CTRL_PINNED_TO_CORE", "CONFIG_SPIRAM_SPEED_2", "CONFIG_SPIRAM_BANKSWITCH_ENABLE", # For ESP32 + "CONFIG_ESP_WIFI_RX_IRAM_OPT", ] BOARD_SETTINGS = [ @@ -360,6 +361,11 @@ def update(debug, board, update_all): target_kconfig_snippets.add(loc) target_symbols = target_symbols.union(differing_keys) + # We treat SPIRAM differently so make sure it isn't a target related + # symbol (even though some targets don't support SPIRAM). + if "SPIRAM" in target_symbols: + target_symbols.remove("SPIRAM") + # kconfig settings can be set by others. item.referenced doesn't # know this. So we collect all things that reference this using # rev_dep. @@ -428,7 +434,9 @@ def update(debug, board, update_all): # Always document the above settings. Settings below should # be non-default. pass - elif matches_group(config_string, PSRAM_SETTINGS) or psram_reference: + elif matches_group(config_string, PSRAM_SETTINGS) or ( + psram_reference and not target_setting + ): print(" " * (len(current_group) + 1), "psram shared") last_psram_group = add_group(psram_settings, last_psram_group, current_group) psram_settings.append(config_string) diff --git a/ports/litex/common-hal/supervisor/Runtime.c b/ports/litex/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/litex/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/litex/common-hal/supervisor/Runtime.h b/ports/litex/common-hal/supervisor/Runtime.h deleted file mode 100644 index d1fe246211bd5..0000000000000 --- a/ports/litex/common-hal/supervisor/Runtime.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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. - */ - -#ifndef MICROPY_INCLUDED_LITEX_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_LITEX_COMMON_HAL_SUPERVISOR_RUNTIME_H - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_LITEX_COMMON_HAL_SUPERVISOR_RUNTIME_H diff --git a/ports/litex/common-hal/supervisor/__init__.c b/ports/litex/common-hal/supervisor/__init__.c deleted file mode 100644 index 6dca35fb5aeb1..0000000000000 --- a/ports/litex/common-hal/supervisor/__init__.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 "py/obj.h" - -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" - - -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; diff --git a/ports/mimxrt10xx/common-hal/supervisor/Runtime.c b/ports/mimxrt10xx/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/mimxrt10xx/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/mimxrt10xx/common-hal/supervisor/Runtime.h b/ports/mimxrt10xx/common-hal/supervisor/Runtime.h deleted file mode 100755 index 11bb590635682..0000000000000 --- a/ports/mimxrt10xx/common-hal/supervisor/Runtime.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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. - */ - -#ifndef MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_SUPERVISOR_RUNTIME_H - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_MIMXRT10XX_COMMON_HAL_SUPERVISOR_RUNTIME_H diff --git a/ports/mimxrt10xx/common-hal/supervisor/__init__.c b/ports/mimxrt10xx/common-hal/supervisor/__init__.c deleted file mode 100755 index 6dca35fb5aeb1..0000000000000 --- a/ports/mimxrt10xx/common-hal/supervisor/__init__.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 "py/obj.h" - -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" - - -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; diff --git a/ports/nrf/.gitignore b/ports/nordic/.gitignore similarity index 100% rename from ports/nrf/.gitignore rename to ports/nordic/.gitignore diff --git a/ports/nrf/Makefile b/ports/nordic/Makefile similarity index 100% rename from ports/nrf/Makefile rename to ports/nordic/Makefile diff --git a/ports/nrf/README.md b/ports/nordic/README.md similarity index 100% rename from ports/nrf/README.md rename to ports/nordic/README.md diff --git a/ports/nrf/background.c b/ports/nordic/background.c similarity index 100% rename from ports/nrf/background.c rename to ports/nordic/background.c diff --git a/ports/nrf/background.h b/ports/nordic/background.h similarity index 100% rename from ports/nrf/background.h rename to ports/nordic/background.h diff --git a/ports/nrf/bluetooth/ble_drv.c b/ports/nordic/bluetooth/ble_drv.c similarity index 100% rename from ports/nrf/bluetooth/ble_drv.c rename to ports/nordic/bluetooth/ble_drv.c diff --git a/ports/nrf/bluetooth/ble_drv.h b/ports/nordic/bluetooth/ble_drv.h similarity index 100% rename from ports/nrf/bluetooth/ble_drv.h rename to ports/nordic/bluetooth/ble_drv.h diff --git a/ports/nrf/bluetooth/bluetooth_common.mk b/ports/nordic/bluetooth/bluetooth_common.mk similarity index 100% rename from ports/nrf/bluetooth/bluetooth_common.mk rename to ports/nordic/bluetooth/bluetooth_common.mk diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/doc/ble_api.dox diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_err.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatt.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gattc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_gatts.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_hci.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_l2cap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_ranges.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/ble_types.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf52/nrf_mbr.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_error_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_nvic.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_API/include/nrf_svc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_license-agreement.txt diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_migration-document.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_release-notes.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex b/ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex rename to ports/nordic/bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/doc/ble_api.dox diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_err.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatt.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gattc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_gatts.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_hci.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_l2cap.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_ranges.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/ble_types.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf52/nrf_mbr.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_error_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_nvic.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_sdm.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_soc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_API/include/nrf_svc.h diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_license-agreement.txt diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_migration-document.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_release-notes-update-2.pdf diff --git a/ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex b/ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex similarity index 100% rename from ports/nrf/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex rename to ports/nordic/bluetooth/s140_nrf52_7.0.1/s140_nrf52_7.0.1_softdevice.hex diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/board.c b/ports/nordic/boards/ADM_B_NRF52840_1/board.c similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/board.c rename to ports/nordic/boards/ADM_B_NRF52840_1/board.c diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.h b/ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.h rename to ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.h diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.mk b/ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/mpconfigboard.mk rename to ports/nordic/boards/ADM_B_NRF52840_1/mpconfigboard.mk diff --git a/ports/nrf/boards/ADM_B_NRF52840_1/pins.c b/ports/nordic/boards/ADM_B_NRF52840_1/pins.c similarity index 100% rename from ports/nrf/boards/ADM_B_NRF52840_1/pins.c rename to ports/nordic/boards/ADM_B_NRF52840_1/pins.c diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/board.c similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/board.c rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/board.c diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.h diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/mpconfigboard.mk diff --git a/ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c b/ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c similarity index 100% rename from ports/nrf/boards/Seeed_XIAO_nRF52840_Sense/pins.c rename to ports/nordic/boards/Seeed_XIAO_nRF52840_Sense/pins.c diff --git a/ports/nrf/boards/TG-Watch/board.c b/ports/nordic/boards/TG-Watch/board.c similarity index 100% rename from ports/nrf/boards/TG-Watch/board.c rename to ports/nordic/boards/TG-Watch/board.c diff --git a/ports/nrf/boards/TG-Watch/mpconfigboard.h b/ports/nordic/boards/TG-Watch/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/TG-Watch/mpconfigboard.h rename to ports/nordic/boards/TG-Watch/mpconfigboard.h diff --git a/ports/nrf/boards/TG-Watch/mpconfigboard.mk b/ports/nordic/boards/TG-Watch/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/TG-Watch/mpconfigboard.mk rename to ports/nordic/boards/TG-Watch/mpconfigboard.mk diff --git a/ports/nrf/boards/TG-Watch/pins.c b/ports/nordic/boards/TG-Watch/pins.c similarity index 100% rename from ports/nrf/boards/TG-Watch/pins.c rename to ports/nordic/boards/TG-Watch/pins.c diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c b/ports/nordic/boards/adafruit_led_glasses_nrf52840/board.c similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/board.c rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/board.c diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h b/ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.h diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk b/ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/mpconfigboard.mk diff --git a/ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c b/ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c similarity index 100% rename from ports/nrf/boards/adafruit_led_glasses_nrf52840/pins.c rename to ports/nordic/boards/adafruit_led_glasses_nrf52840/pins.c diff --git a/ports/nrf/boards/aramcon2_badge/board.c b/ports/nordic/boards/aramcon2_badge/board.c similarity index 100% rename from ports/nrf/boards/aramcon2_badge/board.c rename to ports/nordic/boards/aramcon2_badge/board.c diff --git a/ports/nrf/boards/aramcon2_badge/mpconfigboard.h b/ports/nordic/boards/aramcon2_badge/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/aramcon2_badge/mpconfigboard.h rename to ports/nordic/boards/aramcon2_badge/mpconfigboard.h diff --git a/ports/nrf/boards/aramcon2_badge/mpconfigboard.mk b/ports/nordic/boards/aramcon2_badge/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/aramcon2_badge/mpconfigboard.mk rename to ports/nordic/boards/aramcon2_badge/mpconfigboard.mk diff --git a/ports/nrf/boards/aramcon2_badge/pins.c b/ports/nordic/boards/aramcon2_badge/pins.c similarity index 100% rename from ports/nrf/boards/aramcon2_badge/pins.c rename to ports/nordic/boards/aramcon2_badge/pins.c diff --git a/ports/nrf/boards/aramcon_badge_2019/board.c b/ports/nordic/boards/aramcon_badge_2019/board.c similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/board.c rename to ports/nordic/boards/aramcon_badge_2019/board.c diff --git a/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.h b/ports/nordic/boards/aramcon_badge_2019/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/mpconfigboard.h rename to ports/nordic/boards/aramcon_badge_2019/mpconfigboard.h diff --git a/ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk b/ports/nordic/boards/aramcon_badge_2019/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/mpconfigboard.mk rename to ports/nordic/boards/aramcon_badge_2019/mpconfigboard.mk diff --git a/ports/nrf/boards/aramcon_badge_2019/pins.c b/ports/nordic/boards/aramcon_badge_2019/pins.c similarity index 100% rename from ports/nrf/boards/aramcon_badge_2019/pins.c rename to ports/nordic/boards/aramcon_badge_2019/pins.c diff --git a/ports/nrf/boards/arduino_nano_33_ble/README.md b/ports/nordic/boards/arduino_nano_33_ble/README.md similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/README.md rename to ports/nordic/boards/arduino_nano_33_ble/README.md diff --git a/ports/nrf/boards/arduino_nano_33_ble/board.c b/ports/nordic/boards/arduino_nano_33_ble/board.c similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/board.c rename to ports/nordic/boards/arduino_nano_33_ble/board.c diff --git a/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h b/ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.h rename to ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.h diff --git a/ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.mk b/ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/mpconfigboard.mk rename to ports/nordic/boards/arduino_nano_33_ble/mpconfigboard.mk diff --git a/ports/nrf/boards/arduino_nano_33_ble/pins.c b/ports/nordic/boards/arduino_nano_33_ble/pins.c similarity index 100% rename from ports/nrf/boards/arduino_nano_33_ble/pins.c rename to ports/nordic/boards/arduino_nano_33_ble/pins.c diff --git a/ports/nrf/boards/bastble/README.md b/ports/nordic/boards/bastble/README.md similarity index 100% rename from ports/nrf/boards/bastble/README.md rename to ports/nordic/boards/bastble/README.md diff --git a/ports/nrf/boards/bastble/board.c b/ports/nordic/boards/bastble/board.c similarity index 100% rename from ports/nrf/boards/bastble/board.c rename to ports/nordic/boards/bastble/board.c diff --git a/ports/nrf/boards/bastble/mpconfigboard.h b/ports/nordic/boards/bastble/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bastble/mpconfigboard.h rename to ports/nordic/boards/bastble/mpconfigboard.h diff --git a/ports/nrf/boards/bastble/mpconfigboard.mk b/ports/nordic/boards/bastble/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bastble/mpconfigboard.mk rename to ports/nordic/boards/bastble/mpconfigboard.mk diff --git a/ports/nrf/boards/bastble/pins.c b/ports/nordic/boards/bastble/pins.c similarity index 100% rename from ports/nrf/boards/bastble/pins.c rename to ports/nordic/boards/bastble/pins.c diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/board.c b/ports/nordic/boards/bless_dev_board_multi_sensor/board.c similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/board.c rename to ports/nordic/boards/bless_dev_board_multi_sensor/board.c diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.h b/ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.h rename to ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.h diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.mk b/ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/mpconfigboard.mk rename to ports/nordic/boards/bless_dev_board_multi_sensor/mpconfigboard.mk diff --git a/ports/nrf/boards/bless_dev_board_multi_sensor/pins.c b/ports/nordic/boards/bless_dev_board_multi_sensor/pins.c similarity index 100% rename from ports/nrf/boards/bless_dev_board_multi_sensor/pins.c rename to ports/nordic/boards/bless_dev_board_multi_sensor/pins.c diff --git a/ports/nrf/boards/bluemicro833/board.c b/ports/nordic/boards/bluemicro833/board.c similarity index 100% rename from ports/nrf/boards/bluemicro833/board.c rename to ports/nordic/boards/bluemicro833/board.c diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.h b/ports/nordic/boards/bluemicro833/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bluemicro833/mpconfigboard.h rename to ports/nordic/boards/bluemicro833/mpconfigboard.h diff --git a/ports/nrf/boards/bluemicro833/mpconfigboard.mk b/ports/nordic/boards/bluemicro833/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bluemicro833/mpconfigboard.mk rename to ports/nordic/boards/bluemicro833/mpconfigboard.mk diff --git a/ports/nrf/boards/bluemicro833/pins.c b/ports/nordic/boards/bluemicro833/pins.c similarity index 100% rename from ports/nrf/boards/bluemicro833/pins.c rename to ports/nordic/boards/bluemicro833/pins.c diff --git a/ports/nrf/boards/bluemicro840/board.c b/ports/nordic/boards/bluemicro840/board.c similarity index 100% rename from ports/nrf/boards/bluemicro840/board.c rename to ports/nordic/boards/bluemicro840/board.c diff --git a/ports/nrf/boards/bluemicro840/mpconfigboard.h b/ports/nordic/boards/bluemicro840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/bluemicro840/mpconfigboard.h rename to ports/nordic/boards/bluemicro840/mpconfigboard.h diff --git a/ports/nrf/boards/bluemicro840/mpconfigboard.mk b/ports/nordic/boards/bluemicro840/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/bluemicro840/mpconfigboard.mk rename to ports/nordic/boards/bluemicro840/mpconfigboard.mk diff --git a/ports/nrf/boards/bluemicro840/pins.c b/ports/nordic/boards/bluemicro840/pins.c similarity index 100% rename from ports/nrf/boards/bluemicro840/pins.c rename to ports/nordic/boards/bluemicro840/pins.c diff --git a/ports/nrf/boards/challenger_840/board.c b/ports/nordic/boards/challenger_840/board.c similarity index 100% rename from ports/nrf/boards/challenger_840/board.c rename to ports/nordic/boards/challenger_840/board.c diff --git a/ports/nrf/boards/challenger_840/challenger_840.py b/ports/nordic/boards/challenger_840/challenger_840.py similarity index 100% rename from ports/nrf/boards/challenger_840/challenger_840.py rename to ports/nordic/boards/challenger_840/challenger_840.py diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.h b/ports/nordic/boards/challenger_840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/challenger_840/mpconfigboard.h rename to ports/nordic/boards/challenger_840/mpconfigboard.h diff --git a/ports/nrf/boards/challenger_840/mpconfigboard.mk b/ports/nordic/boards/challenger_840/mpconfigboard.mk similarity index 85% rename from ports/nrf/boards/challenger_840/mpconfigboard.mk rename to ports/nordic/boards/challenger_840/mpconfigboard.mk index 03cbc20b21279..a1dbe1e642998 100644 --- a/ports/nrf/boards/challenger_840/mpconfigboard.mk +++ b/ports/nordic/boards/challenger_840/mpconfigboard.mk @@ -8,6 +8,6 @@ MCU_CHIP = nrf52840 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ,W25Q32FV,W25Q32JVxQ,W25Q64FV,W25Q64JVxQ" -FROZEN_MPY_DIRS += $(TOP)/ports/nrf/boards/challenger_840 +FROZEN_MPY_DIRS += $(TOP)/ports/nordic/boards/challenger_840 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/nrf/boards/challenger_840/pins.c b/ports/nordic/boards/challenger_840/pins.c similarity index 100% rename from ports/nrf/boards/challenger_840/pins.c rename to ports/nordic/boards/challenger_840/pins.c diff --git a/ports/nrf/boards/circuitplayground_bluefruit/board.c b/ports/nordic/boards/circuitplayground_bluefruit/board.c similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/board.c rename to ports/nordic/boards/circuitplayground_bluefruit/board.c diff --git a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h b/ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h rename to ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.h diff --git a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.mk b/ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.mk rename to ports/nordic/boards/circuitplayground_bluefruit/mpconfigboard.mk diff --git a/ports/nrf/boards/circuitplayground_bluefruit/pins.c b/ports/nordic/boards/circuitplayground_bluefruit/pins.c similarity index 100% rename from ports/nrf/boards/circuitplayground_bluefruit/pins.c rename to ports/nordic/boards/circuitplayground_bluefruit/pins.c diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nordic/boards/clue_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/board.c rename to ports/nordic/boards/clue_nrf52840_express/board.c diff --git a/ports/nrf/boards/clue_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/clue_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/clue_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/clue_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/clue_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/clue_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/clue_nrf52840_express/pins.c b/ports/nordic/boards/clue_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/clue_nrf52840_express/pins.c rename to ports/nordic/boards/clue_nrf52840_express/pins.c diff --git a/ports/nrf/boards/common.template.ld b/ports/nordic/boards/common.template.ld similarity index 100% rename from ports/nrf/boards/common.template.ld rename to ports/nordic/boards/common.template.ld diff --git a/ports/nrf/boards/electronut_labs_blip/board.c b/ports/nordic/boards/electronut_labs_blip/board.c similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/board.c rename to ports/nordic/boards/electronut_labs_blip/board.c diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.h b/ports/nordic/boards/electronut_labs_blip/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/mpconfigboard.h rename to ports/nordic/boards/electronut_labs_blip/mpconfigboard.h diff --git a/ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk b/ports/nordic/boards/electronut_labs_blip/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/mpconfigboard.mk rename to ports/nordic/boards/electronut_labs_blip/mpconfigboard.mk diff --git a/ports/nrf/boards/electronut_labs_blip/pins.c b/ports/nordic/boards/electronut_labs_blip/pins.c similarity index 100% rename from ports/nrf/boards/electronut_labs_blip/pins.c rename to ports/nordic/boards/electronut_labs_blip/pins.c diff --git a/ports/nrf/boards/electronut_labs_papyr/board.c b/ports/nordic/boards/electronut_labs_papyr/board.c similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/board.c rename to ports/nordic/boards/electronut_labs_papyr/board.c diff --git a/ports/nrf/boards/electronut_labs_papyr/mpconfigboard.h b/ports/nordic/boards/electronut_labs_papyr/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/mpconfigboard.h rename to ports/nordic/boards/electronut_labs_papyr/mpconfigboard.h diff --git a/ports/nrf/boards/electronut_labs_papyr/mpconfigboard.mk b/ports/nordic/boards/electronut_labs_papyr/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/mpconfigboard.mk rename to ports/nordic/boards/electronut_labs_papyr/mpconfigboard.mk diff --git a/ports/nrf/boards/electronut_labs_papyr/pins.c b/ports/nordic/boards/electronut_labs_papyr/pins.c similarity index 100% rename from ports/nrf/boards/electronut_labs_papyr/pins.c rename to ports/nordic/boards/electronut_labs_papyr/pins.c diff --git a/ports/nrf/boards/espruino_banglejs2/board.c b/ports/nordic/boards/espruino_banglejs2/board.c similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/board.c rename to ports/nordic/boards/espruino_banglejs2/board.c diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.h b/ports/nordic/boards/espruino_banglejs2/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/mpconfigboard.h rename to ports/nordic/boards/espruino_banglejs2/mpconfigboard.h diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk b/ports/nordic/boards/espruino_banglejs2/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk rename to ports/nordic/boards/espruino_banglejs2/mpconfigboard.mk diff --git a/ports/nrf/boards/espruino_banglejs2/pins.c b/ports/nordic/boards/espruino_banglejs2/pins.c similarity index 100% rename from ports/nrf/boards/espruino_banglejs2/pins.c rename to ports/nordic/boards/espruino_banglejs2/pins.c diff --git a/ports/nrf/boards/feather_bluefruit_sense/board.c b/ports/nordic/boards/feather_bluefruit_sense/board.c similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/board.c rename to ports/nordic/boards/feather_bluefruit_sense/board.c diff --git a/ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.h b/ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.h rename to ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.h diff --git a/ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.mk b/ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/mpconfigboard.mk rename to ports/nordic/boards/feather_bluefruit_sense/mpconfigboard.mk diff --git a/ports/nrf/boards/feather_bluefruit_sense/pins.c b/ports/nordic/boards/feather_bluefruit_sense/pins.c similarity index 100% rename from ports/nrf/boards/feather_bluefruit_sense/pins.c rename to ports/nordic/boards/feather_bluefruit_sense/pins.c diff --git a/ports/nrf/boards/feather_nrf52840_express/board.c b/ports/nordic/boards/feather_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/board.c rename to ports/nordic/boards/feather_nrf52840_express/board.c diff --git a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/feather_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/feather_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/feather_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/feather_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/feather_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/feather_nrf52840_express/pins.c b/ports/nordic/boards/feather_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/feather_nrf52840_express/pins.c rename to ports/nordic/boards/feather_nrf52840_express/pins.c diff --git a/ports/nrf/boards/hiibot_bluefi/board.c b/ports/nordic/boards/hiibot_bluefi/board.c similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/board.c rename to ports/nordic/boards/hiibot_bluefi/board.c diff --git a/ports/nrf/boards/hiibot_bluefi/mpconfigboard.h b/ports/nordic/boards/hiibot_bluefi/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/mpconfigboard.h rename to ports/nordic/boards/hiibot_bluefi/mpconfigboard.h diff --git a/ports/nrf/boards/hiibot_bluefi/mpconfigboard.mk b/ports/nordic/boards/hiibot_bluefi/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/mpconfigboard.mk rename to ports/nordic/boards/hiibot_bluefi/mpconfigboard.mk diff --git a/ports/nrf/boards/hiibot_bluefi/pins.c b/ports/nordic/boards/hiibot_bluefi/pins.c similarity index 100% rename from ports/nrf/boards/hiibot_bluefi/pins.c rename to ports/nordic/boards/hiibot_bluefi/pins.c diff --git a/ports/nrf/boards/ikigaisense_vita/board.c b/ports/nordic/boards/ikigaisense_vita/board.c similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/board.c rename to ports/nordic/boards/ikigaisense_vita/board.c diff --git a/ports/nrf/boards/ikigaisense_vita/mpconfigboard.h b/ports/nordic/boards/ikigaisense_vita/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/mpconfigboard.h rename to ports/nordic/boards/ikigaisense_vita/mpconfigboard.h diff --git a/ports/nrf/boards/ikigaisense_vita/mpconfigboard.mk b/ports/nordic/boards/ikigaisense_vita/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/mpconfigboard.mk rename to ports/nordic/boards/ikigaisense_vita/mpconfigboard.mk diff --git a/ports/nrf/boards/ikigaisense_vita/pins.c b/ports/nordic/boards/ikigaisense_vita/pins.c similarity index 100% rename from ports/nrf/boards/ikigaisense_vita/pins.c rename to ports/nordic/boards/ikigaisense_vita/pins.c diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/board.c b/ports/nordic/boards/itsybitsy_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/board.c rename to ports/nordic/boards/itsybitsy_nrf52840_express/board.c diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/itsybitsy_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/pins.c b/ports/nordic/boards/itsybitsy_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/itsybitsy_nrf52840_express/pins.c rename to ports/nordic/boards/itsybitsy_nrf52840_express/pins.c diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/README.md b/ports/nordic/boards/makerdiary_m60_keyboard/README.md similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/README.md rename to ports/nordic/boards/makerdiary_m60_keyboard/README.md diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/board.c b/ports/nordic/boards/makerdiary_m60_keyboard/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/board.c rename to ports/nordic/boards/makerdiary_m60_keyboard/board.c diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.h b/ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.h rename to ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.mk b/ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_m60_keyboard/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_m60_keyboard/pins.c b/ports/nordic/boards/makerdiary_m60_keyboard/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_m60_keyboard/pins.c rename to ports/nordic/boards/makerdiary_m60_keyboard/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/README.md b/ports/nordic/boards/makerdiary_nrf52840_connectkit/README.md similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/README.md rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/README.md diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/board.c b/ports/nordic/boards/makerdiary_nrf52840_connectkit/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/board.c rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_connectkit/pins.c b/ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_connectkit/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_connectkit/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/README.md b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/README.md similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/README.md rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/README.md diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/board.c rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_m2_devkit/pins.c b/ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_m2_devkit/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_m2_devkit/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/board.c b/ports/nordic/boards/makerdiary_nrf52840_mdk/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/board.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_mdk/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c b/ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk/pins.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/board.c diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.h diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/mpconfigboard.mk diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c b/ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c similarity index 100% rename from ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c rename to ports/nordic/boards/makerdiary_nrf52840_mdk_usb_dongle/pins.c diff --git a/ports/nrf/boards/metro_nrf52840_express/board.c b/ports/nordic/boards/metro_nrf52840_express/board.c similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/board.c rename to ports/nordic/boards/metro_nrf52840_express/board.c diff --git a/ports/nrf/boards/metro_nrf52840_express/mpconfigboard.h b/ports/nordic/boards/metro_nrf52840_express/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/mpconfigboard.h rename to ports/nordic/boards/metro_nrf52840_express/mpconfigboard.h diff --git a/ports/nrf/boards/metro_nrf52840_express/mpconfigboard.mk b/ports/nordic/boards/metro_nrf52840_express/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/mpconfigboard.mk rename to ports/nordic/boards/metro_nrf52840_express/mpconfigboard.mk diff --git a/ports/nrf/boards/metro_nrf52840_express/pins.c b/ports/nordic/boards/metro_nrf52840_express/pins.c similarity index 100% rename from ports/nrf/boards/metro_nrf52840_express/pins.c rename to ports/nordic/boards/metro_nrf52840_express/pins.c diff --git a/ports/nrf/boards/microbit_v2/board.c b/ports/nordic/boards/microbit_v2/board.c similarity index 100% rename from ports/nrf/boards/microbit_v2/board.c rename to ports/nordic/boards/microbit_v2/board.c diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.h b/ports/nordic/boards/microbit_v2/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/microbit_v2/mpconfigboard.h rename to ports/nordic/boards/microbit_v2/mpconfigboard.h diff --git a/ports/nrf/boards/microbit_v2/mpconfigboard.mk b/ports/nordic/boards/microbit_v2/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/microbit_v2/mpconfigboard.mk rename to ports/nordic/boards/microbit_v2/mpconfigboard.mk diff --git a/ports/nrf/boards/microbit_v2/pins.c b/ports/nordic/boards/microbit_v2/pins.c similarity index 100% rename from ports/nrf/boards/microbit_v2/pins.c rename to ports/nordic/boards/microbit_v2/pins.c diff --git a/ports/nrf/boards/nice_nano/board.c b/ports/nordic/boards/nice_nano/board.c similarity index 100% rename from ports/nrf/boards/nice_nano/board.c rename to ports/nordic/boards/nice_nano/board.c diff --git a/ports/nrf/boards/nice_nano/mpconfigboard.h b/ports/nordic/boards/nice_nano/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/nice_nano/mpconfigboard.h rename to ports/nordic/boards/nice_nano/mpconfigboard.h diff --git a/ports/nrf/boards/nice_nano/mpconfigboard.mk b/ports/nordic/boards/nice_nano/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/nice_nano/mpconfigboard.mk rename to ports/nordic/boards/nice_nano/mpconfigboard.mk diff --git a/ports/nrf/boards/nice_nano/pins.c b/ports/nordic/boards/nice_nano/pins.c similarity index 100% rename from ports/nrf/boards/nice_nano/pins.c rename to ports/nordic/boards/nice_nano/pins.c diff --git a/ports/nrf/boards/nrf52_prefix.c b/ports/nordic/boards/nrf52_prefix.c similarity index 100% rename from ports/nrf/boards/nrf52_prefix.c rename to ports/nordic/boards/nrf52_prefix.c diff --git a/ports/nrf/boards/ohs2020_badge/board.c b/ports/nordic/boards/ohs2020_badge/board.c similarity index 100% rename from ports/nrf/boards/ohs2020_badge/board.c rename to ports/nordic/boards/ohs2020_badge/board.c diff --git a/ports/nrf/boards/ohs2020_badge/mpconfigboard.h b/ports/nordic/boards/ohs2020_badge/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ohs2020_badge/mpconfigboard.h rename to ports/nordic/boards/ohs2020_badge/mpconfigboard.h diff --git a/ports/nrf/boards/ohs2020_badge/mpconfigboard.mk b/ports/nordic/boards/ohs2020_badge/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ohs2020_badge/mpconfigboard.mk rename to ports/nordic/boards/ohs2020_badge/mpconfigboard.mk diff --git a/ports/nrf/boards/ohs2020_badge/pins.c b/ports/nordic/boards/ohs2020_badge/pins.c similarity index 100% rename from ports/nrf/boards/ohs2020_badge/pins.c rename to ports/nordic/boards/ohs2020_badge/pins.c diff --git a/ports/nrf/boards/particle_argon/board.c b/ports/nordic/boards/particle_argon/board.c similarity index 100% rename from ports/nrf/boards/particle_argon/board.c rename to ports/nordic/boards/particle_argon/board.c diff --git a/ports/nrf/boards/particle_argon/mpconfigboard.h b/ports/nordic/boards/particle_argon/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/particle_argon/mpconfigboard.h rename to ports/nordic/boards/particle_argon/mpconfigboard.h diff --git a/ports/nrf/boards/particle_argon/mpconfigboard.mk b/ports/nordic/boards/particle_argon/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/particle_argon/mpconfigboard.mk rename to ports/nordic/boards/particle_argon/mpconfigboard.mk diff --git a/ports/nrf/boards/particle_argon/pins.c b/ports/nordic/boards/particle_argon/pins.c similarity index 100% rename from ports/nrf/boards/particle_argon/pins.c rename to ports/nordic/boards/particle_argon/pins.c diff --git a/ports/nrf/boards/particle_boron/board.c b/ports/nordic/boards/particle_boron/board.c similarity index 100% rename from ports/nrf/boards/particle_boron/board.c rename to ports/nordic/boards/particle_boron/board.c diff --git a/ports/nrf/boards/particle_boron/mpconfigboard.h b/ports/nordic/boards/particle_boron/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/particle_boron/mpconfigboard.h rename to ports/nordic/boards/particle_boron/mpconfigboard.h diff --git a/ports/nrf/boards/particle_boron/mpconfigboard.mk b/ports/nordic/boards/particle_boron/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/particle_boron/mpconfigboard.mk rename to ports/nordic/boards/particle_boron/mpconfigboard.mk diff --git a/ports/nrf/boards/particle_boron/pins.c b/ports/nordic/boards/particle_boron/pins.c similarity index 100% rename from ports/nrf/boards/particle_boron/pins.c rename to ports/nordic/boards/particle_boron/pins.c diff --git a/ports/nrf/boards/particle_xenon/board.c b/ports/nordic/boards/particle_xenon/board.c similarity index 100% rename from ports/nrf/boards/particle_xenon/board.c rename to ports/nordic/boards/particle_xenon/board.c diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.h b/ports/nordic/boards/particle_xenon/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/particle_xenon/mpconfigboard.h rename to ports/nordic/boards/particle_xenon/mpconfigboard.h diff --git a/ports/nrf/boards/particle_xenon/mpconfigboard.mk b/ports/nordic/boards/particle_xenon/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/particle_xenon/mpconfigboard.mk rename to ports/nordic/boards/particle_xenon/mpconfigboard.mk diff --git a/ports/nrf/boards/particle_xenon/pins.c b/ports/nordic/boards/particle_xenon/pins.c similarity index 100% rename from ports/nrf/boards/particle_xenon/pins.c rename to ports/nordic/boards/particle_xenon/pins.c diff --git a/ports/nrf/boards/pca10056/board.c b/ports/nordic/boards/pca10056/board.c similarity index 100% rename from ports/nrf/boards/pca10056/board.c rename to ports/nordic/boards/pca10056/board.c diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nordic/boards/pca10056/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pca10056/mpconfigboard.h rename to ports/nordic/boards/pca10056/mpconfigboard.h diff --git a/ports/nrf/boards/pca10056/mpconfigboard.mk b/ports/nordic/boards/pca10056/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pca10056/mpconfigboard.mk rename to ports/nordic/boards/pca10056/mpconfigboard.mk diff --git a/ports/nrf/boards/pca10056/pins.c b/ports/nordic/boards/pca10056/pins.c similarity index 100% rename from ports/nrf/boards/pca10056/pins.c rename to ports/nordic/boards/pca10056/pins.c diff --git a/ports/nrf/boards/pca10059/board.c b/ports/nordic/boards/pca10059/board.c similarity index 100% rename from ports/nrf/boards/pca10059/board.c rename to ports/nordic/boards/pca10059/board.c diff --git a/ports/nrf/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip b/ports/nordic/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip similarity index 100% rename from ports/nrf/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip rename to ports/nordic/boards/pca10059/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip diff --git a/ports/nrf/boards/pca10059/mpconfigboard.h b/ports/nordic/boards/pca10059/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pca10059/mpconfigboard.h rename to ports/nordic/boards/pca10059/mpconfigboard.h diff --git a/ports/nrf/boards/pca10059/mpconfigboard.mk b/ports/nordic/boards/pca10059/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pca10059/mpconfigboard.mk rename to ports/nordic/boards/pca10059/mpconfigboard.mk diff --git a/ports/nrf/boards/pca10059/pins.c b/ports/nordic/boards/pca10059/pins.c similarity index 100% rename from ports/nrf/boards/pca10059/pins.c rename to ports/nordic/boards/pca10059/pins.c diff --git a/ports/nrf/boards/pca10100/board.c b/ports/nordic/boards/pca10100/board.c similarity index 100% rename from ports/nrf/boards/pca10100/board.c rename to ports/nordic/boards/pca10100/board.c diff --git a/ports/nrf/boards/pca10100/mpconfigboard.h b/ports/nordic/boards/pca10100/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pca10100/mpconfigboard.h rename to ports/nordic/boards/pca10100/mpconfigboard.h diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nordic/boards/pca10100/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pca10100/mpconfigboard.mk rename to ports/nordic/boards/pca10100/mpconfigboard.mk diff --git a/ports/nrf/boards/pca10100/pins.c b/ports/nordic/boards/pca10100/pins.c similarity index 100% rename from ports/nrf/boards/pca10100/pins.c rename to ports/nordic/boards/pca10100/pins.c diff --git a/ports/nrf/boards/pctel_wsc_1450/board.c b/ports/nordic/boards/pctel_wsc_1450/board.c similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/board.c rename to ports/nordic/boards/pctel_wsc_1450/board.c diff --git a/ports/nrf/boards/pctel_wsc_1450/mpconfigboard.h b/ports/nordic/boards/pctel_wsc_1450/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/mpconfigboard.h rename to ports/nordic/boards/pctel_wsc_1450/mpconfigboard.h diff --git a/ports/nrf/boards/pctel_wsc_1450/mpconfigboard.mk b/ports/nordic/boards/pctel_wsc_1450/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/mpconfigboard.mk rename to ports/nordic/boards/pctel_wsc_1450/mpconfigboard.mk diff --git a/ports/nrf/boards/pctel_wsc_1450/pins.c b/ports/nordic/boards/pctel_wsc_1450/pins.c similarity index 100% rename from ports/nrf/boards/pctel_wsc_1450/pins.c rename to ports/nordic/boards/pctel_wsc_1450/pins.c diff --git a/ports/nrf/boards/pillbug/board.c b/ports/nordic/boards/pillbug/board.c similarity index 100% rename from ports/nrf/boards/pillbug/board.c rename to ports/nordic/boards/pillbug/board.c diff --git a/ports/nrf/boards/pillbug/mpconfigboard.h b/ports/nordic/boards/pillbug/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pillbug/mpconfigboard.h rename to ports/nordic/boards/pillbug/mpconfigboard.h diff --git a/ports/nrf/boards/pillbug/mpconfigboard.mk b/ports/nordic/boards/pillbug/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pillbug/mpconfigboard.mk rename to ports/nordic/boards/pillbug/mpconfigboard.mk diff --git a/ports/nrf/boards/pillbug/pins.c b/ports/nordic/boards/pillbug/pins.c similarity index 100% rename from ports/nrf/boards/pillbug/pins.c rename to ports/nordic/boards/pillbug/pins.c diff --git a/ports/nrf/boards/pitaya_go/board.c b/ports/nordic/boards/pitaya_go/board.c similarity index 100% rename from ports/nrf/boards/pitaya_go/board.c rename to ports/nordic/boards/pitaya_go/board.c diff --git a/ports/nrf/boards/pitaya_go/mpconfigboard.h b/ports/nordic/boards/pitaya_go/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/pitaya_go/mpconfigboard.h rename to ports/nordic/boards/pitaya_go/mpconfigboard.h diff --git a/ports/nrf/boards/pitaya_go/mpconfigboard.mk b/ports/nordic/boards/pitaya_go/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/pitaya_go/mpconfigboard.mk rename to ports/nordic/boards/pitaya_go/mpconfigboard.mk diff --git a/ports/nrf/boards/pitaya_go/pins.c b/ports/nordic/boards/pitaya_go/pins.c similarity index 100% rename from ports/nrf/boards/pitaya_go/pins.c rename to ports/nordic/boards/pitaya_go/pins.c diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/board.c b/ports/nordic/boards/raytac_mdbt50q-db-40/board.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/board.c rename to ports/nordic/boards/raytac_mdbt50q-db-40/board.c diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip b/ports/nordic/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip rename to ports/nordic/boards/raytac_mdbt50q-db-40/bootloader/6.0.0/pca10056_bootloader_6.0.0_s140.zip diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.h b/ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.h rename to ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.h diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.mk b/ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/mpconfigboard.mk rename to ports/nordic/boards/raytac_mdbt50q-db-40/mpconfigboard.mk diff --git a/ports/nrf/boards/raytac_mdbt50q-db-40/pins.c b/ports/nordic/boards/raytac_mdbt50q-db-40/pins.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-db-40/pins.c rename to ports/nordic/boards/raytac_mdbt50q-db-40/pins.c diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/board.c b/ports/nordic/boards/raytac_mdbt50q-rx/board.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/board.c rename to ports/nordic/boards/raytac_mdbt50q-rx/board.c diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.h b/ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.h rename to ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.h diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.mk b/ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/mpconfigboard.mk rename to ports/nordic/boards/raytac_mdbt50q-rx/mpconfigboard.mk diff --git a/ports/nrf/boards/raytac_mdbt50q-rx/pins.c b/ports/nordic/boards/raytac_mdbt50q-rx/pins.c similarity index 100% rename from ports/nrf/boards/raytac_mdbt50q-rx/pins.c rename to ports/nordic/boards/raytac_mdbt50q-rx/pins.c diff --git a/ports/nrf/boards/simmel/board.c b/ports/nordic/boards/simmel/board.c similarity index 100% rename from ports/nrf/boards/simmel/board.c rename to ports/nordic/boards/simmel/board.c diff --git a/ports/nrf/boards/simmel/mpconfigboard.h b/ports/nordic/boards/simmel/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/simmel/mpconfigboard.h rename to ports/nordic/boards/simmel/mpconfigboard.h diff --git a/ports/nrf/boards/simmel/mpconfigboard.mk b/ports/nordic/boards/simmel/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/simmel/mpconfigboard.mk rename to ports/nordic/boards/simmel/mpconfigboard.mk diff --git a/ports/nrf/boards/simmel/pins.c b/ports/nordic/boards/simmel/pins.c similarity index 100% rename from ports/nrf/boards/simmel/pins.c rename to ports/nordic/boards/simmel/pins.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/README.md b/ports/nordic/boards/sparkfun_nrf52840_micromod/README.md similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/README.md rename to ports/nordic/boards/sparkfun_nrf52840_micromod/README.md diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/board.c b/ports/nordic/boards/sparkfun_nrf52840_micromod/board.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/board.c rename to ports/nordic/boards/sparkfun_nrf52840_micromod/board.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.h b/ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.h rename to ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.h diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk b/ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk rename to ports/nordic/boards/sparkfun_nrf52840_micromod/mpconfigboard.mk diff --git a/ports/nrf/boards/sparkfun_nrf52840_micromod/pins.c b/ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_micromod/pins.c rename to ports/nordic/boards/sparkfun_nrf52840_micromod/pins.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/README.md b/ports/nordic/boards/sparkfun_nrf52840_mini/README.md similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/README.md rename to ports/nordic/boards/sparkfun_nrf52840_mini/README.md diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/board.c b/ports/nordic/boards/sparkfun_nrf52840_mini/board.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/board.c rename to ports/nordic/boards/sparkfun_nrf52840_mini/board.c diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h b/ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.h rename to ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.h diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.mk b/ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/mpconfigboard.mk rename to ports/nordic/boards/sparkfun_nrf52840_mini/mpconfigboard.mk diff --git a/ports/nrf/boards/sparkfun_nrf52840_mini/pins.c b/ports/nordic/boards/sparkfun_nrf52840_mini/pins.c similarity index 100% rename from ports/nrf/boards/sparkfun_nrf52840_mini/pins.c rename to ports/nordic/boards/sparkfun_nrf52840_mini/pins.c diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/board.c b/ports/nordic/boards/ssci_isp1807_dev_board/board.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/board.c rename to ports/nordic/boards/ssci_isp1807_dev_board/board.c diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.h b/ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.h rename to ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.h diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.mk b/ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/mpconfigboard.mk rename to ports/nordic/boards/ssci_isp1807_dev_board/mpconfigboard.mk diff --git a/ports/nrf/boards/ssci_isp1807_dev_board/pins.c b/ports/nordic/boards/ssci_isp1807_dev_board/pins.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_dev_board/pins.c rename to ports/nordic/boards/ssci_isp1807_dev_board/pins.c diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/board.c b/ports/nordic/boards/ssci_isp1807_micro_board/board.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/board.c rename to ports/nordic/boards/ssci_isp1807_micro_board/board.c diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.h b/ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.h rename to ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.h diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.mk b/ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/mpconfigboard.mk rename to ports/nordic/boards/ssci_isp1807_micro_board/mpconfigboard.mk diff --git a/ports/nrf/boards/ssci_isp1807_micro_board/pins.c b/ports/nordic/boards/ssci_isp1807_micro_board/pins.c similarity index 100% rename from ports/nrf/boards/ssci_isp1807_micro_board/pins.c rename to ports/nordic/boards/ssci_isp1807_micro_board/pins.c diff --git a/ports/nrf/boards/supermini_nrf52840/board.c b/ports/nordic/boards/supermini_nrf52840/board.c similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/board.c rename to ports/nordic/boards/supermini_nrf52840/board.c diff --git a/ports/nrf/boards/supermini_nrf52840/mpconfigboard.h b/ports/nordic/boards/supermini_nrf52840/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/mpconfigboard.h rename to ports/nordic/boards/supermini_nrf52840/mpconfigboard.h diff --git a/ports/nrf/boards/supermini_nrf52840/mpconfigboard.mk b/ports/nordic/boards/supermini_nrf52840/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/mpconfigboard.mk rename to ports/nordic/boards/supermini_nrf52840/mpconfigboard.mk diff --git a/ports/nrf/boards/supermini_nrf52840/pins.c b/ports/nordic/boards/supermini_nrf52840/pins.c similarity index 100% rename from ports/nrf/boards/supermini_nrf52840/pins.c rename to ports/nordic/boards/supermini_nrf52840/pins.c diff --git a/ports/nrf/boards/teknikio_bluebird/board.c b/ports/nordic/boards/teknikio_bluebird/board.c similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/board.c rename to ports/nordic/boards/teknikio_bluebird/board.c diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.h b/ports/nordic/boards/teknikio_bluebird/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/mpconfigboard.h rename to ports/nordic/boards/teknikio_bluebird/mpconfigboard.h diff --git a/ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk b/ports/nordic/boards/teknikio_bluebird/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/mpconfigboard.mk rename to ports/nordic/boards/teknikio_bluebird/mpconfigboard.mk diff --git a/ports/nrf/boards/teknikio_bluebird/pins.c b/ports/nordic/boards/teknikio_bluebird/pins.c similarity index 100% rename from ports/nrf/boards/teknikio_bluebird/pins.c rename to ports/nordic/boards/teknikio_bluebird/pins.c diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/README.md b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/README.md similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/README.md rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/README.md diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/board.c similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/board.c rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/board.c diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.h diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/mpconfigboard.mk diff --git a/ports/nrf/boards/tinkeringtech_scoutmakes_azul/pins.c b/ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c similarity index 100% rename from ports/nrf/boards/tinkeringtech_scoutmakes_azul/pins.c rename to ports/nordic/boards/tinkeringtech_scoutmakes_azul/pins.c diff --git a/ports/nrf/boards/warmbit_bluepixel/board.c b/ports/nordic/boards/warmbit_bluepixel/board.c similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/board.c rename to ports/nordic/boards/warmbit_bluepixel/board.c diff --git a/ports/nrf/boards/warmbit_bluepixel/mpconfigboard.h b/ports/nordic/boards/warmbit_bluepixel/mpconfigboard.h similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/mpconfigboard.h rename to ports/nordic/boards/warmbit_bluepixel/mpconfigboard.h diff --git a/ports/nrf/boards/warmbit_bluepixel/mpconfigboard.mk b/ports/nordic/boards/warmbit_bluepixel/mpconfigboard.mk similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/mpconfigboard.mk rename to ports/nordic/boards/warmbit_bluepixel/mpconfigboard.mk diff --git a/ports/nrf/boards/warmbit_bluepixel/pins.c b/ports/nordic/boards/warmbit_bluepixel/pins.c similarity index 100% rename from ports/nrf/boards/warmbit_bluepixel/pins.c rename to ports/nordic/boards/warmbit_bluepixel/pins.c diff --git a/ports/nrf/common-hal/_bleio/Adapter.c b/ports/nordic/common-hal/_bleio/Adapter.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Adapter.c rename to ports/nordic/common-hal/_bleio/Adapter.c diff --git a/ports/nrf/common-hal/_bleio/Adapter.h b/ports/nordic/common-hal/_bleio/Adapter.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Adapter.h rename to ports/nordic/common-hal/_bleio/Adapter.h diff --git a/ports/nrf/common-hal/_bleio/Attribute.c b/ports/nordic/common-hal/_bleio/Attribute.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Attribute.c rename to ports/nordic/common-hal/_bleio/Attribute.c diff --git a/ports/nrf/common-hal/_bleio/Attribute.h b/ports/nordic/common-hal/_bleio/Attribute.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Attribute.h rename to ports/nordic/common-hal/_bleio/Attribute.h diff --git a/ports/nrf/common-hal/_bleio/Characteristic.c b/ports/nordic/common-hal/_bleio/Characteristic.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Characteristic.c rename to ports/nordic/common-hal/_bleio/Characteristic.c diff --git a/ports/nrf/common-hal/_bleio/Characteristic.h b/ports/nordic/common-hal/_bleio/Characteristic.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Characteristic.h rename to ports/nordic/common-hal/_bleio/Characteristic.h diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.c b/ports/nordic/common-hal/_bleio/CharacteristicBuffer.c similarity index 100% rename from ports/nrf/common-hal/_bleio/CharacteristicBuffer.c rename to ports/nordic/common-hal/_bleio/CharacteristicBuffer.c diff --git a/ports/nrf/common-hal/_bleio/CharacteristicBuffer.h b/ports/nordic/common-hal/_bleio/CharacteristicBuffer.h similarity index 100% rename from ports/nrf/common-hal/_bleio/CharacteristicBuffer.h rename to ports/nordic/common-hal/_bleio/CharacteristicBuffer.h diff --git a/ports/nrf/common-hal/_bleio/Connection.c b/ports/nordic/common-hal/_bleio/Connection.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Connection.c rename to ports/nordic/common-hal/_bleio/Connection.c diff --git a/ports/nrf/common-hal/_bleio/Connection.h b/ports/nordic/common-hal/_bleio/Connection.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Connection.h rename to ports/nordic/common-hal/_bleio/Connection.h diff --git a/ports/nrf/common-hal/_bleio/Descriptor.c b/ports/nordic/common-hal/_bleio/Descriptor.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Descriptor.c rename to ports/nordic/common-hal/_bleio/Descriptor.c diff --git a/ports/nrf/common-hal/_bleio/Descriptor.h b/ports/nordic/common-hal/_bleio/Descriptor.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Descriptor.h rename to ports/nordic/common-hal/_bleio/Descriptor.h diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.c b/ports/nordic/common-hal/_bleio/PacketBuffer.c similarity index 100% rename from ports/nrf/common-hal/_bleio/PacketBuffer.c rename to ports/nordic/common-hal/_bleio/PacketBuffer.c diff --git a/ports/nrf/common-hal/_bleio/PacketBuffer.h b/ports/nordic/common-hal/_bleio/PacketBuffer.h similarity index 100% rename from ports/nrf/common-hal/_bleio/PacketBuffer.h rename to ports/nordic/common-hal/_bleio/PacketBuffer.h diff --git a/ports/nrf/common-hal/_bleio/Service.c b/ports/nordic/common-hal/_bleio/Service.c similarity index 100% rename from ports/nrf/common-hal/_bleio/Service.c rename to ports/nordic/common-hal/_bleio/Service.c diff --git a/ports/nrf/common-hal/_bleio/Service.h b/ports/nordic/common-hal/_bleio/Service.h similarity index 100% rename from ports/nrf/common-hal/_bleio/Service.h rename to ports/nordic/common-hal/_bleio/Service.h diff --git a/ports/nrf/common-hal/_bleio/UUID.c b/ports/nordic/common-hal/_bleio/UUID.c similarity index 100% rename from ports/nrf/common-hal/_bleio/UUID.c rename to ports/nordic/common-hal/_bleio/UUID.c diff --git a/ports/nrf/common-hal/_bleio/UUID.h b/ports/nordic/common-hal/_bleio/UUID.h similarity index 100% rename from ports/nrf/common-hal/_bleio/UUID.h rename to ports/nordic/common-hal/_bleio/UUID.h diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nordic/common-hal/_bleio/__init__.c similarity index 100% rename from ports/nrf/common-hal/_bleio/__init__.c rename to ports/nordic/common-hal/_bleio/__init__.c diff --git a/ports/nrf/common-hal/_bleio/__init__.h b/ports/nordic/common-hal/_bleio/__init__.h similarity index 100% rename from ports/nrf/common-hal/_bleio/__init__.h rename to ports/nordic/common-hal/_bleio/__init__.h diff --git a/ports/nrf/common-hal/_bleio/bonding.c b/ports/nordic/common-hal/_bleio/bonding.c similarity index 100% rename from ports/nrf/common-hal/_bleio/bonding.c rename to ports/nordic/common-hal/_bleio/bonding.c diff --git a/ports/nrf/common-hal/_bleio/bonding.h b/ports/nordic/common-hal/_bleio/bonding.h similarity index 100% rename from ports/nrf/common-hal/_bleio/bonding.h rename to ports/nordic/common-hal/_bleio/bonding.h diff --git a/ports/nrf/common-hal/alarm/SleepMemory.c b/ports/nordic/common-hal/alarm/SleepMemory.c similarity index 100% rename from ports/nrf/common-hal/alarm/SleepMemory.c rename to ports/nordic/common-hal/alarm/SleepMemory.c diff --git a/ports/nrf/common-hal/alarm/SleepMemory.h b/ports/nordic/common-hal/alarm/SleepMemory.h similarity index 100% rename from ports/nrf/common-hal/alarm/SleepMemory.h rename to ports/nordic/common-hal/alarm/SleepMemory.h diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nordic/common-hal/alarm/__init__.c similarity index 99% rename from ports/nrf/common-hal/alarm/__init__.c rename to ports/nordic/common-hal/alarm/__init__.c index 8af90b19d6779..d8435a59a27ee 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nordic/common-hal/alarm/__init__.c @@ -41,8 +41,8 @@ #include "shared-bindings/time/__init__.h" #include "supervisor/port.h" -#include "supervisor/serial.h" // serial_connected() #include "supervisor/qspi_flash.h" +#include "supervisor/shared/serial.h" // serial_connected() #include "nrf.h" #include "nrf_power.h" diff --git a/ports/nrf/common-hal/alarm/__init__.h b/ports/nordic/common-hal/alarm/__init__.h similarity index 100% rename from ports/nrf/common-hal/alarm/__init__.h rename to ports/nordic/common-hal/alarm/__init__.h diff --git a/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c b/ports/nordic/common-hal/alarm/coproc/CoprocAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/coproc/CoprocAlarm.c rename to ports/nordic/common-hal/alarm/coproc/CoprocAlarm.c diff --git a/ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h b/ports/nordic/common-hal/alarm/coproc/CoprocAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/coproc/CoprocAlarm.h rename to ports/nordic/common-hal/alarm/coproc/CoprocAlarm.h diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.c b/ports/nordic/common-hal/alarm/pin/PinAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/pin/PinAlarm.c rename to ports/nordic/common-hal/alarm/pin/PinAlarm.c diff --git a/ports/nrf/common-hal/alarm/pin/PinAlarm.h b/ports/nordic/common-hal/alarm/pin/PinAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/pin/PinAlarm.h rename to ports/nordic/common-hal/alarm/pin/PinAlarm.h diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.c b/ports/nordic/common-hal/alarm/time/TimeAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/time/TimeAlarm.c rename to ports/nordic/common-hal/alarm/time/TimeAlarm.c diff --git a/ports/nrf/common-hal/alarm/time/TimeAlarm.h b/ports/nordic/common-hal/alarm/time/TimeAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/time/TimeAlarm.h rename to ports/nordic/common-hal/alarm/time/TimeAlarm.h diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.c b/ports/nordic/common-hal/alarm/touch/TouchAlarm.c similarity index 100% rename from ports/nrf/common-hal/alarm/touch/TouchAlarm.c rename to ports/nordic/common-hal/alarm/touch/TouchAlarm.c diff --git a/ports/nrf/common-hal/alarm/touch/TouchAlarm.h b/ports/nordic/common-hal/alarm/touch/TouchAlarm.h similarity index 100% rename from ports/nrf/common-hal/alarm/touch/TouchAlarm.h rename to ports/nordic/common-hal/alarm/touch/TouchAlarm.h diff --git a/ports/nrf/common-hal/analogio/AnalogIn.c b/ports/nordic/common-hal/analogio/AnalogIn.c similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogIn.c rename to ports/nordic/common-hal/analogio/AnalogIn.c diff --git a/ports/nrf/common-hal/analogio/AnalogIn.h b/ports/nordic/common-hal/analogio/AnalogIn.h similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogIn.h rename to ports/nordic/common-hal/analogio/AnalogIn.h diff --git a/ports/nrf/common-hal/analogio/AnalogOut.c b/ports/nordic/common-hal/analogio/AnalogOut.c similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogOut.c rename to ports/nordic/common-hal/analogio/AnalogOut.c diff --git a/ports/nrf/common-hal/analogio/AnalogOut.h b/ports/nordic/common-hal/analogio/AnalogOut.h similarity index 100% rename from ports/nrf/common-hal/analogio/AnalogOut.h rename to ports/nordic/common-hal/analogio/AnalogOut.h diff --git a/ports/nrf/common-hal/analogio/__init__.c b/ports/nordic/common-hal/analogio/__init__.c similarity index 100% rename from ports/nrf/common-hal/analogio/__init__.c rename to ports/nordic/common-hal/analogio/__init__.c diff --git a/ports/nrf/common-hal/audiobusio/I2SOut.c b/ports/nordic/common-hal/audiobusio/I2SOut.c similarity index 100% rename from ports/nrf/common-hal/audiobusio/I2SOut.c rename to ports/nordic/common-hal/audiobusio/I2SOut.c diff --git a/ports/nrf/common-hal/audiobusio/I2SOut.h b/ports/nordic/common-hal/audiobusio/I2SOut.h similarity index 100% rename from ports/nrf/common-hal/audiobusio/I2SOut.h rename to ports/nordic/common-hal/audiobusio/I2SOut.h diff --git a/ports/nrf/common-hal/audiobusio/PDMIn.c b/ports/nordic/common-hal/audiobusio/PDMIn.c similarity index 100% rename from ports/nrf/common-hal/audiobusio/PDMIn.c rename to ports/nordic/common-hal/audiobusio/PDMIn.c diff --git a/ports/nrf/common-hal/audiobusio/PDMIn.h b/ports/nordic/common-hal/audiobusio/PDMIn.h similarity index 100% rename from ports/nrf/common-hal/audiobusio/PDMIn.h rename to ports/nordic/common-hal/audiobusio/PDMIn.h diff --git a/ports/nrf/common-hal/rgbmatrix/__init__.c b/ports/nordic/common-hal/audiobusio/__init__.c similarity index 100% rename from ports/nrf/common-hal/rgbmatrix/__init__.c rename to ports/nordic/common-hal/audiobusio/__init__.c diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.c b/ports/nordic/common-hal/audiopwmio/PWMAudioOut.c similarity index 100% rename from ports/nrf/common-hal/audiopwmio/PWMAudioOut.c rename to ports/nordic/common-hal/audiopwmio/PWMAudioOut.c diff --git a/ports/nrf/common-hal/audiopwmio/PWMAudioOut.h b/ports/nordic/common-hal/audiopwmio/PWMAudioOut.h similarity index 100% rename from ports/nrf/common-hal/audiopwmio/PWMAudioOut.h rename to ports/nordic/common-hal/audiopwmio/PWMAudioOut.h diff --git a/ports/nrf/common-hal/rtc/__init__.c b/ports/nordic/common-hal/audiopwmio/__init__.c similarity index 100% rename from ports/nrf/common-hal/rtc/__init__.c rename to ports/nordic/common-hal/audiopwmio/__init__.c diff --git a/ports/nrf/common-hal/board/__init__.c b/ports/nordic/common-hal/board/__init__.c similarity index 100% rename from ports/nrf/common-hal/board/__init__.c rename to ports/nordic/common-hal/board/__init__.c diff --git a/ports/nrf/common-hal/busio/I2C.c b/ports/nordic/common-hal/busio/I2C.c similarity index 100% rename from ports/nrf/common-hal/busio/I2C.c rename to ports/nordic/common-hal/busio/I2C.c diff --git a/ports/nrf/common-hal/busio/I2C.h b/ports/nordic/common-hal/busio/I2C.h similarity index 100% rename from ports/nrf/common-hal/busio/I2C.h rename to ports/nordic/common-hal/busio/I2C.h diff --git a/ports/nrf/common-hal/busio/SPI.c b/ports/nordic/common-hal/busio/SPI.c similarity index 100% rename from ports/nrf/common-hal/busio/SPI.c rename to ports/nordic/common-hal/busio/SPI.c diff --git a/ports/nrf/common-hal/busio/SPI.h b/ports/nordic/common-hal/busio/SPI.h similarity index 100% rename from ports/nrf/common-hal/busio/SPI.h rename to ports/nordic/common-hal/busio/SPI.h diff --git a/ports/nrf/common-hal/busio/UART.c b/ports/nordic/common-hal/busio/UART.c similarity index 100% rename from ports/nrf/common-hal/busio/UART.c rename to ports/nordic/common-hal/busio/UART.c diff --git a/ports/nrf/common-hal/busio/UART.h b/ports/nordic/common-hal/busio/UART.h similarity index 100% rename from ports/nrf/common-hal/busio/UART.h rename to ports/nordic/common-hal/busio/UART.h diff --git a/ports/nrf/common-hal/busio/__init__.c b/ports/nordic/common-hal/busio/__init__.c similarity index 100% rename from ports/nrf/common-hal/busio/__init__.c rename to ports/nordic/common-hal/busio/__init__.c diff --git a/ports/nrf/common-hal/countio/Counter.c b/ports/nordic/common-hal/countio/Counter.c similarity index 100% rename from ports/nrf/common-hal/countio/Counter.c rename to ports/nordic/common-hal/countio/Counter.c diff --git a/ports/nrf/common-hal/countio/Counter.h b/ports/nordic/common-hal/countio/Counter.h similarity index 100% rename from ports/nrf/common-hal/countio/Counter.h rename to ports/nordic/common-hal/countio/Counter.h diff --git a/ports/nrf/common-hal/countio/__init__.c b/ports/nordic/common-hal/countio/__init__.c similarity index 100% rename from ports/nrf/common-hal/countio/__init__.c rename to ports/nordic/common-hal/countio/__init__.c diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.c b/ports/nordic/common-hal/digitalio/DigitalInOut.c similarity index 100% rename from ports/nrf/common-hal/digitalio/DigitalInOut.c rename to ports/nordic/common-hal/digitalio/DigitalInOut.c diff --git a/ports/nrf/common-hal/digitalio/DigitalInOut.h b/ports/nordic/common-hal/digitalio/DigitalInOut.h similarity index 100% rename from ports/nrf/common-hal/digitalio/DigitalInOut.h rename to ports/nordic/common-hal/digitalio/DigitalInOut.h diff --git a/ports/nrf/common-hal/digitalio/__init__.c b/ports/nordic/common-hal/digitalio/__init__.c similarity index 100% rename from ports/nrf/common-hal/digitalio/__init__.c rename to ports/nordic/common-hal/digitalio/__init__.c diff --git a/ports/nrf/common-hal/memorymap/AddressRange.c b/ports/nordic/common-hal/memorymap/AddressRange.c similarity index 100% rename from ports/nrf/common-hal/memorymap/AddressRange.c rename to ports/nordic/common-hal/memorymap/AddressRange.c diff --git a/ports/nrf/common-hal/memorymap/AddressRange.h b/ports/nordic/common-hal/memorymap/AddressRange.h similarity index 100% rename from ports/nrf/common-hal/memorymap/AddressRange.h rename to ports/nordic/common-hal/memorymap/AddressRange.h diff --git a/ports/nrf/common-hal/memorymap/__init__.c b/ports/nordic/common-hal/memorymap/__init__.c similarity index 100% rename from ports/nrf/common-hal/memorymap/__init__.c rename to ports/nordic/common-hal/memorymap/__init__.c diff --git a/ports/nrf/common-hal/microcontroller/Pin.c b/ports/nordic/common-hal/microcontroller/Pin.c similarity index 100% rename from ports/nrf/common-hal/microcontroller/Pin.c rename to ports/nordic/common-hal/microcontroller/Pin.c diff --git a/ports/nrf/common-hal/microcontroller/Pin.h b/ports/nordic/common-hal/microcontroller/Pin.h similarity index 100% rename from ports/nrf/common-hal/microcontroller/Pin.h rename to ports/nordic/common-hal/microcontroller/Pin.h diff --git a/ports/nrf/common-hal/microcontroller/Processor.c b/ports/nordic/common-hal/microcontroller/Processor.c similarity index 100% rename from ports/nrf/common-hal/microcontroller/Processor.c rename to ports/nordic/common-hal/microcontroller/Processor.c diff --git a/ports/nrf/common-hal/microcontroller/Processor.h b/ports/nordic/common-hal/microcontroller/Processor.h similarity index 100% rename from ports/nrf/common-hal/microcontroller/Processor.h rename to ports/nordic/common-hal/microcontroller/Processor.h diff --git a/ports/nrf/common-hal/microcontroller/__init__.c b/ports/nordic/common-hal/microcontroller/__init__.c similarity index 100% rename from ports/nrf/common-hal/microcontroller/__init__.c rename to ports/nordic/common-hal/microcontroller/__init__.c diff --git a/ports/nrf/common-hal/neopixel_write/__init__.c b/ports/nordic/common-hal/neopixel_write/__init__.c similarity index 100% rename from ports/nrf/common-hal/neopixel_write/__init__.c rename to ports/nordic/common-hal/neopixel_write/__init__.c diff --git a/ports/nrf/common-hal/neopixel_write/__init__.h b/ports/nordic/common-hal/neopixel_write/__init__.h similarity index 100% rename from ports/nrf/common-hal/neopixel_write/__init__.h rename to ports/nordic/common-hal/neopixel_write/__init__.h diff --git a/ports/nrf/common-hal/nvm/ByteArray.c b/ports/nordic/common-hal/nvm/ByteArray.c similarity index 100% rename from ports/nrf/common-hal/nvm/ByteArray.c rename to ports/nordic/common-hal/nvm/ByteArray.c diff --git a/ports/nrf/common-hal/nvm/ByteArray.h b/ports/nordic/common-hal/nvm/ByteArray.h similarity index 100% rename from ports/nrf/common-hal/nvm/ByteArray.h rename to ports/nordic/common-hal/nvm/ByteArray.h diff --git a/ports/nrf/common-hal/nvm/__init__.c b/ports/nordic/common-hal/nvm/__init__.c similarity index 100% rename from ports/nrf/common-hal/nvm/__init__.c rename to ports/nordic/common-hal/nvm/__init__.c diff --git a/ports/nrf/common-hal/os/__init__.c b/ports/nordic/common-hal/os/__init__.c similarity index 100% rename from ports/nrf/common-hal/os/__init__.c rename to ports/nordic/common-hal/os/__init__.c diff --git a/ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c b/ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c similarity index 100% rename from ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c rename to ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c diff --git a/ports/nrf/common-hal/paralleldisplaybus/ParallelBus.h b/ports/nordic/common-hal/paralleldisplaybus/ParallelBus.h similarity index 100% rename from ports/nrf/common-hal/paralleldisplaybus/ParallelBus.h rename to ports/nordic/common-hal/paralleldisplaybus/ParallelBus.h diff --git a/ports/nrf/common-hal/pulseio/PulseIn.c b/ports/nordic/common-hal/pulseio/PulseIn.c similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseIn.c rename to ports/nordic/common-hal/pulseio/PulseIn.c diff --git a/ports/nrf/common-hal/pulseio/PulseIn.h b/ports/nordic/common-hal/pulseio/PulseIn.h similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseIn.h rename to ports/nordic/common-hal/pulseio/PulseIn.h diff --git a/ports/nrf/common-hal/pulseio/PulseOut.c b/ports/nordic/common-hal/pulseio/PulseOut.c similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseOut.c rename to ports/nordic/common-hal/pulseio/PulseOut.c diff --git a/ports/nrf/common-hal/pulseio/PulseOut.h b/ports/nordic/common-hal/pulseio/PulseOut.h similarity index 100% rename from ports/nrf/common-hal/pulseio/PulseOut.h rename to ports/nordic/common-hal/pulseio/PulseOut.h diff --git a/ports/nrf/common-hal/pulseio/__init__.c b/ports/nordic/common-hal/pulseio/__init__.c similarity index 100% rename from ports/nrf/common-hal/pulseio/__init__.c rename to ports/nordic/common-hal/pulseio/__init__.c diff --git a/ports/nrf/common-hal/pwmio/PWMOut.c b/ports/nordic/common-hal/pwmio/PWMOut.c similarity index 100% rename from ports/nrf/common-hal/pwmio/PWMOut.c rename to ports/nordic/common-hal/pwmio/PWMOut.c diff --git a/ports/nrf/common-hal/pwmio/PWMOut.h b/ports/nordic/common-hal/pwmio/PWMOut.h similarity index 100% rename from ports/nrf/common-hal/pwmio/PWMOut.h rename to ports/nordic/common-hal/pwmio/PWMOut.h diff --git a/ports/nrf/common-hal/pwmio/__init__.c b/ports/nordic/common-hal/pwmio/__init__.c similarity index 100% rename from ports/nrf/common-hal/pwmio/__init__.c rename to ports/nordic/common-hal/pwmio/__init__.c diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.c b/ports/nordic/common-hal/rgbmatrix/RGBMatrix.c similarity index 100% rename from ports/nrf/common-hal/rgbmatrix/RGBMatrix.c rename to ports/nordic/common-hal/rgbmatrix/RGBMatrix.c diff --git a/ports/nrf/common-hal/rgbmatrix/RGBMatrix.h b/ports/nordic/common-hal/rgbmatrix/RGBMatrix.h similarity index 100% rename from ports/nrf/common-hal/rgbmatrix/RGBMatrix.h rename to ports/nordic/common-hal/rgbmatrix/RGBMatrix.h diff --git a/ports/nrf/common-hal/watchdog/WatchDogMode.c b/ports/nordic/common-hal/rgbmatrix/__init__.c similarity index 100% rename from ports/nrf/common-hal/watchdog/WatchDogMode.c rename to ports/nordic/common-hal/rgbmatrix/__init__.c diff --git a/ports/nrf/common-hal/rotaryio/IncrementalEncoder.c b/ports/nordic/common-hal/rotaryio/IncrementalEncoder.c similarity index 100% rename from ports/nrf/common-hal/rotaryio/IncrementalEncoder.c rename to ports/nordic/common-hal/rotaryio/IncrementalEncoder.c diff --git a/ports/nrf/common-hal/rotaryio/IncrementalEncoder.h b/ports/nordic/common-hal/rotaryio/IncrementalEncoder.h similarity index 100% rename from ports/nrf/common-hal/rotaryio/IncrementalEncoder.h rename to ports/nordic/common-hal/rotaryio/IncrementalEncoder.h diff --git a/ports/nrf/common-hal/rotaryio/__init__.c b/ports/nordic/common-hal/rotaryio/__init__.c similarity index 100% rename from ports/nrf/common-hal/rotaryio/__init__.c rename to ports/nordic/common-hal/rotaryio/__init__.c diff --git a/ports/nrf/common-hal/rtc/RTC.c b/ports/nordic/common-hal/rtc/RTC.c similarity index 100% rename from ports/nrf/common-hal/rtc/RTC.c rename to ports/nordic/common-hal/rtc/RTC.c diff --git a/ports/nrf/common-hal/rtc/RTC.h b/ports/nordic/common-hal/rtc/RTC.h similarity index 100% rename from ports/nrf/common-hal/rtc/RTC.h rename to ports/nordic/common-hal/rtc/RTC.h diff --git a/ports/nordic/common-hal/rtc/__init__.c b/ports/nordic/common-hal/rtc/__init__.c new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/ports/nordic/common-hal/watchdog/WatchDogMode.c b/ports/nordic/common-hal/watchdog/WatchDogMode.c new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.c b/ports/nordic/common-hal/watchdog/WatchDogTimer.c similarity index 100% rename from ports/nrf/common-hal/watchdog/WatchDogTimer.c rename to ports/nordic/common-hal/watchdog/WatchDogTimer.c diff --git a/ports/nrf/common-hal/watchdog/WatchDogTimer.h b/ports/nordic/common-hal/watchdog/WatchDogTimer.h similarity index 100% rename from ports/nrf/common-hal/watchdog/WatchDogTimer.h rename to ports/nordic/common-hal/watchdog/WatchDogTimer.h diff --git a/ports/nrf/common-hal/watchdog/__init__.c b/ports/nordic/common-hal/watchdog/__init__.c similarity index 100% rename from ports/nrf/common-hal/watchdog/__init__.c rename to ports/nordic/common-hal/watchdog/__init__.c diff --git a/ports/nrf/common-hal/watchdog/__init__.h b/ports/nordic/common-hal/watchdog/__init__.h similarity index 100% rename from ports/nrf/common-hal/watchdog/__init__.h rename to ports/nordic/common-hal/watchdog/__init__.h diff --git a/ports/nrf/device/nrf52/startup_nrf52.c b/ports/nordic/device/nrf52/startup_nrf52.c similarity index 100% rename from ports/nrf/device/nrf52/startup_nrf52.c rename to ports/nordic/device/nrf52/startup_nrf52.c diff --git a/ports/nrf/device/nrf52/startup_nrf52833.c b/ports/nordic/device/nrf52/startup_nrf52833.c similarity index 100% rename from ports/nrf/device/nrf52/startup_nrf52833.c rename to ports/nordic/device/nrf52/startup_nrf52833.c diff --git a/ports/nrf/device/nrf52/startup_nrf52840.c b/ports/nordic/device/nrf52/startup_nrf52840.c similarity index 100% rename from ports/nrf/device/nrf52/startup_nrf52840.c rename to ports/nordic/device/nrf52/startup_nrf52840.c diff --git a/ports/nrf/espruino_dfu_private_key.pem b/ports/nordic/espruino_dfu_private_key.pem similarity index 100% rename from ports/nrf/espruino_dfu_private_key.pem rename to ports/nordic/espruino_dfu_private_key.pem diff --git a/ports/nrf/freeze/test.py b/ports/nordic/freeze/test.py similarity index 100% rename from ports/nrf/freeze/test.py rename to ports/nordic/freeze/test.py diff --git a/ports/nrf/gccollect.c b/ports/nordic/gccollect.c similarity index 100% rename from ports/nrf/gccollect.c rename to ports/nordic/gccollect.c diff --git a/ports/nrf/ld_defines.c b/ports/nordic/ld_defines.c similarity index 100% rename from ports/nrf/ld_defines.c rename to ports/nordic/ld_defines.c diff --git a/ports/nrf/mpconfigport.h b/ports/nordic/mpconfigport.h similarity index 100% rename from ports/nrf/mpconfigport.h rename to ports/nordic/mpconfigport.h diff --git a/ports/nrf/mpconfigport.mk b/ports/nordic/mpconfigport.mk similarity index 100% rename from ports/nrf/mpconfigport.mk rename to ports/nordic/mpconfigport.mk diff --git a/ports/nrf/mphalport.h b/ports/nordic/mphalport.h similarity index 100% rename from ports/nrf/mphalport.h rename to ports/nordic/mphalport.h diff --git a/ports/nrf/nrfx b/ports/nordic/nrfx similarity index 100% rename from ports/nrf/nrfx rename to ports/nordic/nrfx diff --git a/ports/nrf/nrfx_config.h b/ports/nordic/nrfx_config.h similarity index 100% rename from ports/nrf/nrfx_config.h rename to ports/nordic/nrfx_config.h diff --git a/ports/nrf/nrfx_glue.h b/ports/nordic/nrfx_glue.h similarity index 100% rename from ports/nrf/nrfx_glue.h rename to ports/nordic/nrfx_glue.h diff --git a/ports/nrf/nrfx_log.h b/ports/nordic/nrfx_log.h similarity index 100% rename from ports/nrf/nrfx_log.h rename to ports/nordic/nrfx_log.h diff --git a/ports/nrf/peripherals/nrf/cache.c b/ports/nordic/peripherals/nrf/cache.c similarity index 100% rename from ports/nrf/peripherals/nrf/cache.c rename to ports/nordic/peripherals/nrf/cache.c diff --git a/ports/nrf/peripherals/nrf/cache.h b/ports/nordic/peripherals/nrf/cache.h similarity index 100% rename from ports/nrf/peripherals/nrf/cache.h rename to ports/nordic/peripherals/nrf/cache.h diff --git a/ports/nrf/peripherals/nrf/clocks.c b/ports/nordic/peripherals/nrf/clocks.c similarity index 100% rename from ports/nrf/peripherals/nrf/clocks.c rename to ports/nordic/peripherals/nrf/clocks.c diff --git a/ports/nrf/peripherals/nrf/clocks.h b/ports/nordic/peripherals/nrf/clocks.h similarity index 100% rename from ports/nrf/peripherals/nrf/clocks.h rename to ports/nordic/peripherals/nrf/clocks.h diff --git a/ports/nrf/peripherals/nrf/nrf52833/pins.c b/ports/nordic/peripherals/nrf/nrf52833/pins.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52833/pins.c rename to ports/nordic/peripherals/nrf/nrf52833/pins.c diff --git a/ports/nrf/peripherals/nrf/nrf52833/pins.h b/ports/nordic/peripherals/nrf/nrf52833/pins.h similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52833/pins.h rename to ports/nordic/peripherals/nrf/nrf52833/pins.h diff --git a/ports/nrf/peripherals/nrf/nrf52833/power.c b/ports/nordic/peripherals/nrf/nrf52833/power.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52833/power.c rename to ports/nordic/peripherals/nrf/nrf52833/power.c diff --git a/ports/nrf/peripherals/nrf/nrf52840/pins.c b/ports/nordic/peripherals/nrf/nrf52840/pins.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52840/pins.c rename to ports/nordic/peripherals/nrf/nrf52840/pins.c diff --git a/ports/nrf/peripherals/nrf/nrf52840/pins.h b/ports/nordic/peripherals/nrf/nrf52840/pins.h similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52840/pins.h rename to ports/nordic/peripherals/nrf/nrf52840/pins.h diff --git a/ports/nrf/peripherals/nrf/nrf52840/power.c b/ports/nordic/peripherals/nrf/nrf52840/power.c similarity index 100% rename from ports/nrf/peripherals/nrf/nrf52840/power.c rename to ports/nordic/peripherals/nrf/nrf52840/power.c diff --git a/ports/nrf/peripherals/nrf/nvm.c b/ports/nordic/peripherals/nrf/nvm.c similarity index 100% rename from ports/nrf/peripherals/nrf/nvm.c rename to ports/nordic/peripherals/nrf/nvm.c diff --git a/ports/nrf/peripherals/nrf/nvm.h b/ports/nordic/peripherals/nrf/nvm.h similarity index 100% rename from ports/nrf/peripherals/nrf/nvm.h rename to ports/nordic/peripherals/nrf/nvm.h diff --git a/ports/nrf/peripherals/nrf/pins.h b/ports/nordic/peripherals/nrf/pins.h similarity index 100% rename from ports/nrf/peripherals/nrf/pins.h rename to ports/nordic/peripherals/nrf/pins.h diff --git a/ports/nrf/peripherals/nrf/power.h b/ports/nordic/peripherals/nrf/power.h similarity index 100% rename from ports/nrf/peripherals/nrf/power.h rename to ports/nordic/peripherals/nrf/power.h diff --git a/ports/nrf/peripherals/nrf/timers.c b/ports/nordic/peripherals/nrf/timers.c similarity index 100% rename from ports/nrf/peripherals/nrf/timers.c rename to ports/nordic/peripherals/nrf/timers.c diff --git a/ports/nrf/peripherals/nrf/timers.h b/ports/nordic/peripherals/nrf/timers.h similarity index 100% rename from ports/nrf/peripherals/nrf/timers.h rename to ports/nordic/peripherals/nrf/timers.h diff --git a/ports/nrf/qstrdefsport.h b/ports/nordic/qstrdefsport.h similarity index 100% rename from ports/nrf/qstrdefsport.h rename to ports/nordic/qstrdefsport.h diff --git a/ports/nrf/sd_mutex.c b/ports/nordic/sd_mutex.c similarity index 100% rename from ports/nrf/sd_mutex.c rename to ports/nordic/sd_mutex.c diff --git a/ports/nrf/sd_mutex.h b/ports/nordic/sd_mutex.h similarity index 100% rename from ports/nrf/sd_mutex.h rename to ports/nordic/sd_mutex.h diff --git a/ports/nrf/supervisor/cpu.s b/ports/nordic/supervisor/cpu.s similarity index 100% rename from ports/nrf/supervisor/cpu.s rename to ports/nordic/supervisor/cpu.s diff --git a/ports/nrf/supervisor/internal_flash.c b/ports/nordic/supervisor/internal_flash.c similarity index 100% rename from ports/nrf/supervisor/internal_flash.c rename to ports/nordic/supervisor/internal_flash.c diff --git a/ports/nrf/supervisor/internal_flash.h b/ports/nordic/supervisor/internal_flash.h similarity index 100% rename from ports/nrf/supervisor/internal_flash.h rename to ports/nordic/supervisor/internal_flash.h diff --git a/ports/nrf/supervisor/port.c b/ports/nordic/supervisor/port.c similarity index 100% rename from ports/nrf/supervisor/port.c rename to ports/nordic/supervisor/port.c diff --git a/ports/nrf/supervisor/qspi_flash.c b/ports/nordic/supervisor/qspi_flash.c similarity index 100% rename from ports/nrf/supervisor/qspi_flash.c rename to ports/nordic/supervisor/qspi_flash.c diff --git a/ports/nrf/supervisor/qspi_flash.h b/ports/nordic/supervisor/qspi_flash.h similarity index 100% rename from ports/nrf/supervisor/qspi_flash.h rename to ports/nordic/supervisor/qspi_flash.h diff --git a/ports/nrf/supervisor/usb.c b/ports/nordic/supervisor/usb.c similarity index 100% rename from ports/nrf/supervisor/usb.c rename to ports/nordic/supervisor/usb.c diff --git a/ports/nrf/boards/electronut_labs_blip/README.md b/ports/nrf/boards/electronut_labs_blip/README.md deleted file mode 100644 index c34ef16f8ddba..0000000000000 --- a/ports/nrf/boards/electronut_labs_blip/README.md +++ /dev/null @@ -1,67 +0,0 @@ -# Setup - -The `Electronut Labs Blip` board is a development board based on the `nRF52840` SoC from -Nordic Semiconductors. It has a Black Magic Probe compatible programmer and debugger -built in, along with temperature/humidity sensor, ambient light intensity sensor, and -a 3-axis accelerometer. It can be used to prototype very low power devices. It also has -provision for an SD card slot, which makes it a complete and versatile development board. - -Schematic, datasheet, pin mapping etc. can be found over [here](https://docs.electronut.in/blip/). - -Features: - -* Raytac MDBT50Q-1M module based on Nordic Semiconductor's nRF52840 -* LIS2DDH12 High-performance 3-axis "femto" accelerometer -* Optical Sensor LTR-329ALS-01 -* Si7006-A20 I2C humidity and temperature sensor -* On board STM32F103CBT6 as Black magic probe debugger -* NFC Antenna -* MicroSD slot -* Power Supply: USB, JST connector for Li-ion/Li-po -* BQ24079 battery charging and power management IC - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -## Building and Flashing CircuitPython - -No special notes for this, follow `ports/nrf` generic `README.md`. - -### Flashing CircuitPython with GDB using on board Black magic probe debugger - -``` -$ cd ports/nrf -$ make V=1 SD=s140 SERIAL=/dev/ttyACM0 BOARD=electronut_labs_blip all -... -... -LINK build-electronut_labs_blip-s140/firmware.elf - -778588 bytes free in flash out of 1048576 bytes ( 1024.0 kb ). -228320 bytes free in ram for stack out of 245760 bytes ( 240.0 kb ). - -Create build-electronut_labs_blip-s140/firmware.bin -Create build-electronut_labs_blip-s140/firmware.hex -Create build-electronut_labs_blip-s140/firmware.uf2 -python3 ../../tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "build-electronut_labs_blip-s140/firmware.uf2" build-electronut_labs_blip-s140/firmware.hex -Converting to uf2, output size: 540160, start address: 0x26000 -Wrote 540160 bytes to build-electronut_labs_blip-s140/firmware.uf2. -``` - -Now you can use either `.hex` or `.elf` from the generated files inside -`build-electronut_labs_blip-s140` directory. Now you can use `arm-none-eabi-gdb` -to flash circuitpython on Blip. - -### Other tips - -Once circuitpython is running on your board, it will come up as a mass storage -device named `CIRCUITPY`, where you can drop in your python code. The file names -it looks for are `main.py`, `main.txt`, `code.py` or `code.txt`. diff --git a/ports/nrf/boards/electronut_labs_papyr/README.md b/ports/nrf/boards/electronut_labs_papyr/README.md deleted file mode 100644 index 7e5c43cc872d9..0000000000000 --- a/ports/nrf/boards/electronut_labs_papyr/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# Setup - -The `Electronut Labs Papyr` board is based on the `nRF52840` SoC from -Nordic Semiconductors. It has an e-ink display on it, along with a CR2477 -battery holder. - -Papyr can be programmed with the [`Adafruit nRF52 bootloader`](https://github.com/adafruit/Adafruit_nRF52_Bootloader) to - -Schematic, datasheet default pin mapping etc. can be found over [here](https://docs.electronut.in/papyr/). The default pin mapping can be found in the board directory. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -## Installing the Bootloader - -If the `Adafruit nRF52 bootloader` is installed on the board, then the -bootloader allows you to update the core CircuitPython firmware and internal -file system contents using serial, or USB CDC, or USB mass storage. - -On empty devices, the bootloader will need to be flashed once using a -HW debugger such as a Segger J-Link, or Blackmagicprobe -(or [Electronut labs Bumpy](https://docs.electronut.in/bumpy/)). - - -## Building and Flashing CircuitPython - -No special notes for this, follow `ports/nrf` generic `README.md`. - -### Flashing CircuitPython with MSC UF2 - -`uf2` file is generated last by `all` target. - -``` -$ cd ports/nrf -$ make V=1 SD=s140 SERIAL=/dev/ttyACM0 BOARD=electronut_labs_papyr all -... -... -python3 ../../tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "build-electronut_labs_papyr-s140/firmware.uf2" build-electronut_labs_papyr-s140/firmware.hex -Converting to uf2, output size: 536576, start address: 0x26000 -Wrote 536576 bytes to build-electronut_labs_papyr-s140/firmware.uf2 -``` - -Simply drag and drop firmware.uf2 to the MSC, the nrf52840 will blink fast and reset after done. - -### Other tips - -Once circuitpython is running on your board, it will come up as a mass storage -device named `CIRCUITPY`, where you can drop in your python code. The file names -it looks for are `main.py`, `main.txt`, `code.py` or `code.txt`. diff --git a/ports/nrf/boards/feather_nrf52840_express/README.md b/ports/nrf/boards/feather_nrf52840_express/README.md deleted file mode 100644 index 88a78a20fd911..0000000000000 --- a/ports/nrf/boards/feather_nrf52840_express/README.md +++ /dev/null @@ -1,201 +0,0 @@ -# Setup - -The `feather52840` board is currently based on the `PCA10056` development -board from Nordic Semiconductors, since commercial modules are not yet -available for the nRF52840. - -The difference between the `pca10056` and `feather52840` board support -packages is that no bootloader is present on the `pca10056` (a HW debugger -like a Segger J-Link is required to flash firmware images), whereas the -`feather52840` package uses a serial bootloader, with a slightly different -flash layout to account for the bootloader's presence. - -Both targets run on the same hardware and assume the same pinouts. - -The `feather52840` board support package will be updated at a later date -to reflect any pin changes in the final Feather form-factor HW. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -You then need to download the SD and Nordic SDK files via: - -> This script relies on `wget`, which must be available from the command line. - -``` -$ cd ports/nrf -$ ./bluetooth/download_ble_stack.sh -``` - -## Installing the Serial Bootloader - -The Adafruit nRF52840 Feather uses a serial bootloader that allows you to -update the core CircuitPython firmware and internal file system contents -using only a serial connection. - -On empty devices, the serial bootloader will need to be flashed once using a -HW debugger such as a Segger J-Link before the serial updater (`adafruit-nrfutil`) can -be used. - -### Install `nrfjprog` - -Before you can install the bootloader, you will first need to install the -`nrfjprog` tool from Nordic Semiconductors for your operating system. The -binary files can be downloaded via the following links: - -- [nRF5x toolset tar for Linux 32-bit v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-Linux32/52619) -- [nRF5x toolset tar for Linux 64-bit v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-Linux64/51388) -- [nRF5x toolset tar for OSX v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-OSX/53406) -- [nRF5x toolset installer for Windows v9.7.2](http://www.nordicsemi.com/eng/nordic/Products/nRF52832/nRF5x-Command-Line-Tools-Win32/48768) - -You will then need to add the `nrfjprog` folder to your system `PATH` variable -so that it is available from the command line. The exact process for this is -OS specific, but on a POSIX type system like OS X or Linux, you can -temporarily add the location to your `PATH` environment variables as follows: - -``` -$ export PATH=$PATH:YOURPATHHERE/nRF5x-Command-Line-Tools_9_7_2_OSX/nrfjprog/ -``` - -You can test this by running the following command: - -``` -$ nrfjprog --version -nrfjprog version: 9.7.2 -JLinkARM.dll version: 6.20f -``` - -### Flash the USB CDC Bootloader with 'nrfjprog' - -> This operation only needs to be done once, and only on boards that don't - already have the serial bootloader installed. - -Firstly clone the [Adafruit_nRF52_Bootloader](https://github.com/adafruit/Adafruit_nRF52_Bootloader.git) and enter its directory - -``` -$ git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader.git -$ cd Adafruit_nRF52_Bootloader -``` - -Once `nrfjprog` is installed and available in `PATH` you can flash your -board with the serial bootloader via the following command: - -``` -make BOARD=feather_nrf52840_express VERSION=latest flash -``` - -This should give you the following (or very similar) output, and you will see -a DFU blinky pattern on one of the board LEDs: - -``` -$ make BOARD=pca10056 VERSION=latest flash -Flashing: bin/pca10056/6.0.0r0/pca10056_bootloader_s140_6.0.0r0.hex -nrfjprog --program bin/pca10056/6.0.0r0/pca10056_bootloader_s140_6.0.0r0.hex --chiperase -f nrf52 --reset -Parsing hex file. -Erasing user available code and UICR flash areas. -Applying system reset. -Checking that the area to write is not protected. -Programming device. -Applying system reset. -Run. -``` - -From this point onward, you can now use a simple serial port for firmware -updates. - -Note: You can specify other version that are available in the directory `Adafruit_nRF52_Bootloader/bin/feather_nrf52840_express/` . The `VERSION=latest` will use the latest bootloader available. - -### IMPORTANT: Disable Mass Storage on PCA10056 J-Link - -The J-Link firmware on the PCA10056 implement USB Mass Storage, but this -causes a known conflict with reliable USB CDC serial port communication. In -order to use the serial bootloader, **you must disable MSD support on the -Segger J-Link**! - -To disable mass storage support, run the `JLinkExe` (or equivalent) command, -and send `MSDDisable`. (You can re-enable MSD support via `MSDEnable`): - -``` -$ JLinkExe -SEGGER J-Link Commander V6.20f (Compiled Oct 13 2017 17:20:01) -DLL version V6.20f, compiled Oct 13 2017 17:19:52 - -Connecting to J-Link via USB...O.K. -Firmware: J-Link OB-SAM3U128-V2-NordicSemi compiled Jul 24 2017 17:30:12 -Hardware version: V1.00 -S/N: 683947110 -VTref = 3.300V - - -Type "connect" to establish a target connection, '?' for help -J-Link>MSDDisable -Probe configured successfully. -J-Link>exit -``` - -## Building and Flashing CircuitPython - -### Installing `adafruit-nrfutil` - -run follow command to install [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) from PyPi - -``` -$ pip3 install adafruit-nrfutil --user -``` - -### Flashing CircuitPython with USB CDC - -With the serial bootloader present on your board, you first need to force your -board into DFU mode by holding down BUTTON1 and RESETTING the board (with -BUTTON1 still pressed as you come out of reset). - -This will give you a **fast blinky DFU pattern** to indicate you are in DFU -mode. - -You can **build and flash** a CircuitPython binary via the following command: - -``` -$ make V=1 SD=s140 SERIAL=/dev/tty.usbmodem1411 BOARD=feather52840 all dfu-gen dfu-flash -``` - -This should give you the following results: - -``` -$make V=1 BOARD=feather52840 SD=s140 SERIAL=/dev/tty.usbmodem1411 dfu-gen dfu-flash -nrfutil dfu genpkg --sd-req 0xFFFE --dev-type 0x0052 --application build-feather52840-s140/firmware.hex build-feather52840-s140/dfu-package.zip -Zip created at build-feather52840-s140/dfu-package.zip -nrfutil --verbose dfu serial --package build-feather52840-s140/dfu-package.zip -p /dev/ttyACM1 -b 115200 --singlebank -Upgrading target on /dev/ttyACM1 with DFU package /home/hathach/Dropbox/adafruit/circuitpython/ada_cp/ports/nrf/build-feather52840-s140/dfu-package.zip. Flow control is disabled, Single bank mode -Starting DFU upgrade of type 4, SoftDevice size: 0, bootloader size: 0, application size: 199840 -Sending DFU start packet -Sending DFU init packet -Sending firmware file -######################################################################################################################################################################################################################################################################################################################################################################################################### -Activating new firmware - -DFU upgrade took 8.50606513023s -Device programmed. -``` - -### Flashing CircuitPython with MSC UF2 - -uf2 file is generated last by `all` target - -``` -$ make V=1 SD=s140 SERIAL=/dev/tty.usbmodem1411 BOARD=feather52840 all -Create firmware.uf2 -../../tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "build-feather52840-s140/firmware.uf2" "build-feather52840-s140/firmware.hex" -Converting to uf2, output size: 392192, start address: 0x26000 -Wrote 392192 bytes to build-feather52840-s140/firmware.uf2. -``` - -Simply drag and drop firmware.uf2 to the MSC, the nrf52840 will blink fast and reset after done. diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk/README.md b/ports/nrf/boards/makerdiary_nrf52840_mdk/README.md deleted file mode 100644 index f1ba8151ac719..0000000000000 --- a/ports/nrf/boards/makerdiary_nrf52840_mdk/README.md +++ /dev/null @@ -1,102 +0,0 @@ -# MakerDiary NRF52840 MDK - -Refer to https://github.com/makerdiary/nrf52840-mdk or -https://wiki.makerdiary.com/nrf52840-mdk/ for more details about the device. - -Notably, CircuitPython does not currently support QSPI external flash on NRF -devices, so neither does this port - the 64Mb flash device is not used for -anything. Also, don't confuse this with the 64MiB drive that shows up on your -computer - it's actually part of the MSC driver provided by the DAPLink -debugger, and is inaccessible at all from Python land (this drive is where you -can copy `firmware.hex` if you'd prefer to flash that way as opposed to with -`pyocd`. You'll still have access to 256KB of the onboard flash, however, for -storing your Python files, cat pictures, or whatever. - -It's also interesting to note that all three LEDs and the "user button" on this -device are wired through sinks, not sources, so flip your boolean expectations -when dealing with `digitalio.DigitalInOut` on this device - `my_led.value = -True` turns the LED off! Likewise, the user button will read `False` when -pressed. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -You then need to download the SD and Nordic SDK files via: - -> This script relies on `wget`, which must be available from the command line. - -``` -$ cd ports/nrf -$ ./drivers/bluetooth/download_ble_stack.sh -``` - -## Note about bootloaders - -While most Adafruit devices come with (or can easily be flashed with) an -Adafruit-provided bootloader (supporting niceties like UF2 flashing), this -board comes with DAPLink which (apparently?) handles everything from debugging -to programming the device, as well as the boot sequence. What's particularly -awesome about this board is that there is no physical interaction with the board -required to flash new code (read: CircuitPython builds) - the device is _always_ -listening for new firmware uploads (via `pyocd-flashtool`), even if userspace -code is running. - -## Building and Flashing CircuitPython - -You'll need to have [pyocd](https://github.com/mbedmicro/pyOCD) installed as -appropriate for your system. - -```sh -make BOARD=makerdiary_nrf52840_mdk FLASHER=pyocd SD=s140 flash -``` - -This should give you the following (or very similar) output, and you will see -a DFU blinky pattern on one of the board LEDs: - -``` -$ make BOARD=makerdiary_nrf52840_mdk FLASHER=pyocd SD=s140 flash -Use make V=1, make V=2 or set BUILD_VERBOSE similarly in your environment to increase build verbosity. -pyocd-flashtool -t nrf52 build-makerdiary_nrf52840_mdk-s140/firmware.hex --sector_erase -INFO:root:DAP SWD MODE initialised -INFO:root:ROM table #0 @ 0xe00ff000 cidr=b105100d pidr=2002c4008 -INFO:root:[0] -WARNING:root:Invalid coresight component, cidr=0x0 -INFO:root:[1] -INFO:root:[2] -WARNING:root:Invalid coresight component, cidr=0x1010101 -INFO:root:[3] -WARNING:root:Invalid coresight component, cidr=0x0 -INFO:root:[4] -INFO:root:[5] -INFO:root:CPU core is Cortex-M4 -INFO:root:FPU present -INFO:root:6 hardware breakpoints, 4 literal comparators -INFO:root:4 hardware watchpoints -[====================] 100% -INFO:root:Programmed 237568 bytes (58 pages) at 14.28 kB/s -#pyocd-tool -t nrf52 erase 0xFF000 -pyocd-tool -t nrf52 write32 0xFF000 0x00000001 -WARNING:root:Invalid coresight component, cidr=0x0 -WARNING:root:Invalid coresight component, cidr=0x1010101 -WARNING:root:Invalid coresight component, cidr=0x0 -pyocd-tool -t nrf52 reset -WARNING:root:Invalid coresight component, cidr=0x0 -WARNING:root:Invalid coresight component, cidr=0x1010101 -WARNING:root:Invalid coresight component, cidr=0x0 -Resetting target -``` - -Alternatively (and untested by me), it's apparently possible to copy -`firmware.hex` to the MSC device provided by DAPLink and flash that way. Refer -to [the upstream -documentation](https://wiki.makerdiary.com/nrf52840-mdk/getting-started/#drag-n-drop-programming) -for details. diff --git a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/README.md b/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/README.md deleted file mode 100644 index e3e50f905dca0..0000000000000 --- a/ports/nrf/boards/makerdiary_nrf52840_mdk_usb_dongle/README.md +++ /dev/null @@ -1,96 +0,0 @@ -# MakerDiary NRF52840 MDK USB Dongle - -Refer to [The makerdiary Github repo](https://github.com/makerdiary/nrf52840-mdk-usb-dongle) -or [The nrf52840-mdk-usb-dongle wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/) -for more details about the device. - -This is pretty much just the nRF52840 with a useful number of pins exposed for -your pleasure along with one RGB LED and an onboard antenna in a USB stick form -factor with room for headers on the sides. - -Note that all three LEDs on this device are wired through sinks, not sources, -so flip your boolean expectations when dealing with `DigitalInOut` or `PWMOut` -on this device -- -`led.value = True` or `led.duty_cycle = 0xffff` turns the LED off! - -The onboard button is hard wired to the Reset pin so you cannot use it yourself. - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - -## Note about bootloaders - -While most Adafruit devices come with (or can easily be flashed with) an -Adafruit-provided bootloader (supporting niceties like UF2 flashing), this -board comes with one that supports DFU via nrfutil. If you ever need to -restore the DFU bootloader via a SWD debugger, use -[the nRF52 open bootloader hex file](https://github.com/makerdiary/nrf52840-mdk-usb-dongle/tree/master/firmware/open_bootloader). - -## Building and Flashing CircuitPython - -``` -$ cd ports/nrf -``` - -### Build CircuitPython for the MDK USB Dongle - -``` -make BOARD=makerdiary_nrf52840_mdk_usb_dongle SD=s140 V=1 -j4 hex -``` - -This should produce a `build-makerdiary_nrf52840_mdk_usb_dongle-s140/firmware.hex` file. - -### Install nrfutil - -You'll need to have [nrfutil](https://pypi.org/project/nrfutil/) installed as -appropriate for your system. -As of 2019-01, _nrfutil still requires Python 2.7_... ugh! - -### Flash the nRF52 Radio Soft Device - -Build a DFU package from the softdevice hex file and flash it: - -```sh -nrfutil pkg generate --hw-version 52 --sd-req 0x00 --sd-id 0xAE --softdevice bluetooth/s140_nrf52_6.1.0/s140_nrf52_6.1.0_softdevice.hex dfu_sd140-6.1.0.zip -nrfutil dfu usb-serial -pkg dfu_sd140-6.1.0.zip -p /dev/tty.usbmodemABRACADBRA # likely /dev/ttyACM0 on Linux -``` - -Note that the `--sd=id 0xAE` comes from the Nordic nRF52 manual for SoftDevice -6.1.0. When the SoftDevice is changed, read the Nordic manual to find the -correct value and use it on all of the `nrfutil pkg generate` commands. - -`/dev/tty.usbmodem*` is a macOS name. On Linux it'll likely be `/dev/ttyACM*`. On Windows probably a COM port. - -### Flash CircuitPython - -Build a DFU package from the hex application file and flash it: - -``` -nrfutil pkg generate --sd-req 0xAE --application build-makerdiary_nrf52840_mdk_usb_dongle-s140/firmware.hex --hw-version 52 --application-version 1 dfu_circuitpython.zip -nrfutil dfu usb-serial -pkg dfu_circuitpython.zip -p /dev/tty.usbmodemABRACADBRA -``` - -I'm not sure if `--application-version 1` is actually meaningful or required. - -After this, your device should be up and running CircuitPython. When it -resets, you'll see the CIRCUITPY USB filesystem and a new console usb modem -serial port show up. - -``` -Adafruit CircuitPython 4.0.0-alpha.5-139-g10ceb6716 on 2019-01-14; MakerDiary nRF52840 MDK USB Dongle with nRF52840 ->>> -``` - -### TODO items - -* Update the Makefile to do the above DFU .zip building and nrfutil flashing. -* Create a UF2 bootloader for this. It is already a USB stick form factor, it deserves to behave like one. diff --git a/ports/nrf/boards/pctel_wsc_1450/README.md b/ports/nrf/boards/pctel_wsc_1450/README.md deleted file mode 100644 index 91458108e3a55..0000000000000 --- a/ports/nrf/boards/pctel_wsc_1450/README.md +++ /dev/null @@ -1,51 +0,0 @@ -# PCTEL WSC-1450 - -The PCTEL Wireless Sensor Core (WSC) is a versatile Industrial IoT product line -that offers multiple radio connectivity options including cellular, LoRa, -Bluetooth 5, NFC as well as 802.15.4 support. - -In addition to several radios, the PCTEL WSC includes several sensors to -monitor a variety of physical conditions. These sensors can detect gas, air -quality, temperature, relative humidity, acceleration, angular rate of change, -magnetic field, range, and sound. For solution optimization, the PCTEL WSC can -be ordered with a subset of radios and sensors. - -For more details about this board, and its variants, navigate to -https://pctel.com - -# Build instructions - -Configure your build environment according to the Adafruit instructions. To -build circuitpython for WSC-1450 do: - - cd ports/nrf make BOARD=pctel_wsc_1450 - -This will create a number of firmware files in the `build-pctel_wsc_1450` -directory. - - -# Installing - -The WSC-1450 do not feature an Adafruit-provided bootloader (supporting -niceties like UF2 flashing). Instead, WSC-1450 uses DAPLink. DAPLink handles -everything from debugging to programming the device, as well as the boot -sequence. - -1. Connect the WSC-1450 dev kit using a USB cable to the `DHD USB` port. This - will power up the board and open a file browser showing the contents of the -target. (DAPlink magic) -2. Copy the newly built firmware to the WSC-1450 target using drag-n-drop or - other method. The file to upload is -`circuitpython/ports/nrf/build-pctel_wsc_1450/firmware.combined.hex` -3. Wait for the file to upload. -4. Install is complete. Reset the board. - -# Running - -Connect an additional USB cable to the `Target USB` port on the development -board and open a terminal like `screen` on Mac or `TeraTerm` on Windows. Serial -settings are 115200,n,8,1. - -Don't forget to install/update the supporting python libraries. - -Happy hacking. diff --git a/ports/nrf/boards/pitaya_go/README.md b/ports/nrf/boards/pitaya_go/README.md deleted file mode 100644 index a58b752892104..0000000000000 --- a/ports/nrf/boards/pitaya_go/README.md +++ /dev/null @@ -1,40 +0,0 @@ -# Makerdiary Pitaya Go - ->Pitaya Go is a compact and versatile development platform for IoT solutions, -combining the Nordic's high-end multiprotocol SoC nRF52840 and the Microchip's -extreme low power Wi-Fi® network controller ATWINC1500B. It offers a complete -solution for wireless connectivity with IEEE 802.11 b/g/n, Bluetooth 5, Thread -and Zigbee, that is specifically designed for the IoT. -Pitaya Go features a Battery Charger with power path management, 64Mbit ultra -low power QSPI Flash memory, additional NFC-A Tag PCB Antenna, user -programmable RGB LED and Buttons, reversible USB-C Connector and easily -expandable Header Sockets. All these features above make this board an ideal -choice for the next IoT project. - -from [Makerdiary](https://store.makerdiary.com/products/pitaya-go) - - -## Installing CircuitPython submodules - -Before you can build, you will need to run the following commands once, which -will install the submodules that are part of the CircuitPython ecosystem, and -build the `mpy-cross` tool: - -``` -$ cd circuitpython -$ git submodule update --init -$ make -C mpy-cross -``` - - -## Building -```sh -$ cd ports/nrf -$ make BOARD=pitaya_go SD=s140 -V=1 -j4 -``` - -# Flashing CircuitPython - -The Pitaya Go has a pre-programmed bootloader which can be used to program the -Pitaya Go. Follow [the guide - How to Program Pitaya Go](https://wiki.makerdiary.com/pitaya-go/programming/) -to flash the CircuitPython firmware. diff --git a/ports/nrf/common-hal/supervisor/Runtime.c b/ports/nrf/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/nrf/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/nrf/common-hal/supervisor/__init__.c b/ports/nrf/common-hal/supervisor/__init__.c deleted file mode 100755 index 6dca35fb5aeb1..0000000000000 --- a/ports/nrf/common-hal/supervisor/__init__.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 "py/obj.h" - -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" - - -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; diff --git a/ports/raspberrypi/Makefile b/ports/raspberrypi/Makefile index 2eb81017b3ed3..12a183e71af7f 100644 --- a/ports/raspberrypi/Makefile +++ b/ports/raspberrypi/Makefile @@ -249,10 +249,6 @@ SRC_C += \ background.c \ peripherals/pins.c \ lib/crypto-algorithms/sha256.c \ - lib/PicoDVI/software/libdvi/dvi.c \ - lib/PicoDVI/software/libdvi/dvi_serialiser.c \ - lib/PicoDVI/software/libdvi/dvi_timing.c \ - lib/PicoDVI/software/libdvi/tmds_encode.c \ lib/tinyusb/src/portable/raspberrypi/rp2040/dcd_rp2040.c \ lib/tinyusb/src/portable/raspberrypi/rp2040/rp2040_usb.c \ mphalport.c \ @@ -273,6 +269,10 @@ endif ifeq ($(CIRCUITPY_PICODVI),1) SRC_C += \ + lib/PicoDVI/software/libdvi/dvi.c \ + lib/PicoDVI/software/libdvi/dvi_serialiser.c \ + lib/PicoDVI/software/libdvi/dvi_timing.c \ + lib/PicoDVI/software/libdvi/tmds_encode.c \ bindings/picodvi/__init__.c \ bindings/picodvi/Framebuffer.c \ common-hal/picodvi/Framebuffer.c \ @@ -367,6 +367,7 @@ else OBJ_MBEDTLS := endif + SRC_COMMON_HAL_EXPANDED = $(addprefix shared-bindings/, $(SRC_COMMON_HAL)) \ $(addprefix shared-bindings/, $(SRC_BINDINGS_ENUMS)) \ $(addprefix common-hal/, $(SRC_COMMON_HAL)) @@ -393,7 +394,11 @@ SRC_S_UPPER = sdk/src/rp2_common/hardware_divider/divider.S \ sdk/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S \ sdk/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S \ sdk/src/rp2_common/pico_standard_link/crt0.S \ - lib/PicoDVI/software/libdvi/tmds_encode_asm.S \ + +ifeq ($(CIRCUITPY_PICODVI),1) +SRC_S_UPPER += lib/PicoDVI/software/libdvi/tmds_encode_asm.S \ + +endif OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o)) OBJ += $(addprefix $(BUILD)/, $(SRC_SDK:.c=.o)) diff --git a/ports/raspberrypi/boards/adafruit_floppsy_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_floppsy_rp2040/mpconfigboard.mk index 2cd4e0bb8bb5f..b2264a0e58962 100644 --- a/ports/raspberrypi/boards/adafruit_floppsy_rp2040/mpconfigboard.mk +++ b/ports/raspberrypi/boards/adafruit_floppsy_rp2040/mpconfigboard.mk @@ -7,3 +7,6 @@ CHIP_VARIANT = RP2040 CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ,W25Q128JV" + +CIRCUITPY_USB_HOST = 0 +CIRCUITPY_PICODVI = 0 diff --git a/ports/raspberrypi/boards/pimoroni_badger2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_badger2040/mpconfigboard.mk index 7e9c76c030791..818f56300c187 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_badger2040/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ" CIRCUITPY__EVE = 1 +CIRCUITPY_PICODVI = 0 +CIRCUITPY_USB_HOST = 0 diff --git a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk index 281e70ee8db72..65b9b9bfc86ad 100644 --- a/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_badger2040w/mpconfigboard.mk @@ -19,6 +19,9 @@ CIRCUITPY_MDNS = 1 CIRCUITPY_SOCKETPOOL = 1 CIRCUITPY_WIFI = 1 +CIRCUITPY_PICODVI = 0 +CIRCUITPY_USB_HOST = 0 + CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0 # Must be accompanied by a linker script change CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)' diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c index d2400d243bb2a..30b010a4f4e10 100644 --- a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/board.c @@ -33,14 +33,17 @@ #include "shared-module/displayio/__init__.h" #include "shared-bindings/board/__init__.h" #include "supervisor/shared/board.h" +#include "inky-shared.h" #define DELAY 0x80 +digitalio_digitalinout_obj_t enable_pin_obj; + // This is an SPD1656 control chip. The display is a 5.7" ACeP EInk. const uint8_t display_start_sequence[] = { 0x01, 4, 0x37, 0x00, 0x23, 0x23, // power setting - 0x00, 2, 0xef, 0x08, // panel setting (PSR) + 0x00, 2, 0xe3, 0x08, // panel setting (PSR, 0xe3: no rotation) 0x03, 1, 0x00, // PFS 0x06, 3, 0xc7, 0xc7, 0x1d, // booster 0x30, 1, 0x3c, // PLL setting @@ -62,6 +65,13 @@ const uint8_t refresh_sequence[] = { }; void board_init(void) { + // Drive the EN_3V3 pin high so the board stays awake on battery power + enable_pin_obj.base.type = &digitalio_digitalinout_type; + common_hal_digitalio_digitalinout_construct(&enable_pin_obj, &pin_GPIO2); + common_hal_digitalio_digitalinout_switch_to_output(&enable_pin_obj, true, DRIVE_MODE_PUSH_PULL); + + // Never reset + common_hal_digitalio_digitalinout_never_reset(&enable_pin_obj); fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus; busio_spi_obj_t *spi = common_hal_board_create_spi(0); @@ -89,7 +99,7 @@ void board_init(void) { 480, // ram_height 0, // colstart 0, // rowstart - 180, // rotation + 0, // rotation NO_COMMAND, // set_column_window_command NO_COMMAND, // set_row_window_command NO_COMMAND, // set_current_column_command @@ -103,7 +113,7 @@ void board_init(void) { 28.0, // refresh_time NULL, // busy_pin false, // busy_state - 30.0, // seconds_per_frame + 40.0, // seconds_per_frame false, // always_toggle_chip_select false, // grayscale true, // acep diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/inky-shared.h b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/inky-shared.h new file mode 100644 index 0000000000000..6f85d68002855 --- /dev/null +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/inky-shared.h @@ -0,0 +1,8 @@ +#ifndef PIMORONI_INKY_SHARED +#define PIMORONI_INKY_SHARED + +#include "shared-bindings/digitalio/DigitalInOut.h" + +extern digitalio_digitalinout_obj_t enable_pin_obj; + +#endif // PIMORONI_INKY_SHARED diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk index 96708a983af44..c0f67869a086c 100644 --- a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/mpconfigboard.mk @@ -17,9 +17,13 @@ CIRCUITPY_WEB_WORKFLOW = 1 CIRCUITPY_MDNS = 1 CIRCUITPY_SOCKETPOOL = 1 CIRCUITPY_WIFI = 1 +CIRCUITPY_PICODVI = 0 +CIRCUITPY_USB_HOST = 0 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0 # Must be accompanied by a linker script change CFLAGS += -DCIRCUITPY_FIRMWARE_SIZE='(1536 * 1024)' -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel +FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-pcf85063a +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Register +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c index 4496790c6cb22..6ba266e7f3d3e 100644 --- a/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_5_7/pins.c @@ -2,13 +2,46 @@ #include "supervisor/board.h" #include "shared-module/displayio/__init__.h" +#include "py/objtuple.h" +#include "py/qstr.h" + +#include "inky-shared.h" + +// for use with keypad.ShiftRegisterKeys: map keycode (bit-number) +// to logical names board.KEYCODES.SW_A etc. +// N.B.: labels and bit-numbers in the schematic are reversed, i.e. +// SW_A on D0 has bit-number 7 + +STATIC const qstr board_keycodes_fields[] = { + MP_QSTR_SW_A, + MP_QSTR_SW_B, + MP_QSTR_SW_C, + MP_QSTR_SW_D, + MP_QSTR_SW_E, + MP_QSTR_RTC_ALARM, + MP_QSTR_EXT_TRIGGER, + MP_QSTR_INKY_BUS +}; + +STATIC MP_DEFINE_ATTRTUPLE( + board_keycodes_obj, + board_keycodes_fields, + 8, + MP_ROM_INT(7), + MP_ROM_INT(6), + MP_ROM_INT(5), + MP_ROM_INT(4), + MP_ROM_INT(3), + MP_ROM_INT(2), + MP_ROM_INT(1), + MP_ROM_INT(0) + ); STATIC const mp_rom_map_elem_t board_module_globals_table[] = { CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_GPIO0) }, { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_GPIO1) }, - { MP_ROM_QSTR(MP_QSTR_HOLD_SYS_EN), MP_ROM_PTR(&pin_GPIO2) }, { MP_ROM_QSTR(MP_QSTR_I2C_INT), MP_ROM_PTR(&pin_GPIO3) }, { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_GPIO4) }, @@ -39,6 +72,10 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_INKY_RES), MP_ROM_PTR(&pin_GPIO27) }, { MP_ROM_QSTR(MP_QSTR_INKY_DC), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_VOLTAGE_MONITOR), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, + + { MP_ROM_QSTR(MP_QSTR_PICO_LED), MP_ROM_PTR(&pin_CYW0) }, { MP_ROM_QSTR(MP_QSTR_SMPS_MODE), MP_ROM_PTR(&pin_CYW1) }, { MP_ROM_QSTR(MP_QSTR_VBUS_SENSE), MP_ROM_PTR(&pin_CYW2) }, @@ -48,5 +85,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].epaper_display)}, + { MP_ROM_QSTR(MP_QSTR_ENABLE_DIO), MP_ROM_PTR(&enable_pin_obj)}, // GP2 + { MP_ROM_QSTR(MP_QSTR_KEYCODES), MP_ROM_PTR(&board_keycodes_obj)}, }; MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk index 4206a066d5e30..ca57f8419ef70 100644 --- a/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_inky_frame_7_3/mpconfigboard.mk @@ -17,6 +17,8 @@ CIRCUITPY_WEB_WORKFLOW = 1 CIRCUITPY_MDNS = 1 CIRCUITPY_SOCKETPOOL = 1 CIRCUITPY_WIFI = 1 +CIRCUITPY_PICODVI = 0 +CIRCUITPY_USB_HOST = 0 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0 # Must be accompanied by a linker script change diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_plasma2040/mpconfigboard.mk index 10bfb5cc87aae..6676fa79805bb 100644 --- a/ports/raspberrypi/boards/pimoroni_plasma2040/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_plasma2040/mpconfigboard.mk @@ -9,3 +9,5 @@ CHIP_FAMILY = rp2 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ" CIRCUITPY__EVE = 1 +CIRCUITPY_PICODVI = 0 +CIRCUITPY_USB_HOST = 0 diff --git a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk index 0f1604173ec91..26a0ab6f83200 100644 --- a/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk +++ b/ports/raspberrypi/boards/pimoroni_plasma2040w/mpconfigboard.mk @@ -17,6 +17,8 @@ CIRCUITPY_WEB_WORKFLOW = 1 CIRCUITPY_MDNS = 1 CIRCUITPY_SOCKETPOOL = 1 CIRCUITPY_WIFI = 1 +CIRCUITPY_PICODVI = 0 +CIRCUITPY_USB_HOST = 0 CFLAGS += -DCYW43_PIN_WL_HOST_WAKE=24 -DCYW43_PIN_WL_REG_ON=23 -DCYW43_WL_GPIO_COUNT=3 -DCYW43_WL_GPIO_LED_PIN=0 # Must be accompanied by a linker script change diff --git a/ports/nrf/common-hal/supervisor/Runtime.h b/ports/raspberrypi/boards/rfguru_rp2040/board.c old mode 100755 new mode 100644 similarity index 77% rename from ports/nrf/common-hal/supervisor/Runtime.h rename to ports/raspberrypi/boards/rfguru_rp2040/board.c index dbff22e4c9245..331653173ecd1 --- a/ports/nrf/common-hal/supervisor/Runtime.h +++ b/ports/raspberrypi/boards/rfguru_rp2040/board.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright (c) 2018 Michael Schroeder + * Copyright (c) 2021 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 @@ -24,14 +24,6 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_NRF_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_NRF_COMMON_HAL_SUPERVISOR_RUNTIME_H +#include "supervisor/board.h" -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_NRF_COMMON_HAL_SUPERVISOR_RUNTIME_H +// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here. diff --git a/ports/raspberrypi/boards/rfguru_rp2040/mpconfigboard.h b/ports/raspberrypi/boards/rfguru_rp2040/mpconfigboard.h new file mode 100644 index 0000000000000..3543c24907321 --- /dev/null +++ b/ports/raspberrypi/boards/rfguru_rp2040/mpconfigboard.h @@ -0,0 +1,2 @@ +#define MICROPY_HW_BOARD_NAME "RF.Guru RP2040" +#define MICROPY_HW_MCU_NAME "rp2040" diff --git a/ports/raspberrypi/boards/rfguru_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/rfguru_rp2040/mpconfigboard.mk new file mode 100644 index 0000000000000..b63493137a59d --- /dev/null +++ b/ports/raspberrypi/boards/rfguru_rp2040/mpconfigboard.mk @@ -0,0 +1,11 @@ +USB_VID = 0x1209 +USB_PID = 0xFF40 +USB_PRODUCT = "RF.Guru RP2040" +USB_MANUFACTURER = "RF.Guru" + +CHIP_VARIANT = RP2040 +CHIP_FAMILY = rp2 + +EXTERNAL_FLASH_DEVICES = "W25Q128JVxQ" + +CIRCUITPY__EVE = 1 diff --git a/ports/raspberrypi/boards/rfguru_rp2040/pico-sdk-configboard.h b/ports/raspberrypi/boards/rfguru_rp2040/pico-sdk-configboard.h new file mode 100644 index 0000000000000..a41131dd22b7e --- /dev/null +++ b/ports/raspberrypi/boards/rfguru_rp2040/pico-sdk-configboard.h @@ -0,0 +1,4 @@ +// Put board-specific pico-sdk definitions here. This file must exist. + +// Allow extra time for xosc to start. +#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 diff --git a/ports/raspberrypi/boards/rfguru_rp2040/pins.c b/ports/raspberrypi/boards/rfguru_rp2040/pins.c new file mode 100644 index 0000000000000..1c67d863762fc --- /dev/null +++ b/ports/raspberrypi/boards/rfguru_rp2040/pins.c @@ -0,0 +1,48 @@ +#include "shared-bindings/board/__init__.h" + +STATIC const mp_rom_map_elem_t board_module_globals_table[] = { + CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS + { MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) }, + { MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) }, + { MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) }, + { MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) }, + { MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) }, + { MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) }, + { MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) }, + { MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) }, + { MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) }, + { MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) }, + { MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) }, + { MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) }, + { MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) }, + { MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) }, + { MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) }, + { MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) }, + { MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) }, + { MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) }, + { MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) }, + { MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) }, + { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) }, + { MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) }, + { MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) }, + { MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) }, + { MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) }, + { MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) }, + + { MP_ROM_QSTR(MP_QSTR_GP26_A0), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) }, + { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) }, + + { MP_ROM_QSTR(MP_QSTR_GP27_A1), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) }, + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) }, + + { MP_ROM_QSTR(MP_QSTR_GP28_A2), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) }, + + { MP_ROM_QSTR(MP_QSTR_GP29_A3), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table); diff --git a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c index 4329f45cbda58..179717144532b 100644 --- a/ports/raspberrypi/common-hal/audiobusio/I2SOut.c +++ b/ports/raspberrypi/common-hal/audiobusio/I2SOut.c @@ -83,7 +83,7 @@ const uint16_t i2s_program_left_justified[] = { 0x6201, // jmp y-- bitloop1 side 0b01 [2] 0x0a83, -// out pins 1 side 0b10 [2] +// out pins 1 side 0b00 [2] 0x6201, // set y 14 side 0b01 [2] 0xea4e, @@ -96,6 +96,67 @@ const uint16_t i2s_program_left_justified[] = { 0x7201 }; +// Another version of i2s_program with the LRCLC and BCLK pin swapped +const uint16_t i2s_program_swap[] = { +// ; Load the next set of samples +// ; /--- BCLK +// ; |/-- LRCLK +// ; || +// pull noblock side 0b11 ; Loads OSR with the next FIFO value or X + 0x9880, +// mov x osr side 0b11 ; Save the new value in case we need it again + 0xb827, +// set y 14 side 0b11 + 0xf84e, +// bitloop1: +// out pins 1 side 0b01 [2] + 0x6a01, +// jmp y-- bitloop1 side 0b11 [2] + 0x1a83, +// out pins 1 side 0b00 [2] + 0x6201, +// set y 14 side 0b10 [2] + 0xf24e, +// bitloop0: +// out pins 1 side 0b00 [2] + 0x6201, +// jmp y-- bitloop0 side 0b10 [2] + 0x1287, +// out pins 1 side 0b01 [2] + 0x6a01 +}; + +// Another version of i2s_program_left_justified with the LRCLC and BCLK pin +// swapped. +const uint16_t i2s_program_left_justified_swap[] = { +// ; Load the next set of samples +// ; /--- BCLK +// ; |/-- LRCLK +// ; || +// pull noblock side 0b11 ; Loads OSR with the next FIFO value or X + 0x9880, +// mov x osr side 0b11 ; Save the new value in case we need it again + 0xb827, +// set y 14 side 0b11 + 0xf84e, +// bitloop1: +// out pins 1 side 0b00 [2] + 0x6201, +// jmp y-- bitloop1 side 0b10 [2] + 0x1283, +// out pins 1 side 0b00 [2] + 0x6201, +// set y 14 side 0b10 [2] + 0xf24e, +// bitloop0: +// out pins 1 side 0b01 [2] + 0x6a01, +// jmp y-- bitloop0 side 0b11 [2] + 0x1a87, +// out pins 1 side 0b01 [2] + 0x6a01 +}; + void i2sout_reset(void) { } @@ -106,16 +167,34 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, if (main_clock != NULL) { mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_main_clock); } - if (bit_clock->number != word_select->number - 1) { - mp_raise_ValueError(MP_ERROR_TEXT("Bit clock and word select must be sequential GPIO pins")); - } + const mcu_pin_obj_t *sideset_pin = NULL; + const uint16_t *program = NULL; + size_t program_len = 0; - const uint16_t *program = i2s_program; - size_t program_len = sizeof(i2s_program) / sizeof(i2s_program[0]); - if (left_justified) { - program = i2s_program_left_justified; - program_len = sizeof(i2s_program_left_justified) / sizeof(i2s_program_left_justified[0]); - ; + if (bit_clock->number == word_select->number - 1) { + sideset_pin = bit_clock; + + if (left_justified) { + program_len = MP_ARRAY_SIZE(i2s_program_left_justified); + program = i2s_program_left_justified; + } else { + program_len = MP_ARRAY_SIZE(i2s_program); + program = i2s_program; + } + + } else if (bit_clock->number == word_select->number + 1) { + sideset_pin = word_select; + + if (left_justified) { + program_len = MP_ARRAY_SIZE(i2s_program_left_justified_swap); + program = i2s_program_left_justified_swap; + } else { + program_len = MP_ARRAY_SIZE(i2s_program_swap); + program = i2s_program_swap; + } + + } else { + mp_raise_ValueError(MP_ERROR_TEXT("Bit clock and word select must be sequential GPIO pins")); } // Use the state machine to manage pins. @@ -129,7 +208,7 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self, NULL, 0, // in pins 0, 0, // in pulls NULL, 0, 0, 0x1f, // set pins - bit_clock, 2, 0, 0x1f, // sideset pins + sideset_pin, 2, 0, 0x1f, // sideset pins false, // No sideset enable NULL, PULL_NONE, // jump pin 0, // wait gpio pins diff --git a/ports/raspberrypi/common-hal/floppyio/__init__.c b/ports/raspberrypi/common-hal/floppyio/__init__.c new file mode 100644 index 0000000000000..9a117d9329672 --- /dev/null +++ b/ports/raspberrypi/common-hal/floppyio/__init__.c @@ -0,0 +1,195 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2024 Jeff Epler 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 "bindings/rp2pio/StateMachine.h" +#include "py/runtime.h" +#include "shared-bindings/digitalio/DigitalInOut.h" +#include "shared-bindings/floppyio/__init__.h" +#include "common-hal/floppyio/__init__.h" +#include "shared-bindings/time/__init__.h" +#include "supervisor/shared/tick.h" + +static const uint16_t fluxread_program[] = { + // ; Count flux pulses and watch for index pin + // ; flux input is the 'jmp pin'. index is "pin zero". + // ; Counts are in units 3 / F_pio, so e.g., at 30MHz 1 count = 0.1us + // ; Count down while waiting for the counter to go HIGH + // ; The only counting is down, so C code will just have to negate the + // count! + // ; Each 'wait one' loop takes 3 instruction-times + // wait_one: + 0x0041, // jmp x--, wait_one_next ; acts as a non-conditional decrement + // of x + // wait_one_next: + 0x00c3, // jmp pin wait_zero + 0x0000, // jmp wait_one + // ; Each 'wait zero' loop takes 3 instruction-times, needing one + // instruction delay + // ; (it has to match the 'wait one' timing exactly) + // wait_zero: + 0x0044, // jmp x--, wait_zero_next ; acts as a non-conditional decrement + // of x + // wait_zero_next: + 0x01c3, // jmp pin wait_zero [1] + // ; Top bit is index status, bottom 15 bits are inverse of counts + // ; Combined FIFO gives 16 entries (8 32-bit entries) so with the + // ; smallest plausible pulse of 2us there are 250 CPU cycles available + // @125MHz + 0x4001, // in pins, 1 + 0x402f, // in x, 15 + // ; Three cycles for the end of loop, so we need to decrement x to make + // everything + // ; come out right. This has constant timing whether we actually jump back + // vs wrapping. + 0x0040, // jmp x--, wait_one +}; + +typedef struct { + PIO pio; + uint8_t sm; + bool word_available; + uint16_t half; +} floppy_reader; + +static bool data_available(floppy_reader *reader) { + return reader->word_available || !pio_sm_is_rx_fifo_empty(reader->pio, reader->sm); +} + +static uint16_t read_fifo(floppy_reader *reader) { + if (reader->word_available) { + reader->word_available = false; + return reader->half; + } + uint32_t value = pio_sm_get_blocking(reader->pio, reader->sm); + reader->half = value >> 16; + reader->word_available = true; + return value & 0xffff; +} + + +int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index, mp_int_t index_wait_ms) { +#define READ_INDEX() (!!(*index_port & index_mask)) + uint32_t index_mask; + volatile uint32_t *index_port = common_hal_digitalio_digitalinout_get_reg(index, DIGITALINOUT_REG_READ, &index_mask); + + memset(buf, 0, len); + + uint32_t pins_we_use = 1 << data->pin->number; + + rp2pio_statemachine_obj_t state_machine; + bool ok = rp2pio_statemachine_construct(&state_machine, + fluxread_program, MP_ARRAY_SIZE(fluxread_program), + FLOPPYIO_SAMPLERATE * 3, // 3 PIO cycles per sample count + NULL, 0, // init program + NULL, 0, // out + index->pin, 1, // in + 1, 0, // in pull up/down + NULL, 0, // set + NULL, 0, // sideset + 0, 0, // initial pin state + data->pin, // jump pin + pins_we_use, false, true, + true, 32, false, // TX setting we don't use + true, // Wait for txstall. If we don't, then we'll deinit too quickly. + true, 32, true, // move 32 bits at a time + false, // claim pins + false, // Not user-interruptible. + false, // No sideset enable + 0, -1, // wrap + PIO_ANY_OFFSET // offset + ); + if (!ok) { + mp_raise_RuntimeError(MP_ERROR_TEXT("All state machines in use")); + } + + floppy_reader reader = { .pio = state_machine.pio, .sm = state_machine.state_machine, }; + + uint8_t *ptr = buf, *end = ptr + len; + + uint64_t index_deadline_us = time_us_64() + index_wait_ms * 1000; + + common_hal_mcu_disable_interrupts(); + + // check if flux is arriving + uint64_t flux_deadline_us = time_us_64() + 20; + while (pio_sm_is_rx_fifo_empty(reader.pio, reader.sm)) { + if (time_us_64() > flux_deadline_us) { + common_hal_mcu_enable_interrupts(); + common_hal_rp2pio_statemachine_deinit(&state_machine); + mp_raise_RuntimeError(MP_ERROR_TEXT("timeout waiting for flux")); + } + } + + // wait for index pulse low + while (READ_INDEX()) { + if (time_us_64() > index_deadline_us) { + common_hal_mcu_enable_interrupts(); + common_hal_rp2pio_statemachine_deinit(&state_machine); + mp_raise_RuntimeError(MP_ERROR_TEXT("timeout waiting for index pulse")); + } + } + + pio_sm_clear_fifos(reader.pio, reader.sm); + + // if another index doesn't show up ... + index_deadline_us = time_us_64() + index_wait_ms * 1000; + + int last = read_fifo(&reader); + bool last_index = READ_INDEX(); + while (ptr != end) { + + /* Handle index */ + bool now_index = READ_INDEX(); + + if (!now_index && last_index) { + break; + } + last_index = now_index; + + if (!data_available(&reader)) { + // no flux is arriving? is ANY flux arriving or has a full revoulution gone by? + if (time_us_64() > index_deadline_us) { + break; + } + continue; + } + + int timestamp = read_fifo(&reader); + int delta = last - timestamp; + if (delta < 0) { + delta += 65536; + } + delta /= 2; + + last = timestamp; + *ptr++ = delta > 255 ? 255 : delta; + } + + common_hal_mcu_enable_interrupts(); + common_hal_rp2pio_statemachine_deinit(&state_machine); + + return ptr - (uint8_t *)buf; +} diff --git a/ports/raspberrypi/common-hal/neopixel_write/__init__.c b/ports/raspberrypi/common-hal/neopixel_write/__init__.c index c4a2282bdf7f8..6a179270435e4 100644 --- a/ports/raspberrypi/common-hal/neopixel_write/__init__.c +++ b/ports/raspberrypi/common-hal/neopixel_write/__init__.c @@ -62,7 +62,7 @@ void common_hal_neopixel_write(const digitalio_digitalinout_obj_t *digitalinout, // change the pins then though. uint32_t pins_we_use = 1 << digitalinout->pin->number; bool ok = rp2pio_statemachine_construct(&state_machine, - neopixel_program, sizeof(neopixel_program) / sizeof(neopixel_program[0]), + neopixel_program, MP_ARRAY_SIZE(neopixel_program), 12800000, // 12.8MHz, to get appropriate sub-bit times in PIO program. NULL, 0, // init program NULL, 1, // out diff --git a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c index c166b7221e612..81f312b0e4de4 100644 --- a/ports/raspberrypi/common-hal/picodvi/Framebuffer.c +++ b/ports/raspberrypi/common-hal/picodvi/Framebuffer.c @@ -144,10 +144,14 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self, bool color_framebuffer = color_depth >= 8; const struct dvi_timing *timing = NULL; if ((width == 640 && height == 480) || - (width == 320 && height == 240)) { + (width == 320 && height == 240) || + (width == 640 && height == 240) + ) { timing = &dvi_timing_640x480p_60hz; } else if ((width == 800 && height == 480) || - (width == 400 && height == 240)) { + (width == 400 && height == 240) || + (width == 800 && height == 240) + ) { timing = &dvi_timing_800x480p_60hz; } else { if (height != 480 && height != 240) { @@ -223,16 +227,15 @@ void common_hal_picodvi_framebuffer_construct(picodvi_framebuffer_obj_t *self, size_t tmds_bufs_per_scanline; size_t scanline_width = width; if (color_framebuffer) { - dvi_vertical_repeat = 2; dvi_monochrome_tmds = false; tmds_bufs_per_scanline = 3; scanline_width *= 2; } else { - dvi_vertical_repeat = 1; dvi_monochrome_tmds = true; // One tmds buffer is used for all three color outputs. tmds_bufs_per_scanline = 1; } + dvi_vertical_repeat = timing->v_active_lines / self->height; self->pitch = (self->width * color_depth) / 8; // Align each row to words. if (self->pitch % sizeof(uint32_t) != 0) { diff --git a/ports/raspberrypi/common-hal/supervisor/Runtime.c b/ports/raspberrypi/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/raspberrypi/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/raspberrypi/common-hal/supervisor/Runtime.h b/ports/raspberrypi/common-hal/supervisor/Runtime.h deleted file mode 100755 index 45db489bda9c2..0000000000000 --- a/ports/raspberrypi/common-hal/supervisor/Runtime.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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. - */ - -#ifndef MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_SUPERVISOR_RUNTIME_H - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_RASPBERRYPI_COMMON_HAL_SUPERVISOR_RUNTIME_H diff --git a/ports/raspberrypi/common-hal/supervisor/__init__.c b/ports/raspberrypi/common-hal/supervisor/__init__.c deleted file mode 100755 index 6dca35fb5aeb1..0000000000000 --- a/ports/raspberrypi/common-hal/supervisor/__init__.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 "py/obj.h" - -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" - - -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; diff --git a/ports/raspberrypi/common-hal/usb_host/Port.c b/ports/raspberrypi/common-hal/usb_host/Port.c index 6c69037a31810..4aebaff34f3f9 100644 --- a/ports/raspberrypi/common-hal/usb_host/Port.c +++ b/ports/raspberrypi/common-hal/usb_host/Port.c @@ -28,6 +28,7 @@ #include "shared-bindings/microcontroller/Pin.h" #include "shared-bindings/microcontroller/Processor.h" #include "shared-bindings/usb_host/Port.h" +#include "supervisor/shared/serial.h" #include "supervisor/usb.h" #include "src/common/pico_time/include/pico/time.h" @@ -43,7 +44,6 @@ #include "lib/Pico-PIO-USB/src/pio_usb.h" #include "lib/Pico-PIO-USB/src/pio_usb_configuration.h" -#include "supervisor/serial.h" usb_host_port_obj_t usb_host_instance; diff --git a/ports/raspberrypi/supervisor/port.c b/ports/raspberrypi/supervisor/port.c index 2938e7cb303c7..500850d4609f4 100644 --- a/ports/raspberrypi/supervisor/port.c +++ b/ports/raspberrypi/supervisor/port.c @@ -73,7 +73,7 @@ #include "pico/bootrom.h" #include "hardware/watchdog.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "tusb.h" #include @@ -304,7 +304,11 @@ void port_interrupt_after_ticks(uint32_t ticks) { void port_idle_until_interrupt(void) { common_hal_mcu_disable_interrupts(); + #if CIRCUITPY_USB_HOST if (!background_callback_pending() && !tud_task_event_ready() && !tuh_task_event_ready() && !_woken_up) { + #else + if (!background_callback_pending() && !tud_task_event_ready() && !_woken_up) { + #endif __DSB(); __WFI(); } diff --git a/ports/silabs/common-hal/_bleio/Characteristic.c b/ports/silabs/common-hal/_bleio/Characteristic.c index a6e3628b88967..f065a939a6016 100644 --- a/ports/silabs/common-hal/_bleio/Characteristic.c +++ b/ports/silabs/common-hal/_bleio/Characteristic.c @@ -33,8 +33,8 @@ #include "shared-bindings/_bleio/Service.h" #include "shared-bindings/_bleio/__init__.h" #include "shared/runtime/interrupt_char.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/tick.h" -#include "supervisor/serial.h" EventGroupHandle_t xcharacteristic_event; diff --git a/ports/silabs/common-hal/_bleio/Connection.c b/ports/silabs/common-hal/_bleio/Connection.c index 3e8d273c06493..94e556dd0bf45 100644 --- a/ports/silabs/common-hal/_bleio/Connection.c +++ b/ports/silabs/common-hal/_bleio/Connection.c @@ -41,8 +41,8 @@ #include "shared-bindings/_bleio/__init__.h" #include "shared-module/_bleio/Characteristic.h" #include "shared/runtime/interrupt_char.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/tick.h" -#include "supervisor/serial.h" // Give 10 seconds for discovery #define DISCOVERY_TIMEOUT_MS 10000 diff --git a/ports/silabs/common-hal/_bleio/PacketBuffer.c b/ports/silabs/common-hal/_bleio/PacketBuffer.c index d450cd4de1e55..96a7462f6c4ed 100644 --- a/ports/silabs/common-hal/_bleio/PacketBuffer.c +++ b/ports/silabs/common-hal/_bleio/PacketBuffer.c @@ -34,8 +34,8 @@ #include "shared-bindings/_bleio/PacketBuffer.h" #include "shared/runtime/interrupt_char.h" #include "common-hal/_bleio/Connection.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/tick.h" -#include "supervisor/serial.h" // List packet buffer of peripheral device bleio_packet_buffer_obj_list_t bleio_packet_buffer_list; diff --git a/ports/silabs/common-hal/supervisor/Runtime.c b/ports/silabs/common-hal/supervisor/Runtime.c deleted file mode 100644 index f2ac082604cb9..0000000000000 --- a/ports/silabs/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of Adafruit for EFR32 project - * - * The MIT License (MIT) - * - * Copyright 2023 Silicon Laboratories Inc. www.silabs.com - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/silabs/common-hal/supervisor/Runtime.h b/ports/silabs/common-hal/supervisor/Runtime.h deleted file mode 100644 index b71bd9b54580a..0000000000000 --- a/ports/silabs/common-hal/supervisor/Runtime.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of Adafruit for EFR32 project - * - * The MIT License (MIT) - * - * Copyright 2023 Silicon Laboratories Inc. www.silabs.com - * - * 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. - */ - -#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H - -#include "py/obj.h" - -typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; - -#endif // MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H diff --git a/ports/silabs/common-hal/supervisor/__init__.c b/ports/silabs/common-hal/supervisor/__init__.c deleted file mode 100644 index 16dc414b06f8c..0000000000000 --- a/ports/silabs/common-hal/supervisor/__init__.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of Adafruit for EFR32 project - * - * The MIT License (MIT) - * - * Copyright 2023 Silicon Laboratories Inc. www.silabs.com - * - * 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 "py/obj.h" - -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" - -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; diff --git a/ports/silabs/supervisor/serial.c b/ports/silabs/supervisor/serial.c index 62dc9899d8443..e19bde8965afd 100644 --- a/ports/silabs/supervisor/serial.c +++ b/ports/silabs/supervisor/serial.c @@ -27,7 +27,7 @@ #include "py/mphal.h" #include "py/ringbuf.h" #include "supervisor/port.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "shared/readline/readline.h" #include "shared/runtime/interrupt_char.h" #include "shared-bindings/microcontroller/Pin.h" @@ -141,9 +141,8 @@ char port_serial_read(void) { return (char)data; } -// Checking ring buffer haves bytes available or not -bool port_serial_bytes_available(void) { - return ringbuf_num_filled(&con_uart_rx_ringbuf) > 0 ? true : false; +uint32_t port_serial_bytes_available(void) { + return ringbuf_num_filled(&con_uart_rx_ringbuf); } // Send n bytes data to serial by EUSART0 diff --git a/ports/stm/common-hal/supervisor/Runtime.c b/ports/stm/common-hal/supervisor/Runtime.c deleted file mode 100644 index f827651781f10..0000000000000 --- a/ports/stm/common-hal/supervisor/Runtime.c +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 -#include "shared-bindings/supervisor/Runtime.h" -#include "supervisor/serial.h" - -bool common_hal_supervisor_runtime_get_serial_connected(void) { - return (bool)serial_connected(); -} - -bool common_hal_supervisor_runtime_get_serial_bytes_available(void) { - return (bool)serial_bytes_available(); -} diff --git a/ports/stm/common-hal/supervisor/__init__.c b/ports/stm/common-hal/supervisor/__init__.c deleted file mode 100755 index 6dca35fb5aeb1..0000000000000 --- a/ports/stm/common-hal/supervisor/__init__.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2018 Michael Schroeder - * - * 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 "py/obj.h" - -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" - - -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, -}; diff --git a/ports/stm/supervisor/serial.c b/ports/stm/supervisor/serial.c index 10196fbc31185..b0ed7e193add5 100644 --- a/ports/stm/supervisor/serial.c +++ b/ports/stm/supervisor/serial.c @@ -27,7 +27,7 @@ #include "py/mphal.h" #include -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #if CPY_STM32F4 #include "stm32f4xx_hal.h" #include "stm32f4/gpio.h" @@ -66,11 +66,12 @@ char port_serial_read(void) { #endif } -bool port_serial_bytes_available(void) { +// There is no easy way to find the number of pending characters, so just say there's 1. +uint32_t port_serial_bytes_available(void) { #if CPY_STM32F4 - return __HAL_UART_GET_FLAG(&huart2, UART_FLAG_RXNE); + return __HAL_UART_GET_FLAG(&huart2, UART_FLAG_RXNE) ? 1 : 0; #else - return false; + return 0; #endif } diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk index ee8a395e87ac9..4e002867ccd80 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.mk +++ b/ports/unix/variants/coverage/mpconfigvariant.mk @@ -40,6 +40,7 @@ SRC_BITMAP := \ shared-bindings/displayio/Bitmap.c \ shared-bindings/displayio/ColorConverter.c \ shared-bindings/displayio/Palette.c \ + shared-bindings/floppyio/__init__.c \ shared-bindings/jpegio/__init__.c \ shared-bindings/jpegio/JpegDecoder.c \ shared-bindings/locale/__init__.c \ @@ -69,6 +70,7 @@ SRC_BITMAP := \ shared-module/displayio/Bitmap.c \ shared-module/displayio/ColorConverter.c \ shared-module/displayio/Palette.c \ + shared-module/floppyio/__init__.c \ shared-module/jpegio/__init__.c \ shared-module/jpegio/JpegDecoder.c \ shared-module/os/getenv.c \ @@ -94,6 +96,7 @@ CFLAGS += \ -DCIRCUITPY_BITMAPTOOLS=1 \ -DCIRCUITPY_CODEOP=1 \ -DCIRCUITPY_DISPLAYIO_UNIX=1 \ + -DCIRCUITPY_FLOPPYIO=1 \ -DCIRCUITPY_FUTURE=1 \ -DCIRCUITPY_GIFIO=1 \ -DCIRCUITPY_JPEGIO=1 \ diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 62acd69ae1a5f..58b9c169cf0ca 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -252,6 +252,9 @@ endif ifeq ($(CIRCUITPY_KEYPAD),1) SRC_PATTERNS += keypad/% endif +ifeq ($(CIRCUITPY_KEYPAD_DEMUX),1) +SRC_PATTERNS += keypad_demux/% +endif ifeq ($(CIRCUITPY_LOCALE),1) SRC_PATTERNS += locale/% endif @@ -475,6 +478,7 @@ SRC_COMMON_HAL_ALL = \ dotclockframebuffer/DotClockFramebuffer.c \ dotclockframebuffer/__init__.c \ dualbank/__init__.c \ + floppyio/__init__.c \ frequencyio/FrequencyIn.c \ frequencyio/__init__.c \ imagecapture/ParallelImageCapture.c \ @@ -516,8 +520,6 @@ SRC_COMMON_HAL_ALL = \ socketpool/__init__.c \ socketpool/SocketPool.c \ socketpool/Socket.c \ - supervisor/Runtime.c \ - supervisor/__init__.c \ usb_host/__init__.c \ usb_host/Port.c \ watchdog/WatchDogMode.c \ @@ -569,6 +571,7 @@ $(filter $(SRC_PATTERNS), \ qrio/PixelPolicy.c \ qrio/QRInfo.c \ supervisor/RunReason.c \ + supervisor/Runtime.c \ supervisor/StatusBar.c \ wifi/AuthMode.c \ wifi/Packet.c \ @@ -739,6 +742,12 @@ SRC_SHARED_MODULE_ALL += \ ssl/SSLSocket.c endif +ifeq ($(CIRCUITPY_KEYPAD_DEMUX),1) +SRC_SHARED_MODULE_ALL += \ + keypad_demux/__init__.c \ + keypad_demux/DemuxKeyMatrix.c +endif + # If supporting _bleio via HCI, make devices/ble_hci/common-hal/_bleio be includable, # and use C source files in devices/ble_hci/common-hal. ifeq ($(CIRCUITPY_BLEIO_HCI),1) diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 9040e8681e1f3..dc9b201f6349c 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -26,7 +26,7 @@ // This file contains settings that are common across CircuitPython ports, to make // sure that the same feature set and settings are used, such as in atmel-samd -// and nrf. +// and nordic. #ifndef __INCLUDED_MPCONFIG_CIRCUITPY_H #define __INCLUDED_MPCONFIG_CIRCUITPY_H @@ -265,6 +265,8 @@ typedef long mp_off_t; #endif #ifndef MICROPY_PY_COLLECTIONS_DEQUE #define MICROPY_PY_COLLECTIONS_DEQUE (CIRCUITPY_FULL_BUILD) +#define MICROPY_PY_COLLECTIONS_DEQUE_ITER (CIRCUITPY_FULL_BUILD) +#define MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR (CIRCUITPY_FULL_BUILD) #endif #define MICROPY_PY_RE_MATCH_GROUPS (CIRCUITPY_RE) #define MICROPY_PY_RE_MATCH_SPAN_START_END (CIRCUITPY_RE) diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index fc9fdcbd31afa..1998642a0fd7b 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -345,6 +345,9 @@ CFLAGS += -DCIRCUITPY_KEYPAD_KEYMATRIX=$(CIRCUITPY_KEYPAD_KEYMATRIX) CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS ?= $(CIRCUITPY_KEYPAD) CFLAGS += -DCIRCUITPY_KEYPAD_SHIFTREGISTERKEYS=$(CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS) +CIRCUITPY_KEYPAD_DEMUX ?= $(CIRCUITPY_KEYPAD) +CFLAGS += -DCIRCUITPY_KEYPAD_DEMUX=$(CIRCUITPY_KEYPAD_DEMUX) + CIRCUITPY_LOCALE ?= $(CIRCUITPY_FULL_BUILD) CFLAGS += -DCIRCUITPY_LOCALE=$(CIRCUITPY_LOCALE) @@ -425,6 +428,10 @@ CFLAGS += -DCIRCUITPY_RE=$(CIRCUITPY_RE) CIRCUITPY_REQUIRE_I2C_PULLUPS ?= 1 CFLAGS += -DCIRCUITPY_REQUIRE_I2C_PULLUPS=$(CIRCUITPY_REQUIRE_I2C_PULLUPS) +# Allow the use of strapping pins for i2c +CIRCUITPY_I2C_ALLOW_STRAPPING_PINS ?= 0 +CFLAGS += -DCIRCUITPY_I2C_ALLOW_STRAPPING_PINS=$(CIRCUITPY_I2C_ALLOW_STRAPPING_PINS) + # CIRCUITPY_RP2PIO is handled in the raspberrypi tree. # Only for rp2 chips. # Assume not a rp2 build. diff --git a/py/mpconfig.h b/py/mpconfig.h index 6510dc13a99ec..016f9104f7854 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -1324,6 +1324,16 @@ typedef double mp_float_t; #define MICROPY_PY_COLLECTIONS_DEQUE (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) #endif +// Whether "collections.deque" supports iteration +#ifndef MICROPY_PY_COLLECTIONS_DEQUE_ITER +#define MICROPY_PY_COLLECTIONS_DEQUE_ITER (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#endif + +// Whether "collections.deque" supports subscription +#ifndef MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR +#define MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) +#endif + // Whether to provide "collections.OrderedDict" type #ifndef MICROPY_PY_COLLECTIONS_ORDEREDDICT #define MICROPY_PY_COLLECTIONS_ORDEREDDICT (MICROPY_CONFIG_ROM_LEVEL_AT_LEAST_EXTRA_FEATURES) diff --git a/py/objdeque.c b/py/objdeque.c index 8b52b8d387303..583537017fdb2 100644 --- a/py/objdeque.c +++ b/py/objdeque.c @@ -25,13 +25,11 @@ */ #include // for ssize_t -#include - -#include "py/mpconfig.h" -#if MICROPY_PY_COLLECTIONS_DEQUE #include "py/runtime.h" +#if MICROPY_PY_COLLECTIONS_DEQUE + typedef struct _mp_obj_deque_t { mp_obj_base_t base; size_t alloc; @@ -42,14 +40,14 @@ typedef struct _mp_obj_deque_t { #define FLAG_CHECK_OVERFLOW 1 } mp_obj_deque_t; -STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { - mp_arg_check_num(n_args, n_kw, 2, 3, false); +static mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg); +static mp_obj_t mp_obj_deque_extend(mp_obj_t self_in, mp_obj_t arg_in); +#if MICROPY_PY_COLLECTIONS_DEQUE_ITER +static mp_obj_t mp_obj_new_deque_it(mp_obj_t deque, mp_obj_iter_buf_t *iter_buf); +#endif - /* Initialization from existing sequence is not supported, so an empty - tuple must be passed as such. */ - if (args[0] != mp_const_empty_tuple) { - mp_raise_ValueError(NULL); - } +static mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { + mp_arg_check_num(n_args, n_kw, 2, 3, false); // Protect against -1 leading to zero-length allocation and bad array access mp_int_t maxlen = mp_obj_get_int(args[1]); @@ -66,21 +64,27 @@ STATIC mp_obj_t deque_make_new(const mp_obj_type_t *type, size_t n_args, size_t o->flags = mp_obj_get_int(args[2]); } + mp_obj_deque_extend(MP_OBJ_FROM_PTR(o), args[0]); + return MP_OBJ_FROM_PTR(o); } -STATIC mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) { +static size_t deque_len(mp_obj_deque_t *self) { + ssize_t len = self->i_put - self->i_get; + if (len < 0) { + len += self->alloc; + } + return len; +} + +static mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) { mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); switch (op) { case MP_UNARY_OP_BOOL: return mp_obj_new_bool(self->i_get != self->i_put); - case MP_UNARY_OP_LEN: { - ssize_t len = self->i_put - self->i_get; - if (len < 0) { - len += self->alloc; - } - return MP_OBJ_NEW_SMALL_INT(len); - } + case MP_UNARY_OP_LEN: + return MP_OBJ_NEW_SMALL_INT(deque_len(self)); + #if MICROPY_PY_SYS_GETSIZEOF case MP_UNARY_OP_SIZEOF: { size_t sz = sizeof(*self) + sizeof(mp_obj_t) * self->alloc; @@ -92,7 +96,7 @@ STATIC mp_obj_t deque_unary_op(mp_unary_op_t op, mp_obj_t self_in) { } } -STATIC mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) { +static mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) { mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); size_t new_i_put = self->i_put + 1; @@ -115,9 +119,48 @@ STATIC mp_obj_t mp_obj_deque_append(mp_obj_t self_in, mp_obj_t arg) { return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_2(deque_append_obj, mp_obj_deque_append); +static MP_DEFINE_CONST_FUN_OBJ_2(deque_append_obj, mp_obj_deque_append); + +static mp_obj_t mp_obj_deque_appendleft(mp_obj_t self_in, mp_obj_t arg) { + mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); + + size_t new_i_get = self->i_get - 1; + if (self->i_get == 0) { + new_i_get = self->alloc - 1; + } + + if (self->flags & FLAG_CHECK_OVERFLOW && new_i_get == self->i_put) { + mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("full")); + } + + self->i_get = new_i_get; + self->items[self->i_get] = arg; + + // overwriting first element in deque + if (self->i_put == new_i_get) { + if (self->i_put == 0) { + self->i_put = self->alloc - 1; + } else { + self->i_put--; + } + } + + return mp_const_none; +} +static MP_DEFINE_CONST_FUN_OBJ_2(deque_appendleft_obj, mp_obj_deque_appendleft); -STATIC mp_obj_t deque_popleft(mp_obj_t self_in) { +static mp_obj_t mp_obj_deque_extend(mp_obj_t self_in, mp_obj_t arg_in) { + mp_obj_iter_buf_t iter_buf; + mp_obj_t iter = mp_getiter(arg_in, &iter_buf); + mp_obj_t item; + while ((item = mp_iternext(iter)) != MP_OBJ_STOP_ITERATION) { + mp_obj_deque_append(self_in, item); + } + return mp_const_none; +} +static MP_DEFINE_CONST_FUN_OBJ_2(deque_extend_obj, mp_obj_deque_extend); + +static mp_obj_t deque_popleft(mp_obj_t self_in) { mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); if (self->i_get == self->i_put) { @@ -133,35 +176,139 @@ STATIC mp_obj_t deque_popleft(mp_obj_t self_in) { return ret; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(deque_popleft_obj, deque_popleft); +static MP_DEFINE_CONST_FUN_OBJ_1(deque_popleft_obj, deque_popleft); + +static mp_obj_t deque_pop(mp_obj_t self_in) { + mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); + + if (self->i_get == self->i_put) { + mp_raise_msg(&mp_type_IndexError, MP_ERROR_TEXT("empty")); + } + + if (self->i_put == 0) { + self->i_put = self->alloc - 1; + } else { + self->i_put--; + } + + mp_obj_t ret = self->items[self->i_put]; + self->items[self->i_put] = MP_OBJ_NULL; + + return ret; +} +static MP_DEFINE_CONST_FUN_OBJ_1(deque_pop_obj, deque_pop); + +#if MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR +static mp_obj_t deque_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) { + if (value == MP_OBJ_NULL) { + // delete not supported, fall back to mp_obj_subscr() error message + return MP_OBJ_NULL; + } + mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); + + size_t offset = mp_get_index(self->base.type, deque_len(self), index, false); + size_t index_val = self->i_get + offset; + if (index_val > self->alloc) { + index_val -= self->alloc; + } + + if (value == MP_OBJ_SENTINEL) { + // load + return self->items[index_val]; + } else { + // store into deque + self->items[index_val] = value; + return mp_const_none; + } +} +#endif #if 0 -STATIC mp_obj_t deque_clear(mp_obj_t self_in) { +static mp_obj_t deque_clear(mp_obj_t self_in) { mp_obj_deque_t *self = MP_OBJ_TO_PTR(self_in); self->i_get = self->i_put = 0; mp_seq_clear(self->items, 0, self->alloc, sizeof(*self->items)); return mp_const_none; } -STATIC MP_DEFINE_CONST_FUN_OBJ_1(deque_clear_obj, deque_clear); +static MP_DEFINE_CONST_FUN_OBJ_1(deque_clear_obj, deque_clear); #endif -STATIC const mp_rom_map_elem_t deque_locals_dict_table[] = { +static const mp_rom_map_elem_t deque_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_append), MP_ROM_PTR(&deque_append_obj) }, + { MP_ROM_QSTR(MP_QSTR_appendleft), MP_ROM_PTR(&deque_appendleft_obj) }, + { MP_ROM_QSTR(MP_QSTR_extend), MP_ROM_PTR(&deque_extend_obj) }, #if 0 { MP_ROM_QSTR(MP_QSTR_clear), MP_ROM_PTR(&deque_clear_obj) }, #endif + { MP_ROM_QSTR(MP_QSTR_pop), MP_ROM_PTR(&deque_pop_obj) }, { MP_ROM_QSTR(MP_QSTR_popleft), MP_ROM_PTR(&deque_popleft_obj) }, }; -STATIC MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table); +static MP_DEFINE_CONST_DICT(deque_locals_dict, deque_locals_dict_table); + +#if MICROPY_PY_COLLECTIONS_DEQUE_ITER +#define DEQUE_TYPE_FLAGS MP_TYPE_FLAG_ITER_IS_GETITER +#define DEQUE_TYPE_ITER iter, mp_obj_new_deque_it, +#else +#define DEQUE_TYPE_FLAGS MP_TYPE_FLAG_NONE +#define DEQUE_TYPE_ITER +#endif + +#if MICROPY_PY_COLLECTIONS_DEQUE_SUBSCR +#define DEQUE_TYPE_SUBSCR subscr, deque_subscr, +#else +#define DEQUE_TYPE_SUBSCR +#endif MP_DEFINE_CONST_OBJ_TYPE( mp_type_deque, MP_QSTR_deque, - MP_TYPE_FLAG_NONE, + MP_TYPE_FLAG_ITER_IS_GETITER, make_new, deque_make_new, unary_op, deque_unary_op, + DEQUE_TYPE_SUBSCR + DEQUE_TYPE_ITER locals_dict, &deque_locals_dict ); +/******************************************************************************/ +/* deque iterator */ + +#if MICROPY_PY_COLLECTIONS_DEQUE_ITER + +typedef struct _mp_obj_deque_it_t { + mp_obj_base_t base; + mp_fun_1_t iternext; + mp_obj_t deque; + size_t cur; +} mp_obj_deque_it_t; + +static mp_obj_t deque_it_iternext(mp_obj_t self_in) { + mp_obj_deque_it_t *self = MP_OBJ_TO_PTR(self_in); + mp_obj_deque_t *deque = MP_OBJ_TO_PTR(self->deque); + if (self->cur != deque->i_put) { + mp_obj_t o_out = deque->items[self->cur]; + if (++self->cur == deque->alloc) { + self->cur = 0; + } + return o_out; + } else { + return MP_OBJ_STOP_ITERATION; + } +} + +static mp_obj_t mp_obj_new_deque_it(mp_obj_t deque, mp_obj_iter_buf_t *iter_buf) { + mp_obj_deque_t *deque_ = MP_OBJ_TO_PTR(deque); + size_t i_get = deque_->i_get; + assert(sizeof(mp_obj_deque_it_t) <= sizeof(mp_obj_iter_buf_t)); + mp_obj_deque_it_t *o = (mp_obj_deque_it_t *)iter_buf; + o->base.type = &mp_type_polymorph_iter; + o->iternext = deque_it_iternext; + o->deque = deque; + o->cur = i_get; + return MP_OBJ_FROM_PTR(o); +} + +#endif + #endif // MICROPY_PY_COLLECTIONS_DEQUE diff --git a/shared-bindings/alarm/touch/TouchAlarm.c b/shared-bindings/alarm/touch/TouchAlarm.c index 2c2bb973277c3..0dafcf9bbf0cc 100644 --- a/shared-bindings/alarm/touch/TouchAlarm.c +++ b/shared-bindings/alarm/touch/TouchAlarm.c @@ -40,7 +40,7 @@ //| :param microcontroller.Pin pin: The pin to monitor. On some ports, the choice of pin //| may be limited due to hardware restrictions, particularly for deep-sleep alarms. //| -//| **Limitations:** Not available on SAMD, nRF, or RP2040. +//| **Limitations:** Not available on SAMD, Nordic, or RP2040. //| """ //| ... STATIC mp_obj_t alarm_touch_touchalarm_make_new(const mp_obj_type_t *type, diff --git a/shared-bindings/analogio/AnalogIn.c b/shared-bindings/analogio/AnalogIn.c index cff9e10b89533..93ebe7e0b848f 100644 --- a/shared-bindings/analogio/AnalogIn.c +++ b/shared-bindings/analogio/AnalogIn.c @@ -56,7 +56,14 @@ MP_WEAK const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t //| """Use the AnalogIn on the given pin. The reference voltage varies by //| platform so use ``reference_voltage`` to read the configured setting. //| -//| :param ~microcontroller.Pin pin: the pin to read from""" +//| :param ~microcontroller.Pin pin: the pin to read from +//| +//| **Limitations:** On Espressif ESP32, `AnalogIn` is not available when WiFi is in use: +//| the hardware makes use of the ADC. Attempts to use `AnalogIn` will raise `espidf.IDFError`. +//| On other Espressif chips, the ADC is available, but is shared with WiFi. +//| WiFi use takes precedence and may temporarily cause `espidf.IDFError` to be raise. +//| when you read a value. You can retry the read. +//| """ //| ... STATIC mp_obj_t analogio_analogin_make_new(const mp_obj_type_t *type, mp_uint_t n_args, size_t n_kw, const mp_obj_t *args) { diff --git a/shared-bindings/analogio/AnalogOut.c b/shared-bindings/analogio/AnalogOut.c index 0c6ca73670237..19c4340e2dc06 100644 --- a/shared-bindings/analogio/AnalogOut.c +++ b/shared-bindings/analogio/AnalogOut.c @@ -38,7 +38,7 @@ //| class AnalogOut: //| """Output analog values (a specific voltage). //| -//| **Limitations:** Not available on nRF, RP2040, Spresense, as there is no on-chip DAC. +//| **Limitations:** Not available on Nordic, RP2040, Spresense, as there is no on-chip DAC. //| On Espressif, available only on ESP32 and ESP32-S2; other chips do not have a DAC. //| //| Example usage:: diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 946dfa3d9039d..f0c4a92b3f320 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -97,7 +97,7 @@ //| *New in CircuitPython 4.0:* ``timeout`` has incompatibly changed units from milliseconds to seconds. //| The new upper limit on ``timeout`` is meant to catch mistaken use of milliseconds. //| -//| **Limitations:** RS485 is not supported on SAMD, nRF, Broadcom, Spresense, or STM. +//| **Limitations:** RS485 is not supported on SAMD, Nordic, Broadcom, Spresense, or STM. //| On i.MX and Raspberry Pi RP2040, RS485 support is implemented in software: //| The timing for the ``rs485_dir`` pin signal is done on a best-effort basis, and may not meet //| RS485 specifications intermittently. diff --git a/shared-bindings/epaperdisplay/EPaperDisplay.c b/shared-bindings/epaperdisplay/EPaperDisplay.c index 0770c329c70e7..4ffdc452b2236 100644 --- a/shared-bindings/epaperdisplay/EPaperDisplay.c +++ b/shared-bindings/epaperdisplay/EPaperDisplay.c @@ -297,7 +297,10 @@ MP_DEFINE_CONST_FUN_OBJ_1(epaperdisplay_epaperdisplay_refresh_obj, epaperdisplay //| """Time, in fractional seconds, until the ePaper display can be refreshed.""" STATIC mp_obj_t epaperdisplay_epaperdisplay_obj_get_time_to_refresh(mp_obj_t self_in) { epaperdisplay_epaperdisplay_obj_t *self = native_display(self_in); - return mp_obj_new_float(common_hal_epaperdisplay_epaperdisplay_get_time_to_refresh(self) / 1000.0); + // band aid fix for + // sleeping for display.time_to_refresh might not be long enough due to rounding error (?) + uint32_t refresh_ms = common_hal_epaperdisplay_epaperdisplay_get_time_to_refresh(self); + return mp_obj_new_float((refresh_ms + 100) / 1000.0); } MP_DEFINE_CONST_FUN_OBJ_1(epaperdisplay_epaperdisplay_get_time_to_refresh_obj, epaperdisplay_epaperdisplay_obj_get_time_to_refresh); diff --git a/shared-bindings/floppyio/__init__.c b/shared-bindings/floppyio/__init__.c index fa45cd53a8a1f..4338fbf6158a5 100644 --- a/shared-bindings/floppyio/__init__.c +++ b/shared-bindings/floppyio/__init__.c @@ -25,9 +25,14 @@ */ #include "shared-bindings/floppyio/__init__.h" +#if CIRCUITPY_DIGITALIO #include "shared-bindings/digitalio/DigitalInOut.h" #include "common-hal/floppyio/__init__.h" +#else +#define FLOPPYIO_SAMPLERATE (24000000) +#endif +#include #include #include "py/binary.h" @@ -35,7 +40,10 @@ #include "py/runtime.h" //| def flux_readinto( -//| buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut +//| buffer: WriteableBuffer, +//| data: digitalio.DigitalInOut, +//| index: digitalio.DigitalInOut, +//| index_wait=0.220, //| ) -> int: //| """Read flux transition information into the buffer. //| @@ -47,67 +55,128 @@ //| :param buffer: Read data into this buffer. Each element represents the time between successive zero-to-one transitions. //| :param data: Pin on which the flux data appears //| :param index: Pin on which the index pulse appears +//| :param index_wait: Time to wait, in seconds, for the index pulse //| :return: The actual number of bytes of read //| """ //| ... //| STATIC mp_obj_t floppyio_flux_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_buffer, ARG_data, ARG_index }; + #if CIRCUITPY_DIGITALIO + enum { ARG_buffer, ARG_data, ARG_index, ARG_index_wait }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_index, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_index_wait, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); mp_buffer_info_t bufinfo; mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE); + digitalio_digitalinout_obj_t *data = assert_digitalinout(args[ARG_data].u_obj); digitalio_digitalinout_obj_t *index = assert_digitalinout(args[ARG_index].u_obj); - return MP_OBJ_NEW_SMALL_INT(common_hal_floppyio_flux_readinto(bufinfo.buf, bufinfo.len, data, index)); + mp_int_t index_wait_ms = args[ARG_index_wait].u_obj ? + MICROPY_FLOAT_C_FUN(round)(mp_arg_validate_type_float(args[ARG_index_wait].u_obj, MP_QSTR_index_wait) * 1000) : + 220; + + return MP_OBJ_NEW_SMALL_INT(common_hal_floppyio_flux_readinto(bufinfo.buf, bufinfo.len, data, index, index_wait_ms)); + #else + mp_raise_NotImplementedError(NULL); + #endif } MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_flux_readinto_obj, 0, floppyio_flux_readinto); //| def mfm_readinto( -//| buffer: WriteableBuffer, data: digitalio.DigitalInOut, index: digitalio.DigitalInOut +//| buffer: WriteableBuffer, +//| flux: ReadableBuffer, +//| flux_t2_max: int, +//| flux_t3_max: int, +//| validity: bytearray | None = None, +//| clear_validity: bool = True, //| ) -> int: -//| """Read mfm blocks into the buffer. +//| """Decode MFM flux into the buffer //| //| The track is assumed to consist of 512-byte sectors. //| -//| The function returns when all sectors have been successfully read, or -//| a number of index pulses have occurred. Due to technical limitations, this -//| process may not be interruptible by KeyboardInterrupt. +//| The function returns the number of sectors successfully read. In addition, +//| it updates the ``validity`` buffer with information about which sectors +//| were read. //| -//| :param buffer: Read data into this buffer. Must be a multiple of 512. -//| :param data: Pin on which the mfm data appears -//| :param index: Pin on which the index pulse appears +//| MFM encoding uses pulses of 3 widths, "T2", "T3" and "T4". +//| A 1440KiB disk in standard MFM format has "T2" pulses of 2000ns, "T3" pulses of 3000ns, +//| and "T4" pulses of 4000ns. +//| +//| Parameters ``t2_max`` and ``t3_max`` are used to distinguish these pulses. +//| A pulse with ``p <= t2_max`` is a "T2" pulse, +//| a pulse with ``t2_max < p <= t3_max`` is a "T3" pulse, +//| and a pulse with ``t3_max < p`` is a "T4" pulse. +//| +//| The following code can convert a number in nanoseconds to a number of samples +//| for a given sample rate: +//| +//| .. code-block:: py +//| +//| def ns_to_count(ns, samplerate): +//| return round(ns * samplerate * 1e-9) +//| +//| This means the following typical values are a good starting place for a 1.44MB floppy: +//| +//| .. code-block:: py +//| +//| t2_max = ns_to_count(2500, samplerate) # Mid way between T2 and T3 length +//| t3_max = ns_to_count(3500, samplerate) # Mid way between T2 and T3 length +//| +//| :param buffer: Read data into this buffer. Byte length must be a multiple of 512. +//| :param flux: Flux data from a previous `flux_readinto` call +//| :param t2_max: Maximum time of a flux cell in counts. +//| :param t3_max: Nominal time of a flux cell in counts. +//| :param validity: Optional bytearray. For each sector successfully read, the corresponding validity entry is set to ``1`` and previously valid sectors are not decoded. +//| :param clear_validity: If `True`, clear the validity information before decoding and attempt to decode all sectors. //| :return: The actual number of sectors read //| """ //| ... //| STATIC mp_obj_t floppyio_mfm_readinto(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) { - enum { ARG_buffer, ARG_data, ARG_index }; + enum { ARG_buffer, ARG_flux, ARG_t2_max, ARG_t3_max, ARG_validity, ARG_clear_validity }; static const mp_arg_t allowed_args[] = { { MP_QSTR_buffer, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, - { MP_QSTR_data, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, - { MP_QSTR_index, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_flux, MP_ARG_REQUIRED | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_flux_t2_max, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, + { MP_QSTR_flux_t3_max, MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} }, + { MP_QSTR_validity, MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_clear_validity, MP_ARG_BOOL, {.u_bool = true } }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); mp_buffer_info_t bufinfo; mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE); - digitalio_digitalinout_obj_t *data = assert_digitalinout(args[ARG_data].u_obj); - digitalio_digitalinout_obj_t *index = assert_digitalinout(args[ARG_index].u_obj); - if (bufinfo.len % 512 != 0) { mp_raise_ValueError(MP_ERROR_TEXT("Buffer must be a multiple of 512 bytes")); } size_t n_sectors = bufinfo.len / 512; - return MP_OBJ_NEW_SMALL_INT(common_hal_floppyio_mfm_readinto(bufinfo.buf, n_sectors, data, index)); + + mp_buffer_info_t bufinfo_flux; + mp_get_buffer_raise(args[ARG_flux].u_obj, &bufinfo_flux, MP_BUFFER_READ); + + mp_buffer_info_t bufinfo_validity; + uint8_t validity_buf[n_sectors]; + if (args[ARG_validity].u_obj) { + mp_get_buffer_raise(args[ARG_validity].u_obj, &bufinfo_validity, MP_BUFFER_READ); + mp_arg_validate_length_min(bufinfo_validity.len, n_sectors, MP_QSTR_validity); + if (args[ARG_clear_validity].u_bool) { + memset(validity_buf, 0, sizeof(validity_buf)); + } + } else { + bufinfo_validity.buf = &validity_buf; + bufinfo_validity.len = n_sectors; + memset(validity_buf, 0, sizeof(validity_buf)); + } + + return MP_OBJ_NEW_SMALL_INT(common_hal_floppyio_mfm_readinto(&bufinfo, &bufinfo_flux, bufinfo_validity.buf, args[ARG_t2_max].u_int, args[ARG_t3_max].u_int)); } MP_DEFINE_CONST_FUN_OBJ_KW(floppyio_mfm_readinto_obj, 0, floppyio_mfm_readinto); diff --git a/shared-bindings/floppyio/__init__.h b/shared-bindings/floppyio/__init__.h index 322bbe7d430cd..54079ee025f66 100644 --- a/shared-bindings/floppyio/__init__.h +++ b/shared-bindings/floppyio/__init__.h @@ -26,7 +26,11 @@ #pragma once +#include "py/obj.h" + +#if CIRCUITPY_DIGITALIO #include "common-hal/digitalio/DigitalInOut.h" +int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index, mp_int_t index_wait_ms); +#endif -int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index); -int common_hal_floppyio_mfm_readinto(void *buf, size_t n_sector, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index); +int common_hal_floppyio_mfm_readinto(const mp_buffer_info_t *buf, const mp_buffer_info_t *flux_buf, uint8_t *validity, size_t t2_max, size_t t3_max); diff --git a/shared-bindings/fourwire/FourWire.c b/shared-bindings/fourwire/FourWire.c index 86ce13d36e672..9986e1ac22068 100644 --- a/shared-bindings/fourwire/FourWire.c +++ b/shared-bindings/fourwire/FourWire.c @@ -47,7 +47,7 @@ //| spi_bus: busio.SPI, //| *, //| command: Optional[microcontroller.Pin], -//| chip_select: microcontroller.Pin, +//| chip_select: Optional[microcontroller.Pin], //| reset: Optional[microcontroller.Pin] = None, //| baudrate: int = 24000000, //| polarity: int = 0, @@ -79,7 +79,7 @@ STATIC mp_obj_t fourwire_fourwire_make_new(const mp_obj_type_t *type, size_t n_a static const mp_arg_t allowed_args[] = { { MP_QSTR_spi_bus, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_command, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, - { MP_QSTR_chip_select, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED }, + { MP_QSTR_chip_select, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, { MP_QSTR_reset, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none} }, { MP_QSTR_baudrate, MP_ARG_INT | MP_ARG_KW_ONLY, {.u_int = 24000000} }, { MP_QSTR_polarity, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 0} }, @@ -89,7 +89,7 @@ STATIC mp_obj_t fourwire_fourwire_make_new(const mp_obj_type_t *type, size_t n_a mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); const mcu_pin_obj_t *command = validate_obj_is_free_pin_or_none(args[ARG_command].u_obj, MP_QSTR_command); - const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj, MP_QSTR_chip_select); + const mcu_pin_obj_t *chip_select = validate_obj_is_free_pin_or_none(args[ARG_chip_select].u_obj, MP_QSTR_chip_select); const mcu_pin_obj_t *reset = validate_obj_is_free_pin_or_none(args[ARG_reset].u_obj, MP_QSTR_reset); mp_obj_t spi = mp_arg_validate_type(args[ARG_spi_bus].u_obj, &busio_spi_type, MP_QSTR_spi_bus); diff --git a/shared-bindings/keypad/KeyMatrix.c b/shared-bindings/keypad/KeyMatrix.c index d035f2d6d7bd0..13556436f623e 100644 --- a/shared-bindings/keypad/KeyMatrix.c +++ b/shared-bindings/keypad/KeyMatrix.c @@ -59,6 +59,7 @@ //| columns_to_anodes: bool = True, //| interval: float = 0.020, //| max_events: int = 64, +//| debounce_threshold: int = 1, //| ) -> None: //| """ //| Create a `Keys` object that will scan the key matrix attached to the given row and column pins. @@ -82,19 +83,24 @@ //| maximum number of key transition events that are saved. //| Must be >= 1. //| If a new event arrives when the queue is full, the oldest event is discarded. +//| :param int debounce_threshold: Emit events for state changes only after a key has been +//| in the respective state for ``debounce_threshold`` times on average. +//| Successive measurements are spaced apart by ``interval`` seconds. +//| The default is 1, which resolves immediately. The maximum is 127. //| """ //| ... STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_KEYPAD_KEYMATRIX keypad_keymatrix_obj_t *self = mp_obj_malloc(keypad_keymatrix_obj_t, &keypad_keymatrix_type); - enum { ARG_row_pins, ARG_column_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events }; + enum { ARG_row_pins, ARG_column_pins, ARG_columns_to_anodes, ARG_interval, ARG_max_events, ARG_debounce_threshold }; static const mp_arg_t allowed_args[] = { { MP_QSTR_row_pins, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_column_pins, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_columns_to_anodes, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} }, { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} }, + { MP_QSTR_debounce_threshold, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); @@ -109,6 +115,7 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar const mp_float_t interval = mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval); const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events); + const uint8_t debounce_threshold = (uint8_t)mp_arg_validate_int_range(args[ARG_debounce_threshold].u_int, 1, 127, MP_QSTR_debounce_threshold); const mcu_pin_obj_t *row_pins_array[num_row_pins]; const mcu_pin_obj_t *column_pins_array[num_column_pins]; @@ -127,7 +134,7 @@ STATIC mp_obj_t keypad_keymatrix_make_new(const mp_obj_type_t *type, size_t n_ar column_pins_array[column] = pin; } - common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_column_pins, column_pins_array, args[ARG_columns_to_anodes].u_bool, interval, max_events); + common_hal_keypad_keymatrix_construct(self, num_row_pins, row_pins_array, num_column_pins, column_pins_array, args[ARG_columns_to_anodes].u_bool, interval, max_events, debounce_threshold); return MP_OBJ_FROM_PTR(self); #else mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_KeyMatrix); diff --git a/shared-bindings/keypad/KeyMatrix.h b/shared-bindings/keypad/KeyMatrix.h index bdf77dd32aefc..f6085eb231db6 100644 --- a/shared-bindings/keypad/KeyMatrix.h +++ b/shared-bindings/keypad/KeyMatrix.h @@ -32,7 +32,7 @@ extern const mp_obj_type_t keypad_keymatrix_type; -void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, const mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events); +void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, const mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events, uint8_t debounce_threshold); void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self); diff --git a/shared-bindings/keypad/Keys.c b/shared-bindings/keypad/Keys.c index 94a8b76da0938..512cad2da3ae9 100644 --- a/shared-bindings/keypad/Keys.c +++ b/shared-bindings/keypad/Keys.c @@ -59,7 +59,8 @@ //| value_when_pressed: bool, //| pull: bool = True, //| interval: float = 0.020, -//| max_events: int = 64 +//| max_events: int = 64, +//| debounce_threshold: int = 1, //| ) -> None: //| """ //| Create a `Keys` object that will scan keys attached to the given sequence of pins. @@ -84,19 +85,24 @@ //| maximum number of key transition events that are saved. //| Must be >= 1. //| If a new event arrives when the queue is full, the oldest event is discarded. +//| :param int debounce_threshold: Emit events for state changes only after a key has been +//| in the respective state for ``debounce_threshold`` times on average. +//| Successive measurements are spaced apart by ``interval`` seconds. +//| The default is 1, which resolves immediately. The maximum is 127. //| """ //| ... STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { #if CIRCUITPY_KEYPAD_KEYS keypad_keys_obj_t *self = mp_obj_malloc(keypad_keys_obj_t, &keypad_keys_type); - enum { ARG_pins, ARG_value_when_pressed, ARG_pull, ARG_interval, ARG_max_events }; + enum { ARG_pins, ARG_value_when_pressed, ARG_pull, ARG_interval, ARG_max_events, ARG_debounce_threshold }; static const mp_arg_t allowed_args[] = { { MP_QSTR_pins, MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL }, { MP_QSTR_pull, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = true} }, { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL } }, { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} }, + { MP_QSTR_debounce_threshold, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); @@ -110,6 +116,7 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, s const mp_float_t interval = mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval); const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events); + const uint8_t debounce_threshold = (uint8_t)mp_arg_validate_int_range(args[ARG_debounce_threshold].u_int, 1, 127, MP_QSTR_debounce_threshold); const mcu_pin_obj_t *pins_array[num_pins]; @@ -118,7 +125,7 @@ STATIC mp_obj_t keypad_keys_make_new(const mp_obj_type_t *type, size_t n_args, s validate_obj_is_free_pin(mp_obj_subscr(pins, MP_OBJ_NEW_SMALL_INT(i), MP_OBJ_SENTINEL), MP_QSTR_pin); } - common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, interval, max_events); + common_hal_keypad_keys_construct(self, num_pins, pins_array, value_when_pressed, args[ARG_pull].u_bool, interval, max_events, debounce_threshold); return MP_OBJ_FROM_PTR(self); #else diff --git a/shared-bindings/keypad/Keys.h b/shared-bindings/keypad/Keys.h index eb833b97d6804..e57030f7d0e0d 100644 --- a/shared-bindings/keypad/Keys.h +++ b/shared-bindings/keypad/Keys.h @@ -32,7 +32,7 @@ extern const mp_obj_type_t keypad_keys_type; -void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, mp_float_t interval, size_t max_events); +void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, mp_float_t interval, size_t max_events, uint8_t debounce_threshold); void common_hal_keypad_keys_deinit(keypad_keys_obj_t *self); diff --git a/shared-bindings/keypad/ShiftRegisterKeys.c b/shared-bindings/keypad/ShiftRegisterKeys.c index 872f270847da6..aaca596052908 100644 --- a/shared-bindings/keypad/ShiftRegisterKeys.c +++ b/shared-bindings/keypad/ShiftRegisterKeys.c @@ -62,7 +62,8 @@ //| key_count: Union[int, Sequence[int]], //| value_when_pressed: bool, //| interval: float = 0.020, -//| max_events: int = 64 +//| max_events: int = 64, +//| debounce_threshold: int = 1, //| ) -> None: //| """ //| Create a `Keys` object that will scan keys attached to a parallel-in serial-out shift register @@ -95,6 +96,10 @@ //| maximum number of key transition events that are saved. //| Must be >= 1. //| If a new event arrives when the queue is full, the oldest event is discarded. +//| :param int debounce_threshold: Emit events for state changes only after a key has been +//| in the respective state for ``debounce_threshold`` times on average. +//| Successive measurements are spaced apart by ``interval`` seconds. +//| The default is 1, which resolves immediately. The maximum is 127. //| """ //| ... @@ -102,7 +107,7 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz #if CIRCUITPY_KEYPAD_SHIFTREGISTERKEYS keypad_shiftregisterkeys_obj_t *self = mp_obj_malloc(keypad_shiftregisterkeys_obj_t, &keypad_shiftregisterkeys_type); - enum { ARG_clock, ARG_data, ARG_latch, ARG_value_to_latch, ARG_key_count, ARG_value_when_pressed, ARG_interval, ARG_max_events }; + enum { ARG_clock, ARG_data, ARG_latch, ARG_value_to_latch, ARG_key_count, ARG_value_when_pressed, ARG_interval, ARG_max_events, ARG_debounce_threshold }; static const mp_arg_t allowed_args[] = { { MP_QSTR_clock, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ }, { MP_QSTR_data, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ }, @@ -112,6 +117,7 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz { MP_QSTR_value_when_pressed, MP_ARG_REQUIRED | MP_ARG_KW_ONLY | MP_ARG_BOOL }, { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} }, + { MP_QSTR_debounce_threshold, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, }; mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); @@ -168,9 +174,10 @@ STATIC mp_obj_t keypad_shiftregisterkeys_make_new(const mp_obj_type_t *type, siz const mp_float_t interval = mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval); const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events); + const uint8_t debounce_threshold = (uint8_t)mp_arg_validate_int_range(args[ARG_debounce_threshold].u_int, 1, 127, MP_QSTR_debounce_threshold); common_hal_keypad_shiftregisterkeys_construct( - self, clock, num_data_pins, data_pins_array, latch, value_to_latch, num_key_counts, key_count_array, value_when_pressed, interval, max_events); + self, clock, num_data_pins, data_pins_array, latch, value_to_latch, num_key_counts, key_count_array, value_when_pressed, interval, max_events, debounce_threshold); return MP_OBJ_FROM_PTR(self); diff --git a/shared-bindings/keypad/ShiftRegisterKeys.h b/shared-bindings/keypad/ShiftRegisterKeys.h index e3d1bc20be4a9..b98818140c160 100644 --- a/shared-bindings/keypad/ShiftRegisterKeys.h +++ b/shared-bindings/keypad/ShiftRegisterKeys.h @@ -32,7 +32,7 @@ extern const mp_obj_type_t keypad_shiftregisterkeys_type; -void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, mp_uint_t num_data_pins, const mcu_pin_obj_t *data_pins[], const mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t num_key_count, size_t key_counts[], bool value_when_pressed, mp_float_t interval, size_t max_events); +void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, mp_uint_t num_data_pins, const mcu_pin_obj_t *data_pins[], const mcu_pin_obj_t *latch_pin, bool value_to_latch, size_t num_key_count, size_t key_counts[], bool value_when_pressed, mp_float_t interval, size_t max_events, uint8_t debounce_threshold); void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self); diff --git a/shared-bindings/keypad_demux/DemuxKeyMatrix.c b/shared-bindings/keypad_demux/DemuxKeyMatrix.c new file mode 100644 index 0000000000000..64fd8a0ff13a8 --- /dev/null +++ b/shared-bindings/keypad_demux/DemuxKeyMatrix.c @@ -0,0 +1,252 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2024 CDarius + * + * 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 "shared/runtime/context_manager_helpers.h" +#include "py/binary.h" +#include "py/objproperty.h" +#include "py/runtime.h" +#include "shared-bindings/keypad/__init__.h" +#include "shared-bindings/keypad/Event.h" +#include "shared-bindings/keypad_demux/DemuxKeyMatrix.h" +#include "shared-bindings/microcontroller/Pin.h" +#include "shared-bindings/util.h" + +//| class DemuxKeyMatrix: +//| """Manage Cardputer 2D matrix of keys with a demultiplexer to drive rows and pins on columns. +//| +//| .. raw:: html +//| +//|

+//|

+//| Available on these boards +//|
    +//| {% for board in support_matrix_reverse["keypad_demux.DemuxKeyMatrix"] %} +//|
  • {{ board }} +//| {% endfor %} +//|
+//|
+//|

+//| +//| """ +//| +//| def __init__( +//| self, +//| row_addr_pins: Sequence[microcontroller.Pin], +//| column_pins: Sequence[microcontroller.Pin], +//| interval: float = 0.020, +//| max_events: int = 64, +//| debounce_threshold: int = 1, +//| ) -> None: +//| """ +//| Create a `keypad.Keys` object that will scan the key matrix attached to the given row and column pins. +//| There should not be any external pull-ups or pull-downs on the matrix: +//| ``DemuxKeyMatrix`` enables internal pull-ups or pull-downs on the pins as necessary. +//| +//| The keys are numbered sequentially from zero. A key number can be computed +//| by ``row * len(column_pins) + column``. +//| +//| An `keypad.EventQueue` is created when this object is created and is available in the `events` attribute. +//| +//| :param Sequence[microcontroller.Pin] row_addr_pins: The pins attached to the rows demultiplexer. +//| :param Sequence[microcontroller.Pin] column_pins: The pins attached to the columns. +//| :param float interval: Scan keys no more often than ``interval`` to allow for debouncing. +//| ``interval`` is in float seconds. The default is 0.020 (20 msecs). +//| :param int max_events: maximum size of `events` `keypad.EventQueue`: +//| maximum number of key transition events that are saved. +//| Must be >= 1. +//| If a new event arrives when the queue is full, the oldest event is discarded. +//| :param int debounce_threshold: Emit events for state changes only after a key has been +//| in the respective state for ``debounce_threshold`` times on average. +//| Successive measurements are spaced apart by ``interval`` seconds. +//| The default is 1, which resolves immediately. The maximum is 127. +//| """ +//| ... + +STATIC mp_obj_t keypad_demux_demuxkeymatrix_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) { + keypad_demux_demuxkeymatrix_obj_t *self = mp_obj_malloc(keypad_demux_demuxkeymatrix_obj_t, &keypad_demux_demuxkeymatrix_type); + enum { ARG_row_addr_pins, ARG_column_pins, ARG_interval, ARG_max_events, ARG_debounce_threshold }; + static const mp_arg_t allowed_args[] = { + { MP_QSTR_row_addr_pins, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_column_pins, MP_ARG_REQUIRED | MP_ARG_OBJ }, + { MP_QSTR_interval, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} }, + { MP_QSTR_max_events, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 64} }, + { MP_QSTR_debounce_threshold, MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = 1} }, + }; + mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; + mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); + + mp_obj_t row_addr_pins = args[ARG_row_addr_pins].u_obj; + // mp_obj_len() will be >= 0. + const size_t num_row_addr_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(row_addr_pins)); + + mp_obj_t column_pins = args[ARG_column_pins].u_obj; + const size_t num_column_pins = (size_t)MP_OBJ_SMALL_INT_VALUE(mp_obj_len(column_pins)); + + const mp_float_t interval = + mp_arg_validate_obj_float_non_negative(args[ARG_interval].u_obj, 0.020f, MP_QSTR_interval); + const size_t max_events = (size_t)mp_arg_validate_int_min(args[ARG_max_events].u_int, 1, MP_QSTR_max_events); + const uint8_t debounce_threshold = (uint8_t)mp_arg_validate_int_range(args[ARG_debounce_threshold].u_int, 1, 127, MP_QSTR_debounce_threshold); + + const mcu_pin_obj_t *row_addr_pins_array[num_row_addr_pins]; + const mcu_pin_obj_t *column_pins_array[num_column_pins]; + + validate_no_duplicate_pins_2(row_addr_pins, column_pins, MP_QSTR_row_addr_pins, MP_QSTR_column_pins); + + for (size_t row_addr = 0; row_addr < num_row_addr_pins; row_addr++) { + const mcu_pin_obj_t *pin = + validate_obj_is_free_pin(mp_obj_subscr(row_addr_pins, MP_OBJ_NEW_SMALL_INT(row_addr), MP_OBJ_SENTINEL), MP_QSTR_pin); + row_addr_pins_array[row_addr] = pin; + } + + for (size_t column = 0; column < num_column_pins; column++) { + const mcu_pin_obj_t *pin = + validate_obj_is_free_pin(mp_obj_subscr(column_pins, MP_OBJ_NEW_SMALL_INT(column), MP_OBJ_SENTINEL), MP_QSTR_pin); + column_pins_array[column] = pin; + } + + common_hal_keypad_demux_demuxkeymatrix_construct(self, num_row_addr_pins, row_addr_pins_array, num_column_pins, column_pins_array, interval, max_events, debounce_threshold); + return MP_OBJ_FROM_PTR(self); +} + +//| def deinit(self) -> None: +//| """Stop scanning and release the pins.""" +//| ... +STATIC mp_obj_t keypad_demux_demuxkeymatrix_deinit(mp_obj_t self_in) { + keypad_demux_demuxkeymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); + common_hal_keypad_demux_demuxkeymatrix_deinit(self); + return MP_ROM_NONE; +} +MP_DEFINE_CONST_FUN_OBJ_1(keypad_demux_demuxkeymatrix_deinit_obj, keypad_demux_demuxkeymatrix_deinit); + +//| def __enter__(self) -> DemuxKeyMatrix: +//| """No-op used by Context Managers.""" +//| ... +// Provided by context manager helper. + +//| def __exit__(self) -> None: +//| """Automatically deinitializes when exiting a context. See +//| :ref:`lifetime-and-contextmanagers` for more info.""" +//| ... +STATIC mp_obj_t keypad_demux_demuxkeymatrix___exit__(size_t n_args, const mp_obj_t *args) { + (void)n_args; + common_hal_keypad_demux_demuxkeymatrix_deinit(args[0]); + return MP_ROM_NONE; +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(keypad_demux_demuxkeymatrix___exit___obj, 4, 4, keypad_demux_demuxkeymatrix___exit__); + +STATIC void check_for_deinit(keypad_demux_demuxkeymatrix_obj_t *self) { + if (common_hal_keypad_deinited(self)) { + raise_deinited_error(); + } +} + +//| def reset(self) -> None: +//| """Reset the internal state of the scanner to assume that all keys are now released. +//| Any key that is already pressed at the time of this call will therefore immediately cause +//| a new key-pressed event to occur. +//| """ +//| ... + +//| key_count: int +//| """The number of keys that are being scanned. (read-only) +//| """ + +//| def key_number_to_row_column(self, key_number: int) -> Tuple[int]: +//| """Return the row and column for the given key number. +//| The row is ``key_number // len(column_pins)``. +//| The column is ``key_number % len(column_pins)``. +//| +//| :return: ``(row, column)`` +//| :rtype: Tuple[int] +//| """ +//| ... +STATIC mp_obj_t keypad_demux_demuxkeymatrix_key_number_to_row_column(mp_obj_t self_in, mp_obj_t key_number_in) { + keypad_demux_demuxkeymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); + check_for_deinit(self); + + const mp_uint_t key_number = (mp_uint_t)mp_arg_validate_int_range( + mp_obj_get_int(key_number_in), + 0, (mp_int_t)common_hal_keypad_generic_get_key_count(self), + MP_QSTR_key_number); + + mp_uint_t row; + mp_uint_t column; + common_hal_keypad_demux_demuxkeymatrix_key_number_to_row_column(self, key_number, &row, &column); + + mp_obj_t row_column[2]; + row_column[0] = MP_OBJ_NEW_SMALL_INT(row); + row_column[1] = MP_OBJ_NEW_SMALL_INT(column); + + return mp_obj_new_tuple(2, row_column); +} +MP_DEFINE_CONST_FUN_OBJ_2(keypad_demux_demuxkeymatrix_key_number_to_row_column_obj, keypad_demux_demuxkeymatrix_key_number_to_row_column); + +//| def row_column_to_key_number(self, row: int, column: int) -> int: +//| """Return the key number for a given row and column. +//| The key number is ``row * len(column_pins) + column``. +//| """ +//| ... +STATIC mp_obj_t keypad_demux_demuxkeymatrix_row_column_to_key_number(mp_obj_t self_in, mp_obj_t row_in, mp_obj_t column_in) { + keypad_demux_demuxkeymatrix_obj_t *self = MP_OBJ_TO_PTR(self_in); + check_for_deinit(self); + + const mp_uint_t row = (mp_uint_t)mp_arg_validate_int_range( + mp_obj_get_int(row_in), 0, (mp_int_t)common_hal_keypad_demux_demuxkeymatrix_get_row_count(self), MP_QSTR_row); + + const mp_int_t column = (mp_uint_t)mp_arg_validate_int_range( + mp_obj_get_int(column_in), 0, (mp_int_t)common_hal_keypad_demux_demuxkeymatrix_get_column_count(self), MP_QSTR_column); + + return MP_OBJ_NEW_SMALL_INT( + (mp_int_t)common_hal_keypad_demux_demuxkeymatrix_row_column_to_key_number(self, row, column)); +} +MP_DEFINE_CONST_FUN_OBJ_3(keypad_demux_demuxkeymatrix_row_column_to_key_number_obj, keypad_demux_demuxkeymatrix_row_column_to_key_number); + +//| events: keypad.EventQueue +//| """The `keypad.EventQueue` associated with this `keypad.Keys` object. (read-only) +//| """ +//| + +STATIC const mp_rom_map_elem_t keypad_demux_demuxkeymatrix_locals_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&keypad_demux_demuxkeymatrix_deinit_obj) }, + { MP_ROM_QSTR(MP_QSTR___enter__), MP_ROM_PTR(&default___enter___obj) }, + { MP_ROM_QSTR(MP_QSTR___exit__), MP_ROM_PTR(&keypad_demux_demuxkeymatrix___exit___obj) }, + + { MP_ROM_QSTR(MP_QSTR_events), MP_ROM_PTR(&keypad_generic_events_obj) }, + { MP_ROM_QSTR(MP_QSTR_key_count), MP_ROM_PTR(&keypad_generic_key_count_obj) }, + { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&keypad_generic_reset_obj) }, + { MP_ROM_QSTR(MP_QSTR_key_number_to_row_column), MP_ROM_PTR(&keypad_demux_demuxkeymatrix_key_number_to_row_column_obj) }, + { MP_ROM_QSTR(MP_QSTR_row_column_to_key_number), MP_ROM_PTR(&keypad_demux_demuxkeymatrix_row_column_to_key_number_obj) }, +}; + +STATIC MP_DEFINE_CONST_DICT(keypad_demux_demuxkeymatrix_locals_dict, keypad_demux_demuxkeymatrix_locals_dict_table); + +MP_DEFINE_CONST_OBJ_TYPE( + keypad_demux_demuxkeymatrix_type, + MP_QSTR_DemuxKeyMatrix, + MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS, + make_new, keypad_demux_demuxkeymatrix_make_new, + locals_dict, &keypad_demux_demuxkeymatrix_locals_dict + ); diff --git a/shared-bindings/keypad_demux/DemuxKeyMatrix.h b/shared-bindings/keypad_demux/DemuxKeyMatrix.h new file mode 100644 index 0000000000000..a4acbc9115047 --- /dev/null +++ b/shared-bindings/keypad_demux/DemuxKeyMatrix.h @@ -0,0 +1,45 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2024 CDarius + * + * 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. + */ + +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_DEMUX_DEMUXKEYMATRIX_H +#define MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_DEMUX_DEMUXKEYMATRIX_H + +#include "py/objlist.h" +#include "shared-module/keypad_demux/DemuxKeyMatrix.h" + +extern const mp_obj_type_t keypad_demux_demuxkeymatrix_type; + +void common_hal_keypad_demux_demuxkeymatrix_construct(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t num_row_addr_pins, const mcu_pin_obj_t *row_addr_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], mp_float_t interval, size_t max_events, uint8_t debounce_threshold); + +void common_hal_keypad_demux_demuxkeymatrix_deinit(keypad_demux_demuxkeymatrix_obj_t *self); + +void common_hal_keypad_demux_demuxkeymatrix_key_number_to_row_column(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t key_number, mp_uint_t *row, mp_uint_t *column); +mp_uint_t common_hal_keypad_demux_demuxkeymatrix_row_column_to_key_number(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t row, mp_uint_t column); + +size_t common_hal_keypad_demux_demuxkeymatrix_get_column_count(keypad_demux_demuxkeymatrix_obj_t *self); +size_t common_hal_keypad_demux_demuxkeymatrix_get_row_count(keypad_demux_demuxkeymatrix_obj_t *self); + +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_KEYPAD_DEMUX_DEMUXKEYMATRIX_H diff --git a/ports/cxd56/common-hal/supervisor/__init__.c b/shared-bindings/keypad_demux/__init__.c old mode 100755 new mode 100644 similarity index 57% rename from ports/cxd56/common-hal/supervisor/__init__.c rename to shared-bindings/keypad_demux/__init__.c index e240525f22396..fdce618e6401b --- a/ports/cxd56/common-hal/supervisor/__init__.c +++ b/shared-bindings/keypad_demux/__init__.c @@ -3,7 +3,7 @@ * * The MIT License (MIT) * - * Copyright 2019 Sony Semiconductor Solutions Corporation + * Copyright (c) 2024 CDarius * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,13 +24,29 @@ * THE SOFTWARE. */ -#include "shared-bindings/supervisor/__init__.h" -#include "shared-bindings/supervisor/Runtime.h" +#include "py/obj.h" -// The singleton supervisor.Runtime object, bound to supervisor.runtime -// It currently only has properties, and no state. -const super_runtime_obj_t common_hal_supervisor_runtime_obj = { - .base = { - .type = &supervisor_runtime_type, - }, +#include "shared-bindings/keypad_demux/DemuxKeyMatrix.h" +#include "shared-bindings/util.h" + +//| """Support for scanning key matrices that use a demultiplexer +//| +//| The `keypad_demux` module provides native support to scan sets of keys or buttons, +//| connected in a row-and-column matrix. +//| +//| .. jinja +//| """ + +STATIC mp_rom_map_elem_t keypad_demux_module_globals_table[] = { + { MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_keypad_demux) }, + { MP_ROM_QSTR(MP_QSTR_DemuxKeyMatrix), MP_OBJ_FROM_PTR(&keypad_demux_demuxkeymatrix_type) }, +}; + +STATIC MP_DEFINE_CONST_DICT(keypad_demux_module_globals, keypad_demux_module_globals_table); + +const mp_obj_module_t keypad_demux_module = { + .base = { &mp_type_module }, + .globals = (mp_obj_dict_t *)&keypad_demux_module_globals, }; + +MP_REGISTER_MODULE(MP_QSTR_keypad_demux, keypad_demux_module); diff --git a/shared-bindings/rtc/RTC.c b/shared-bindings/rtc/RTC.c index 6384f2ea704c1..9445d4fb0e477 100644 --- a/shared-bindings/rtc/RTC.c +++ b/shared-bindings/rtc/RTC.c @@ -93,7 +93,7 @@ MP_PROPERTY_GETSET(rtc_rtc_datetime_obj, //| //| A positive value speeds up the clock and a negative value slows it down. //| -//| **Limitations:** Calibration not supported on SAMD, nRF, RP240, Spresense, and STM. +//| **Limitations:** Calibration not supported on SAMD, Nordic, RP240, Spresense, and STM. //| //| Range and value is hardware specific, but one step is often approximately 1 ppm:: //| diff --git a/shared-bindings/supervisor/Runtime.c b/shared-bindings/supervisor/Runtime.c index 326d8b66bcaa9..591eddd29a21e 100644 --- a/shared-bindings/supervisor/Runtime.c +++ b/shared-bindings/supervisor/Runtime.c @@ -35,6 +35,7 @@ #include "shared-bindings/supervisor/SafeModeReason.h" #include "supervisor/shared/reload.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/stack.h" #include "supervisor/shared/status_leds.h" #include "supervisor/shared/bluetooth/bluetooth.h" @@ -79,19 +80,29 @@ MP_PROPERTY_GETTER(supervisor_runtime_usb_connected_obj, //| serial_connected: bool //| """Returns the USB serial communication status (read-only).""" STATIC mp_obj_t supervisor_runtime_get_serial_connected(mp_obj_t self) { - return mp_obj_new_bool(common_hal_supervisor_runtime_get_serial_connected()); + return mp_obj_new_bool(serial_connected()); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_connected_obj, supervisor_runtime_get_serial_connected); MP_PROPERTY_GETTER(supervisor_runtime_serial_connected_obj, (mp_obj_t)&supervisor_runtime_get_serial_connected_obj); -//| serial_bytes_available: bool -//| """Returns whether any bytes are available to read -//| on the USB serial input. Allows for polling to see whether -//| to call the built-in input() or wait. (read-only)""" +//| serial_bytes_available: int +//| """Returns the number of bytes are available to read on the console serial input. +//| Multiple console serial inputs may be in use at once, including +//| USB, web workflow, BLE workflow, and/or UART. +//| +//| Allows for polling to see whether to call the built-in input() or wait. (read-only) +//| +//| **Limitations**: On STM, UART (not USB) console input can only determine that at least one character +//| is available, and so if only the UART console is in use, only ``1`` or ``0`` will be returned. +//| +//| Changed in version 9.1.0: Previously returned only ``True`` or ``False``. +//| Since ``0`` acts as ``False``, ``if supervisor.runtime.serial_byes_available:`` +//| will still work. +//| """ STATIC mp_obj_t supervisor_runtime_get_serial_bytes_available(mp_obj_t self) { - return mp_obj_new_bool(common_hal_supervisor_runtime_get_serial_bytes_available()); + return MP_OBJ_NEW_SMALL_INT(serial_bytes_available()); } MP_DEFINE_CONST_FUN_OBJ_1(supervisor_runtime_get_serial_bytes_available_obj, supervisor_runtime_get_serial_bytes_available); diff --git a/shared-bindings/supervisor/Runtime.h b/shared-bindings/supervisor/Runtime.h index 3c3e2611f6755..bc4e2db471f39 100644 --- a/shared-bindings/supervisor/Runtime.h +++ b/shared-bindings/supervisor/Runtime.h @@ -24,10 +24,8 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_RUNTIME_STATUS_H -#define MICROPY_INCLUDED_SHARED_BINDINGS_RUNTIME_STATUS_H +#pragma once -#include #include "py/obj.h" #include "shared-bindings/supervisor/RunReason.h" @@ -43,10 +41,8 @@ void supervisor_set_safe_mode(safe_mode_t safe_mode); bool common_hal_supervisor_runtime_get_serial_connected(void); -bool common_hal_supervisor_runtime_get_serial_bytes_available(void); +uint32_t common_hal_supervisor_runtime_get_serial_bytes_available(void); // TODO: placeholders for future functions // bool common_hal_get_supervisor_runtime_repl_active(void); // bool common_hal_get_supervisor_runtime_usb_enumerated(void); - -#endif // MICROPY_INCLUDED_SHARED_BINDINGS_SUPERVISOR_RUNTIME_H diff --git a/shared-bindings/supervisor/__init__.h b/shared-bindings/supervisor/__init__.h index b6643c2fd6658..ec98be946172f 100644 --- a/shared-bindings/supervisor/__init__.h +++ b/shared-bindings/supervisor/__init__.h @@ -30,7 +30,7 @@ // #include "py/mpconfig.h" #include "py/obj.h" -#include "common-hal/supervisor/Runtime.h" +#include "shared-module/supervisor/Runtime.h" #include "shared-module/supervisor/StatusBar.h" #include "supervisor/usb.h" diff --git a/shared-bindings/time/__init__.h b/shared-bindings/time/__init__.h index dba8229f26d0f..432736a1ec8e0 100644 --- a/shared-bindings/time/__init__.h +++ b/shared-bindings/time/__init__.h @@ -30,6 +30,7 @@ #include #include +#include "py/obj.h" #include "shared/timeutils/timeutils.h" extern mp_obj_t struct_time_from_tm(timeutils_struct_time_t *tm); diff --git a/shared-bindings/wifi/Radio.h b/shared-bindings/wifi/Radio.h index b976b5080cc51..7e85dc8a4cd9a 100644 --- a/shared-bindings/wifi/Radio.h +++ b/shared-bindings/wifi/Radio.h @@ -39,38 +39,45 @@ extern const mp_obj_namedtuple_type_t wifi_radio_station_type; typedef enum { // 0 is circuitpython-specific; 1-53 are IEEE; 200+ are Espressif - WIFI_RADIO_ERROR_NONE = 0, - WIFI_RADIO_ERROR_UNSPECIFIED = 1, - WIFI_RADIO_ERROR_AUTH_EXPIRE = 2, - WIFI_RADIO_ERROR_AUTH_LEAVE = 3, - WIFI_RADIO_ERROR_ASSOC_EXPIRE = 4, - WIFI_RADIO_ERROR_ASSOC_TOOMANY = 5, - WIFI_RADIO_ERROR_NOT_AUTHED = 6, - WIFI_RADIO_ERROR_NOT_ASSOCED = 7, - WIFI_RADIO_ERROR_ASSOC_LEAVE = 8, - WIFI_RADIO_ERROR_ASSOC_NOT_AUTHED = 9, - WIFI_RADIO_ERROR_DISASSOC_PWRCAP_BAD = 10, - WIFI_RADIO_ERROR_DISASSOC_SUPCHAN_BAD = 11, - WIFI_RADIO_ERROR_IE_INVALID = 13, - WIFI_RADIO_ERROR_MIC_FAILURE = 14, - WIFI_RADIO_ERROR_4WAY_HANDSHAKE_TIMEOUT = 15, - WIFI_RADIO_ERROR_GROUP_KEY_UPDATE_TIMEOUT = 16, - WIFI_RADIO_ERROR_IE_IN_4WAY_DIFFERS = 17, - WIFI_RADIO_ERROR_GROUP_CIPHER_INVALID = 18, - WIFI_RADIO_ERROR_PAIRWISE_CIPHER_INVALID = 19, - WIFI_RADIO_ERROR_AKMP_INVALID = 20, - WIFI_RADIO_ERROR_UNSUPP_RSN_IE_VERSION = 21, - WIFI_RADIO_ERROR_INVALID_RSN_IE_CAP = 22, - WIFI_RADIO_ERROR_802_1X_AUTH_FAILED = 23, - WIFI_RADIO_ERROR_CIPHER_SUITE_REJECTED = 24, - WIFI_RADIO_ERROR_INVALID_PMKID = 53, - WIFI_RADIO_ERROR_BEACON_TIMEOUT = 200, - WIFI_RADIO_ERROR_NO_AP_FOUND = 201, - WIFI_RADIO_ERROR_AUTH_FAIL = 202, - WIFI_RADIO_ERROR_ASSOC_FAIL = 203, - WIFI_RADIO_ERROR_HANDSHAKE_TIMEOUT = 204, - WIFI_RADIO_ERROR_CONNECTION_FAIL = 205, - WIFI_RADIO_ERROR_AP_TSF_RESET = 206, + // See wifi_err_reason_t in esp-idf/components/esp_wifi/include/esp_wifi_types.h + WIFI_RADIO_ERROR_NONE = 0, + WIFI_RADIO_ERROR_UNSPECIFIED = 1, + WIFI_RADIO_ERROR_AUTH_EXPIRE = 2, + WIFI_RADIO_ERROR_AUTH_LEAVE = 3, + WIFI_RADIO_ERROR_ASSOC_EXPIRE = 4, + WIFI_RADIO_ERROR_ASSOC_TOOMANY = 5, + WIFI_RADIO_ERROR_NOT_AUTHED = 6, + WIFI_RADIO_ERROR_NOT_ASSOCED = 7, + WIFI_RADIO_ERROR_ASSOC_LEAVE = 8, + WIFI_RADIO_ERROR_ASSOC_NOT_AUTHED = 9, + WIFI_RADIO_ERROR_DISASSOC_PWRCAP_BAD = 10, + WIFI_RADIO_ERROR_DISASSOC_SUPCHAN_BAD = 11, + WIFI_RADIO_ERROR_IE_INVALID = 13, + WIFI_RADIO_ERROR_MIC_FAILURE = 14, + WIFI_RADIO_ERROR_4WAY_HANDSHAKE_TIMEOUT = 15, + WIFI_RADIO_ERROR_GROUP_KEY_UPDATE_TIMEOUT = 16, + WIFI_RADIO_ERROR_IE_IN_4WAY_DIFFERS = 17, + WIFI_RADIO_ERROR_GROUP_CIPHER_INVALID = 18, + WIFI_RADIO_ERROR_PAIRWISE_CIPHER_INVALID = 19, + WIFI_RADIO_ERROR_AKMP_INVALID = 20, + WIFI_RADIO_ERROR_UNSUPP_RSN_IE_VERSION = 21, + WIFI_RADIO_ERROR_INVALID_RSN_IE_CAP = 22, + WIFI_RADIO_ERROR_802_1X_AUTH_FAILED = 23, + WIFI_RADIO_ERROR_CIPHER_SUITE_REJECTED = 24, + WIFI_RADIO_ERROR_INVALID_PMKID = 53, + WIFI_RADIO_ERROR_BEACON_TIMEOUT = 200, + WIFI_RADIO_ERROR_NO_AP_FOUND = 201, + WIFI_RADIO_ERROR_AUTH_FAIL = 202, + WIFI_RADIO_ERROR_ASSOC_FAIL = 203, + WIFI_RADIO_ERROR_HANDSHAKE_TIMEOUT = 204, + WIFI_RADIO_ERROR_CONNECTION_FAIL = 205, + WIFI_RADIO_ERROR_AP_TSF_RESET = 206, + WIFI_RADIO_ERRROR_ROAMING = 207, + WIFI_RADIO_ASSOC_COMEBACK_TOO_LONG = 208, + WIFI_RADIO_SA_QUERY_TIMEOUT = 209, + WIFI_RADIO_NO_AP_FOUND_W_COMPATIBLE_SECURITY = 210, // collapsed to AUTH_FAIL + WIFI_RADIO_NO_AP_FOUND_IN_AUTHMODE_THRESHOLD = 211, // collapsed to AUTH_FAIL + WIFI_RADIO_NO_AP_FOUND_IN_RSSI_THRESHOLD = 212, } wifi_radio_error_t; extern bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self); diff --git a/shared-module/bitbangio/SPI.c b/shared-module/bitbangio/SPI.c index 7e2d8d46eb09a..dce9a7c2ed343 100644 --- a/shared-module/bitbangio/SPI.c +++ b/shared-module/bitbangio/SPI.c @@ -96,7 +96,12 @@ void shared_module_bitbangio_spi_configure(bitbangio_spi_obj_t *self, self->delay_half += 1; } - self->polarity = polarity; + if (polarity != self->polarity) { + // If the polarity has changed, make sure we re-initialize the idle state + // of the clock as well. + self->polarity = polarity; + common_hal_digitalio_digitalinout_switch_to_output(&self->clock, polarity == 1, DRIVE_MODE_PUSH_PULL); + } self->phase = phase; } diff --git a/shared-module/floppyio/__init__.c b/shared-module/floppyio/__init__.c index 6700c48078a0c..cb41dba0c3939 100644 --- a/shared-module/floppyio/__init__.c +++ b/shared-module/floppyio/__init__.c @@ -25,30 +25,29 @@ */ #include "py/runtime.h" +#include "py/mphal.h" #include "shared-bindings/time/__init__.h" #include "shared-bindings/floppyio/__init__.h" +#if CIRCUITPY_DIGITALIO #include "common-hal/floppyio/__init__.h" #include "shared-bindings/digitalio/DigitalInOut.h" - -#ifndef T2_5 -#define T2_5 (FLOPPYIO_SAMPLERATE * 5 / 2 / 1000000) -#endif -#ifndef T3_5 -#define T3_5 (FLOPPYIO_SAMPLERATE * 7 / 2 / 1000000) #endif -#define MFM_IO_MMIO (1) #include "lib/adafruit_floppy/src/mfm_impl.h" +#if CIRCUITPY_DIGITALIO +MP_WEAK __attribute__((optimize("O3"))) -int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index) { +int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index, mp_int_t index_wait_ms) { + mp_printf(&mp_plat_print, "common_hal_floppyio_flux_readinto in %s\n", __FILE__); uint32_t index_mask; volatile uint32_t *index_port = common_hal_digitalio_digitalinout_get_reg(index, DIGITALINOUT_REG_READ, &index_mask); uint32_t data_mask; volatile uint32_t *data_port = common_hal_digitalio_digitalinout_get_reg(data, DIGITALINOUT_REG_READ, &data_mask); + uint32_t index_deadline_ms = supervisor_ticks_ms32() + index_wait_ms; #undef READ_INDEX #undef READ_DATA #define READ_INDEX() (!!(*index_port & index_mask)) @@ -62,6 +61,11 @@ int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalin // wait for index pulse low while (READ_INDEX()) { /* NOTHING */ + if (supervisor_ticks_ms32() > index_deadline_ms) { + common_hal_mcu_enable_interrupts(); + mp_raise_RuntimeError(MP_ERROR_TEXT("timeout waiting for index pulse")); + return 0; + } } @@ -95,16 +99,19 @@ int common_hal_floppyio_flux_readinto(void *buf, size_t len, digitalio_digitalin return pulses_ptr - pulses; } +#endif -int common_hal_floppyio_mfm_readinto(void *buf, size_t n_sectors, digitalio_digitalinout_obj_t *data, digitalio_digitalinout_obj_t *index) { - mfm_io_t io; - io.index_port = common_hal_digitalio_digitalinout_get_reg(index, DIGITALINOUT_REG_READ, &io.index_mask); - io.data_port = common_hal_digitalio_digitalinout_get_reg(data, DIGITALINOUT_REG_READ, &io.data_mask); - - common_hal_mcu_disable_interrupts(); - uint8_t validity[n_sectors]; - int result = read_track(io, n_sectors, buf, validity); - common_hal_mcu_enable_interrupts(); +int common_hal_floppyio_mfm_readinto(const mp_buffer_info_t *buf, const mp_buffer_info_t *flux_buf, uint8_t *validity, size_t t2_max, size_t t3_max) { + mfm_io_t io = { + .T2_max = t2_max, + .T3_max = t3_max, + .pulses = flux_buf->buf, + .n_pulses = flux_buf->len, + .sectors = buf->buf, + .sector_validity = validity, + .n_sectors = buf->len / 512, + }; + int result = decode_track_mfm(&io); return result; } diff --git a/shared-module/fourwire/FourWire.c b/shared-module/fourwire/FourWire.c index ea7a9bfe9d402..720238f0e6c77 100644 --- a/shared-module/fourwire/FourWire.c +++ b/shared-module/fourwire/FourWire.c @@ -47,8 +47,6 @@ void common_hal_fourwire_fourwire_construct(fourwire_fourwire_obj_t *self, self->polarity = polarity; self->phase = phase; - common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select); - common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL); self->command.base.type = &mp_type_NoneType; if (command != NULL) { @@ -66,7 +64,14 @@ void common_hal_fourwire_fourwire_construct(fourwire_fourwire_obj_t *self, common_hal_fourwire_fourwire_reset(self); } - common_hal_never_reset_pin(chip_select); + self->chip_select.base.type = &mp_type_NoneType; + if (chip_select != NULL) { + self->chip_select.base.type = &digitalio_digitalinout_type; + common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select); + common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL); + common_hal_never_reset_pin(chip_select); + } + } void common_hal_fourwire_fourwire_deinit(fourwire_fourwire_obj_t *self) { @@ -107,7 +112,9 @@ bool common_hal_fourwire_fourwire_begin_transaction(mp_obj_t obj) { } common_hal_busio_spi_configure(self->bus, self->frequency, self->polarity, self->phase, 8); - common_hal_digitalio_digitalinout_set_value(&self->chip_select, false); + if (self->chip_select.base.type != &mp_type_NoneType) { + common_hal_digitalio_digitalinout_set_value(&self->chip_select, false); + } return true; } @@ -146,10 +153,12 @@ void common_hal_fourwire_fourwire_send(mp_obj_t obj, display_byte_type_t data_ty if (bits > 0) { buffer = buffer << (8 - bits); common_hal_busio_spi_write(self->bus, &buffer, 1); - // toggle CS to discard superfluous bits - common_hal_digitalio_digitalinout_set_value(&self->chip_select, true); - common_hal_mcu_delay_us(1); - common_hal_digitalio_digitalinout_set_value(&self->chip_select, false); + if (self->chip_select.base.type != &mp_type_NoneType) { + // toggle CS to discard superfluous bits + common_hal_digitalio_digitalinout_set_value(&self->chip_select, true); + common_hal_mcu_delay_us(1); + common_hal_digitalio_digitalinout_set_value(&self->chip_select, false); + } } } else { common_hal_digitalio_digitalinout_set_value(&self->command, data_type == DISPLAY_DATA); @@ -158,9 +167,11 @@ void common_hal_fourwire_fourwire_send(mp_obj_t obj, display_byte_type_t data_ty // IC latches commands based on it. for (size_t i = 0; i < data_length; i++) { common_hal_busio_spi_write(self->bus, &data[i], 1); - common_hal_digitalio_digitalinout_set_value(&self->chip_select, true); - common_hal_mcu_delay_us(1); - common_hal_digitalio_digitalinout_set_value(&self->chip_select, false); + if (self->chip_select.base.type != &mp_type_NoneType) { + common_hal_digitalio_digitalinout_set_value(&self->chip_select, true); + common_hal_mcu_delay_us(1); + common_hal_digitalio_digitalinout_set_value(&self->chip_select, false); + } } } else { common_hal_busio_spi_write(self->bus, data, data_length); @@ -170,7 +181,9 @@ void common_hal_fourwire_fourwire_send(mp_obj_t obj, display_byte_type_t data_ty void common_hal_fourwire_fourwire_end_transaction(mp_obj_t obj) { fourwire_fourwire_obj_t *self = MP_OBJ_TO_PTR(obj); - common_hal_digitalio_digitalinout_set_value(&self->chip_select, true); + if (self->chip_select.base.type != &mp_type_NoneType) { + common_hal_digitalio_digitalinout_set_value(&self->chip_select, true); + } common_hal_busio_spi_unlock(self->bus); } diff --git a/shared-module/keypad/KeyMatrix.c b/shared-module/keypad/KeyMatrix.c index df5c55b3f7c9a..856e595a28434 100644 --- a/shared-module/keypad/KeyMatrix.c +++ b/shared-module/keypad/KeyMatrix.c @@ -49,7 +49,7 @@ static mp_uint_t row_column_to_key_number(keypad_keymatrix_obj_t *self, mp_uint_ return row * self->column_digitalinouts->len + column; } -void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, const mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events) { +void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint_t num_row_pins, const mcu_pin_obj_t *row_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], bool columns_to_anodes, mp_float_t interval, size_t max_events, uint8_t debounce_threshold) { mp_obj_t row_dios[num_row_pins]; for (size_t row = 0; row < num_row_pins; row++) { @@ -72,13 +72,10 @@ void common_hal_keypad_keymatrix_construct(keypad_keymatrix_obj_t *self, mp_uint } self->column_digitalinouts = mp_obj_new_tuple(num_column_pins, column_dios); - self->currently_pressed = (bool *)m_malloc(sizeof(bool) * num_row_pins * num_column_pins); - self->previously_pressed = (bool *)m_malloc(sizeof(bool) * num_row_pins * num_column_pins); - self->columns_to_anodes = columns_to_anodes; self->funcs = &keymatrix_funcs; - keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events); + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events, debounce_threshold); } void common_hal_keypad_keymatrix_deinit(keypad_keymatrix_obj_t *self) { @@ -138,8 +135,6 @@ static void keymatrix_scan_now(void *self_in, mp_obj_t timestamp) { for (size_t column = 0; column < common_hal_keypad_keymatrix_get_column_count(self); column++) { mp_uint_t key_number = row_column_to_key_number(self, row, column); - const bool previous = self->currently_pressed[key_number]; - self->previously_pressed[key_number] = previous; // Get the current state, by reading whether the column got pulled to the row value or not. // If low and columns_to_anodes is true, the key is pressed. @@ -147,10 +142,9 @@ static void keymatrix_scan_now(void *self_in, mp_obj_t timestamp) { const bool current = common_hal_digitalio_digitalinout_get_value(self->column_digitalinouts->items[column]) != self->columns_to_anodes; - self->currently_pressed[key_number] = current; // Record any transitions. - if (previous != current) { + if (keypad_debounce((keypad_scanner_obj_t *)self, key_number, current)) { keypad_eventqueue_record(self->events, key_number, current, timestamp); } } diff --git a/shared-module/keypad/Keys.c b/shared-module/keypad/Keys.c index 22ad7cc7fb87a..51d3836788e65 100644 --- a/shared-module/keypad/Keys.c +++ b/shared-module/keypad/Keys.c @@ -44,7 +44,7 @@ static keypad_scanner_funcs_t keys_funcs = { .get_key_count = keys_get_key_count, }; -void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, mp_float_t interval, size_t max_events) { +void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pins, const mcu_pin_obj_t *pins[], bool value_when_pressed, bool pull, mp_float_t interval, size_t max_events, uint8_t debounce_threshold) { mp_obj_t dios[num_pins]; for (size_t i = 0; i < num_pins; i++) { @@ -58,12 +58,10 @@ void common_hal_keypad_keys_construct(keypad_keys_obj_t *self, mp_uint_t num_pin } self->digitalinouts = mp_obj_new_tuple(num_pins, dios); - self->currently_pressed = (bool *)m_malloc(sizeof(bool) * num_pins); - self->previously_pressed = (bool *)m_malloc(sizeof(bool) * num_pins); self->value_when_pressed = value_when_pressed; self->funcs = &keys_funcs; - keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events); + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events, debounce_threshold); } @@ -93,18 +91,13 @@ static void keypad_keys_scan_now(void *self_in, mp_obj_t timestamp) { size_t key_count = keys_get_key_count(self); for (mp_uint_t key_number = 0; key_number < key_count; key_number++) { - // Remember the previous up/down state. - const bool previous = self->currently_pressed[key_number]; - self->previously_pressed[key_number] = previous; - // Get the current state. const bool current = common_hal_digitalio_digitalinout_get_value(self->digitalinouts->items[key_number]) == self->value_when_pressed; - self->currently_pressed[key_number] = current; // Record any transitions. - if (previous != current) { + if (keypad_debounce((keypad_scanner_obj_t *)self, key_number, current)) { keypad_eventqueue_record(self->events, key_number, current, timestamp); } } diff --git a/shared-module/keypad/ShiftRegisterKeys.c b/shared-module/keypad/ShiftRegisterKeys.c index 028b6aaf8007a..64e36c619cd01 100644 --- a/shared-module/keypad/ShiftRegisterKeys.c +++ b/shared-module/keypad/ShiftRegisterKeys.c @@ -44,7 +44,7 @@ static keypad_scanner_funcs_t shiftregisterkeys_funcs = { .get_key_count = shiftregisterkeys_get_key_count, }; -void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, mp_uint_t num_data_pins, const mcu_pin_obj_t *data_pins[], const mcu_pin_obj_t *latch_pin, bool value_to_latch, mp_uint_t num_key_counts, size_t key_counts[], bool value_when_pressed, mp_float_t interval, size_t max_events) { +void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_t *self, const mcu_pin_obj_t *clock_pin, mp_uint_t num_data_pins, const mcu_pin_obj_t *data_pins[], const mcu_pin_obj_t *latch_pin, bool value_to_latch, mp_uint_t num_key_counts, size_t key_counts[], bool value_when_pressed, mp_float_t interval, size_t max_events, uint8_t debounce_threshold) { digitalio_digitalinout_obj_t *clock = mp_obj_malloc(digitalio_digitalinout_obj_t, &digitalio_digitalinout_type); @@ -94,7 +94,7 @@ void common_hal_keypad_shiftregisterkeys_construct(keypad_shiftregisterkeys_obj_ self->value_when_pressed = value_when_pressed; self->funcs = &shiftregisterkeys_funcs; - keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events); + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events, debounce_threshold); } void common_hal_keypad_shiftregisterkeys_deinit(keypad_shiftregisterkeys_obj_t *self) { @@ -143,7 +143,7 @@ static void shiftregisterkeys_scan_now(void *self_in, mp_obj_t timestamp) { for (mp_uint_t scan_number = 0; scan_number < self->max_key_count; scan_number++) { common_hal_digitalio_digitalinout_set_value(self->clock, false); - // Zero-th data appears on on the data pin immediately, without shifting. + // Zero-th data appears on the data pin immediately, without shifting. // Loop through all the data pins that share the latch mp_uint_t index = 0; @@ -157,17 +157,13 @@ static void shiftregisterkeys_scan_now(void *self_in, mp_obj_t timestamp) { mp_uint_t key_number = scan_number + index; - // Remember the previous up/down state. - const bool previous = self->currently_pressed[key_number]; - self->previously_pressed[key_number] = previous; - + // Get the current state. // Get the current state. const bool current = common_hal_digitalio_digitalinout_get_value(self->data_pins->items[i]) == self->value_when_pressed; - self->currently_pressed[key_number] = current; // Record any transitions. - if (previous != current) { + if (keypad_debounce((keypad_scanner_obj_t *)self, key_number, current)) { keypad_eventqueue_record(self->events, key_number, current, timestamp); } diff --git a/shared-module/keypad/__init__.c b/shared-module/keypad/__init__.c index 5d0905e42035a..7a4e29158308a 100644 --- a/shared-module/keypad/__init__.c +++ b/shared-module/keypad/__init__.c @@ -99,10 +99,9 @@ void keypad_deregister_scanner(keypad_scanner_obj_t *scanner) { supervisor_release_lock(&keypad_scanners_linked_list_lock); } -void keypad_construct_common(keypad_scanner_obj_t *self, mp_float_t interval, size_t max_events) { +void keypad_construct_common(keypad_scanner_obj_t *self, mp_float_t interval, size_t max_events, uint8_t debounce_threshold) { size_t key_count = common_hal_keypad_generic_get_key_count(self); - self->currently_pressed = (bool *)m_malloc(sizeof(bool) * key_count); - self->previously_pressed = (bool *)m_malloc(sizeof(bool) * key_count); + self->debounce_counter = (int8_t *)m_malloc(sizeof(int8_t) * key_count); self->interval_ticks = (mp_uint_t)(interval * 1024); // interval * 1000 * (1024/1000) @@ -110,6 +109,8 @@ void keypad_construct_common(keypad_scanner_obj_t *self, mp_float_t interval, si common_hal_keypad_eventqueue_construct(events, max_events); self->events = events; + self->debounce_threshold = debounce_threshold; + // Add self to the list of active keypad scanners. keypad_register_scanner(self); keypad_scan_now(self, port_get_raw_ticks(NULL)); @@ -127,11 +128,27 @@ static void keypad_scan_maybe(keypad_scanner_obj_t *self, uint64_t now) { keypad_scan_now(self, now); } +bool keypad_debounce(keypad_scanner_obj_t *self, mp_uint_t key_number, bool current) { + if (current) { + if ((self->debounce_counter[key_number] < self->debounce_threshold) && + (++self->debounce_counter[key_number] == 0)) { + self->debounce_counter[key_number] = self->debounce_threshold; + return true; + } + } else { + if ((self->debounce_counter[key_number] > -self->debounce_threshold) && + (--self->debounce_counter[key_number] == 0)) { + self->debounce_counter[key_number] = -self->debounce_threshold; + return true; + } + } + return false; +} + void common_hal_keypad_generic_reset(void *self_in) { keypad_scanner_obj_t *self = self_in; size_t key_count = common_hal_keypad_generic_get_key_count(self); - memset(self->previously_pressed, false, key_count); - memset(self->currently_pressed, false, key_count); + memset(self->debounce_counter, self->debounce_threshold, key_count); keypad_scan_now(self, port_get_raw_ticks(NULL)); } diff --git a/shared-module/keypad/__init__.h b/shared-module/keypad/__init__.h index cc792ff791309..e794a89846098 100644 --- a/shared-module/keypad/__init__.h +++ b/shared-module/keypad/__init__.h @@ -43,10 +43,10 @@ typedef struct _keypad_scanner_funcs_t { struct _keypad_scanner_obj_t *next; \ keypad_scanner_funcs_t *funcs; \ uint64_t next_scan_ticks; \ - bool *previously_pressed; \ - bool *currently_pressed; \ + int8_t *debounce_counter; \ struct _keypad_eventqueue_obj_t *events; \ - mp_uint_t interval_ticks + mp_uint_t interval_ticks; \ + uint8_t debounce_threshold typedef struct _keypad_scanner_obj_t { KEYPAD_SCANNER_COMMON_FIELDS; @@ -59,7 +59,8 @@ void keypad_reset(void); void keypad_register_scanner(keypad_scanner_obj_t *scanner); void keypad_deregister_scanner(keypad_scanner_obj_t *scanner); -void keypad_construct_common(keypad_scanner_obj_t *scanner, mp_float_t interval, size_t max_events); +void keypad_construct_common(keypad_scanner_obj_t *scanner, mp_float_t interval, size_t max_events, uint8_t debounce_cycles); +bool keypad_debounce(keypad_scanner_obj_t *self, mp_uint_t key_number, bool current); size_t common_hal_keypad_generic_get_key_count(void *scanner); void common_hal_keypad_deinit_core(void *scanner); diff --git a/shared-module/keypad_demux/DemuxKeyMatrix.c b/shared-module/keypad_demux/DemuxKeyMatrix.c new file mode 100644 index 0000000000000..1469ad6dffed0 --- /dev/null +++ b/shared-module/keypad_demux/DemuxKeyMatrix.c @@ -0,0 +1,148 @@ +/* + * This file is part of the Micro Python project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2024 CDarius + * + * 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 + +#include "py/gc.h" +#include "py/runtime.h" +#include "shared-bindings/digitalio/DigitalInOut.h" +#include "shared-bindings/keypad/EventQueue.h" +#include "shared-bindings/keypad_demux/DemuxKeyMatrix.h" +#include "shared-bindings/keypad/__init__.h" +#include "shared-bindings/supervisor/__init__.h" +#include "shared-bindings/util.h" +#include "supervisor/port.h" +#include "supervisor/shared/tick.h" + +static void demuxkeymatrix_scan_now(void *self_in, mp_obj_t timestamp); +static size_t demuxkeymatrix_get_key_count(void *self_in); + +static keypad_scanner_funcs_t keymatrix_funcs = { + .scan_now = demuxkeymatrix_scan_now, + .get_key_count = demuxkeymatrix_get_key_count, +}; + +static mp_uint_t row_column_to_key_number(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t row, mp_uint_t column) { + return row * self->column_digitalinouts->len + column; +} + +void common_hal_keypad_demux_demuxkeymatrix_construct(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t num_row_addr_pins, const mcu_pin_obj_t *row_addr_pins[], mp_uint_t num_column_pins, const mcu_pin_obj_t *column_pins[], mp_float_t interval, size_t max_events, uint8_t debounce_threshold) { + + mp_obj_t row_addr_dios[num_row_addr_pins]; + for (size_t row = 0; row < num_row_addr_pins; row++) { + digitalio_digitalinout_obj_t *dio = + mp_obj_malloc(digitalio_digitalinout_obj_t, &digitalio_digitalinout_type); + common_hal_digitalio_digitalinout_construct(dio, row_addr_pins[row]); + common_hal_digitalio_digitalinout_switch_to_output(dio, false, DRIVE_MODE_PUSH_PULL); + row_addr_dios[row] = dio; + } + self->row_addr_digitalinouts = mp_obj_new_tuple(num_row_addr_pins, row_addr_dios); + + mp_obj_t column_dios[num_column_pins]; + for (size_t column = 0; column < num_column_pins; column++) { + digitalio_digitalinout_obj_t *dio = + mp_obj_malloc(digitalio_digitalinout_obj_t, &digitalio_digitalinout_type); + dio->base.type = &digitalio_digitalinout_type; + common_hal_digitalio_digitalinout_construct(dio, column_pins[column]); + common_hal_digitalio_digitalinout_switch_to_input(dio, PULL_UP); + column_dios[column] = dio; + } + self->column_digitalinouts = mp_obj_new_tuple(num_column_pins, column_dios); + + self->funcs = &keymatrix_funcs; + + keypad_construct_common((keypad_scanner_obj_t *)self, interval, max_events, debounce_threshold); +} + +void common_hal_keypad_demux_demuxkeymatrix_deinit(keypad_demux_demuxkeymatrix_obj_t *self) { + if (common_hal_keypad_deinited(self)) { + return; + } + + // Remove self from the list of active keypad scanners first. + keypad_deregister_scanner((keypad_scanner_obj_t *)self); + + for (size_t row_addr = 0; row_addr < self->row_addr_digitalinouts->len; row_addr++) { + common_hal_digitalio_digitalinout_deinit(self->row_addr_digitalinouts->items[row_addr]); + } + self->row_addr_digitalinouts = MP_ROM_NONE; + + for (size_t column = 0; column < self->column_digitalinouts->len; column++) { + common_hal_digitalio_digitalinout_deinit(self->column_digitalinouts->items[column]); + } + self->column_digitalinouts = MP_ROM_NONE; + common_hal_keypad_deinit_core(self); +} + +size_t common_hal_keypad_demux_demuxkeymatrix_get_row_count(keypad_demux_demuxkeymatrix_obj_t *self) { + return 1 << self->row_addr_digitalinouts->len; +} + +size_t common_hal_keypad_demux_demuxkeymatrix_get_column_count(keypad_demux_demuxkeymatrix_obj_t *self) { + return self->column_digitalinouts->len; +} + +mp_uint_t common_hal_keypad_demux_demuxkeymatrix_row_column_to_key_number(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t row, mp_uint_t column) { + return row_column_to_key_number(self, row, column); +} + +void common_hal_keypad_demux_demuxkeymatrix_key_number_to_row_column(keypad_demux_demuxkeymatrix_obj_t *self, mp_uint_t key_number, mp_uint_t *row, mp_uint_t *column) { + const size_t num_columns = common_hal_keypad_demux_demuxkeymatrix_get_column_count(self); + *row = key_number / num_columns; + *column = key_number % num_columns; +} + +static size_t demuxkeymatrix_get_key_count(void *self_in) { + keypad_demux_demuxkeymatrix_obj_t *self = self_in; + return common_hal_keypad_demux_demuxkeymatrix_get_column_count(self) * common_hal_keypad_demux_demuxkeymatrix_get_row_count(self); +} + +static void demuxkeymatrix_scan_now(void *self_in, mp_obj_t timestamp) { + keypad_demux_demuxkeymatrix_obj_t *self = self_in; + + for (size_t row = 0; row < common_hal_keypad_demux_demuxkeymatrix_get_row_count(self); row++) { + // Set the row address on demultiplexer + size_t mask = 0b00000001; + for (size_t row_addr_pin = 0; row_addr_pin < self->row_addr_digitalinouts->len; row_addr_pin++) { + digitalio_digitalinout_obj_t *dio = self->row_addr_digitalinouts->items[row_addr_pin]; + common_hal_digitalio_digitalinout_set_value(dio, (mask & row) != 0); + mask = mask << 1; + } + + for (size_t column = 0; column < common_hal_keypad_demux_demuxkeymatrix_get_column_count(self); column++) { + mp_uint_t key_number = row_column_to_key_number(self, row, column); + + // Get the current state, by reading whether the column got pulled to the row value or not. + // If low, the key is pressed. + const bool current = !common_hal_digitalio_digitalinout_get_value(self->column_digitalinouts->items[column]); + + // Record any transitions. + if (keypad_debounce((keypad_scanner_obj_t *)self, key_number, current)) { + keypad_eventqueue_record(self->events, key_number, current, timestamp); + } + } + } +} diff --git a/ports/stm/common-hal/supervisor/Runtime.h b/shared-module/keypad_demux/DemuxKeyMatrix.h old mode 100755 new mode 100644 similarity index 61% rename from ports/stm/common-hal/supervisor/Runtime.h rename to shared-module/keypad_demux/DemuxKeyMatrix.h index a357eb0c7ee4d..794b05781752f --- a/ports/stm/common-hal/supervisor/Runtime.h +++ b/shared-module/keypad_demux/DemuxKeyMatrix.h @@ -1,9 +1,9 @@ /* - * This file is part of the MicroPython project, http://micropython.org/ + * This file is part of the Micro Python project, http://micropython.org/ * * The MIT License (MIT) * - * Copyright (c) 2018 Michael Schroeder + * Copyright (c) 2024 CDarius * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -24,14 +24,22 @@ * THE SOFTWARE. */ -#ifndef MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H -#define MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H +#ifndef MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_DEMUX_DEMUXKEYMATRIX_H +#define MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_DEMUX_DEMUXKEYMATRIX_H #include "py/obj.h" +#include "py/objtuple.h" + +#include "common-hal/digitalio/DigitalInOut.h" +#include "shared-module/keypad/__init__.h" +#include "shared-module/keypad/EventQueue.h" typedef struct { - mp_obj_base_t base; - // Stores no state currently. -} super_runtime_obj_t; + KEYPAD_SCANNER_COMMON_FIELDS; + mp_obj_tuple_t *row_addr_digitalinouts; + mp_obj_tuple_t *column_digitalinouts; +} keypad_demux_demuxkeymatrix_obj_t; + +void keypad_demux_demuxkeymatrix_scan(keypad_demux_demuxkeymatrix_obj_t *self); -#endif // MICROPY_INCLUDED_STM32_COMMON_HAL_SUPERVISOR_RUNTIME_H +#endif // MICROPY_INCLUDED_SHARED_MODULE_KEYPAD_DEMUX_DEMUXKEYMATRIX_H diff --git a/shared-module/keypad_demux/__init__.c b/shared-module/keypad_demux/__init__.c new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/ports/atmel-samd/common-hal/supervisor/Runtime.h b/shared-module/supervisor/Runtime.h similarity index 100% rename from ports/atmel-samd/common-hal/supervisor/Runtime.h rename to shared-module/supervisor/Runtime.h diff --git a/shared-module/supervisor/__init__.c b/shared-module/supervisor/__init__.c index 80941dc5e843b..8e346251737c6 100644 --- a/shared-module/supervisor/__init__.c +++ b/shared-module/supervisor/__init__.c @@ -24,10 +24,18 @@ * THE SOFTWARE. */ -#include #include "py/obj.h" -#include "shared-bindings/supervisor/StatusBar.h" + #include "shared-bindings/supervisor/__init__.h" +#include "shared-bindings/supervisor/Runtime.h" +#include "shared-bindings/supervisor/StatusBar.h" + +// The singleton supervisor.Runtime object, bound to supervisor.runtime +const super_runtime_obj_t common_hal_supervisor_runtime_obj = { + .base = { + .type = &supervisor_runtime_type, + }, +}; // The singleton supervisor.StatusBar object, bound to supervisor.status_bar supervisor_status_bar_obj_t shared_module_supervisor_status_bar_obj = { diff --git a/shared/timeutils/timeutils.h b/shared/timeutils/timeutils.h index 9f4b500caa7b6..13ec3a01f2b22 100644 --- a/shared/timeutils/timeutils.h +++ b/shared/timeutils/timeutils.h @@ -27,6 +27,8 @@ #ifndef MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H #define MICROPY_INCLUDED_LIB_TIMEUTILS_TIMEUTILS_H +#include "mpconfigport.h" // CIRCUITPY-CHANGE for MICROPY_EPOCH_IS_1970 + // The number of seconds between 1970/1/1 and 2000/1/1 is calculated using: // time.mktime((2000,1,1,0,0,0,0,0,0)) - time.mktime((1970,1,1,0,0,0,0,0,0)) #define TIMEUTILS_SECONDS_1970_TO_2000 (946684800ULL) diff --git a/supervisor/shared/bluetooth/bluetooth.c b/supervisor/shared/bluetooth/bluetooth.c index f96c73d6613f0..1cdd6c68fac94 100644 --- a/supervisor/shared/bluetooth/bluetooth.c +++ b/supervisor/shared/bluetooth/bluetooth.c @@ -39,7 +39,7 @@ #include "common-hal/_bleio/__init__.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/status_leds.h" #include "supervisor/shared/tick.h" #include "supervisor/shared/translate/translate.h" diff --git a/supervisor/shared/bluetooth/serial.c b/supervisor/shared/bluetooth/serial.c index a5f4d776b36f3..28902d6091dbf 100644 --- a/supervisor/shared/bluetooth/serial.c +++ b/supervisor/shared/bluetooth/serial.c @@ -166,10 +166,12 @@ bool ble_serial_connected(void) { return _tx_packet_buffer.conn_handle != BLE_CONN_HANDLE_INVALID; } -bool ble_serial_available(void) { - return _enabled && - !common_hal_bleio_characteristic_buffer_deinited(&_rx_buffer) && - common_hal_bleio_characteristic_buffer_rx_characters_available(&_rx_buffer); +uint32_t ble_serial_available(void) { + if (_enabled && !common_hal_bleio_characteristic_buffer_deinited(&_rx_buffer)) { + return common_hal_bleio_characteristic_buffer_rx_characters_available(&_rx_buffer); + } else { + return 0; + } } char ble_serial_read_char(void) { diff --git a/supervisor/shared/bluetooth/serial.h b/supervisor/shared/bluetooth/serial.h index cc73a15c06439..4d318b9667148 100644 --- a/supervisor/shared/bluetooth/serial.h +++ b/supervisor/shared/bluetooth/serial.h @@ -28,12 +28,13 @@ #define MICROPY_INCLUDED_SUPERVISOR_SHARED_BLUETOOTH_SERIAL_H #include +#include void supervisor_start_bluetooth_serial(void); void supervisor_stop_bluetooth_serial(void); bool ble_serial_connected(void); -bool ble_serial_available(void); +uint32_t ble_serial_available(void); char ble_serial_read_char(void); void ble_serial_write(const char *text, size_t len); void ble_serial_enable(void); diff --git a/supervisor/shared/micropython.c b/supervisor/shared/micropython.c index 2600d8715d898..698df2a44c8a7 100644 --- a/supervisor/shared/micropython.c +++ b/supervisor/shared/micropython.c @@ -26,7 +26,6 @@ #include -#include "supervisor/serial.h" #include "lib/oofatfs/ff.h" #include "py/mpconfig.h" #include "py/mphal.h" @@ -34,6 +33,7 @@ #include "py/runtime.h" #include "py/stream.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/status_leds.h" #if CIRCUITPY_WATCHDOG diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c index ee5282befb3d3..6a79b6dc6d29f 100644 --- a/supervisor/shared/safe_mode.c +++ b/supervisor/shared/safe_mode.c @@ -35,8 +35,8 @@ #include "shared-bindings/microcontroller/ResetReason.h" #include "supervisor/linker.h" -#include "supervisor/serial.h" #include "supervisor/shared/rgb_led_colors.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/status_leds.h" #include "supervisor/shared/translate/translate.h" #include "supervisor/shared/tick.h" diff --git a/supervisor/shared/serial.c b/supervisor/shared/serial.c index a78ed77f1f0f3..38e6d6003b010 100644 --- a/supervisor/shared/serial.c +++ b/supervisor/shared/serial.c @@ -33,7 +33,7 @@ #include "supervisor/shared/cpu.h" #include "supervisor/shared/display.h" #include "shared-bindings/terminalio/Terminal.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "supervisor/usb.h" #include "shared-bindings/microcontroller/Pin.h" #include "shared-module/usb_cdc/__init__.h" @@ -121,8 +121,8 @@ MP_WEAK char port_serial_read(void) { return -1; } -MP_WEAK bool port_serial_bytes_available(void) { - return false; +MP_WEAK uint32_t port_serial_bytes_available(void) { + return 0; } MP_WEAK void port_serial_write_substring(const char *text, uint32_t length) { @@ -260,52 +260,46 @@ char serial_read(void) { return -1; } -bool serial_bytes_available(void) { +uint32_t serial_bytes_available(void) { + // There may be multiple serial input channels, so sum the count from all. + uint32_t count = 0; + #if CIRCUITPY_USB_VENDOR - if (tud_vendor_connected() && tud_vendor_available() > 0) { - return true; + if (tud_vendor_connected()) { + count += tud_vendor_available(); } #endif #if CIRCUITPY_CONSOLE_UART - if (common_hal_busio_uart_rx_characters_available(&console_uart)) { - return true; - } + count += common_hal_busio_uart_rx_characters_available(&console_uart); #endif #if CIRCUITPY_SERIAL_BLE - if (ble_serial_available()) { - return true; - } + count += ble_serial_available(); #endif #if CIRCUITPY_WEB_WORKFLOW - if (websocket_available()) { - return true; - } + count += websocket_available(); #endif #if CIRCUITPY_USB_KEYBOARD_WORKFLOW - if (usb_keyboard_chars_available() > 0) { - return true; - } + count += usb_keyboard_chars_available(); #endif #if CIRCUITPY_USB_CDC - if (usb_cdc_console_enabled() && tud_cdc_available() > 0) { - return true; + if (usb_cdc_console_enabled()) { + count += tud_cdc_available(); } #endif + #if CIRCUITPY_USB - if (tud_cdc_available() > 0) { - return true; - } + count += tud_cdc_available(); #endif - if (port_serial_bytes_available() > 0) { - return true; - } - return false; + // Port-specific serial input. + count += port_serial_bytes_available(); + + return count; } void serial_write_substring(const char *text, uint32_t length) { diff --git a/supervisor/serial.h b/supervisor/shared/serial.h similarity index 96% rename from supervisor/serial.h rename to supervisor/shared/serial.h index 2e30998f3bbba..76bf1d37bf503 100644 --- a/supervisor/serial.h +++ b/supervisor/shared/serial.h @@ -46,7 +46,7 @@ void serial_write(const char *text); // Only writes up to given length. Does not check for null termination at all. void serial_write_substring(const char *text, uint32_t length); char serial_read(void); -bool serial_bytes_available(void); +uint32_t serial_bytes_available(void); bool serial_connected(void); // Used for temporarily suppressing output to the console or display. @@ -59,7 +59,7 @@ void port_serial_early_init(void); void port_serial_init(void); bool port_serial_connected(void); char port_serial_read(void); -bool port_serial_bytes_available(void); +uint32_t port_serial_bytes_available(void); void port_serial_write_substring(const char *text, uint32_t length); int console_uart_printf(const char *fmt, ...) __attribute__((format(printf, 1, 2))); diff --git a/supervisor/shared/status_bar.c b/supervisor/shared/status_bar.c index 16d23fe541028..1e08e0e0318b6 100644 --- a/supervisor/shared/status_bar.c +++ b/supervisor/shared/status_bar.c @@ -30,7 +30,7 @@ #include "shared-bindings/supervisor/__init__.h" #include "shared-bindings/supervisor/StatusBar.h" #include "supervisor/background_callback.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/status_bar.h" #if CIRCUITPY_TERMINALIO diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c index cbf90208f7ce7..4ef24ffba735d 100644 --- a/supervisor/shared/translate/translate.c +++ b/supervisor/shared/translate/translate.c @@ -37,7 +37,7 @@ #include "py/misc.h" #include "py/mpprint.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" void serial_write_compressed(mp_rom_error_text_t compressed) { mp_printf(MP_PYTHON_PRINTER, "%S", compressed); diff --git a/supervisor/shared/usb/host_keyboard.c b/supervisor/shared/usb/host_keyboard.c index d5f55d8161980..cdbc1caae0a4f 100644 --- a/supervisor/shared/usb/host_keyboard.c +++ b/supervisor/shared/usb/host_keyboard.c @@ -368,8 +368,8 @@ void usb_keyboard_init(void) { ringbuf_init(&_incoming_ringbuf, _buf, sizeof(_buf)); } -bool usb_keyboard_chars_available(void) { - return ringbuf_num_filled(&_incoming_ringbuf) > 0; +uint32_t usb_keyboard_chars_available(void) { + return ringbuf_num_filled(&_incoming_ringbuf); } char usb_keyboard_read_char(void) { diff --git a/supervisor/shared/usb/usb.c b/supervisor/shared/usb/usb.c index 32d68f47d448f..a536f154aa005 100644 --- a/supervisor/shared/usb/usb.c +++ b/supervisor/shared/usb/usb.c @@ -30,8 +30,8 @@ #include "shared-bindings/supervisor/__init__.h" #include "supervisor/background_callback.h" #include "supervisor/port.h" -#include "supervisor/serial.h" #include "supervisor/usb.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/workflow.h" #include "shared/runtime/interrupt_char.h" #include "shared/readline/readline.h" diff --git a/supervisor/shared/web_workflow/websocket.c b/supervisor/shared/web_workflow/websocket.c index ff81756bb0fd8..a6b9b322a55f7 100644 --- a/supervisor/shared/web_workflow/websocket.c +++ b/supervisor/shared/web_workflow/websocket.c @@ -180,12 +180,12 @@ static bool _read_next_payload_byte(uint8_t *c) { return false; } -bool websocket_available(void) { +uint32_t websocket_available(void) { if (!websocket_connected()) { - return false; + return 0; } websocket_background(); - return ringbuf_num_filled(&_incoming_ringbuf) > 0; + return ringbuf_num_filled(&_incoming_ringbuf); } char websocket_read_char(void) { diff --git a/supervisor/shared/web_workflow/websocket.h b/supervisor/shared/web_workflow/websocket.h index c3db2bf05cf7e..7f0a559fa983f 100644 --- a/supervisor/shared/web_workflow/websocket.h +++ b/supervisor/shared/web_workflow/websocket.h @@ -27,13 +27,14 @@ #pragma once #include +#include #include "shared-bindings/socketpool/Socket.h" void websocket_init(void); void websocket_handoff(socketpool_socket_obj_t *socket); bool websocket_connected(void); -bool websocket_available(void); +uint32_t websocket_available(void); char websocket_read_char(void); void websocket_background(void); void websocket_write(const char *text, size_t len); diff --git a/supervisor/shared/workflow.c b/supervisor/shared/workflow.c index 3c9a41ac3bc19..a328c2aceca0e 100644 --- a/supervisor/shared/workflow.c +++ b/supervisor/shared/workflow.c @@ -32,7 +32,7 @@ #include "supervisor/fatfs.h" #include "supervisor/filesystem.h" #include "supervisor/workflow.h" -#include "supervisor/serial.h" +#include "supervisor/shared/serial.h" #include "supervisor/shared/workflow.h" #if CIRCUITPY_BLEIO diff --git a/supervisor/usb.h b/supervisor/usb.h index 2e73412a9c49d..fd4d275cb0b3e 100644 --- a/supervisor/usb.h +++ b/supervisor/usb.h @@ -88,7 +88,7 @@ bool usb_msc_ejected(void); #if CIRCUITPY_USB_KEYBOARD_WORKFLOW void usb_keyboard_init(void); -bool usb_keyboard_chars_available(void); +uint32_t usb_keyboard_chars_available(void); char usb_keyboard_read_char(void); bool usb_keyboard_in_use(uint8_t dev_addr, uint8_t interface); diff --git a/tests/basics/deque1.py b/tests/basics/deque1.py index 8b7874e2b1d37..9ca6d434a75f9 100644 --- a/tests/basics/deque1.py +++ b/tests/basics/deque1.py @@ -63,3 +63,52 @@ ~d except TypeError: print("TypeError") + + +# Same tests, but now with pop() and appendleft() + +d = deque((), 2) +print(len(d)) +print(bool(d)) + +try: + d.popleft() +except IndexError: + print("IndexError") + +print(d.append(1)) +print(len(d)) +print(bool(d)) +print(d.popleft()) +print(len(d)) + +d.append(2) +print(d.popleft()) + +d.append(3) +d.append(4) +print(len(d)) +print(d.popleft(), d.popleft()) +try: + d.popleft() +except IndexError: + print("IndexError") + +d.append(5) +d.append(6) +d.append(7) +print(len(d)) +print(d.popleft(), d.popleft()) +print(len(d)) +try: + d.popleft() +except IndexError: + print("IndexError") + +d = deque((), 2) +d.appendleft(1) +d.appendleft(2) +d.appendleft(3) +d.appendleft(4) +d.appendleft(5) +print(d.pop(), d.pop()) diff --git a/tests/basics/deque2.py b/tests/basics/deque2.py index 80fcd66785663..743c040789d69 100644 --- a/tests/basics/deque2.py +++ b/tests/basics/deque2.py @@ -6,18 +6,50 @@ print("SKIP") raise SystemExit +# Initial sequence is supported +d = deque([1, 2, 3], 10) + +# iteration over sequence +for x in d: + print(x) + +# Iterables larger than maxlen have the beginnings removed, also tests +# iteration through conversion to list +d = deque([1, 2, 3, 4, 5], 3) +print(list(d)) + +# Empty iterables are also supported +deque([], 10) + +# Extending deques with iterables +d.extend([6, 7]) +print(list(d)) + +# Accessing queue elements via index +d = deque((0, 1, 2, 3), 5) +print(d[0], d[1], d[-1]) + +# Writing queue elements via index +d[3] = 5 +print(d[3]) + +# Accessing indices out of bounds raises IndexError +try: + d[4] +except IndexError: + print("IndexError") -# Initial sequence is not supported try: - deque([1, 2, 3], 10) -except ValueError: - print("ValueError") + d[4] = 0 +except IndexError: + print("IndexError") -# Not even empty list, only empty tuple +# Removing elements with del is not supported, fall back on mp_obj_subscr() error message try: - deque([], 10) -except ValueError: - print("ValueError") + del d[0] +except TypeError: + print("TypeError") + # Only fixed-size deques are supported, so length arg is mandatory try: @@ -32,6 +64,11 @@ except IndexError: print("IndexError") +try: + d.pop() +except IndexError: + print("IndexError") + print(d.append(1)) print(d.popleft()) @@ -46,6 +83,11 @@ except IndexError as e: print(repr(e)) +try: + d.pop() +except IndexError as e: + print(repr(e)) + d.append(5) d.append(6) print(len(d)) @@ -53,6 +95,12 @@ d.append(7) except IndexError as e: print(repr(e)) + +try: + d.appendleft(8) +except IndexError as e: + print(repr(e)) + print(len(d)) print(d.popleft(), d.popleft()) diff --git a/tests/basics/deque2.py.exp b/tests/basics/deque2.py.exp index 3df8acf405627..71f74ed6c4aaf 100644 --- a/tests/basics/deque2.py.exp +++ b/tests/basics/deque2.py.exp @@ -1,14 +1,25 @@ -ValueError -ValueError +1 +2 +3 +[3, 4, 5] +[5, 6, 7] +0 1 3 +5 +IndexError +IndexError TypeError +TypeError +IndexError IndexError None 1 2 3 4 IndexError('empty',) +IndexError('empty',) 2 IndexError('full',) +IndexError('full',) 2 5 6 0 diff --git a/tests/basics/deque_slice.py b/tests/basics/deque_slice.py new file mode 100644 index 0000000000000..367aeea3a171c --- /dev/null +++ b/tests/basics/deque_slice.py @@ -0,0 +1,29 @@ +try: + from collections import deque +except ImportError: + print("SKIP") + raise SystemExit + +d = deque((), 10) + +d.append(1) +d.append(2) +d.append(3) + +# Index slicing for reads is not supported in CPython +try: + d[0:1] +except TypeError: + print("TypeError") + +# Index slicing for writes is not supported in CPython +try: + d[0:1] = (-1, -2) +except TypeError: + print("TypeError") + +# Index slicing for writes is not supported in CPython +try: + del d[0:1] +except TypeError: + print("TypeError") diff --git a/tests/circuitpython-manual/alarm/deepsleep.py b/tests/circuitpython-manual/alarm/deepsleep.py index ab4f9ea70a554..66c0066b94f12 100644 --- a/tests/circuitpython-manual/alarm/deepsleep.py +++ b/tests/circuitpython-manual/alarm/deepsleep.py @@ -73,7 +73,7 @@ def show_noalarm(): pin_alarm = alarm.pin.PinAlarm( pin=wake_pin, value=True, edge=True, pull=True ) # STM32 must be this exact config -# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # NRF and ESP32S2 must use level, not edge +# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # Nordic and ESP32S2 must use level, not edge # pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=True, pull=True) # RP2040 supports any config alarm.exit_and_deep_sleep_until_alarms(time_alarm, pin_alarm) diff --git a/tests/circuitpython-manual/alarm/lightsleep.py b/tests/circuitpython-manual/alarm/lightsleep.py index b2878db4bbd81..c826b2fe641da 100644 --- a/tests/circuitpython-manual/alarm/lightsleep.py +++ b/tests/circuitpython-manual/alarm/lightsleep.py @@ -58,7 +58,7 @@ def show_noalarm(): ## PinAlarm only needs to be set once pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=True, pull=True) # STM32, RP2040 -# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # NRF, ESP32-S2, RP2040 +# pin_alarm = alarm.pin.PinAlarm(pin=wake_pin, value=False, edge=False, pull=True) # Nordic, ESP32-S2, RP2040 while True: ## TimeAlarms must be reset each time you sleep, since they use monotonic time diff --git a/tests/circuitpython/getenv.py b/tests/circuitpython/getenv.py index 1bd2ea5b65161..941674d114a91 100644 --- a/tests/circuitpython/getenv.py +++ b/tests/circuitpython/getenv.py @@ -58,6 +58,7 @@ def ioctl(self, op, arg): b'key = """\n', b"key =\n", b'key="', + b'key = strings must be quoted\n', ] diff --git a/tests/circuitpython/getenv.py.exp b/tests/circuitpython/getenv.py.exp index 925dafb469275..67707eb67fd75 100644 --- a/tests/circuitpython/getenv.py.exp +++ b/tests/circuitpython/getenv.py.exp @@ -32,3 +32,4 @@ key Invalid byte '\n' key Invalid byte '"' key invalid syntax for integer with base 10: '' key Invalid byte 'EOF' +key invalid syntax for integer with base 10: 'strings must be quoted' diff --git a/tests/circuitpython/mfm.py b/tests/circuitpython/mfm.py new file mode 100644 index 0000000000000..9839b5c756073 --- /dev/null +++ b/tests/circuitpython/mfm.py @@ -0,0 +1,79 @@ +import floppyio + +mfm_content = ( + b'HHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHH' + b'H00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH0' + b'0HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00H' + b'HHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHH' + b'H00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH0' + b'0HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00H' + b'HHH00HHHH00HHHH00HHHH00HHHH00HHHH00H00000000000000000000000000' + b'00000000000000000000000000000000000000000000000000000000000000' + b'0000000H0H`H`0H`H`0H`H`00000H0HHH00HHHH00HHHH00HHHH00HHHH00HHH' + b'H00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH0' + b'0HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00H' + b'HHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHH' + b'H00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH0' + b'0HHHH00HHHH00HHHH00H000000000000000000000000000000000000000000' + b'00000000000000000000000000000000000000000000000000000H`H`H0`H`' + b'H0`H`H0000000H0000000000000000000000HH0000H`0HH`HH0`000`HH00HH' + b'HH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH' + b'00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00HHHH00' + b'H0000000000000000000000000000000000000000000000000000000000000' + b'0000000000000000000000000000000000H`H`H0`H`H0`H`H00000`0`0H00H' + b'`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0' + b'HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HH' + b'H0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0H' + b'H0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0' + b'H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H0' + b'0H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H' + b'`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0' + b'HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH' + b'0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0' + b'H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0' + b'H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H0' + b'0H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H' + b'`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0' + b'HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HH' + b'H0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0H' + b'H0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0' + b'H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H0' + b'0H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H' + b'`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0' + b'HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH' + b'0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0' + b'H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0' + b'H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H0' + b'0H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H' + b'`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0' + b'HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HH' + b'H0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0H' + b'H0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0' + b'H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H0' + b'0H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H' + b'`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0' + b'HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH' + b'0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0' + b'H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0' + b'H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H0' + b'0H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H' + b'`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0' + b'HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HH' + b'H0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0H' + b'H0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0' + b'H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H0' + b'0H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H' + b'`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0' + b'HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH' + b'0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0' + b'H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0' + b'H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H0' + b'0H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H' + b'`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0HH0HH0H00H`0HHH0H0H00H`0' + b'HH0HH0H00H`0HHH0H0H00H`0HH0``HHHH0`0000hhhhhhhhhhhhhhhhhhhhhhh' +) + +b = bytearray(512) +r = floppyio.mfm_readinto(b, mfm_content, 60, 84) +print(r) +print(b) diff --git a/tests/circuitpython/mfm.py.exp b/tests/circuitpython/mfm.py.exp new file mode 100644 index 0000000000000..aa8f5d5f3f517 --- /dev/null +++ b/tests/circuitpython/mfm.py.exp @@ -0,0 +1,2 @@ +1 +bytearray(b'adafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadafadaf') diff --git a/tests/unix/extra_coverage.py.exp b/tests/unix/extra_coverage.py.exp index 46fd6ddcf2c42..10bf6c4e49049 100644 --- a/tests/unix/extra_coverage.py.exp +++ b/tests/unix/extra_coverage.py.exp @@ -55,12 +55,12 @@ _thread aesio array audiocore audiomixer binascii bitmapfilter bitmaptools cexample cmath codeop collections cppexample displayio errno example_package -gc hashlib heapq io -jpegio json locale math -os platform qrio rainbowio -random re select struct -synthio sys time traceback -uctypes ulab zlib +floppyio gc hashlib heapq +io jpegio json locale +math os platform qrio +rainbowio random re select +struct synthio sys time +traceback uctypes ulab zlib me rainbowio random diff --git a/tools/ci_fetch_deps.py b/tools/ci_fetch_deps.py index d60f4e54c055b..5f6c4c2d7d941 100644 --- a/tools/ci_fetch_deps.py +++ b/tools/ci_fetch_deps.py @@ -68,7 +68,7 @@ def matching_submodules(s): ], "litex": ["extmod/ulab/", "lib/tinyusb/", "lib/tlsf"], "mimxrt10xx": ["extmod/ulab/", "lib/tinyusb/", "lib/tlsf", "data/nvm.toml/"], - "nrf": [ + "nordic": [ "extmod/ulab/", "lib/mp3/", "lib/protomatter/", @@ -176,7 +176,7 @@ def main(target): submodules = ["tools/"] # for huffman elif target == "windows": # This builds one board from a number of ports so fill out a bunch of submodules - for port in ("atmel-samd", "nrf", "raspberrypi", "stm"): + for port in ("atmel-samd", "nordic", "raspberrypi", "stm"): submodules.append(f"ports/{port}") submodules.extend(PORT_DEPS[port]) unique_submodules = set(submodules) diff --git a/tools/merge_micropython.py b/tools/merge_micropython.py index 262225c52f705..f90316bed3886 100644 --- a/tools/merge_micropython.py +++ b/tools/merge_micropython.py @@ -27,6 +27,7 @@ "esp8266", "mimxrt", "minimal", + "nordic", "pic16bit", "powerpc", "qemu-arm", @@ -59,31 +60,6 @@ git.rm(path) line = out_buf.readline() -# MicroPython added their nrf code in ports/nrf too. So, we always take our version. -out_buf = StringIO() -git.status("--porcelain=1", "ports/nrf", _out=out_buf) -out_buf.seek(0) -line = out_buf.readline() -while line: - state, path = line.split() - if state == "UU": - git.checkout("--ours", path) - git.add(path) - elif state == "UA": - git.rm(path) - elif state == "AA": - git.rm("-f", path) - elif state == "A": - git.rm("-f", path) - elif state == "DU": - git.rm(path) - elif state == "DD": - git.rm(path) - else: - print(state, path) - line = out_buf.readline() - - # MicroPython has their own CI settings. Let's not use them now. out_buf = StringIO() git.status("--porcelain=1", ".github/workflows", _out=out_buf)