Prevent sketch compiled with S132 v2 upload to device running S132 v5 and vice versa

Author: hathach

boards.txt

@@ -42,6 +42,7 @@ feather52.menu.softdevice.s132v201=0.5.0 dual, S132 2.0.1
 feather52.menu.softdevice.s132v201.build.sd_flags=-DS132 -DSD_VER=201
 feather52.menu.softdevice.s132v201.build.sd_name=s132
 feather52.menu.softdevice.s132v201.build.sd_version=2.0.1
+feather52.menu.softdevice.s132v201.build.sd_fwid=0x0088
 feather52.menu.softdevice.s132v201.build.bootfile=0.5.0/dual/feather52_bootloader_v050_s132_v201
 feather52.menu.softdevice.s132v201.upload.maximum_size=165888
 feather52.menu.softdevice.s132v201.upload.maximum_data_size=51072
@@ -50,6 +51,7 @@ feather52.menu.softdevice.s132v510=5.1.0 dual, S132 5.1.0
 feather52.menu.softdevice.s132v510.build.sd_flags=-DS132 -DSD_VER=510
 feather52.menu.softdevice.s132v510.build.sd_name=s132
 feather52.menu.softdevice.s132v510.build.sd_version=5.1.0
+feather52.menu.softdevice.s132v510.build.sd_fwid=0x00A5
 feather52.menu.softdevice.s132v510.build.bootfile={build.sd_version}/dual/feather52_bootloader_5.1.0_s132_dual
 feather52.menu.softdevice.s132v510.upload.maximum_size=151552
 feather52.menu.softdevice.s132v510.upload.maximum_data_size=51072

changelog.md

@@ -1,5 +1,9 @@
 # Adafruit nRF52 Arduino Core Changelog
 
+## 0.8.1
+
+- Prevent sketch compiled with S132 v2 upload to device running S132 v5 and vice versa.
+
 ## 0.8.0
 
 ## Core

cores/nRF5/utility/utilities.c

@@ -45,7 +45,6 @@
 static lookup_entry_t const sd_lookup_items[] =
 {
     { .key = 0x0088, .data = "S132 2.0.1" },
-    { .key = 0x009D, .data = "S132 5.0.0" },
     { .key = 0x00A5, .data = "S132 5.1.0" },
 };
 

libraries/Bluefruit52Lib/library.properties

@@ -1,5 +1,5 @@
 name=Adafruit BLE Libraries for Bluefruit52
-version=0.8.0
+version=0.8.1
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Arduino library for nRF52-based Adafruit Bluefruit LE modules

platform.txt

@@ -17,7 +17,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 name=Adafruit nRF52 Boards
-version=0.8.0
+version=0.8.1
 
 # Compile variables
 # -----------------
@@ -102,7 +102,7 @@ recipe.c.combine.pattern="{compiler.path}{compiler.c.elf.cmd}"  "-L{build.path}"
 recipe.objcopy.hex.pattern="{compiler.path}{compiler.elf2hex.cmd}" {compiler.elf2hex.flags} {compiler.elf2hex.extra_flags} "{build.path}/{build.project_name}.elf" "{build.path}/{build.project_name}.hex"
 
 ## Creat dfu package zip file
-recipe.objcopy.zip.pattern="{tools.nrfutil.cmd}" dfu genpkg --dev-type 0x0052 --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
+recipe.objcopy.zip.pattern="{tools.nrfutil.cmd}" dfu genpkg --dev-type 0x0052 --sd-req {build.sd_fwid} --application "{build.path}/{build.project_name}.hex" "{build.path}/{build.project_name}.zip"
 
 ## Save bin
 recipe.output.tmp_file_bin={build.project_name}.bin

tools/nrfutil-0.5.2/nordicsemi/__main__.py

@@ -287,8 +287,8 @@ def serial(package, port, baudrate, flowcontrol):
         click.echo("Failed to upgrade target. Error is: {0}".format(e.message))
         click.echo("")
         click.echo("Possible causes:")
-        click.echo("- Bootloader, SoftDevice or Application on target "
-                   "does not match the requirements in the DFU package.")
+        click.echo("- Selected bootloader version does not match the one on Bluefruit device.")
+        click.echo("    Upgrade the bootloader or select correct version in Tools->Bootloader.")
         click.echo("- Baud rate must be 115200, Flow control must be off.")
         click.echo("- Target is not in DFU mode. Ground DFU pin and RESET and release both to enter DFU mode.")