Merge pull request #1768 from meshtastic/nrf52-Rollup

Nrf52 rollup
This commit is contained in:
Thomas Göttgens 2022-10-10 15:30:45 +02:00 committed by GitHub
commit 784cd8c6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -1,7 +1,7 @@
[nrf52_base] [nrf52_base]
; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
; platform = nordicnrf52 ;pending https://github.com/platformio/builder-framework-arduino-nrf5/pull/7 platform = platformio/nordicnrf52@^9.4.0
platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge ; platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge
extends = arduino_base extends = arduino_base
build_type = debug ; I'm debugging with ICE a lot now build_type = debug ; I'm debugging with ICE a lot now

View File

@ -4,7 +4,8 @@ build_flags = ${nrf52_base.build_flags}
lib_deps = lib_deps =
${arduino_base.lib_deps} ${arduino_base.lib_deps}
${environmental_base.lib_deps} ${environmental_base.lib_deps}
https://github.com/Kongduino/Adafruit_nRFCrypto.git#20fc7fdaf086bd70e901c007dd23c6e8856aec25 # https://github.com/Kongduino/Adafruit_nRFCrypto.git#20fc7fdaf086bd70e901c007dd23c6e8856aec25
https://github.com/caveman99/Adafruit_nRFCrypto.git#patch-3 # pending fix pull on kongduino repo
; Note: By default no lora device is created for this build - it uses a simulated interface ; Note: By default no lora device is created for this build - it uses a simulated interface
[env:nrf52840dk] [env:nrf52840dk]