Add beginnings of RAK4600 and update to latest nrf52 arduino sources

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-;default_envs = tbeam
+default_envs = tbeam
 ;default_envs = tbeam0.7
 ;default_envs = heltec
 ;default_envs = tlora-v1
@@ -19,7 +19,8 @@
 ;default_envs = eink
 ;default_envs = nrf52840dk-geeksville
 ;default_envs = native # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here
-default_envs = rak4631
+;default_envs = rak4631
+;default_envs = rak4630
 
 [common]
 ; common is not currently used
@@ -194,7 +195,7 @@ src_filter =
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
 ; platform = nordicnrf52
-platform = https://github.com/meshtastic/platform-nordicnrf52.git#1a2639a6b0f79b5df66bea3e3089f0d5285fdc63
+platform = https://github.com/meshtastic/platform-nordicnrf52.git#merge
 extends = arduino_base
 build_type = debug ; I'm debugging with ICE a lot now
 ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
@@ -241,6 +242,14 @@ debug_init_break =
 ;debug_init_break = tbreak loop
 ;debug_init_break = tbreak Reset_Handler
 
+[nrf52840_base]
+; Common base class for all nrf52840 based targets
+extends = nrf52_base
+lib_deps =
+  ${arduino_base.lib_deps}
+  Adafruit nRFCrypto 
+  # add Adafruit nRFCrypto platform IO automated scan is broken
+
 [env:lora_isp4520]
 extends = nrf52_base
 board = lora_isp4520
@@ -262,12 +271,12 @@ monitor_port = /dev/ttyUSB0
 ; The NRF52840-dk development board
 ; Note: By default no lora device is created for this build - it uses a simulated interface
 [env:nrf52840dk]
-extends = nrf52_base
+extends = nrf52840_base
 board = nrf52840_dk
 
 ; The NRF52840-dk development board, but @geeksville's board - which has a busted oscilliator 
 [env:nrf52840dk-geeksville]
-extends = nrf52_base
+extends = nrf52840_base
 board = nrf52840_dk_modified
 # add our variants files to the include and src paths
 build_flags = ${nrf52_base.build_flags} -Ivariants/pca10056-rc-clock
@@ -290,17 +299,28 @@ monitor_speed = 115200
 # For experimenting with RAM sizes
 # board_build.ldscript = linker/nrf52840_s140_sim832.ld
 
+; The very slick RAK wireless RAK 4631 / 4630 board
 [env:rak4631]
-extends = nrf52_base
+extends = nrf52840_base
 board = wiscore_rak4631
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
 build_flags = ${nrf52_base.build_flags} -Ivariants/WisCore_RAK4631_Board
-src_filter = ${nrf52_base.src_filter} +<../variants/eink>
+src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
+debug_tool = jlink
+; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
+;upload_protocol = jlink
+
+; THIS IS UNTESTED (I don't have this board), but other developers can use it as a starting point
+[env:rak4600]
+extends = nrf52_base
+board = wiscore_rak4600
+# add our variants files to the include and src paths
+# define build flags for the TFT_eSPI library
+build_flags = ${nrf52_base.build_flags} -Ivariants/WisCore_RAK4600_Board
+src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4600_Board>
 lib_deps = 
   ${arduino_base.lib_deps}
-debug_tool = jlink
-upload_protocol = jlink
 
 ; The PPR board
 [env:ppr]
@@ -321,7 +341,7 @@ lib_deps =
 
 ; First prototype eink/nrf52840/sx1262 device
 [env:eink]
-extends = nrf52_base
+extends = nrf52840_base
 board = eink
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -329,13 +349,13 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/eink
   -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 src_filter = ${nrf52_base.src_filter} +<../variants/eink>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
   https://github.com/geeksville/EPD_Libraries.git
   TFT_eSPI
 
 ; First prototype eink/nrf52840/sx1262 device
 [env:eink0.1]
-extends = nrf52_base
+extends = nrf52840_base
 board = eink0.1
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -343,13 +363,13 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/eink0.1
   -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
 src_filter = ${nrf52_base.src_filter} +<../variants/eink0.1>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
   https://github.com/geeksville/EPD_Libraries.git
   TFT_eSPI
 
 ; The https://github.com/BigCorvus/SX1262-LoRa-BLE-Relay board by @BigCorvus
 [env:lora-relay-v1]
-extends = nrf52_base
+extends = nrf52840_base
 board = lora-relay-v1
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -365,13 +385,13 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/lora_relay_v1
   -DSPI_FREQUENCY=27000000
 src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v1>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
   SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
   TFT_eSPI
 
 ; The https://github.com/BigCorvus/LoRa-BLE-Relay-v2 board by @BigCorvus
 [env:lora-relay-v2]
-extends = nrf52_base
+extends = nrf52840_base
 board = lora-relay-v2
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
@@ -389,7 +409,7 @@ build_flags = ${nrf52_base.build_flags} -Ivariants/lora_relay_v2
   -DTFT_SCLK=ST7735_SCK
 src_filter = ${nrf52_base.src_filter} +<../variants/lora_relay_v2>
 lib_deps = 
-  ${arduino_base.lib_deps}
+  ${nrf52840_base.lib_deps}
   SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
   TFT_eSPI