Skip to content

Commit

Permalink
rename ports/nrf to ports/nordic
Browse files Browse the repository at this point in the history
  • Loading branch information
dhalbert committed Mar 19, 2024
1 parent 84e937f commit dc69c29
Show file tree
Hide file tree
Showing 441 changed files with 105 additions and 741 deletions.
6 changes: 3 additions & 3 deletions .github/actions/deps/ports/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Fetch nrf port deps
name: Fetch nordic port deps

runs:
using: composite
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion docs/shared_bindings_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"espressif",
"litex",
"mimxrt10xx",
"nrf",
"nordic",
"raspberrypi",
"silabs",
"stm",
Expand Down
9 changes: 5 additions & 4 deletions docs/supported_ports.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit dc69c29

Please sign in to comment.