Skip to content

Fix to not incorrectly include TINYUSB on nrf52832 targets #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix to not incorrectly include TINYUSB on nrf52832 targets #7

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5310584
Fix to not incorrectly include TINYUSB on nrf52832 targets
geeksville Jul 10, 2020
9d11b9e
Update based on ardafruit nrf52 arduino platform.txt
geeksville Sep 7, 2020
1cd8dca
Add crypto lib to nrf52840 builds
geeksville Apr 15, 2021
d6085f7
Merge remote-tracking branch 'root/master'
geeksville Apr 15, 2021
111703c
Merge remote-tracking branch 'root/master'
geeksville Aug 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion adafruit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@

usb_path = join(FRAMEWORK_DIR, "libraries", "Adafruit_TinyUSB_Arduino")
if isdir(usb_path):
if env.subst("$BOARD") != "adafruit_feather_nrf52832":
if board.get("build.mcu") != "nrf52832":
env.Append(
CPPDEFINES=[
"USBCON",
Expand All @@ -247,6 +247,22 @@
]
)

# NRF52840 has a new crypto lib
crypto_path = join(FRAMEWORK_DIR, "libraries", "Adafruit_nRFCrypto", "src")
if isdir(crypto_path):
if board.get("build.mcu") == "nrf52840":
env.Append(
CPPPATH=[
join(crypto_path),
],
LIBPATH=[
join(crypto_path, "cortex-m4", "fpv4-sp-d16-hard")
],
LIBS=[
join("nrf_cc310_0.9.13-no-interrupts")
]
)

cpp_flags = env.Flatten(env.get("CPPDEFINES", []))

if "CFG_DEBUG" not in cpp_flags:
Expand Down