Merge pull request #4 from RAKWireless/0.21.20-staging

Minor Update

Author: beegee-tokyo

README.md

@@ -77,12 +77,9 @@ WisBlock is created with 4 modular blocks.
 - WisBlock IO modules **extend the input and output possibilities** of WisBlock.
 - Options include cellular, displays, LEDs, button interfaces, and additional USB and GPIO ports as well as Wi-Fi.
 
-<center><img src="./assets/WisBlock.png" alt="Modules""></center>  
+<center><img src="./assets/WisBlock.png" alt="Modules"></center>  
 
 ## BSP Installation
-<!--
-There are two methods that you can use to install this BSP. We highly recommend the first option unless you wish to participate in active development of this codebase via Github.
--->
 
 ### Stable Version
 
@@ -95,42 +92,15 @@ Do _**NOT**_ install the Arduino IDE from the Microsoft App Store. Please instal
 ----
 
 
- 1. [Download and install the Arduino IDE](https://www.arduino.cc/en/Main/Software) (At least v1.6.12)
- 2. Start the Arduino IDE
- 3. Go into Preferences
- 4. Add **'https://downloads.rakwireless.com/Arduino/BSP/package_raknrf_index.json'** as a new line in the  **'Additional Board Manager URL'** list. (see below figure)
-<center><img src="./assets/Add-BSP-URL.png" alt="Add BSP""></center>    
- 5. Restart the Arduino IDE
- 6. Open the Boards Manager from the Tools -> Board menu and install 'RAKwireless nRF Boards'
-<center><img src="./assets/Install-BSP.png" alt="Install""></center>    
-7. Once the BSP is installed, select 'RAK4631' or 'RAK4601' from the Tools -> Board menu, which will update your system config to use the right compiler and settings for the module.
-<center><img src="/assets/Select-Board.png" alt="Select Board""></center>    
-
+#### (1) [Download and install the Arduino IDE](https://www.arduino.cc/en/Main/Software) (At least v1.6.12)
+#### (2) Follow [this guide](https://github.com/RAKWireless/RAKwireless-Arduino-BSP-Index) to install the required Board Support Package (BSP)    
+----
 ### Examples and Tutorials
 After you selected a RAK board you can see examples for all WisBlock modules
-<center><img src="./assets/List-examples.png" alt="Select Board""></center>     
+<center><img src="./assets/List-examples.png" alt="Select Board"></center>     
 
 For more information about the examples and tutorials visit our [Github WisBlock repo](https://github.com/RAKWireless/WisBlock)    
 
-### Development Version
-
-<!--
-# TODO do we need installation from the repo? Add it later
- 1. Install BSP via Board Manager as above to install compiler & tools.
- 2. Delete the core folder `nrf52` installed by Board Manager in Adruino15, depending on your OS. It could be
-  * macOS  : `~/Library/Arduino15/packages/raknrf/hardware/nrf52`
-  * Linux  : `~/.arduino15/packages/raknrf/hardware/nrf52`
-  * Windows: `%APPDATA%\Local\Arduino15\packages\raknrf\hardware\nrf52`
- 3. `cd <SKETCHBOOK>`, where `<SKETCHBOOK>` is your Arduino Sketch folder:
-  * macOS  : `~/Documents/Arduino`
-  * Linux  : `~/Arduino`
-  * Windows: `~/Documents/Arduino`
- 4. Create a folder named `hardware/RAKwireless`, if it does not exist, and change directories to it
- 5. Clone this repo & its submodules: `git clone --recurse-submodules https://github.com/beegee-tokyo/WisCore-nRF-BSP.git`
- 6. Restart the Arduino IDE
- 7. Once the BSP is installed, select 'RAK4631' or 'RAK4601' from the Tools -> Board menu, which will update your system config to use the right compiler and settings for the module.
--->
-
 ### Adafruit's nrfutil tools
 
 [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil) (derived from Nordic pc-nrfutil) is needed to upload sketch via serial port.
@@ -202,7 +172,7 @@ $ nrfjprog --reset -f nrf52
 
 This BSP is based on [Adafruits nRF52 BSP](https://github.com/adafruit/Adafruit_nRF52_Arduino),    
 which is based on [Arduino-nRF5](https://github.com/sandeepmistry/arduino-nRF5) by Sandeep Mistry,    
-which in turn is based on the [Arduino SAMD Core](https://github.com/arduino/ArduinoCore-samd).
+which in turn is based on the [Arduino SAMD Core](https://github.com/arduino/ArduinoCore-samd).    
 
 The following libraries are used:
 

boards.txt

@@ -18,7 +18,6 @@
 
 menu.softdevice=Bootloader
 menu.debug=Debug
-menu.region=Region
 
 # ----------------------------------
 # WisBlock Core RAK4631 Board
@@ -64,20 +63,6 @@ WisCoreRAK4631Board.menu.debug.l3=Level 3 (Segger SystemView)
 WisCoreRAK4631Board.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
 WisCoreRAK4631Board.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
-# Region Menu
-WisCoreRAK4631Board.menu.region.10=EU868
-WisCoreRAK4631Board.menu.region.10.build.region_flags=-DREGION_EU868
-WisCoreRAK4631Board.menu.region.11=US915
-WisCoreRAK4631Board.menu.region.11.build.region_flags=-DREGION_US915
-WisCoreRAK4631Board.menu.region.12=AU915
-WisCoreRAK4631Board.menu.region.12.build.region_flags=-DREGION_AU915
-WisCoreRAK4631Board.menu.region.13=KR920
-WisCoreRAK4631Board.menu.region.13.build.region_flags=-DREGION_KR920
-WisCoreRAK4631Board.menu.region.14=AS923
-WisCoreRAK4631Board.menu.region.14.build.region_flags=-DREGION_AS923
-WisCoreRAK4631Board.menu.region.15=IN865
-WisCoreRAK4631Board.menu.region.15.build.region_flags=-DREGION_IN865
-
 # ----------------------------------
 # WisBlock Core RAK4600 Board
 # ----------------------------------
@@ -119,62 +104,3 @@ WisCoreRAK4600Board.menu.debug.l2=Level 2 (Full Debug)
 WisCoreRAK4600Board.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 WisCoreRAK4600Board.menu.debug.l3=Level 3 (Segger SystemView)
 WisCoreRAK4600Board.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
-
-# Region Menu
-WisCoreRAK4600Board.menu.region.10=EU868
-WisCoreRAK4600Board.menu.region.10.build.region_flags=-DREGION_EU868
-WisCoreRAK4600Board.menu.region.11=US915
-WisCoreRAK4600Board.menu.region.11.build.region_flags=-DREGION_US915
-WisCoreRAK4600Board.menu.region.12=AU915
-WisCoreRAK4600Board.menu.region.12.build.region_flags=-DREGION_AU915
-WisCoreRAK4600Board.menu.region.13=KR920
-WisCoreRAK4600Board.menu.region.13.build.region_flags=-DREGION_KR920
-WisCoreRAK4600Board.menu.region.14=AS923
-WisCoreRAK4600Board.menu.region.14.build.region_flags=-DREGION_AS923
-WisCoreRAK4600Board.menu.region.15=IN865
-WisCoreRAK4600Board.menu.region.15.build.region_flags=-DREGION_IN865
-
-# ----------------------------------
-# WisTrio RAK5010 
-# ----------------------------------
-WisTrioRAK5010.name=WisTrio RAK5010 Board
-WisTrioRAK5010.bootloader.tool=bootburn
-
-# Upload
-WisTrioRAK5010.upload.tool=nrfutil
-WisTrioRAK5010.upload.protocol=nrfutil
-WisTrioRAK5010.upload.use_1200bps_touch=true
-WisTrioRAK5010.upload.wait_for_upload_port=true
-WisTrioRAK5010.upload.maximum_size=815104
-WisTrioRAK5010.upload.maximum_data_size=237568
-
-# Build
-WisTrioRAK5010.build.mcu=cortex-m4
-WisTrioRAK5010.build.f_cpu=64000000
-WisTrioRAK5010.build.board=WisTrioRAK5010
-WisTrioRAK5010.build.core=nRF5
-WisTrioRAK5010.build.variant=WisTrio_RAK5010_Board
-WisTrioRAK5010.build.usb_manufacturer="RAKwireless"
-WisTrioRAK5010.build.usb_product="WisTrio RAK5010 Board"
-WisTrioRAK5010.build.extra_flags=-DNRF52840_XXAA {build.flags.usb}
-WisTrioRAK5010.build.ldscript=nrf52840_s140_v6.ld
-WisTrioRAK5010.build.vid=0x239A
-WisTrioRAK5010.build.pid=0x8029
-
-# SofDevice Menu
-WisTrioRAK5010.menu.softdevice.s140v6=0.3.2 SoftDevice s140 6.1.1
-WisTrioRAK5010.menu.softdevice.s140v6.build.sd_name=s140
-WisTrioRAK5010.menu.softdevice.s140v6.build.sd_version=6.1.1
-WisTrioRAK5010.menu.softdevice.s140v6.build.sd_fwid=0x00B6
-
-# Debug Menu
-WisTrioRAK5010.menu.debug.l0=Level 0 (Release)
-WisTrioRAK5010.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
-WisTrioRAK5010.menu.debug.l1=Level 1 (Error Message)
-WisTrioRAK5010.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
-WisTrioRAK5010.menu.debug.l2=Level 2 (Full Debug)
-WisTrioRAK5010.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
-WisTrioRAK5010.menu.debug.l3=Level 3 (Segger SystemView)
-WisTrioRAK5010.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
-WisTrioRAK5010.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
-

changelog.md

@@ -1,6 +1,11 @@
 
 # RAKwireless WisBlock BSP Changelog
 
+## 0.21.20 - 2021.04.10
+
+- Update examples
+- Make compatible with new Sx126x-Arduino library V2.0.0
+
 ## 0.21.11 - 2021.03.03
 
 - Update examples