Merge branch 'dev'

add CFLAGS += -DDEVICE_NAME='"BLE_NAME"' to board.mk

.clang-format

@@ -1,99 +0,0 @@
----
-Language: Cpp
-BasedOnStyle: LLVM
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments:
-  Enabled: true
-  AcrossEmptyLines: false
-  AcrossComments: false
-AlignConsecutiveBitFields:
-  Enabled: true
-  AcrossEmptyLines: false
-  AcrossComments: false
-AlignConsecutiveDeclarations:
-  Enabled: true
-  AcrossEmptyLines: false
-  AcrossComments: false
-AlignConsecutiveMacros:
-  Enabled: true
-  AcrossEmptyLines: true
-  AcrossComments: false
-AlignConsecutiveShortCaseStatements:
-  Enabled: true
-  AcrossEmptyLines: true
-  AcrossComments: true
-  AlignCaseColons: false
-AlignEscapedNewlines: LeftWithLastLine
-AlignOperands: true
-AlignTrailingComments:
-  Kind: Always
-  OverEmptyLines: 2
-AllowAllArgumentsOnNextLine: false
-AllowAllConstructorInitializersOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortBlocksOnASingleLine: Empty
-AllowShortCaseExpressionOnASingleLine: true
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortEnumsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: None
-AllowShortIfStatementsOnASingleLine: Never
-AlwaysBreakTemplateDeclarations: Yes
-BinPackArguments: true
-BreakBeforeBraces: Custom
-BraceWrapping:
-  AfterCaseLabel: false
-  AfterClass: false
-  AfterControlStatement: false
-  AfterEnum: false
-  AfterFunction: false
-  AfterNamespace: false
-  AfterStruct: false
-  AfterUnion: false
-  AfterExternBlock: false
-  BeforeCatch: true
-  BeforeElse: false
-  BeforeLambdaBody: false
-  BeforeWhile: false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BracedInitializerIndentWidth: 2
-BreakBeforeBinaryOperators: None
-BreakConstructorInitializers: AfterColon
-BreakConstructorInitializersBeforeComma: false
-ContinuationIndentWidth: 2
-ColumnLimit: 120
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-Cpp11BracedListStyle: true
-IncludeBlocks: Preserve
-IncludeCategories:
-  - Regex: '^<.*'
-    Priority: 1
-  - Regex: '^".*'
-    Priority: 2
-  - Regex: '.*'
-    Priority: 3
-IncludeIsMainRegex: '([-_](test|unittest))?$'
-IndentPPDirectives: BeforeHash
-InsertBraces: true
-IndentCaseLabels: true
-InsertNewlineAtEOF: true
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 2
-NamespaceIndentation: All
-PenaltyBreakBeforeFirstCallParameter: 1000000
-PenaltyBreakOpenParenthesis: 1000000
-PPIndentWidth: 2
-QualifierAlignment: Custom
-QualifierOrder: ['static', 'const', 'volatile', 'restrict', 'type']
-SpaceAfterTemplateKeyword: false
-SpaceBeforeRangeBasedForLoopColon: false
-SpaceInEmptyParentheses: false
-SpacesInAngles: false
-SpacesInConditionalStatement: false
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SortIncludes: false
-TabWidth: 2
-...

.github/FUNDING.yml

@@ -0,0 +1 @@
+ko_fi: oltaco

.github/workflows/githubci.yml

@@ -1,9 +1,9 @@
 name: Build
 
 on:
-  pull_request:
-  push:
-  repository_dispatch:
+  #  pull_request:
+  #  push:
+  #  repository_dispatch:
   release:
     types:
       - created

.gitignore

@@ -66,6 +66,9 @@ TAGS
 .DS_Store
 Makefile.user
 
-# Exclude all SoftDevice S340 files
-lib/softdevice/s340*
-
+# Python virtual environments
+venv/
+.python-version
+lib/python3.13/
+lib64
+pyvenv.cfg

.gitmodules

@@ -8,6 +8,3 @@
 	path = lib/uf2
 	url = https://github.com/microsoft/uf2.git
 
-[submodule "lib/tinycrypt"]
-	path = lib/tinycrypt
-	url = https://github.com/intel/tinycrypt

AGENTS.md

@@ -1,25 +0,0 @@
-# Agent Instructions
-
-## Style
-- Follow the repo `.clang-format` when making changes.
-
-## Build / Verify
-- Prefer CMake for testing/verification.
-- Always build both boards during verification:
-  - `feather_nrf52832`
-  - `feather_nrf52840_express`
-
-### CMake (preferred)
-```bash
-cmake -S . -B cmake-build-feather_nrf52832 -DBOARD=feather_nrf52832
-cmake --build cmake-build-feather_nrf52832
-
-cmake -S . -B cmake-build-feather_nrf52840_express -DBOARD=feather_nrf52840_express
-cmake --build cmake-build-feather_nrf52840_express
-```
-
-### Make (alternate)
-```bash
-make BOARD=feather_nrf52832 all
-make BOARD=feather_nrf52840_express all
-```

CMakeLists.txt

@@ -1,11 +1,14 @@
 cmake_minimum_required(VERSION 3.17)
-include(CMakePrintHelpers)
 find_package(Python COMPONENTS Interpreter)
 
 if (NOT DEFINED BOARD)
   message(FATAL_ERROR "BOARD is not defined")
 endif ()
 
+if (NOT DEFINED TOOLCHAIN)
+  set(TOOLCHAIN gcc)
+endif ()
+
 # include board specific
 include(${CMAKE_CURRENT_LIST_DIR}/src/boards/${BOARD}/board.cmake)
 
@@ -18,22 +21,15 @@ else ()
   set(JLINK_DEVICE ${MCU_VARIANT}_xxaa)
 endif ()
 
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/toolchain/arm_gcc.cmake)
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
+
+project(Adafruit_nRF52_Bootloader C ASM)
 
 set(NRFX_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/nrfx)
 set(SDK11_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/sdk11/components)
 set(SDK_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/sdk/components)
 set(SOFTDEVICE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/softdevice)
-set(MBR_HEX ${SOFTDEVICE_DIR}/mbr/hex/mbr_nrf52_2.4.1_mbr.hex)
 set(TINYUSB_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/tinyusb/src)
-set(TCRYPT_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/tinycrypt/lib)
-
-option(DEFAULT_TO_OTA_DFU "Default to OTA DFU instead of Serial DFU" OFF)
-option(SIGNED_FW "Enable signed firmware verification" OFF)
-option(DUALBANK_FW "Enable dual bank DFU support" OFF)
-option(FORCE_UF2 "Force UF2 support even with SIGNED_FW" OFF)
-set(SIGNED_FW_QX "" CACHE STRING "Public key Qx (comma-separated bytes)")
-set(SIGNED_FW_QY "" CACHE STRING "Public key Qy (comma-separated bytes)")
 
 set(UF2CONV_PY ${CMAKE_CURRENT_LIST_DIR}/lib/uf2/utils/uf2conv.py)
 set(UF2_FAMILY_ID_BOOTLOADER 0xd663823c)
@@ -41,13 +37,21 @@ set(UF2_FAMILY_ID_BOOTLOADER 0xd663823c)
 #-------------------
 # Bootloader
 #-------------------
-if (NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
-  set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "Build type" FORCE)
+set(CMAKE_EXECUTABLE_SUFFIX .elf)
+add_executable(bootloader)
+
+# SD_VERSION can be overwritten by board.cmake
+if(NOT DEFINED SD_VERSION)
+  if(MCU_VARIANT STREQUAL "nrf52833")
+    set(SD_VERSION 7.3.0)
+  else()
+    set(SD_VERSION 6.1.1)
+  endif()
 endif ()
 
-project(Adafruit_nRF52_Bootloader C ASM)
-set(CMAKE_EXECUTABLE_SUFFIX .elf)
-add_executable(bootloader
+set(MBR_HEX ${SOFTDEVICE_DIR}/mbr/hex/mbr_nrf52_2.4.1_mbr.hex)
+
+target_sources(bootloader PUBLIC
   # src
   src/dfu_ble_svc.c
   src/dfu_init.c
@@ -66,6 +70,7 @@ add_executable(bootloader
   ${SDK11_DIR}/libraries/bootloader_dfu/bootloader_util.c
   ${SDK11_DIR}/libraries/bootloader_dfu/dfu_transport_serial.c
   ${SDK11_DIR}/libraries/bootloader_dfu/dfu_transport_ble.c
+  ${SDK11_DIR}/libraries/bootloader_dfu/dfu_single_bank.c
   ${SDK11_DIR}/ble/ble_services/ble_dfu/ble_dfu.c
   ${SDK11_DIR}/ble/ble_services/ble_dis/ble_dis.c
   ${SDK11_DIR}/drivers_nrf/pstorage/pstorage_raw.c
@@ -79,33 +84,9 @@ add_executable(bootloader
   ${SDK_DIR}/libraries/hci/hci_slip.c
   ${SDK_DIR}/libraries/hci/hci_transport.c
   ${SDK_DIR}/libraries/util/nrf_assert.c
-  # startup
+  # ASM
   ${NRFX_DIR}/mdk/gcc_startup_${MCU_VARIANT}.S
   )
-
-if (DUALBANK_FW)
-  target_sources(bootloader PUBLIC
-    ${SDK11_DIR}/libraries/bootloader_dfu/dfu_dual_bank.c
-  )
-else ()
-  target_sources(bootloader PUBLIC
-    ${SDK11_DIR}/libraries/bootloader_dfu/dfu_single_bank.c
-  )
-endif ()
-
-if (SIGNED_FW)
-  target_sources(bootloader PUBLIC
-    ${TCRYPT_DIR}/source/sha256.c
-    ${TCRYPT_DIR}/source/ecc.c
-    ${TCRYPT_DIR}/source/ecc_dsa.c
-    ${TCRYPT_DIR}/source/utils.c
-  )
-
-  target_include_directories(bootloader PUBLIC
-    ${TCRYPT_DIR}/include
-  )
-endif ()
-
 target_include_directories(bootloader PUBLIC
   src
   src/boards
@@ -139,9 +120,29 @@ target_include_directories(bootloader PUBLIC
   ${SOFTDEVICE_DIR}/mbr/headers
   )
 
-# Debug linker file
+# Debug option
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+  # TODO not work yet, also need to add segger rtt, DFU_APP_DATA_RESERVED=0, BOOTLOADER_REGION_START=0xED000
   set(LD_FILE ${CMAKE_CURRENT_LIST_DIR}/linker/${MCU_VARIANT}_debug.ld)
+
+  target_sources(bootloader PUBLIC
+    lib/SEGGER_RTT/RTT/SEGGER_RTT.c
+    )
+  target_include_directories(bootloader PUBLIC
+    lib/SEGGER_RTT/RTT
+    )
+
+  target_compile_definitions(bootloader PUBLIC
+    CFG_DEBUG
+    SEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
+    DFU_APP_DATA_RESERVED=0
+    )
+
+  if (MCU_VARIANT STREQUAL "nrf52840")
+    target_compile_definitions(bootloader PUBLIC BOOTLOADER_REGION_START=0xEA000)
+  else ()
+    target_compile_definitions(bootloader PUBLIC BOOTLOADER_REGION_START=0x6D000)
+  endif ()
 else ()
   set(LD_FILE ${CMAKE_CURRENT_LIST_DIR}/linker/${MCU_VARIANT}.ld)
 endif ()
@@ -149,7 +150,6 @@ endif ()
 target_link_options(bootloader PUBLIC
   "LINKER:--script=${LD_FILE}"
   -L${NRFX_DIR}/mdk
-  -nostartfiles
   --specs=nosys.specs --specs=nano.specs
   )
 target_compile_options(bootloader PUBLIC
@@ -175,32 +175,8 @@ target_compile_options(bootloader PUBLIC
   )
 target_compile_definitions(bootloader PUBLIC
   SOFTDEVICE_PRESENT
-  CONFIG_GPIO_AS_PINRESET
-  __START=main
-  __STARTUP_CLEAR_BSS
   )
 
-if (SIGNED_FW)
-  if (SIGNED_FW_QX STREQUAL "" OR SIGNED_FW_QY STREQUAL "")
-    message(FATAL_ERROR "SIGNED_FW requires SIGNED_FW_QX and SIGNED_FW_QY to be set")
-  endif ()
-  string(REPLACE " " "" SIGNED_FW_QX_STR "${SIGNED_FW_QX}")
-  string(REPLACE " " "" SIGNED_FW_QY_STR "${SIGNED_FW_QY}")
-  target_compile_definitions(bootloader PUBLIC
-    SIGNED_FW
-    "SIGNED_FW_QX=${SIGNED_FW_QX_STR}"
-    "SIGNED_FW_QY=${SIGNED_FW_QY_STR}"
-  )
-endif ()
-
-if (FORCE_UF2)
-  target_compile_definitions(bootloader PUBLIC FORCE_UF2)
-endif ()
-
-if (DEFAULT_TO_OTA_DFU)
-  target_compile_definitions(bootloader PUBLIC DEFAULT_TO_OTA_DFU)
-endif ()
-
 if (TRACE_ETM STREQUAL "1")
   # ENABLE_TRACE will cause system_nrf5x.c to set up ETM trace
   target_compile_definitions(bootloader PUBLIC ENABLE_TRACE)
@@ -241,36 +217,32 @@ endif ()
 # MCU Variant differences
 # Supported are: nrf52 (nrf52832), nrf52833, nrf52840
 #----------------------------------------------------
-
-# SD_VERSION can be overwritten by board.cmake
-if(NOT DEFINED SD_VERSION)
-  if(MCU_VARIANT STREQUAL "nrf52833")
-    set(SD_VERSION 7.3.0)
-  else()
-    set(SD_VERSION 6.1.1)
-  endif()
-endif ()
-
 if (MCU_VARIANT STREQUAL "nrf52")
   set(SD_NAME s132)
   set(DFU_DEV_REV 0xADAF)
   set(DFU_APP_DATA_RESERVED 7*4096)
-  target_compile_definitions(bootloader PUBLIC NRF52 NRF52832_XXAA)
+  target_compile_definitions(bootloader PUBLIC
+    NRF52
+    NRF52832_XXAA
+    S132
+    )
 elseif (MCU_VARIANT STREQUAL "nrf52833")
+  set(SD_NAME s140)
   set(DFU_DEV_REV 52833)
   set(DFU_APP_DATA_RESERVED 7*4096)
-  target_compile_definitions(bootloader PUBLIC NRF52833_XXAA)
-  if (NOT DEFINED SD_NAME)
-    set(SD_NAME s140)
-  endif ()
+  target_compile_definitions(bootloader PUBLIC
+    NRF52833_XXAA
+    S140
+    )
 elseif (MCU_VARIANT STREQUAL "nrf52840")
+  set(SD_NAME s140)
   set(DFU_DEV_REV 52840)
   # App reserved 40KB (8+32) to match circuitpython for 840
   set(DFU_APP_DATA_RESERVED 10*4096)
-  target_compile_definitions(bootloader PUBLIC NRF52840_XXAA)
-  if (NOT DEFINED SD_NAME)
-    set(SD_NAME s140)
-  endif ()
+  target_compile_definitions(bootloader PUBLIC
+    NRF52840_XXAA
+    S140
+    )
 else ()
   message(FATAL_ERROR "MCU_VARIANT ${MCU_VARIANT} is unknown")
 endif ()
@@ -278,44 +250,27 @@ endif ()
 set(SD_FILENAME ${SD_NAME}_nrf52_${SD_VERSION})
 set(SD_HEX ${SOFTDEVICE_DIR}/${SD_FILENAME}/${SD_FILENAME}_softdevice.hex)
 
-string(TOUPPER ${SD_NAME} SD_NAME_UPPER)
-target_compile_definitions(bootloader PUBLIC ${SD_NAME_UPPER})
 target_include_directories(bootloader PUBLIC
   ${SOFTDEVICE_DIR}/${SD_FILENAME}/${SD_FILENAME}_API/include
   )
 
-# debug build
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-  # TODO not work yet, also need to add segger rtt, DFU_APP_DATA_RESERVED=0, BOOTLOADER_REGION_START=0xED000
-  target_sources(bootloader PUBLIC lib/SEGGER_RTT/RTT/SEGGER_RTT.c)
-  target_include_directories(bootloader PUBLIC lib/SEGGER_RTT/RTT)
-  target_compile_definitions(bootloader PUBLIC
-    CFG_DEBUG
-    SEGGER_RTT_MODE_DEFAULT=SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL
-    DFU_APP_DATA_RESERVED=0
-  )
-  if (MCU_VARIANT STREQUAL "nrf52840")
-    target_compile_definitions(bootloader PUBLIC BOOTLOADER_REGION_START=0xEA000)
-  else ()
-    target_compile_definitions(bootloader PUBLIC BOOTLOADER_REGION_START=0x6D000)
-  endif ()
-else ()
+if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
   target_compile_definitions(bootloader PUBLIC DFU_APP_DATA_RESERVED=${DFU_APP_DATA_RESERVED})
 endif ()
 
-#----------------------------------
-# ANT_LICENSE_KEY handling
-#----------------------------------
-if (DEFINED ANT_LICENSE_KEY)
-  target_compile_definitions(bootloader PUBLIC ANT_LICENSE_KEY=${ANT_LICENSE_KEY})
-endif()
-
 #----------------------------------
 # Get UF2 version from git
 #----------------------------------
 execute_process(COMMAND git describe --dirty --always --tags OUTPUT_VARIABLE GIT_VERSION)
 string(STRIP ${GIT_VERSION} GIT_VERSION)
 
+execute_process(COMMAND bash "-c" "git submodule status | cut -d\" \" -f3,4 | paste -s -d\" \" -"
+  OUTPUT_VARIABLE GIT_SUBMODULE_VERSIONS
+  )
+string(STRIP ${GIT_SUBMODULE_VERSIONS} GIT_SUBMODULE_VERSIONS)
+string(REPLACE ../ "" GIT_SUBMODULE_VERSIONS ${GIT_SUBMODULE_VERSIONS})
+string(REPLACE lib/ "" GIT_SUBMODULE_VERSIONS ${GIT_SUBMODULE_VERSIONS})
+
 string(REPLACE "-" ";" RELEASE_VERSION ${GIT_VERSION})
 list(GET RELEASE_VERSION 0 RELEASE_VERSION)
 string(REPLACE "." ";" RELEASE_VERSION ${RELEASE_VERSION})
@@ -324,14 +279,24 @@ list(GET RELEASE_VERSION 1 RELEASE_VERSION_MINOR)
 list(GET RELEASE_VERSION 2 RELEASE_VERSION_PATCH)
 math(EXPR MK_BOOTLOADER_VERSION "(${RELEASE_VERSION_MAJOR} << 16) + (${RELEASE_VERSION_MINOR} << 8) + ${RELEASE_VERSION_PATCH}")
 
-cmake_print_variables(GIT_VERSION MK_BOOTLOADER_VERSION)
+cmake_print_variables(GIT_VERSION GIT_SUBMODULE_VERSIONS MK_BOOTLOADER_VERSION)
 
 target_compile_definitions(bootloader PUBLIC
-  UF2_VERSION="${GIT_VERSION}"
+  UF2_VERSION_BASE="${GIT_VERSION}"
+  UF2_VERSION="${GIT_VERSION} - ${GIT_SUBMODULE_VERSIONS}"
   BLEDIS_FW_VERSION="${GIT_VERSION} ${SD_NAME} ${SD_VERSION}"
   MK_BOOTLOADER_VERSION=${MK_BOOTLOADER_VERSION}
   )
 
+#----------------------------------
+# Post build
+#----------------------------------
+
+# run size after build
+add_custom_command(TARGET bootloader POST_BUILD
+  COMMAND ${CMAKE_SIZE} $<TARGET_FILE:bootloader>
+  )
+
 # Add bin/hex output
 add_custom_command(TARGET bootloader POST_BUILD
   COMMAND ${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:bootloader> $<TARGET_FILE_DIR:bootloader>/bootloader.bin
@@ -343,11 +308,12 @@ add_custom_command(TARGET bootloader POST_BUILD
 #----------------------------------
 # Flashing target
 #----------------------------------
+
 if (NOT DEFINED NRFJPROG)
   set(NRFJPROG nrfjprog)
 endif()
 
-add_custom_target(flash-bootloader
+add_custom_target(flash-jlink
   DEPENDS bootloader
   COMMAND ${NRFJPROG} --program $<TARGET_FILE:bootloader> --verify --sectoranduicrerase -f nrf52 --reset
   )
@@ -358,27 +324,13 @@ add_custom_target(flash-uf2
   )
 
 add_custom_target(flash-sd
-  DEPENDS flash-mbr
-  COMMAND ${NRFJPROG} --program ${SD_HEX} --verify --sectorerase -f nrf52
+  COMMAND ${NRFJPROG} --program ${SD_HEX} --verify --sectorerase -f nrf52 --reset
   )
 
 add_custom_target(flash-mbr
-  COMMAND ${NRFJPROG} --program ${MBR_HEX} --verify --sectorerase -f nrf52
+  COMMAND ${NRFJPROG} --program ${MBR_HEX} --verify --sectorerase -f nrf52 --reset
   )
 
 add_custom_target(flash-erase
   COMMAND ${NRFJPROG} -f nrf52 --eraseall
-  )
-
-add_custom_target(flash-all
-  DEPENDS bootloader flash-erase
-  COMMAND ${NRFJPROG} --program ${SD_HEX} --verify --sectorerase -f nrf52
-  COMMAND ${NRFJPROG} --program $<TARGET_FILE:bootloader> --verify --sectoranduicrerase -f nrf52 --reset
-  )
-
-# flash skip crc magic ( app valid = 0x0001, crc = 0x0000 )
-#add_custom_target(flash-skip-crc
-#  #COMMAND ${NRFJPROG} --memwr $(BOOT_SETTING_ADDR) --val 0x00000001 -f nrf52
-#  COMMAND ${NRFJPROG} --memwr 0xFF000 --val 0x00000001 -f nrf52
-#  #COMMAND ${NRFJPROG} --memwr 0x7F000 --val 0x00000001 -f nrf52
-#  )
+  )

Makefile

@@ -1,20 +1,12 @@
 #------------------------------------------------------------------------------
 # CONFIGURE
-# - SDK_PATH     : path to SDK directory
+# - SDK_PATH   : path to SDK directory
 #
-# - SD_NAME            : e.g s132, s140
-# - SD_VERSION         : SoftDevice version e.g 6.0.0
-# - SD_HEX             : to bootloader hex binary
-# - SIGNED_FW          : if bootloader will ONLY accept signed firmware
-# - SIGNED_FW_QX       : Qx for signed firmware verification
-# - SIGNED_FW_QY       : Qy for signed firmware verification
-# - DUALBANK_FW        : If bootloader will implement a dual bank feature to allow autorecover from failed
-# - FORCE_UF2          : if SIGNED_FW is 1, will force to include UF2 support (UNSECURE, UF2 does NOT validate signature!)
-# - DEFAULT_TO_OTA_DFU : if entering DFU, by default enter OTA DFU instead of Serial DFU
+# - SD_NAME    : e.g s132, s140
+# - SD_VERSION : SoftDevice version e.g 6.0.0
+# - SD_HEX     : to bootloader hex binary
 #------------------------------------------------------------------------------
 
-PYTHON = python
-
 # local customization
 -include Makefile.user
 
@@ -24,7 +16,6 @@ PYTHON = python
 SDK_PATH     = lib/sdk/components
 SDK11_PATH   = lib/sdk11/components
 TUSB_PATH    = lib/tinyusb/src
-TCRYPT_PATH  = lib/tinycrypt/lib
 NRFX_PATH    = lib/nrfx
 SD_PATH      = lib/softdevice/$(SD_FILENAME)
 
@@ -42,15 +33,6 @@ SD_HEX       = $(SD_PATH)/$(SD_FILENAME)_softdevice.hex
 
 MBR_HEX			 = lib/softdevice/mbr/hex/mbr_nrf52_2.4.1_mbr.hex
 
-# Detect the operating system
-# The "OS" environment variable on Windows is always "Windows_NT"
-# when running under a modern shell like cmd.exe or powershell
-ifeq ($(OS),Windows_NT)
-	NULL_DEVICE = NUL
-else
-	NULL_DEVICE = /dev/null
-endif
-
 # linker by MCU eg. nrf52840.ld
 ifeq ($(DEBUG), 1)
   LD_FILE = linker/$(MCU_SUB_VARIANT)_debug.ld
@@ -59,6 +41,7 @@ else
 endif
 
 GIT_VERSION := $(shell git describe --dirty --always --tags)
+GIT_SUBMODULE_VERSIONS := $(shell git submodule status | cut -d" " -f3,4 | paste -s -d" " -)
 
 # compiled file name
 OUT_NAME = $(BOARD)_bootloader-$(GIT_VERSION)
@@ -121,39 +104,25 @@ BIN = _bin/$(BOARD)
 
 # MCU_SUB_VARIANT can be nrf52 (nrf52832), nrf52833, nrf52840
 ifeq ($(MCU_SUB_VARIANT),nrf52)
-  CFLAGS += -DNRF52 -DNRF52832_XXAA
   SD_NAME = s132
   DFU_DEV_REV = 0xADAF
+  CFLAGS += -DNRF52 -DNRF52832_XXAA -DS132
   DFU_APP_DATA_RESERVED=7*4096
 else ifeq ($(MCU_SUB_VARIANT),nrf52833)
-  CFLAGS += -DNRF52833_XXAA
+  SD_NAME = s140
   DFU_DEV_REV = 52833
+  CFLAGS += -DNRF52833_XXAA -DS140
   DFU_APP_DATA_RESERVED=7*4096
-  ifndef SD_NAME
-		SD_NAME = s140
-	endif
 else ifeq ($(MCU_SUB_VARIANT),nrf52840)
-  CFLAGS += -DNRF52840_XXAA
+  SD_NAME = s140
   DFU_DEV_REV = 52840
+  CFLAGS += -DNRF52840_XXAA -DS140
   # App reserved 40KB (8+32) to match circuitpython for 840
   DFU_APP_DATA_RESERVED=10*4096
-  ifndef SD_NAME
-		SD_NAME = s140
-	endif
 else
   $(error Sub Variant $(MCU_SUB_VARIANT) is unknown)
 endif
 
-SD_NAME_UPPER = $(subst s,S,${SD_NAME})
-CFLAGS += -D$(SD_NAME_UPPER)
-
-#----------------------------------
-# ANT_LICENSE_KEY handling
-#----------------------------------
-ifdef ANT_LICENSE_KEY
-  CFLAGS += -DANT_LICENSE_KEY=\"$(ANT_LICENSE_KEY)\"
-endif
-
 #------------------------------------------------------------------------------
 # SOURCE FILES
 #------------------------------------------------------------------------------
@@ -167,15 +136,6 @@ C_SRC += \
   src/screen.c \
   src/images.c \
 
-# if using a signed firmware
-ifeq ($(SIGNED_FW), 1)
-C_SRC += \
-  $(TCRYPT_PATH)/source/sha256.c \
-  $(TCRYPT_PATH)/source/ecc.c \
-  $(TCRYPT_PATH)/source/ecc_dsa.c \
-  $(TCRYPT_PATH)/source/utils.c
-endif
-
 # all files in boards
 C_SRC += src/boards/boards.c
 
@@ -190,11 +150,7 @@ C_SRC += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader_settings.c
 C_SRC += $(SDK11_PATH)/libraries/bootloader_dfu/bootloader_util.c
 C_SRC += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_transport_serial.c
 C_SRC += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_transport_ble.c
-ifeq ($(DUALBANK_FW), 1)
-C_SRC += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_dual_bank.c
-else
 C_SRC += $(SDK11_PATH)/libraries/bootloader_dfu/dfu_single_bank.c
-endif
 C_SRC += $(SDK11_PATH)/ble/ble_services/ble_dfu/ble_dfu.c
 C_SRC += $(SDK11_PATH)/ble/ble_services/ble_dis/ble_dis.c
 C_SRC += $(SDK11_PATH)/drivers_nrf/pstorage/pstorage_raw.c
@@ -228,10 +184,10 @@ C_SRC += src/boards/$(BOARD)/pinconfig.c
 
 # USB Application ( MSC + UF2 )
 C_SRC += \
-	src/usb/usb_desc.c \
 	src/usb/msc_uf2.c \
-	src/usb/uf2/ghostfat.c \
-	src/usb/usb.c
+	src/usb/usb_desc.c \
+	src/usb/usb.c \
+	src/usb/uf2/ghostfat.c
 
 # TinyUSB stack
 C_SRC += \
@@ -242,8 +198,8 @@ C_SRC += \
 	$(TUSB_PATH)/class/cdc/cdc_device.c \
 	$(TUSB_PATH)/class/msc/msc_device.c \
 	$(TUSB_PATH)/tusb.c
-endif
 
+endif
 
 #------------------------------------------------------------------------------
 # Assembly Files
@@ -262,11 +218,6 @@ IPATH += \
   src/cmsis/include \
   src/usb \
   $(TUSB_PATH)
-  
-ifeq ($(SIGNED_FW), 1)
-IPATH += \
-  $(TCRYPT_PATH)/include
-endif
 
 # nrfx
 IPATH += \
@@ -359,23 +310,10 @@ ifneq ($(USE_NFCT),yes)
 endif
 
 CFLAGS += -DSOFTDEVICE_PRESENT
-CFLAGS += -DUF2_VERSION='"$(GIT_VERSION)"'
+CFLAGS += -DUF2_VERSION_BASE='"$(GIT_VERSION)"'
+CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS)"'
 CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"'
 
-ifeq ($(SIGNED_FW), 1)
-CFLAGS += -DSIGNED_FW
-CFLAGS += -DSIGNED_FW_QX='$(SIGNED_FW_QX)'
-CFLAGS += -DSIGNED_FW_QY='$(SIGNED_FW_QY)'
-endif
-
-ifeq ($(FORCE_UF2), 1)
-CFLAGS += -DFORCE_UF2
-endif
-
-ifeq ($(DEFAULT_TO_OTA_DFU), 1)
-CFLAGS += -DDEFAULT_TO_OTA_DFU
-endif
-
 _VER = $(subst ., ,$(word 1, $(subst -, ,$(GIT_VERSION))))
 CFLAGS += -DMK_BOOTLOADER_VERSION='($(word 1,$(_VER)) << 16) + ($(word 2,$(_VER)) << 8) + $(word 3,$(_VER))'
 
@@ -397,6 +335,12 @@ endif
 
 CFLAGS += -DDFU_APP_DATA_RESERVED=$(DFU_APP_DATA_RESERVED)
 
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
+# Fixes for gcc version 12, 13 and 14.
+ifneq (,$(filter 12.% 13.% 14.%,$(shell $(CC) -dumpversion 2>/dev/null)))
+	CFLAGS += --param=min-pagesize=0
+endif
+
 #------------------------------------------------------------------------------
 # Linker Flags
 #------------------------------------------------------------------------------
@@ -488,17 +432,17 @@ $(BUILD)/$(OUT_NAME).hex: $(BUILD)/$(OUT_NAME).out
 # Hex file with mbr (still no SD)
 $(BUILD)/$(OUT_NAME)_nosd.hex: $(BUILD)/$(OUT_NAME).hex
 	@echo Create $(notdir $@)
-	@$(PYTHON) tools/hexmerge.py --overlap=replace -o $@ $< $(MBR_HEX)
+	@python3 tools/hexmerge.py --overlap=replace -o $@ $< $(MBR_HEX)
 
 # Bootolader self-update uf2
 $(BUILD)/update-$(OUT_NAME)_nosd.uf2: $(BUILD)/$(OUT_NAME)_nosd.hex
 	@echo Create $(notdir $@)
-	$(PYTHON) lib/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID_BOOTLOADER) -c -o $@ $^
+	@python3 lib/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID_BOOTLOADER) -c -o $@ $^
 
 # merge bootloader and sd hex together
 $(BUILD)/$(MERGED_FILE).hex: $(BUILD)/$(OUT_NAME).hex
 	@echo Create $(notdir $@)
-	@$(PYTHON) tools/hexmerge.py -o $@ $< $(SD_HEX)
+	@python3 tools/hexmerge.py -o $@ $< $(SD_HEX)
 
 # Create pkg zip file for bootloader+SD combo to use with DFU CDC
 $(BUILD)/$(MERGED_FILE).zip: $(BUILD)/$(OUT_NAME).hex

README.md

@@ -1,299 +1,88 @@
-# Adafruit nRF52 Bootloader
 
-[![Build Status](https://github.com/adafruit/Adafruit_nRF52_Bootloader/workflows/Build/badge.svg)](https://github.com/adafruit/Adafruit_nRF52_Bootloader/actions)
+# Adafruit nRF52 Bootloader w/ Enhanced OTA DFU
 
-A CDC/DFU/UF2 bootloader for Nordic nRF52 microcontroller. UF2 is an easy-to-use bootloader that appears as a flash drive. You can just copy `.uf2`-format application images to the flash drive to load new firmware. See https://github.com/Microsoft/uf2 for more information.
+The main of this fork is to change the behaviour of the bootloader when a DFU fails, along with some other patches that make it work on nRF52840. 
+When this bootloader *detects* an invalid application firmware after a DFU update it will boot to OTA mode instead of UF2/CDC mode. This isn't totally bulletproof (sometimes the device will just hang at the end of DFU) but if your device is difficult to access then this is a lot better than the default behaviour.
 
-DFU via serial/CDC requires [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil), a modified version of [Nordic nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil). Install `python3` if it is not installed already and run this command to install adafruit-nrfutil from PyPi:
+---
+#### Boards supported:
+- Heltec Automation Mesh Node T114 / HT-nRF5262
+- Nologo ProMicro NRF52840 (aka SuperMini NRF52840)
+- Seeed Studio SenseCAP Card Tracker T1000-E
+- Seeed Studio Wio Tracker L1
+- Seeed Studio XIAO nRF52840 BLE
+- Seeed Studio XIAO nRF52840 BLE SENSE
+- RAK 4631 ([See note](#notes-on-RAK4631-bootloader))
+- RAK WisMesh Tag (new 28/11/2025)
 
-```
-$ pip3 install --user adafruit-nrfutil
-```
+Any board already supported by the Adafruit nrf52 bootloader can be added, or if there's another nRF52840-based board you're interested in please raise an issue.
 
-## Supported Boards
+---
+#### Installation:
+**IMPORTANT:** If you are running a MeshCore companion firmware or Ripple firmware on your device **you will need to run an erase after flashing a new bootloader**. Use the MeshCore web flasher to do the erase, it will guide you to the correct erase firmware for your device. Other erase firmwares will not work, they will not erase the ExtraFS area.
 
-Officially supported boards are:
+The recommended way to install the bootloader is using the UF2 file.
+Download the UF2 file for your board, enter UF2 mode (usually by double pressing the reset button within 0.5s) and copy the UF2 file across.
 
-- [Adafruit CLUE](https://www.adafruit.com/product/4500)
-- [Adafruit Circuit Playground Bluefruit](https://www.adafruit.com/product/4333)
-- [Adafruit Feather nRF52832](https://www.adafruit.com/product/3406)
-- [Adafruit Feather nRF52840 Express](https://www.adafruit.com/product/4062)
-- [Adafruit Feather nRF52840 Sense](https://www.adafruit.com/product/4516)
-- [Adafruit ItsyBitsy nRF52840 Express](https://www.adafruit.com/product/4481)
-- [Adafruit LED Glasses Driver nRF52840](https://www.adafruit.com/product/5217)
-- Adafruit Metro nRF52840 Express
-- [Raytac MDBT50Q-RX Dongle](https://www.adafruit.com/product/5199)
+If you have somehow managed to accidentally flash an incorrect bootloader to your device you will likely require flashing a full bootloader and SoftDevice zip package using ``adafruit-nrfutil``  
 
-In addition, there is also lots of other 3rd-party boards which are added by other makers, users and community. Check
-out the [complete list of all boards here](/supported_boards.md).
 
-## Features
+---
+#### Recommended settings and notes for doing OTA update:
+To perform the OTA update you can use either "nRF Connect" ([Android](https://play.google.com/store/apps/details?id=no.nordicsemi.android.mcp&hl=en&gl=US)/[iOS](https://apps.apple.com/gb/app/nrf-connect-for-mobile/id1054362403)) or "nRF Device Firmware Update" ([Android](https://play.google.com/store/apps/details?id=no.nordicsemi.android.dfu&hl=en&gl=US)/[iOS](https://apps.apple.com/sa/app/device-firmware-update/id1624454660)). My preference is the "nRF Device Firmware Update" app on Android, but I have no experience with flashing from iOS devices.
 
-- DFU over Serial and OTA (application, Bootloader+SD)
-- Self-upgradable via Serial and OTA
-- DFU using UF2 (https://github.com/Microsoft/uf2) (application only)
-- Auto-enter DFU briefly on startup for DTR auto-reset trick (832 only)
-- Supports dual bank firmware updates (disabled by default)
-- Supports signed firmware updates (disabled by default)
+We recommend the following settings for the DFU app.<br/><br/>
 
-Note: For OTA, `Packet Receipt Notification` (PRN) must be 8 or less, which can be configured in nRF DFU. Otherwise, the
-bootloader will run out of
-memory.
+<table>
+<tr>
+<td valign="top">
 
-## How to use
+**Packets Receipt Notification:** OFF  
+**Number of packets:** 8  
+**Reboot time:** 0ms  
+**Scan timeout:** 2000ms  
+**Request high MTU:** OFF  
+**Disable resume:** ON  
+**Prepare object delay:** 400ms  
+**Force Scanning:** ON  
+**Keep bond:** OFF  
+**External MCU DFU:** OFF
 
-There are two pins, `DFU` and `FRST` that bootloader will check upon reset/power:
+</td>
+<td valign="top">
 
-- `Double Reset` Reset twice within 500 ms will enter DFU with UF2 and CDC support (only works with nRF52840)
-- `DFU = LOW` and `FRST = HIGH`: Enter bootloader with UF2 and CDC support
-- `DFU = LOW` and `FRST = LOW`: Enter bootloader with OTA, to upgrade with a mobile application such as Nordic nrfConnect/Toolbox
-- <s>`DFU = HIGH` and `FRST = LOW`: Factory Reset mode: erase firmware application and its data</s>
-- `DFU = HIGH` and `FRST = HIGH`: Go to application code if it is present, otherwise enter DFU with UF2
-- The `GPREGRET` register can also be set to force the bootloader can enter any of above modes (plus a CDC-only mode for Arduino).
-`GPREGRET` is set by the application before performing a soft reset.
+Click the screenshot to view full.
 
-```c
-#include "nrf_nvic.h"
-void reset_to_uf2(void) {
-  NRF_POWER->GPREGRET = 0x57; // 0xA8 OTA, 0x4e Serial
-  NVIC_SystemReset();         // or sd_nvic_SystemReset();
-}
-```
+<a href="docs/Screenshot_20251114_142334_DFU.jpg">
+    <img src="docs/Screenshot_20251114_142334_DFU.jpg" width="200">
+</a>
 
-On the Nordic PCA10056 DK board, `DFU` is connected to **Button1**, and `FRST` is connected to **Button2**.
-So holding down **Button1** while clicking **RESET** will put the board into USB bootloader mode, with UF2 and CDC support.
-Holding down **Button2** while clicking **RESET** will put the board into OTA (over-the-air) bootloader mode.
+</td>
+</tr>
+</table>
 
-On the Nordic PCA10059 Dongle board, `DFU` is connected to the white button.
-`FRST` is connected to pin 1.10. Ground it to pull `FRST` low, as if you had pushed an `FRST`  button.
-There is an adjacent ground pad.
 
-For other boards, please check the board definition for details.
+**IMPORTANT:** If you do an OTA update while your device is plugged into a computer the device will update but <U>it will not boot into the new application firmware</u>. It will require a manual reset in order to start. Plugged into a USB charger is fine.
 
-### Making your own UF2
+---
+#### Performing an OTA update on a MeshCore repeater
+First you will need to login to the repeater and issue the 'start ota' CLI command.
 
-To create your own UF2 DFU update image, simply use the [Python conversion script](https://github.com/Microsoft/uf2/blob/master/utils/uf2conv.py) on a .bin file or .hex file, specifying the family as **0xADA52840** (nRF52840) or **0x621E937A** (nRF52833).
+Next open the nRF Device Firmware Update app, select the appropriate MeshCore firmware zip file for your device, select your device (it will be called ProMicro_OTA/RAK4631_OTA etc), and press start.
 
-```
-nRF52840
-uf2conv.py firmware.hex -c -f 0xADA52840
+Now cross your fingers and hope for the best!
 
-nRF52833
-uf2conv.py firmware.hex -c -f 0x621E937A
-```
+----
+#### Donations:
+Although it's not necessary, if you find this useful please consider donating to support my work!
 
-If using a .bin file with the conversion script you must specify application address with the -b switch, this address depend on the SoftDevice size/version e.g S140 v6 is 0x26000, v7 is 0x27000
+[![Ko-Fi](https://img.shields.io/badge/Ko--fi-F16061?style=for-the-badge&logo=ko-fi&logoColor=white)](https://ko-fi.com/oltaco)
 
-```
-nRF52840
-uf2conv.py firmware.bin -c -b 0x26000 -f 0xADA52840
+---
+#### Notes on RAK4631 bootloader
+This version of the RAK4631 bootloader is based on a much newer version (0.9.2) of the Adafruit nRF52 bootloader than what RAK Wireless uses on their official bootloader (0.6.2-11).  
 
-nRF52833
-uf2conv.py firmware.bin -c -b 0x27000 -f 0x621E937A
-```
 
-To create a UF2 image for bootloader from a .hex file using separated family of **0xd663823c**
+I haven't looked to see what changes (if any) that RAK made to the Adafruit bootloader, so I'm not sure if there's any difference but I have tested this bootloader and I haven't found any problems thus far. If you would rather use the original RAK bootloader but with these patches included you can find that [here](https://github.com/oltaco/WisCore_RAK4631_Bootloader/releases).
 
-```
-uf2conv.py bootloader.hex -c -f 0xd663823c
-```
 
-## Burn & Upgrade with pre-built binaries
-
-You can burn and/or upgrade the bootloader with either a J-link or DFU (serial) to a specific pre-built binary version
-without the hassle of installing a toolchain and compiling the code.
-This is preferred if you are not developing/customizing the bootloader.
-Pre-builtin binaries are available on GitHub [releases](https://github.com/adafruit/Adafruit_nRF52_Bootloader/releases)
-
-Note: The bootloader can be downgraded. Since the binary release is a merged version of
-both bootloader and the Nordic SoftDevice, you can freely upgrade/downgrade to any version you like.
-
-## How to compile and build 
-
-You should only continue if you are looking to develop bootloader for your own.
-You must have have a J-Link available to "unbrick" your device.
-
-### Prerequisites
-
-- ARM GCC
-- Nordic's [nRF5x Command Line Tools](https://www.nordicsemi.com/Software-and-Tools/Development-Tools/nRF-Command-Line-Tools)
-- [Python IntelHex](https://pypi.org/project/IntelHex/)
-
-### Build:
-
-Firstly clone this repo including its submodules with following command:
-
-```
-git clone --recurse-submodules https://github.com/adafruit/Adafruit_nRF52_Bootloader
-```
-
-For git versions before `2.13.0` you have to do that manually:
-```
-git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader
-cd Adafruit_nRF52_Bootloader
-git submodule update --init
-```
-
-#### Build using `make`
-Then build it with `make BOARD={board} all`, for example:
-
-```
-make BOARD=feather_nrf52840_express all
-```
-
-For the list of supported boards, run `make` without `BOARD=` :
-
-```
-make
-You must provide a BOARD parameter with 'BOARD='
-Supported boards are: feather_nrf52840_express feather_nrf52840_express pca10056
-Makefile:90: *** BOARD not defined.  Stop
-```
-
-#### Build using `cmake`
-
-Firstly initialize your build environment by passing your board to `cmake` via `-DBOARD={board}`:
-
-```bash
-mkdir build
-cd build
-cmake .. -DBOARD=feather_nrf52840_express 
-```
-
-And then build it with:
-
-```bash
-make
-```
-
-You can also use the generator of your choice. For example adding the `-GNinja` and then you can invoke `ninja build` instead of `make`.
-
-To list all supported targets, run:
-
-```bash
-cmake --build . --target help
-``` 
-
-To build individual targets, you can specify it directly with `make` or using `cmake --build`:
-
-```bash
-make bootloader
-cmake --build . --target bootloader
-```
-
-### Flash
-
-To flash the bootloader (without softdevice/mbr) using JLink:
-
-```
-make BOARD=feather_nrf52840_express flash
-```
-
-If you are using pyocd as debugger, add `FLASHER=pyocd` to make command:
-
-```
-make BOARD=feather_nrf52840_express FLASHER=pyocd flash
-```
-
-To upgrade the bootloader using DFU Serial via port /dev/ttyACM0
-
-```
-make BOARD=feather_nrf52840_express SERIAL=/dev/ttyACM0 flash-dfu
-```
-
-To flash SoftDevice (will also erase chip):
-
-```
-make BOARD=feather_nrf52840_express flash-sd
-```
-
-To flash MBR only
-
-```
-make BOARD=feather_nrf52840_express flash-mbr
-```
-
-### Dual bank firmware support:
-
-This bootloader can split the FLASH memory into 2 partitions, one for the last successfully uploaded firmware, and the other for the new firmware that is being uploaded. In case the firmware upload fails, the bootloader will revert to the last working firmware version. The only drawback is that the maximum firmware size is half of the device FLASH size: That is why it is disabled by default.
-You can enable this feature by passing DUALBANK_FW=1 to the make process while compiling the bootloader
-
-### Signed firmware support:
-This bootloader can validate that the uploaded firmware is digitally signed, and refuse to install unsigned or signed with the improper key firmware. Because this will make Arduino uploads stop working (because they are not digitally signed), this feature is disabled by default.
-But if you want to ensure noone else is allowed to upload firmware to your device, this option is probably what you want to enable.
-
-To create a signing key, you will need the adafruit-nrfutil utility. First, generate a signing key and store at given path by using
-
-```
-adafruit-nrfutil keys --gen-key stored_key.pem
-```
-
-This command will create a signing key and store it in the file stored_key.pem.  STORE THIS FILE IN A SAFE PLACE, as without it, you won't be able to sign your firmware packages, and the bootloader will refuse to flash them!!
-
-Now, you must show the verification key (that is calculated from the signing key):
-
-```
-adafruit-nrfutil keys --show-vk code stored_key.pem
-```
-
-This command will read your signing key (from the file stored_key.pem) and display C source code with the Qx and Qy arrays: Something along the lines
-
-```
-static uint8_t Qx[] = { ... };
-static uint8_t Qy[] = { ... };
-```
-
-You must save the Qx and Qy values, remove all spaces, and pass them to the make command line
-```
-make BOARD=feather_nrf52840_express SIGNED_FW=1 SIGNED_FW_QX='Qx values' SIGNED_FW_QY='Qy values'
-```
-
-And replace Qx values with the Qx array values, and the Qy values with the Qy array values. That will create a bootloader that ONLY accepts firmware signed with the stored_key.pem signing key. Take into account that the option SIGNED_FW=1 is what enables to build a bootloader that enforces signing, and will ALSO result in disabling UF2 support, as UF2 format does NOT support signing keys. There is an option (only for testing!) called FORCE_UF2 that will FORCE UF2 support on bootloaders that enforce firmware security. It is there to bypass security so you can test a secure bootloader and have a way to recover it something goes wrong, but should NEVER be used if you want to enforce security
-
-Finally, to create a signed firmware application/bootloader update package, you can use, for example
-
-```
-adafruit-nrfutil dfu genpkg --dev-type 0x0052 --sd-req 0x0123 --application "application.hex" --key-file "stored_key.pem" "application_package.zip"
-```
-
-Please, use full paths for all files. The examples omit them for clarity!
-
-And, to upload it to your device, 
-
-```
-adafruit-nrfutil.exe --verbose dfu serial -pkg "application_package.zip" -p /dev/tty0 -b 115200
-```
-
-### Common makefile problems
-
-#### `arm-none-eabi-gcc`: No such file or directory
-
-If you get the following error ...
-
-```
-make BOARD=feather_nrf52840_express all
-Compiling file: main.c
-/bin/sh: /usr/bin/arm-none-eabi-gcc: No such file or directory
-make: *** [_build/main.o] Error 127
-```
-
-... you may need to pass the location of the GCC ARM toolchain binaries to `make` using
-the variable `CROSS_COMPILE` as below:
-```
-make CROSS_COMPILE=/opt/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi- BOARD=feather_nrf52832 all
-```
-
-For other compile errors, check the gcc version with `arm-none-eabi-gcc --version` to insure it is at least 9.x.
-
-#### `ModuleNotFoundError: No module named 'intelhex'`
-
-Install python-intelhex with
-
-```
-pip install intelhex
-```
-
-#### `make: nrfjprog: No such file or directory`
-
-Make sure that `nrfjprog` is available from the command-line. This binary is
-part of Nordic's nRF5x Command Line Tools.

cmake/cpu/cortex-m4.cmake

@@ -1,6 +1,23 @@
-set(TOOLCHAIN_COMMON_FLAGS
-  -mthumb
-  -mcpu=cortex-m4
-  -mfloat-abi=hard
-  -mfpu=fpv4-sp-d16
-)
+if (TOOLCHAIN STREQUAL "gcc")
+  set(TOOLCHAIN_COMMON_FLAGS
+    -mthumb
+    -mcpu=cortex-m4
+    -mfloat-abi=hard
+    -mfpu=fpv4-sp-d16
+    )
+
+  if (NOT DEFINED FREERTOS_PORT)
+    set(FREERTOS_PORT GCC_ARM_CM4F CACHE INTERNAL "")
+  endif ()
+
+elseif (TOOLCHAIN STREQUAL "iar")
+  set(TOOLCHAIN_COMMON_FLAGS
+    --cpu cortex-m4
+    --fpu VFPv4
+    )
+
+  if (NOT DEFINED FREERTOS_PORT)
+    set(FREERTOS_PORT IAR_ARM_CM4F CACHE INTERNAL "")
+  endif ()
+
+endif ()

cmake/toolchain/arm_gcc.cmake

@@ -3,7 +3,10 @@ set(CMAKE_SYSTEM_NAME Generic)
 set(CMAKE_C_COMPILER "arm-none-eabi-gcc")
 set(CMAKE_CXX_COMPILER "arm-none-eabi-g++")
 set(CMAKE_ASM_COMPILER "arm-none-eabi-gcc")
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+
+set(CMAKE_SIZE "arm-none-eabi-size" CACHE FILEPATH "")
+set(CMAKE_OBJCOPY "arm-none-eabi-objcopy" CACHE FILEPATH "")
+set(CMAKE_OBJDUMP "arm-none-eabi-objdump" CACHE FILEPATH "")
 
 set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
 
@@ -13,6 +16,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 
+# pass TOOLCHAIN_CPU to
+set(CMAKE_TRY_COMPILE_PLATFORM_VARIABLES CMAKE_SYSTEM_PROCESSOR)
+
 include(${CMAKE_CURRENT_LIST_DIR}/../cpu/${CMAKE_SYSTEM_PROCESSOR}.cmake)
 
 # enable all possible warnings for building examples
@@ -21,7 +27,6 @@ list(APPEND TOOLCHAIN_COMMON_FLAGS
   -ffunction-sections
   -fsingle-precision-constant
   -fno-strict-aliasing
-  -g
   )
 
 set(TOOLCHAIN_EXE_LINKER_FLAGS
@@ -30,9 +35,12 @@ set(TOOLCHAIN_EXE_LINKER_FLAGS
   #-Wl,--cref
   )
 
-# join the toolchain flags into a single string
-list(JOIN TOOLCHAIN_COMMON_FLAGS " " TOOLCHAIN_COMMON_FLAGS)
-list(JOIN TOOLCHAIN_EXE_LINKER_FLAGS " " CMAKE_EXE_LINKER_FLAGS_INIT)
+include(${CMAKE_CURRENT_LIST_DIR}/set_flags.cmake)
 
-set(CMAKE_C_FLAGS_INIT "${TOOLCHAIN_COMMON_FLAGS} ${TOOLCHAIN_C_FLAGS}")
-set(CMAKE_ASM_FLAGS_INIT "${TOOLCHAIN_COMMON_FLAGS} ${TOOLCHAIN_ASM_FLAGS}")
+# try_compile is cmake test compiling its own example,
+# pass -nostdlib to skip stdlib linking
+get_property(IS_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE)
+if (IS_IN_TRY_COMPILE)
+  set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib")
+  set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -nostdlib")
+endif ()

cmake/toolchain/set_flags.cmake

@@ -0,0 +1,17 @@
+include(CMakePrintHelpers)
+
+# join the toolchain flags into a single string
+list(JOIN TOOLCHAIN_COMMON_FLAGS " " TOOLCHAIN_COMMON_FLAGS)
+
+foreach (LANG IN ITEMS C CXX ASM)
+  set(CMAKE_${LANG}_FLAGS_INIT ${TOOLCHAIN_COMMON_FLAGS})
+
+  #cmake_print_variables(CMAKE_${LANG}_FLAGS_INIT)
+
+  # optimization flags for LOG, LOGGER ?
+  #set(CMAKE_${LANG}_FLAGS_RELEASE_INIT "-Os")
+  #set(CMAKE_${LANG}_FLAGS_DEBUG_INIT "-O0")
+endforeach ()
+
+# Linker
+list(JOIN TOOLCHAIN_EXE_LINKER_FLAGS " " CMAKE_EXE_LINKER_FLAGS_INIT)

lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c

@@ -17,13 +17,13 @@
 #include <stddef.h>
 #include "sdk_common.h"
 
-#define MAX_DFU_PKT_LEN                 (BLEGATT_ATT_MTU_MAX - 3) /**< Maximum length (in bytes) of the DFU Packet characteristic. */
-#define PKT_START_DFU_PARAM_LEN         2                                               /**< Length (in bytes) of the parameters for Packet Start DFU Request. */
-#define PKT_INIT_DFU_PARAM_LEN          2                                               /**< Length (in bytes) of the parameters for Packet Init DFU Request. */
-#define PKT_RCPT_NOTIF_REQ_LEN          3                                               /**< Length (in bytes) of the Packet Receipt Notification Request. */
-#define MAX_PKTS_RCPT_NOTIF_LEN         6                                               /**< Maximum length (in bytes) of the Packets Receipt Notification. */
-#define MAX_RESPONSE_LEN                7                                               /**< Maximum length (in bytes) of the response to a Control Point command. */
-#define MAX_NOTIF_BUFFER_LEN            MAX(MAX_PKTS_RCPT_NOTIF_LEN, MAX_RESPONSE_LEN)  /**< Maximum length (in bytes) of the buffer needed by DFU Service while sending notifications to peer. */
+#define MAX_DFU_PKT_LEN         20                                              /**< Maximum length (in bytes) of the DFU Packet characteristic. */
+#define PKT_START_DFU_PARAM_LEN 2                                               /**< Length (in bytes) of the parameters for Packet Start DFU Request. */
+#define PKT_INIT_DFU_PARAM_LEN  2                                               /**< Length (in bytes) of the parameters for Packet Init DFU Request. */
+#define PKT_RCPT_NOTIF_REQ_LEN  3                                               /**< Length (in bytes) of the Packet Receipt Notification Request. */
+#define MAX_PKTS_RCPT_NOTIF_LEN 6                                               /**< Maximum length (in bytes) of the Packets Receipt Notification. */
+#define MAX_RESPONSE_LEN        7                                               /**< Maximum length (in bytes) of the response to a Control Point command. */
+#define MAX_NOTIF_BUFFER_LEN    MAX(MAX_PKTS_RCPT_NOTIF_LEN, MAX_RESPONSE_LEN)  /**< Maximum length (in bytes) of the buffer needed by DFU Service while sending notifications to peer. */
 
 enum
 {
@@ -57,8 +57,7 @@ static uint32_t dfu_pkt_char_add(ble_dfu_t * const p_dfu)
 
     memset(&char_md, 0, sizeof(char_md));
 
-    char_md.char_props.write         = 1; // For those improved apps that can take advantage of ACK
-    char_md.char_props.write_wo_resp = 1; // Nordic IOS DFU app REQUIRES Write Without Response */
+    char_md.char_props.write_wo_resp = 1;
     char_md.p_char_user_desc         = NULL;
     char_md.p_char_pf                = NULL;
     char_md.p_user_desc_md           = NULL;
@@ -556,35 +555,29 @@ uint32_t ble_dfu_bytes_rcvd_report(ble_dfu_t * p_dfu, uint32_t num_of_firmware_b
         return NRF_ERROR_INVALID_STATE;
     }
 
-    uint32_t err_code;
-	do {
+    ble_gatts_hvx_params_t hvx_params;
+    uint16_t               index = 0;
 
-        ble_gatts_hvx_params_t hvx_params;
-        uint16_t               index = 0;
-    
-        // Encode the Op Code.
-        m_notif_buffer[index++] = OP_CODE_RESPONSE;
-    
-        // Encode the Reqest Op Code.
-        m_notif_buffer[index++] = OP_CODE_IMAGE_SIZE_REQ;
-    
-        // Encode the Response Value.
-        m_notif_buffer[index++] = (uint8_t)BLE_DFU_RESP_VAL_SUCCESS;
-    
-        index += uint32_encode(num_of_firmware_bytes_rcvd, &m_notif_buffer[index]);
-    
-        memset(&hvx_params, 0, sizeof(hvx_params));
-    
-        hvx_params.handle = p_dfu->dfu_ctrl_pt_handles.value_handle;
-        hvx_params.type   = BLE_GATT_HVX_NOTIFICATION;
-        hvx_params.offset = 0;
-        hvx_params.p_len  = &index;
-        hvx_params.p_data = m_notif_buffer;
-		
-        err_code = sd_ble_gatts_hvx(p_dfu->conn_handle, &hvx_params);
-    } while (err_code == NRF_ERROR_RESOURCES);	
+    // Encode the Op Code.
+    m_notif_buffer[index++] = OP_CODE_RESPONSE;
 
-    return err_code;	
+    // Encode the Reqest Op Code.
+    m_notif_buffer[index++] = OP_CODE_IMAGE_SIZE_REQ;
+
+    // Encode the Response Value.
+    m_notif_buffer[index++] = (uint8_t)BLE_DFU_RESP_VAL_SUCCESS;
+
+    index += uint32_encode(num_of_firmware_bytes_rcvd, &m_notif_buffer[index]);
+
+    memset(&hvx_params, 0, sizeof(hvx_params));
+
+    hvx_params.handle = p_dfu->dfu_ctrl_pt_handles.value_handle;
+    hvx_params.type   = BLE_GATT_HVX_NOTIFICATION;
+    hvx_params.offset = 0;
+    hvx_params.p_len  = &index;
+    hvx_params.p_data = m_notif_buffer;
+
+    return sd_ble_gatts_hvx(p_dfu->conn_handle, &hvx_params);
 }
 
 
@@ -600,28 +593,22 @@ uint32_t ble_dfu_pkts_rcpt_notify(ble_dfu_t * p_dfu, uint32_t num_of_firmware_by
         return NRF_ERROR_INVALID_STATE;
     }
 
-    uint32_t err_code;
-	do {
+    ble_gatts_hvx_params_t hvx_params;
+    uint16_t               index = 0;
 
-        ble_gatts_hvx_params_t hvx_params;
-        uint16_t               index = 0;
-    
-        m_notif_buffer[index++] = OP_CODE_PKT_RCPT_NOTIF;
-    
-        index += uint32_encode(num_of_firmware_bytes_rcvd, &m_notif_buffer[index]);
-    
-        memset(&hvx_params, 0, sizeof(hvx_params));
-    
-        hvx_params.handle = p_dfu->dfu_ctrl_pt_handles.value_handle;
-        hvx_params.type   = BLE_GATT_HVX_NOTIFICATION;
-        hvx_params.offset = 0;
-        hvx_params.p_len  = &index;
-        hvx_params.p_data = m_notif_buffer;
+    m_notif_buffer[index++] = OP_CODE_PKT_RCPT_NOTIF;
 
-        err_code = sd_ble_gatts_hvx(p_dfu->conn_handle, &hvx_params);
-    } while (err_code == NRF_ERROR_RESOURCES);	
+    index += uint32_encode(num_of_firmware_bytes_rcvd, &m_notif_buffer[index]);
 
-    return err_code;	
+    memset(&hvx_params, 0, sizeof(hvx_params));
+
+    hvx_params.handle = p_dfu->dfu_ctrl_pt_handles.value_handle;
+    hvx_params.type   = BLE_GATT_HVX_NOTIFICATION;
+    hvx_params.offset = 0;
+    hvx_params.p_len  = &index;
+    hvx_params.p_data = m_notif_buffer;
+
+    return sd_ble_gatts_hvx(p_dfu->conn_handle, &hvx_params);
 }
 
 
@@ -639,30 +626,24 @@ uint32_t ble_dfu_response_send(ble_dfu_t         * p_dfu,
         return NRF_ERROR_INVALID_STATE;
     }
 
-    uint32_t err_code;
-	do {
+    ble_gatts_hvx_params_t hvx_params;
+    uint16_t               index = 0;
 
-        ble_gatts_hvx_params_t hvx_params;
-        uint16_t               index = 0;
-    
-        m_notif_buffer[index++] = OP_CODE_RESPONSE;
-    
-        // Encode the Request Op code
-        m_notif_buffer[index++] = (uint8_t)dfu_proc;
-    
-        // Encode the Response Value.
-        m_notif_buffer[index++] = (uint8_t)resp_val;
-    
-        memset(&hvx_params, 0, sizeof(hvx_params));
-    
-        hvx_params.handle = p_dfu->dfu_ctrl_pt_handles.value_handle;
-        hvx_params.type   = BLE_GATT_HVX_NOTIFICATION;
-        hvx_params.offset = 0;
-        hvx_params.p_len  = &index;
-        hvx_params.p_data = m_notif_buffer;
-    
-        err_code = sd_ble_gatts_hvx(p_dfu->conn_handle, &hvx_params);
-    } while (err_code == NRF_ERROR_RESOURCES);
+    m_notif_buffer[index++] = OP_CODE_RESPONSE;
 
-    return err_code;	
+    // Encode the Request Op code
+    m_notif_buffer[index++] = (uint8_t)dfu_proc;
+
+    // Encode the Response Value.
+    m_notif_buffer[index++] = (uint8_t)resp_val;
+
+    memset(&hvx_params, 0, sizeof(hvx_params));
+
+    hvx_params.handle = p_dfu->dfu_ctrl_pt_handles.value_handle;
+    hvx_params.type   = BLE_GATT_HVX_NOTIFICATION;
+    hvx_params.offset = 0;
+    hvx_params.p_len  = &index;
+    hvx_params.p_data = m_notif_buffer;
+
+    return sd_ble_gatts_hvx(p_dfu->conn_handle, &hvx_params);
 }

lib/sdk11/components/drivers_nrf/pstorage/pstorage_raw.c

@@ -280,10 +280,6 @@ static void app_notify(uint32_t result, cmd_queue_element_t * p_elem)
  */
 void pstorage_sys_event_handler(uint32_t sys_evt)
 {
-    // Do not bother processing events we are not interested in
-    if (sys_evt != NRF_EVT_FLASH_OPERATION_SUCCESS &&
-        sys_evt != NRF_EVT_FLASH_OPERATION_ERROR) return;
-		
     uint32_t retval = NRF_SUCCESS;
 
     // The event shall only be processed if requested by this module.
@@ -343,7 +339,6 @@ void pstorage_sys_event_handler(uint32_t sys_evt)
  * @brief Function for processing of commands and issuing flash access request to the SoftDevice.
  *
  * @return The return value received from SoftDevice.
- * @remark This function is only called when m_cmd_queue.flash_access == false
  */
 static uint32_t cmd_process(void)
 {
@@ -357,9 +352,6 @@ static uint32_t cmd_process(void)
 
     storage_addr = p_cmd->storage_addr.block_id;
 
-    // Let's assume we will do a flash access
-    m_cmd_queue.flash_access = true;
-	
     switch (p_cmd->op_code)
     {
         case PSTORAGE_STORE_OP_CODE:
@@ -404,10 +396,9 @@ static uint32_t cmd_process(void)
             break;
     }
     
-    // An error means we will not do it
-    if (retval != NRF_SUCCESS)
+    if (retval == NRF_SUCCESS)
     {
-       m_cmd_queue.flash_access = false;
+       m_cmd_queue.flash_access = true;
     }
 
     return retval;

lib/sdk11/components/libraries/bootloader_dfu/bootloader.c

@@ -44,8 +44,7 @@ typedef enum
     BOOTLOADER_SETTINGS_SAVING,                         /**< Bootloader status for indicating that saving of bootloader settings is in progress. */
     BOOTLOADER_COMPLETE,                                /**< Bootloader status for indicating that all operations for the update procedure has completed and it is safe to reset the system. */
     BOOTLOADER_TIMEOUT,                                 /**< Bootloader status field for indicating that a timeout has occured and current update process should be aborted. */
-    BOOTLOADER_SYS_RESET,                               /**< Bootloader status field for indicating that a reset has been requested and current update process should be aborted. */
-    BOOTLOADER_RESET_TO_SELF,                           /**< Bootloader status field for indicating that a reset has been requested and current update process should be aborted and the bootloader must be reentered. */
+    BOOTLOADER_RESET,                                   /**< Bootloader status field for indicating that a reset has been requested and current update process should be aborted. */
 } bootloader_status_t;
 
 static pstorage_handle_t        m_bootsettings_handle;  /**< Pstorage handle to use for registration and identifying the bootloader module on subsequent calls to the pstorage module for load and store of bootloader setting in flash. */
@@ -137,10 +136,9 @@ static void wait_for_events(void)
 
     if ((m_update_status == BOOTLOADER_COMPLETE) ||
         (m_update_status == BOOTLOADER_TIMEOUT) ||
-        (m_update_status == BOOTLOADER_SYS_RESET) ||
-        (m_update_status == BOOTLOADER_RESET_TO_SELF))
+        (m_update_status == BOOTLOADER_RESET) )
     {
-      // When update has completed or a timeout/reset occurred we will return.
+      // When update has completed or a timeout/reset occured we will return.
       return;
     }
   }
@@ -188,36 +186,10 @@ static void bootloader_settings_save(bootloader_settings_t * p_settings)
 {
   if ( is_ota() )
   {
-    uint32_t err_code;
-    while(1) {
-      err_code = pstorage_clear(&m_bootsettings_handle, sizeof(bootloader_settings_t));
-      if (err_code != NRF_ERROR_NO_MEM) {
-        break;
-      }
-      // This means the write/erase queue of commands was completely full - Should not
-      //  happen, but better safe than sorry, wait until space becomes available -
-      //  the pstorage event handler is only run from the main loop, and we are also 
-      //  running from a BLE event on the main loop: This means if we wait here, the FLASH 
-      //  completion events will never be handled (will be queued by app_scheduler, but
-      //  not handled, and that means this wait will never end... So, process SOC events
-      //  from the SD (but NOT BLE events!) - This will free entries on the pstorage queue
-      //  as soon as operations are complete, allowing this op to be queued
-      while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-        // nothing
-      }
-    }
+    uint32_t err_code = pstorage_clear(&m_bootsettings_handle, sizeof(bootloader_settings_t));
     APP_ERROR_CHECK(err_code);
 
-    while(1) {
-      err_code = pstorage_store(&m_bootsettings_handle, (uint8_t *) p_settings, sizeof(bootloader_settings_t), 0);
-      if (err_code != NRF_ERROR_NO_MEM) {
-        break;
-      }
-      // No space, wait until an entry in the queue is freed
-      while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-        // nothing
-      }
-    }
+    err_code = pstorage_store(&m_bootsettings_handle, (uint8_t *) p_settings, sizeof(bootloader_settings_t), 0);
     APP_ERROR_CHECK(err_code);
   }
   else
@@ -324,8 +296,7 @@ void bootloader_dfu_update_process(dfu_update_status_t update_status)
   }
   else if (update_status.status_code == DFU_RESET)
   {
-    m_update_status =
-      (update_status.restart_into_bootloader == false ? BOOTLOADER_SYS_RESET : BOOTLOADER_RESET_TO_SELF);
+    m_update_status = BOOTLOADER_RESET;
   }
   else
   {
@@ -333,10 +304,6 @@ void bootloader_dfu_update_process(dfu_update_status_t update_status)
   }
 }
 
-bool bootloader_must_reset_to_self(void)
-{
-  return m_update_status == BOOTLOADER_RESET_TO_SELF;
-}
 
 uint32_t bootloader_init(void)
 {

lib/sdk11/components/libraries/bootloader_dfu/bootloader.h

@@ -32,13 +32,6 @@
  */
 uint32_t bootloader_init(void);
 
-/**@brief Function to check if bootloader must be reentered after a reset
- * @details: This function can only be called after bootloader_dfu_start returns
- * @retval     true          If device must reboot to the bootloader
- * @retval     false         If device must reboot to the application, if possible
- */
-bool bootloader_must_reset_to_self(void);
-
 /**@brief Function for validating application region in flash.
  * @retval     true          If Application region is valid.
  * @retval     false         If Application region is not valid.
@@ -99,8 +92,6 @@ uint32_t bootloader_dfu_sd_update_finalize(void);
 
 void bootloader_mbr_addrs_populate(void);
 
-extern uint32_t proc_soc(void);
-
 #endif // BOOTLOADER_H__
 
 /**@} */

lib/sdk11/components/libraries/bootloader_dfu/bootloader_settings.c

@@ -40,22 +40,15 @@ void bootloader_util_settings_get(const bootloader_settings_t ** pp_bootloader_s
     *pp_bootloader_settings = p_bootloader_settings;
 }
 
-void bootloader_mbr_addrs_populate(void)
-{
-#if defined(__GNUC__) && (__GNUC__ >= 12)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
-  if (*(const uint32_t *)MBR_BOOTLOADER_ADDR == 0xFFFFFFFF)
-  {
-    nrfx_nvmc_word_write(MBR_BOOTLOADER_ADDR, BOOTLOADER_REGION_START);
-  }
-
-  if (*(const uint32_t *)MBR_PARAM_PAGE_ADDR == 0xFFFFFFFF)
-  {
-    nrfx_nvmc_word_write(MBR_PARAM_PAGE_ADDR, BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS);
-  }
-#if defined(__GNUC__) && (__GNUC__ >= 12)
-#pragma GCC diagnostic pop
-#endif
-}
+void bootloader_mbr_addrs_populate(void)
+{
+  if (*(const uint32_t *)MBR_BOOTLOADER_ADDR == 0xFFFFFFFF)
+  {
+    nrfx_nvmc_word_write(MBR_BOOTLOADER_ADDR, BOOTLOADER_REGION_START);
+  }
+
+  if (*(const uint32_t *)MBR_PARAM_PAGE_ADDR == 0xFFFFFFFF)
+  {
+    nrfx_nvmc_word_write(MBR_PARAM_PAGE_ADDR, BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS);
+  }
+}

lib/sdk11/components/libraries/bootloader_dfu/bootloader_util.c

@@ -32,12 +32,6 @@
 #if defined ( __CC_ARM )
 __asm static void bootloader_util_reset(uint32_t start_addr)
 {
-    MOVS  R5, #0x00             ; R5 = 0
-    MSR   CONTROL, R5           ; Clear CONTROL
-    MSR   PRIMASK, R5           ; Clear PRIMASK
-    MSR   BASEPRI, R5           ; Clear BASEPRI
-    MSR   FAULTMASK, R5         ; Clear FAULTMASK
-
     LDR   R5, [R0]              ; Get App initial MSP for bootloader.
     MSR   MSP, R5               ; Set the main stack pointer to the applications MSP.
     LDR   R0, [R0, #0x04]       ; Load Reset handler into R0. This will be first argument to branch instruction (BX).
@@ -75,12 +69,6 @@ static inline void bootloader_util_reset (uint32_t start_addr) __attribute__ ((o
 static inline void bootloader_util_reset(uint32_t start_addr)
 {
     __asm volatile(
-        "movs  r5, #0x00\t\n"           // R5 = 0
-        "msr   control, r5\t\n"         // Clear CONTROL
-        "msr   primask, r5\t\n"         // Clear PRIMASK
-        "msr   basepri, r5\t\n"         // Clear BASEPRI
-        "msr   faultmask, r5\t\n"       // Clear FAULTMASK
-
         "ldr   r0, [%0]\t\n"            // Get App initial MSP for bootloader.
         "msr   msp, r0\t\n"             // Set the main stack pointer to the applications MSP.
         "ldr   r0, [%0, #0x04]\t\n"     // Load Reset handler into R0.
@@ -120,13 +108,7 @@ static inline void bootloader_util_reset(uint32_t start_addr)
 #elif defined ( __ICCARM__ )
 static inline void bootloader_util_reset(uint32_t start_addr)
 {
-    asm("movs  r5, #0x00\n"                   // R5 = 0
-        "msr   control, r5\n"                 // Clear CONTROL
-        "msr   primask, r5\n"                 // Clear PRIMASK
-        "msr   basepri, r5\n"                 // Clear BASEPRI
-        "msr   faultmask, r5\n"               // Clear FAULTMASK
-
-        "ldr   r5, [%0]\n"                    // Get App initial MSP for bootloader.
+    asm("ldr   r5, [%0]\n"                    // Get App initial MSP for bootloader.
         "msr   msp, r5\n"                     // Set the main stack pointer to the applications MSP.
         "ldr   r0, [%0, #0x04]\n"             // Load Reset handler into R0.
 

lib/sdk11/components/libraries/bootloader_dfu/dfu_bank_internal.h

@@ -40,8 +40,6 @@ typedef enum
     DFU_STATE_WAIT_4_ACTIVATE                                                       /**< State for: waiting for dfu_image_activate(). */
 } dfu_state_t;
 
-#define DFU_TIMEOUT_INTERVAL        APP_TIMER_TICKS(360000)                         /**< DFU timeout interval in milliseconds. */
-
 #define IS_UPDATING_SD(START_PKT)   ((START_PKT).dfu_update_mode & DFU_UPDATE_SD)   /**< Macro for determining if a SoftDevice update is ongoing. */
 #define IS_UPDATING_BL(START_PKT)   ((START_PKT).dfu_update_mode & DFU_UPDATE_BL)   /**< Macro for determining if a Bootloader update is ongoing. */
 #define IS_UPDATING_APP(START_PKT)  ((START_PKT).dfu_update_mode & DFU_UPDATE_APP)  /**< Macro for determining if a Application update is ongoing. */

lib/sdk11/components/libraries/bootloader_dfu/dfu_dual_bank.c

@@ -1,947 +0,0 @@
-/* Copyright (c) 2013 Nordic Semiconductor. All Rights Reserved.
- *
- * The information contained herein is property of Nordic Semiconductor ASA.
- * Terms and conditions of usage are described in detail in NORDIC
- * SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT.
- *
- * Licensees are granted free, non-transferable use of the information. NO
- * WARRANTY of ANY KIND is provided. This heading must NOT be removed from
- * the file.
- *
- */
-
-#include <stddef.h>
-#include "dfu.h"
-#include <dfu_types.h>
-#include "dfu_bank_internal.h"
-#include "nrf.h"
-#include "nrf_sdm.h"
-#include "app_error.h"
-#include "app_timer.h"
-#include "bootloader.h"
-#include "bootloader_types.h"
-#include "pstorage.h"
-#include "nrf_mbr.h"
-#include "dfu_init.h"
-#include "sdk_common.h"
-
-static dfu_state_t                  m_dfu_state;                /**< Current DFU state. */
-static uint32_t                     m_image_size;               /**< Size of the image that will be transmitted. */
-
-static dfu_start_packet_t           m_start_packet;             /**< Start packet received for this update procedure. Contains update mode and image sizes information to be used for image transfer. */
-static uint8_t                      m_init_packet[128];         /**< Init packet, can hold CRC, Hash, Signed Hash and similar, for image validation, integrity check and authorization checking. */ 
-static uint8_t                      m_init_packet_length;       /**< Length of init packet received. */
-static uint16_t                     m_image_crc;                /**< Calculated CRC of the image received. */
-
-APP_TIMER_DEF(m_dfu_timer_id);                                  /**< Application timer id. */
-static bool                         m_dfu_timed_out = false;    /**< Boolean flag value for tracking DFU timer timeout state. */
-
-static pstorage_handle_t            m_storage_handle_swap;      /**< Pstorage handle for the swap area (bank 1). Bank used when updating an application or bootloader without SoftDevice. */
-static pstorage_handle_t            m_storage_handle_app;       /**< Pstorage handle for the application area (bank 0). Bank used when updating a SoftDevice w/wo bootloader. Handle also used when swapping received application from bank 1 to bank 0. */
-static pstorage_handle_t          * mp_storage_handle_active;   /**< Pointer to the pstorage handle for the active bank for receiving of data packets. */
-
-static dfu_callback_t               m_data_pkt_cb;              /**< Callback from DFU Bank module for notification of asynchronous operation such as flash prepare. */
-static dfu_bank_func_t              m_functions;                /**< Structure holding operations for the selected update process. */
-
-
-/**@brief Function for handling callbacks from pstorage module.
- *
- * @details Handles pstorage results for clear and storage operation. For detailed description of
- *          the parameters provided with the callback, please refer to \ref pstorage_ntf_cb_t.
- */
-static void pstorage_callback_handler(pstorage_handle_t * p_handle,
-                                      uint8_t             op_code,
-                                      uint32_t            result,
-                                      uint8_t           * p_data,
-                                      uint32_t            data_len)
-{
-    switch (op_code)
-    {
-        case PSTORAGE_STORE_OP_CODE:
-            if ((m_dfu_state == DFU_STATE_RX_DATA_PKT) && (m_data_pkt_cb != NULL))
-            {
-                m_data_pkt_cb(DATA_PACKET, result, p_data);
-            }
-            break;
-
-        case PSTORAGE_CLEAR_OP_CODE:
-            if (m_dfu_state == DFU_STATE_PREPARING)
-            {
-                m_functions.cleared();
-                m_dfu_state = DFU_STATE_RDY;
-                if (m_data_pkt_cb != NULL)
-                {
-                    m_data_pkt_cb(START_PACKET, result, p_data);
-                }
-            }
-            break;
-
-        default:
-            break;
-    }
-    APP_ERROR_CHECK(result);
-}
-
-
-/**@brief Function for handling the DFU timeout.
- *
- * @param[in] p_context The timeout context.
- */
-static void dfu_timeout_handler(void * p_context)
-{
-    UNUSED_PARAMETER(p_context);
-    dfu_update_status_t update_status = {0};
-
-    m_dfu_timed_out           = true;
-    update_status.status_code = DFU_TIMEOUT;
-
-    bootloader_dfu_update_process(update_status);
-}
-
-
-/**@brief   Function for restarting the DFU Timer.
- *
- * @details This function will stop and restart the DFU timer. This function will be called by the
- *          functions handling any DFU packet received from the peer that is transferring a firmware
- *          image.
- */
-static uint32_t dfu_timer_restart(void)
-{
-    if (m_dfu_timed_out)
-    {
-        // The DFU timer had already timed out.
-        return NRF_ERROR_INVALID_STATE;
-    }
-
-    uint32_t err_code = app_timer_stop(m_dfu_timer_id);
-    APP_ERROR_CHECK(err_code);
-
-    err_code = app_timer_start(m_dfu_timer_id, DFU_TIMEOUT_INTERVAL, NULL);
-    APP_ERROR_CHECK(err_code);
-
-    return err_code;
-}
-
-
-/**@brief   Function for preparing of flash before receiving SoftDevice image.
- *
- * @details This function will erase current application area to ensure sufficient amount of
- *          storage for the SoftDevice image. Upon erase complete a callback will be done.
- *          See \ref dfu_bank_prepare_t for further details.
- */
-static void dfu_prepare_func_app_erase(uint32_t image_size)
-{
-    mp_storage_handle_active = &m_storage_handle_app;
-
-    // Doing a SoftDevice update thus current application must be cleared to ensure enough space
-    // for new SoftDevice.
-    m_dfu_state = DFU_STATE_PREPARING;
-    
-    if ( is_ota() )
-    {
-        uint32_t err_code;
-        while(1) {
-            err_code = pstorage_clear(&m_storage_handle_app, m_image_size);
-            if (err_code != NRF_ERROR_NO_MEM)
-                break;
-            // No space, wait until an entry in the queue is freed
-            while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                // nothing
-            }
-        }
-        APP_ERROR_CHECK(err_code);      
-    }
-    else
-    {
-        flash_nrf5x_erase(DFU_BANK_0_REGION_START, m_image_size);
-
-        // invoke complete callback
-        pstorage_callback_handler(&m_storage_handle_app, PSTORAGE_CLEAR_OP_CODE, NRF_SUCCESS, NULL, 0);
-    }
-}
-
-
-/**@brief   Function for preparing swap before receiving application or bootloader image.
- *
- * @details This function will erase current swap area to ensure flash is ready for storage of the
- *          Application or Bootloader image. Upon erase complete a callback will be done.
- *          See \ref dfu_bank_prepare_t for further details.
- */
-static void dfu_prepare_func_swap_erase(uint32_t image_size)
-{
-    mp_storage_handle_active = &m_storage_handle_swap;
-
-    m_dfu_state = DFU_STATE_PREPARING;
-    
-    if ( is_ota() )
-    {
-        uint32_t err_code;
-        while(1) {
-            err_code = pstorage_clear(&m_storage_handle_swap, image_size);
-            if (err_code != NRF_ERROR_NO_MEM)
-                break;
-            // No space, wait until an entry in the queue is freed
-            while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                // nothing
-            }
-        }
-        APP_ERROR_CHECK(err_code);
-    } 
-    else 
-    {
-        flash_nrf5x_erase(DFU_BANK_1_REGION_START, image_size);
-
-        // invoke complete callback
-        pstorage_callback_handler(&m_storage_handle_swap, PSTORAGE_CLEAR_OP_CODE, NRF_SUCCESS, NULL, 0);
-    }
-}
-
-
-/**@brief   Function for handling behaviour when clear operation has completed.
- */
-static void dfu_cleared_func_swap(void)
-{
-    // Do nothing.
-}
-
-
-/**@brief   Function for handling behaviour when clear operation has completed.
- */
-static void dfu_cleared_func_app(void)
-{
-    dfu_update_status_t update_status = { 0 };
-    update_status.status_code = DFU_BANK_0_ERASED;
-    bootloader_dfu_update_process(update_status);
-}
-
-
-/**@brief   Function for calculating storage offset for receiving SoftDevice image.
- *
- * @details When a new SoftDevice is received it will be temporary stored in flash before moved to
- *          address 0x0. In order to successfully validate transfer and relocation it is important
- *          that temporary image and final installed image does not overlap hence an offset must
- *          be calculated in case new image is larger than currently installed SoftDevice.
- */
-uint32_t offset_calculate(uint32_t sd_image_size)
-{
-    uint32_t offset = 0;
-    
-    if (m_start_packet.sd_image_size > DFU_BANK_0_REGION_START)
-    {
-        uint32_t page_mask = (CODE_PAGE_SIZE - 1);
-        uint32_t diff = m_start_packet.sd_image_size - DFU_BANK_0_REGION_START;
-        
-        offset = diff & ~page_mask;
-        
-        // Align offset to next page if image size is not page sized.
-        if ((diff & page_mask) > 0)
-        {
-            offset += CODE_PAGE_SIZE;
-        }
-    }
-
-    return offset;
-}
-
-
-/**@brief Function for activating received SoftDevice image.
- *
- *  @note This function will not move the SoftDevice image.
- *        The bootloader settings will be marked as SoftDevice update complete and the swapping of
- *        current SoftDevice will occur after system reset.
- *
- * @return NRF_SUCCESS on success.
- */
-static uint32_t dfu_activate_sd(void)
-{
-    dfu_update_status_t update_status = {0};
-
-    update_status.status_code    = DFU_UPDATE_SD_COMPLETE;
-    update_status.app_crc        = m_image_crc;
-    update_status.sd_image_start = DFU_BANK_0_REGION_START;
-    update_status.sd_size        = m_start_packet.sd_image_size;
-    update_status.bl_size        = m_start_packet.bl_image_size;
-    update_status.app_size       = m_start_packet.app_image_size;
-
-    bootloader_dfu_update_process(update_status);
-
-    return NRF_SUCCESS;
-}
-
-
-/**@brief Function for activating received Application image.
- *
- *  @details This function will move the received application image from swap (bank 1) to
- *           application area (bank 0).
- *
- * @return NRF_SUCCESS on success. Error code otherwise.
- */
-static uint32_t dfu_activate_app(void)
-{
-    uint32_t err_code = NRF_SUCCESS;
-
-    // Erase BANK 0.
-    if ( is_ota() )
-    {
-        while(1) {
-            err_code = pstorage_clear(&m_storage_handle_app, m_start_packet.app_image_size);
-            if (err_code != NRF_ERROR_NO_MEM)
-                break;
-            // No space, wait until an entry in the queue is freed
-            while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                // nothing
-            }
-        }
-        APP_ERROR_CHECK(err_code);
-        
-        while(1) {
-            err_code = pstorage_store(&m_storage_handle_app,
-                                          (uint8_t *)m_storage_handle_swap.block_id,
-                                          m_start_packet.app_image_size,
-                                          0);
-
-            if (err_code != NRF_ERROR_NO_MEM)
-                break;
-            // No space, wait until an entry in the queue is freed
-            while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                // nothing
-            }
-        }
-        VERIFY_SUCCESS(err_code);
-        
-    }
-    else
-    {
-        flash_nrf5x_erase(DFU_BANK_0_REGION_START, m_start_packet.app_image_size); 
-        pstorage_callback_handler(&m_storage_handle_app, PSTORAGE_CLEAR_OP_CODE, NRF_SUCCESS, NULL, 0);
-        
-        flash_nrf5x_write(DFU_BANK_0_REGION_START, (uint8_t *)DFU_BANK_1_REGION_START, m_start_packet.app_image_size, false);
-        flash_nrf5x_flush(false);
-        pstorage_callback_handler(&m_storage_handle_app, PSTORAGE_STORE_OP_CODE, NRF_SUCCESS, (uint8_t *) DFU_BANK_1_REGION_START, m_start_packet.app_image_size);
-    }
-    
-    if (err_code == NRF_SUCCESS)
-    {
-        dfu_update_status_t update_status = { 0 };
-
-        memset(&update_status, 0, sizeof(dfu_update_status_t ));
-        update_status.status_code = DFU_UPDATE_APP_COMPLETE;
-        update_status.app_crc     = m_image_crc;
-        update_status.app_size    = m_start_packet.app_image_size;
-
-        bootloader_dfu_update_process(update_status);
-    }
-
-    return err_code;
-}
-
-
-/**@brief Function for activating received Bootloader image.
- *
- *  @note This function will not move the bootloader image.
- *        The bootloader settings will be marked as Bootloader update complete and the swapping of
- *        current bootloader will occur after system reset.
- *
- * @return NRF_SUCCESS on success.
- */
-static uint32_t dfu_activate_bl(void)
-{
-    dfu_update_status_t update_status = {0};
-
-    update_status.status_code = DFU_UPDATE_BOOT_COMPLETE;
-    update_status.app_crc     = m_image_crc;
-    update_status.sd_size     = m_start_packet.sd_image_size;
-    update_status.bl_size     = m_start_packet.bl_image_size;
-    update_status.app_size    = m_start_packet.app_image_size;
-
-    bootloader_dfu_update_process(update_status);
-
-    return NRF_SUCCESS;
-}
-
-
-uint32_t dfu_init(void)
-{
-    uint32_t                err_code;
-    pstorage_module_param_t storage_module_param = {.cb = pstorage_callback_handler};
-
-    m_init_packet_length = 0;
-    m_image_crc          = 0;
-
-    err_code = pstorage_register(&storage_module_param, &m_storage_handle_app);
-    if (err_code != NRF_SUCCESS)
-    {
-        m_dfu_state = DFU_STATE_INIT_ERROR;
-        return err_code;
-    }
-
-    m_storage_handle_app.block_id  = DFU_BANK_0_REGION_START;
-    m_storage_handle_swap          = m_storage_handle_app;
-    m_storage_handle_swap.block_id = DFU_BANK_1_REGION_START;
-
-    // Create the timer to monitor the activity by the peer doing the firmware update.
-    err_code = app_timer_create(&m_dfu_timer_id,
-                                APP_TIMER_MODE_SINGLE_SHOT,
-                                dfu_timeout_handler);
-    APP_ERROR_CHECK(err_code);
-
-    // Start the DFU timer.
-    err_code = app_timer_start(m_dfu_timer_id, DFU_TIMEOUT_INTERVAL, NULL);
-    APP_ERROR_CHECK(err_code);
-
-    m_data_received = 0;
-    m_dfu_state     = DFU_STATE_IDLE;
-
-    return NRF_SUCCESS;
-}
-
-
-void dfu_register_callback(dfu_callback_t callback_handler)
-{
-    m_data_pkt_cb = callback_handler;
-}
-
-
-uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
-{
-    uint32_t err_code;
-
-    m_start_packet = *(p_packet->params.start_packet);
-
-    // Check that the requested update procedure is supported.
-    // Currently the following combinations are allowed:
-    // - Application
-    // - SoftDevice
-    // - Bootloader
-    // - SoftDevice with Bootloader
-    if (IS_UPDATING_APP(m_start_packet) && 
-        (IS_UPDATING_SD(m_start_packet) || IS_UPDATING_BL(m_start_packet)))
-    {
-        // App update is only supported independently.
-        return NRF_ERROR_NOT_SUPPORTED;
-    }
-
-    if (!(IS_WORD_SIZED(m_start_packet.sd_image_size) &&
-          IS_WORD_SIZED(m_start_packet.bl_image_size) &&
-          IS_WORD_SIZED(m_start_packet.app_image_size)))
-    {
-        // Image_sizes are not a multiple of 4 (word size).
-        return NRF_ERROR_NOT_SUPPORTED;
-    }
-
-    m_image_size = m_start_packet.sd_image_size + m_start_packet.bl_image_size +
-                   m_start_packet.app_image_size;
-    
-    if (m_start_packet.bl_image_size > DFU_BL_IMAGE_MAX_SIZE)
-    {
-        return NRF_ERROR_DATA_SIZE;
-    }
-
-    if (IS_UPDATING_SD(m_start_packet))
-    {
-        if (m_image_size > (DFU_IMAGE_MAX_SIZE_FULL))
-        {
-            return NRF_ERROR_DATA_SIZE;
-        }
-        m_functions.prepare  = dfu_prepare_func_app_erase;
-        m_functions.cleared  = dfu_cleared_func_app;
-        m_functions.activate = dfu_activate_sd;
-    }
-    else
-    {
-        if (m_image_size > DFU_IMAGE_MAX_SIZE_BANKED)
-        {
-            return NRF_ERROR_DATA_SIZE;
-        }
-
-        m_functions.prepare = dfu_prepare_func_swap_erase;
-        m_functions.cleared = dfu_cleared_func_swap;
-        if (IS_UPDATING_BL(m_start_packet))
-        {
-            m_functions.activate = dfu_activate_bl;
-        }
-        else
-        {
-            m_functions.activate = dfu_activate_app;
-        }
-    }
-
-    if ( DFU_STATE_IDLE != m_dfu_state ) 
-        return NRF_ERROR_INVALID_STATE;
-    
-    // Valid peer activity detected. Hence restart the DFU timer.
-    err_code = dfu_timer_restart();
-    VERIFY_SUCCESS(err_code);
-    
-    m_functions.prepare(m_image_size);
-
-    return NRF_SUCCESS;
-}
-
-
-uint32_t dfu_data_pkt_handle(dfu_update_packet_t * p_packet)
-{
-    uint32_t   data_length;
-    uint32_t   err_code;
-    uint32_t * p_data;
-
-    VERIFY_PARAM_NOT_NULL(p_packet);
-
-    // Check pointer alignment.
-    if (!is_word_aligned(p_packet->params.data_packet.p_data_packet))
-    {
-        // The p_data_packet is not word aligned address.
-        return NRF_ERROR_INVALID_ADDR;
-    }
-
-    switch (m_dfu_state)
-    {
-        case DFU_STATE_RDY:
-        case DFU_STATE_RX_INIT_PKT:
-            return NRF_ERROR_INVALID_STATE;
-
-        case DFU_STATE_RX_DATA_PKT:
-            data_length = p_packet->params.data_packet.packet_length * sizeof(uint32_t);
-
-            if ((m_data_received + data_length) > m_image_size)
-            {
-                // The caller is trying to write more bytes into the flash than the size provided to
-                // the dfu_image_size_set function. This is treated as a serious error condition and
-                // an unrecoverable one. Hence point the variable mp_app_write_address to the top of
-                // the flash area. This will ensure that all future application data packet writes
-                // will be blocked because of the above check.
-                m_data_received = 0xFFFFFFFF;
-
-                return NRF_ERROR_DATA_SIZE;
-            }
-
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
-
-            p_data = (uint32_t *)p_packet->params.data_packet.p_data_packet;
-
-            if ( is_ota() )
-            {
-                while(1) {
-                    err_code = pstorage_store(mp_storage_handle_active, (uint8_t *)p_data, data_length, m_data_received);
-                    if (err_code != NRF_ERROR_NO_MEM)
-                        break;
-                    // No space, wait until an entry in the queue is freed
-                    while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                        // nothing
-                    }
-                }
-                VERIFY_SUCCESS(err_code);
-            }
-            else
-            {
-                flash_nrf5x_write(
-                    (mp_storage_handle_active == &m_storage_handle_app
-                        ? DFU_BANK_0_REGION_START 
-                        : DFU_BANK_1_REGION_START)
-                    + m_data_received, p_data, data_length, false);
-                pstorage_callback_handler(mp_storage_handle_active, PSTORAGE_STORE_OP_CODE, NRF_SUCCESS, (uint8_t *) p_data, data_length);
-            }
-
-            m_data_received += data_length;
-
-            if (m_data_received != m_image_size)
-            {
-                // The entire image is not received yet. More data is expected.
-                err_code = NRF_ERROR_INVALID_LENGTH;
-            }
-            else
-            {
-                if ( !is_ota() ) flash_nrf5x_flush(false);
-                
-                // The entire image has been received. Return NRF_SUCCESS.
-                err_code = NRF_SUCCESS;
-            }
-            break;
-
-        default:
-            err_code = NRF_ERROR_INVALID_STATE;
-            break;
-    }
-
-    return err_code;
-}
-
-
-uint32_t dfu_init_pkt_complete(void)
-{
-    uint32_t err_code = NRF_ERROR_INVALID_STATE;
-    
-    // DFU initialization has been done and a start packet has been received.
-    if (IMAGE_WRITE_IN_PROGRESS())
-    {
-        // Image write is already in progress. Cannot handle an init packet now.
-        return NRF_ERROR_INVALID_STATE;
-    }
-    
-    if (m_dfu_state == DFU_STATE_RX_INIT_PKT)
-    {
-        err_code = dfu_init_prevalidate(m_init_packet, m_init_packet_length, m_start_packet.dfu_update_mode);
-        if (err_code == NRF_SUCCESS)
-        {
-            m_dfu_state = DFU_STATE_RX_DATA_PKT;
-        }
-        else
-        {
-            m_init_packet_length = 0;
-        }
-    }
-    return err_code;
-}
-
-
-uint32_t dfu_init_pkt_handle(dfu_update_packet_t * p_packet)
-{
-    uint32_t err_code = NRF_SUCCESS;
-    uint32_t length;
-
-    switch (m_dfu_state)
-    {
-        case DFU_STATE_RDY:
-            m_dfu_state = DFU_STATE_RX_INIT_PKT;
-            // When receiving init packet in state ready just update and fall through this case.         
-            /* FALLTHRU */
-
-        case DFU_STATE_RX_INIT_PKT:
-            // DFU initialization has been done and a start packet has been received.
-            if (IMAGE_WRITE_IN_PROGRESS())
-            {
-                // Image write is already in progress. Cannot handle an init packet now.
-                return NRF_ERROR_INVALID_STATE;
-            }
-
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
-
-            length = p_packet->params.data_packet.packet_length * sizeof(uint32_t);
-            if ((m_init_packet_length + length) > sizeof(m_init_packet))
-            {
-                return NRF_ERROR_INVALID_LENGTH;
-            }
-            
-            memcpy(&m_init_packet[m_init_packet_length],
-                   &p_packet->params.data_packet.p_data_packet[0],
-                   length);
-            m_init_packet_length += length;
-            break;
-
-        default:
-            // Either the start packet was not received or dfu_init function was not called before.
-            return NRF_ERROR_INVALID_STATE;
-    }
-
-    return NRF_SUCCESS;
-}
-
-
-uint32_t dfu_image_validate()
-{
-    uint32_t err_code;
-
-    switch (m_dfu_state)
-    {
-        case DFU_STATE_RX_DATA_PKT:
-            // Check if the application image write has finished.
-            if (m_data_received != m_image_size)
-            {
-                // Image not yet fully transferred by the peer or the peer has attempted to write
-                // too much data. Hence the validation should fail.
-                err_code = NRF_ERROR_INVALID_STATE;
-            }
-            else
-            {
-                m_dfu_state = DFU_STATE_VALIDATE;
-
-                // Valid peer activity detected. Hence restart the DFU timer.
-                err_code = dfu_timer_restart();
-                if (err_code == NRF_SUCCESS)
-                {
-                    err_code = dfu_init_postvalidate((uint8_t *)mp_storage_handle_active->block_id,
-                                                     m_image_size);
-                    VERIFY_SUCCESS(err_code);
-
-                    m_dfu_state = DFU_STATE_WAIT_4_ACTIVATE;
-                }
-            }
-            break;
-
-        default:
-            err_code = NRF_ERROR_INVALID_STATE;
-            break;
-    }
-
-    return err_code;
-}
-
-
-uint32_t dfu_image_activate()
-{
-    uint32_t err_code;
-
-    switch (m_dfu_state)
-    {
-        case DFU_STATE_WAIT_4_ACTIVATE:
-
-            // Stop the DFU Timer because the peer activity need not be monitored any longer.
-            err_code = app_timer_stop(m_dfu_timer_id);
-            APP_ERROR_CHECK(err_code);
-
-            err_code = m_functions.activate();
-            break;
-
-        default:
-            err_code = NRF_ERROR_INVALID_STATE;
-            break;
-    }
-
-    return err_code;
-}
-
-
-void dfu_reset(void)
-{
-    dfu_update_status_t update_status = { 0 };
-
-    update_status.status_code = DFU_RESET;
-
-    // If we are still receiving packets, and we are expecting more of them,
-    //  and we receive the RESET command, this means the DFU app is trying
-    //  to interrupt and recover a failed previous attempt of FLASHing a new
-    //  application. Make sure to reboot into DFU mode instead of starting 
-    //  a previously stored application (specially valid for double bank 
-    //  bootloaders
-    update_status.restart_into_bootloader = (m_dfu_state == DFU_STATE_RX_DATA_PKT && m_data_received != m_image_size);
-
-    bootloader_dfu_update_process(update_status);
-}
-
-
-static uint32_t dfu_compare_block(uint32_t * ptr1, uint32_t * ptr2, uint32_t len)
-{
-    sd_mbr_command_t sd_mbr_cmd;
-
-    sd_mbr_cmd.command             = SD_MBR_COMMAND_COMPARE;
-    sd_mbr_cmd.params.compare.ptr1 = ptr1;
-    sd_mbr_cmd.params.compare.ptr2 = ptr2;
-    sd_mbr_cmd.params.compare.len  = len / sizeof(uint32_t);
-
-    return sd_mbr_command(&sd_mbr_cmd);
-}
-
-
-static uint32_t dfu_copy_sd(uint32_t * src, uint32_t * dst, uint32_t len)
-{
-    sd_mbr_command_t sd_mbr_cmd;
-
-    sd_mbr_cmd.command            = SD_MBR_COMMAND_COPY_SD;
-    sd_mbr_cmd.params.copy_sd.src = src;
-    sd_mbr_cmd.params.copy_sd.dst = dst;
-    sd_mbr_cmd.params.copy_sd.len = len / sizeof(uint32_t);
-
-    return sd_mbr_command(&sd_mbr_cmd);
-}
-
-
-static uint32_t dfu_sd_img_block_swap(uint32_t * src, 
-                                      uint32_t * dst, 
-                                      uint32_t len, 
-                                      uint32_t block_size)
-{
-    // It is necessary to swap the new SoftDevice in 3 rounds to ensure correct copy of data
-    // and verification of data in case power reset occurs during write to flash. 
-    // To ensure the robustness of swapping the images are compared backwards till start of
-    // image swap. If the back is identical everything is swapped.
-    uint32_t err_code = dfu_compare_block(src, dst, len);
-    if (err_code == NRF_SUCCESS)
-    {
-        return err_code;
-    }
-
-    if ((uint32_t)dst > SOFTDEVICE_REGION_START)
-    {
-        err_code = dfu_sd_img_block_swap((uint32_t *)((uint32_t)src - block_size), 
-                                         (uint32_t *)((uint32_t)dst - block_size), 
-                                         block_size, 
-                                         block_size);
-        VERIFY_SUCCESS(err_code);
-    }
-
-    err_code = dfu_copy_sd(src, dst, len);
-    VERIFY_SUCCESS(err_code);
-
-    return dfu_compare_block(src, dst, len);
-}
-
-
-uint32_t dfu_sd_image_swap(void)
-{
-    bootloader_settings_t boot_settings;
-
-    bootloader_settings_get(&boot_settings);
-
-    if (boot_settings.sd_image_size == 0)
-    {
-        return NRF_SUCCESS;
-    }
-    
-    if ((SOFTDEVICE_REGION_START + boot_settings.sd_image_size) > boot_settings.sd_image_start)
-    {
-        uint32_t err_code;
-        uint32_t sd_start        = SOFTDEVICE_REGION_START;
-        uint32_t block_size      = (boot_settings.sd_image_start - sd_start) / 2;
-        
-        /* ##### FIX START ##### */
-        block_size &= ~(uint32_t)(CODE_PAGE_SIZE - 1); 
-        /* ##### FIX END ##### */       
-        
-        uint32_t image_end       = boot_settings.sd_image_start + boot_settings.sd_image_size;
-
-        uint32_t img_block_start = boot_settings.sd_image_start + 2 * block_size;
-        uint32_t sd_block_start  = sd_start + 2 * block_size;
-        
-        if (SD_SIZE_GET(MBR_SIZE) < boot_settings.sd_image_size)
-        {
-            // This will clear a page thus ensuring the old image is invalidated before swapping.
-            err_code = dfu_copy_sd((uint32_t *)(sd_start + block_size), 
-                                   (uint32_t *)(sd_start + block_size), 
-                                   sizeof(uint32_t));
-            VERIFY_SUCCESS(err_code);
-
-            err_code = dfu_copy_sd((uint32_t *)sd_start, (uint32_t *)sd_start, sizeof(uint32_t));
-            VERIFY_SUCCESS(err_code);
-        }
-        
-        return dfu_sd_img_block_swap((uint32_t *)img_block_start, 
-                                     (uint32_t *)sd_block_start, 
-                                     image_end - img_block_start, 
-                                     block_size);
-    }
-    else
-    {
-        if (boot_settings.sd_image_size != 0)
-        {
-            return dfu_copy_sd((uint32_t *)boot_settings.sd_image_start,
-                               (uint32_t *)SOFTDEVICE_REGION_START, 
-                               boot_settings.sd_image_size);
-        }
-    }
-
-    return NRF_SUCCESS;
-}
-
-
-uint32_t dfu_bl_image_swap(void)
-{
-    bootloader_settings_t bootloader_settings;
-    sd_mbr_command_t      sd_mbr_cmd;
-
-    bootloader_settings_get(&bootloader_settings);
-
-    if (bootloader_settings.bl_image_size != 0)
-    {
-        uint32_t bl_image_start = (bootloader_settings.sd_image_size == 0) ?
-                                  DFU_BANK_1_REGION_START :
-                                  bootloader_settings.sd_image_start + 
-                                  bootloader_settings.sd_image_size;
-
-        sd_mbr_cmd.command               = SD_MBR_COMMAND_COPY_BL;
-        sd_mbr_cmd.params.copy_bl.bl_src = (uint32_t *)(bl_image_start);
-        sd_mbr_cmd.params.copy_bl.bl_len = bootloader_settings.bl_image_size / sizeof(uint32_t);
-
-        return sd_mbr_command(&sd_mbr_cmd);
-    }
-    return NRF_SUCCESS;
-}
-
-
-uint32_t dfu_bl_image_validate(void)
-{
-    bootloader_settings_t bootloader_settings;
-    sd_mbr_command_t      sd_mbr_cmd_1;
-    sd_mbr_command_t      sd_mbr_cmd_2;
-
-    bootloader_settings_get(&bootloader_settings);
-
-    if (bootloader_settings.bl_image_size != 0)
-    {
-        uint32_t bl_image_start_1 = (bootloader_settings.sd_image_size == 0) ?
-                                  DFU_BANK_0_REGION_START :
-                                  bootloader_settings.sd_image_start +
-                                  bootloader_settings.sd_image_size;
-
-        sd_mbr_cmd_1.command             = SD_MBR_COMMAND_COMPARE;
-        sd_mbr_cmd_1.params.compare.ptr1 = (uint32_t *)BOOTLOADER_REGION_START;
-        sd_mbr_cmd_1.params.compare.ptr2 = (uint32_t *)(bl_image_start_1);
-        sd_mbr_cmd_1.params.compare.len  = bootloader_settings.bl_image_size / sizeof(uint32_t);
-
-        uint32_t err_code = sd_mbr_command(&sd_mbr_cmd_1);
-        if (err_code == NRF_SUCCESS)
-            return NRF_SUCCESS;
-
-        uint32_t bl_image_start_2 = (bootloader_settings.sd_image_size == 0) ?
-                                  DFU_BANK_1_REGION_START :
-                                  bootloader_settings.sd_image_start +
-                                  bootloader_settings.sd_image_size;
-
-        sd_mbr_cmd_2.command             = SD_MBR_COMMAND_COMPARE;
-        sd_mbr_cmd_2.params.compare.ptr1 = (uint32_t *)BOOTLOADER_REGION_START;
-        sd_mbr_cmd_2.params.compare.ptr2 = (uint32_t *)(bl_image_start_2);
-        sd_mbr_cmd_2.params.compare.len  = bootloader_settings.bl_image_size / sizeof(uint32_t);
-
-        return sd_mbr_command(&sd_mbr_cmd_2);
-    }
-    return NRF_SUCCESS;
-}
-
-
-uint32_t dfu_sd_image_validate(void)
-{
-    bootloader_settings_t bootloader_settings;
-    sd_mbr_command_t      sd_mbr_cmd;
-
-    bootloader_settings_get(&bootloader_settings);
-
-    if (bootloader_settings.sd_image_size == 0)
-    {
-        return NRF_SUCCESS;
-    }
-    
-    if ((SOFTDEVICE_REGION_START + bootloader_settings.sd_image_size) > bootloader_settings.sd_image_start)
-    {
-        uint32_t sd_start        = SOFTDEVICE_REGION_START;
-        uint32_t block_size      = (bootloader_settings.sd_image_start - sd_start) / 2;
-        uint32_t image_end       = bootloader_settings.sd_image_start + 
-                                   bootloader_settings.sd_image_size;
-        
-        /* ##### FIX START ##### */
-        block_size &= ~(uint32_t)(CODE_PAGE_SIZE - 1); 
-        /* ##### FIX END ##### */       
-
-        uint32_t img_block_start = bootloader_settings.sd_image_start + 2 * block_size;
-        uint32_t sd_block_start  = sd_start + 2 * block_size;
-
-        if (SD_SIZE_GET(MBR_SIZE) < bootloader_settings.sd_image_size)
-        {
-            return NRF_ERROR_NULL;
-        }
-
-        return dfu_sd_img_block_swap((uint32_t *)img_block_start, 
-                                     (uint32_t *)sd_block_start, 
-                                     image_end - img_block_start, 
-                                     block_size);
-    }
-    
-    sd_mbr_cmd.command             = SD_MBR_COMMAND_COMPARE;
-    sd_mbr_cmd.params.compare.ptr1 = (uint32_t *)SOFTDEVICE_REGION_START;
-    sd_mbr_cmd.params.compare.ptr2 = (uint32_t *)bootloader_settings.sd_image_start;
-    sd_mbr_cmd.params.compare.len  = bootloader_settings.sd_image_size / sizeof(uint32_t);
-
-    return sd_mbr_command(&sd_mbr_cmd);
-}

lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c

@@ -31,13 +31,10 @@ static dfu_state_t                  m_dfu_state;                /**< Current DFU
 static uint32_t                     m_image_size;               /**< Size of the image that will be transmitted. */
 
 static dfu_start_packet_t           m_start_packet;             /**< Start packet received for this update procedure. Contains update mode and image sizes information to be used for image transfer. */
-static uint8_t                      m_init_packet[128];         /**< Init packet, can hold CRC, Hash, Signed Hash and similar, for image validation, integrety check and authorization checking. */
+static uint8_t                      m_init_packet[64];          /**< Init packet, can hold CRC, Hash, Signed Hash and similar, for image validation, integrety check and authorization checking. */ 
 static uint8_t                      m_init_packet_length;       /**< Length of init packet received. */
 static uint16_t                     m_image_crc;                /**< Calculated CRC of the image received. */
 
-APP_TIMER_DEF(m_dfu_timer_id);                                  /**< Application timer id. */
-static bool                         m_dfu_timed_out = false;    /**< Boolean flag value for tracking DFU timer timeout state. */
-
 static pstorage_handle_t            m_storage_handle_app;       /**< Pstorage handle for the application area (bank 0). Bank used when updating a SoftDevice w/wo bootloader. Handle also used when swapping received application from bank 1 to bank 0. */
 static pstorage_handle_t          * mp_storage_handle_active;   /**< Pointer to the pstorage handle for the active bank for receiving of data packets. */
 
@@ -83,47 +80,6 @@ static void pstorage_callback_handler(pstorage_handle_t * p_handle,
     APP_ERROR_CHECK(result);
 }
 
-
-/**@brief Function for handling the DFU timeout.
- *
- * @param[in] p_context The timeout context.
- */
-static void dfu_timeout_handler(void * p_context)
-{
-    UNUSED_PARAMETER(p_context);
-    dfu_update_status_t update_status;
-
-    m_dfu_timed_out           = true;
-    update_status.status_code = DFU_TIMEOUT;
-
-    bootloader_dfu_update_process(update_status);
-}
-
-
-/**@brief   Function for restarting the DFU Timer.
- *
- * @details This function will stop and restart the DFU timer. This function will be called by the
- *          functions handling any DFU packet received from the peer that is transferring a firmware
- *          image.
- */
-static uint32_t dfu_timer_restart(void)
-{
-    if (m_dfu_timed_out)
-    {
-        // The DFU timer had already timed out.
-        return NRF_ERROR_INVALID_STATE;
-    }
-
-    uint32_t err_code = app_timer_stop(m_dfu_timer_id);
-    APP_ERROR_CHECK(err_code);
-
-    err_code = app_timer_start(m_dfu_timer_id, DFU_TIMEOUT_INTERVAL, NULL);
-    APP_ERROR_CHECK(err_code);
-
-    return err_code;
-}
-
-
 /**@brief   Function for preparing of flash before receiving SoftDevice image.
  *
  * @details This function will erase current application area to ensure sufficient amount of
@@ -132,33 +88,31 @@ static uint32_t dfu_timer_restart(void)
  */
 static void dfu_prepare_func_app_erase(uint32_t image_size)
 {
-    mp_storage_handle_active = &m_storage_handle_app;
+  mp_storage_handle_active = &m_storage_handle_app;
 
-    // Doing a SoftDevice update thus current application must be cleared to ensure enough space
-    // for new SoftDevice.
-    m_dfu_state = DFU_STATE_PREPARING;
+  // Doing a SoftDevice update thus current application must be cleared to ensure enough space
+  // for new SoftDevice.
+  m_dfu_state = DFU_STATE_PREPARING;
 
-    if ( is_ota() )
+  if ( is_ota() )
+  {
+    uint32_t err_code = pstorage_clear(&m_storage_handle_app, m_image_size);
+    APP_ERROR_CHECK(err_code);
+  }
+  else
+  {
+    uint32_t const page_count = NRFX_CEIL_DIV(m_image_size, CODE_PAGE_SIZE);
+
+    for ( uint32_t i = 0; i < page_count; i++ )
     {
-        uint32_t err_code;
-        while(1) {
-            err_code = pstorage_clear(&m_storage_handle_app, m_image_size);
-            if (err_code != NRF_ERROR_NO_MEM)
-                break;
-            // No space, wait until an entry in the queue is freed
-            while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                // nothing
-            }
-        }
-        APP_ERROR_CHECK(err_code);
+      uint32_t const addr = DFU_BANK_0_REGION_START + i * CODE_PAGE_SIZE;
+      PRINTF("Erase 0x%08lX\r\n", addr);
+      nrfx_nvmc_page_erase(addr);
     }
-    else
-    {
-        flash_nrf5x_erase(DFU_BANK_0_REGION_START, m_image_size);
 
-        // invoke complete callback
-        pstorage_callback_handler(&m_storage_handle_app, PSTORAGE_CLEAR_OP_CODE, NRF_SUCCESS, NULL, 0);
-    }
+    // invoke complete callback
+    pstorage_callback_handler(&m_storage_handle_app, PSTORAGE_CLEAR_OP_CODE, NRF_SUCCESS, NULL, 0);
+  }
 }
 
 
@@ -182,14 +136,14 @@ static void dfu_cleared_func_app(void)
 uint32_t offset_calculate(uint32_t sd_image_size)
 {
     uint32_t offset = 0;
-
+    
     if (m_start_packet.sd_image_size > DFU_BANK_0_REGION_START)
     {
         uint32_t page_mask = (CODE_PAGE_SIZE - 1);
         uint32_t diff = m_start_packet.sd_image_size - DFU_BANK_0_REGION_START;
-
+        
         offset = diff & ~page_mask;
-
+        
         // Align offset to next page if image size is not page sized.
         if ((diff & page_mask) > 0)
         {
@@ -235,7 +189,8 @@ static uint32_t dfu_activate_sd(void)
  */
 static uint32_t dfu_activate_app(void)
 {
-    dfu_update_status_t update_status = { 0 };
+    uint32_t            err_code = NRF_SUCCESS;
+    dfu_update_status_t update_status;
 
     memset(&update_status, 0, sizeof(dfu_update_status_t ));
     update_status.status_code = DFU_UPDATE_APP_COMPLETE;
@@ -244,7 +199,7 @@ static uint32_t dfu_activate_app(void)
 
     bootloader_dfu_update_process(update_status);
 
-    return NRF_SUCCESS;
+    return err_code;
 }
 
 
@@ -258,7 +213,7 @@ static uint32_t dfu_activate_app(void)
  */
 static uint32_t dfu_activate_bl(void)
 {
-    dfu_update_status_t update_status = {0};
+    dfu_update_status_t update_status;
 
     update_status.status_code = DFU_UPDATE_BOOT_COMPLETE;
     update_status.app_crc     = m_image_crc;
@@ -289,16 +244,6 @@ uint32_t dfu_init(void)
 
     m_storage_handle_app.block_id  = DFU_BANK_0_REGION_START;
 
-    // Create the timer to monitor the activity by the peer doing the firmware update.
-    err_code = app_timer_create(&m_dfu_timer_id,
-                                APP_TIMER_MODE_SINGLE_SHOT,
-                                dfu_timeout_handler);
-    APP_ERROR_CHECK(err_code);
-
-    // Start the DFU timer.
-    err_code = app_timer_start(m_dfu_timer_id, DFU_TIMEOUT_INTERVAL, NULL);
-    APP_ERROR_CHECK(err_code);
-
     m_data_received = 0;
     m_dfu_state     = DFU_STATE_IDLE;
 
@@ -314,8 +259,6 @@ void dfu_register_callback(dfu_callback_t callback_handler)
 
 uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
 {
-    uint32_t err_code;
-
     m_start_packet = *(p_packet->params.start_packet);
 
     // Check that the requested update procedure is supported.
@@ -324,7 +267,7 @@ uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
     // - SoftDevice
     // - Bootloader
     // - SoftDevice with Bootloader
-    if (IS_UPDATING_APP(m_start_packet) &&
+    if (IS_UPDATING_APP(m_start_packet) && 
         (IS_UPDATING_SD(m_start_packet) || IS_UPDATING_BL(m_start_packet)))
     {
         // App update is only supported independently.
@@ -341,7 +284,7 @@ uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
 
     m_image_size = m_start_packet.sd_image_size + m_start_packet.bl_image_size +
                    m_start_packet.app_image_size;
-
+    
     if (m_start_packet.bl_image_size > DFU_BL_IMAGE_MAX_SIZE)
     {
         return NRF_ERROR_DATA_SIZE;
@@ -353,7 +296,7 @@ uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
     }
     m_functions.prepare  = dfu_prepare_func_app_erase;
     m_functions.cleared  = dfu_cleared_func_app;
-
+    
     if (IS_UPDATING_SD(m_start_packet))
     {
         m_functions.activate = dfu_activate_sd;
@@ -369,10 +312,6 @@ uint32_t dfu_start_pkt_handle(dfu_update_packet_t * p_packet)
 
     if ( DFU_STATE_IDLE != m_dfu_state ) return NRF_ERROR_INVALID_STATE;
 
-    // Valid peer activity detected. Hence restart the DFU timer.
-    err_code = dfu_timer_restart();
-    VERIFY_SUCCESS(err_code);
-
     m_functions.prepare(m_image_size);
 
     return NRF_SUCCESS;
@@ -415,29 +354,17 @@ uint32_t dfu_data_pkt_handle(dfu_update_packet_t * p_packet)
                 return NRF_ERROR_DATA_SIZE;
             }
 
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
-
             p_data = (uint32_t *)p_packet->params.data_packet.p_data_packet;
 
             if ( is_ota() )
             {
-                while(1) {
-                    err_code = pstorage_store(mp_storage_handle_active, (uint8_t *)p_data, data_length, m_data_received);
-                    if (err_code != NRF_ERROR_NO_MEM)
-                        break;
-                    // No space, wait until an entry in the queue is freed
-                    while (NRF_ERROR_NOT_FOUND != proc_soc()) {
-                        // nothing
-                    }
-                }
-                VERIFY_SUCCESS(err_code);
+              err_code = pstorage_store(mp_storage_handle_active, (uint8_t *)p_data, data_length, m_data_received);
+              VERIFY_SUCCESS(err_code);
             }
             else
             {
-                flash_nrf5x_write(DFU_BANK_0_REGION_START + m_data_received, p_data, data_length, false);
-                pstorage_callback_handler(mp_storage_handle_active, PSTORAGE_STORE_OP_CODE, NRF_SUCCESS, (uint8_t *) p_data, data_length);
+              flash_nrf5x_write(DFU_BANK_0_REGION_START + m_data_received, p_data, data_length, false);
+              pstorage_callback_handler(mp_storage_handle_active, PSTORAGE_STORE_OP_CODE, NRF_SUCCESS, (uint8_t *) p_data, data_length);
             }
 
             m_data_received += data_length;
@@ -449,10 +376,10 @@ uint32_t dfu_data_pkt_handle(dfu_update_packet_t * p_packet)
             }
             else
             {
-                if ( !is_ota() ) flash_nrf5x_flush(false);
+              if ( !is_ota() ) flash_nrf5x_flush(false);
 
-                // The entire image has been received. Return NRF_SUCCESS.
-                err_code = NRF_SUCCESS;
+              // The entire image has been received. Return NRF_SUCCESS.
+              err_code = NRF_SUCCESS;
             }
             break;
 
@@ -468,14 +395,14 @@ uint32_t dfu_data_pkt_handle(dfu_update_packet_t * p_packet)
 uint32_t dfu_init_pkt_complete(void)
 {
     uint32_t err_code = NRF_ERROR_INVALID_STATE;
-
+    
     // DFU initialization has been done and a start packet has been received.
     if (IMAGE_WRITE_IN_PROGRESS())
     {
         // Image write is already in progress. Cannot handle an init packet now.
         return NRF_ERROR_INVALID_STATE;
     }
-
+    
     if (m_dfu_state == DFU_STATE_RX_INIT_PKT)
     {
         err_code = dfu_init_prevalidate(m_init_packet, m_init_packet_length, m_start_packet.dfu_update_mode);
@@ -494,7 +421,6 @@ uint32_t dfu_init_pkt_complete(void)
 
 uint32_t dfu_init_pkt_handle(dfu_update_packet_t * p_packet)
 {
-    uint32_t err_code = NRF_SUCCESS;
     uint32_t length;
 
     switch (m_dfu_state)
@@ -512,10 +438,6 @@ uint32_t dfu_init_pkt_handle(dfu_update_packet_t * p_packet)
                 return NRF_ERROR_INVALID_STATE;
             }
 
-            // Valid peer activity detected. Hence restart the DFU timer.
-            err_code = dfu_timer_restart();
-            VERIFY_SUCCESS(err_code);
-
             length = p_packet->params.data_packet.packet_length * sizeof(uint32_t);
             if ((m_init_packet_length + length) > sizeof(m_init_packet))
             {
@@ -555,16 +477,9 @@ uint32_t dfu_image_validate()
             {
                 m_dfu_state = DFU_STATE_VALIDATE;
 
-                // Valid peer activity detected. Hence restart the DFU timer.
-                err_code = dfu_timer_restart();
-                if (err_code == NRF_SUCCESS)
-                {
-                    err_code = dfu_init_postvalidate((uint8_t *)mp_storage_handle_active->block_id,
-                                                     m_image_size);
-                    VERIFY_SUCCESS(err_code);
-
-                    m_dfu_state = DFU_STATE_WAIT_4_ACTIVATE;
-                }
+                err_code = dfu_init_postvalidate((uint8_t *)mp_storage_handle_active->block_id, m_image_size);
+                VERIFY_SUCCESS(err_code);
+                m_dfu_state = DFU_STATE_WAIT_4_ACTIVATE;
             }
             break;
 
@@ -584,11 +499,6 @@ uint32_t dfu_image_activate()
     switch (m_dfu_state)
     {
         case DFU_STATE_WAIT_4_ACTIVATE:
-
-            // Stop the DFU Timer because the peer activity need not be monitored any longer.
-            err_code = app_timer_stop(m_dfu_timer_id);
-            APP_ERROR_CHECK(err_code);
-
             err_code = m_functions.activate();
             break;
 
@@ -603,18 +513,10 @@ uint32_t dfu_image_activate()
 
 void dfu_reset(void)
 {
-    dfu_update_status_t update_status = { 0 };
+    dfu_update_status_t update_status;
 
     update_status.status_code = DFU_RESET;
 
-    // If we are still receiving packets, and we are expecting more of them,
-    //  and we receive the RESET command, this means the DFU app is trying
-    //  to interrupt and recover a failed previous attempt of FLASHing a new
-    //  application. Make sure to reboot into DFU mode instead of starting 
-    //  a previously stored application (specially valid for double bank 
-    //  bootloaders
-    update_status.restart_into_bootloader = (m_dfu_state == DFU_STATE_RX_DATA_PKT && m_data_received != m_image_size);
-
     bootloader_dfu_update_process(update_status);
 }
 
@@ -645,13 +547,13 @@ static uint32_t dfu_copy_sd(uint32_t * src, uint32_t * dst, uint32_t len)
 }
 
 
-static uint32_t dfu_sd_img_block_swap(uint32_t * src,
-                                      uint32_t * dst,
-                                      uint32_t len,
+static uint32_t dfu_sd_img_block_swap(uint32_t * src, 
+                                      uint32_t * dst, 
+                                      uint32_t len, 
                                       uint32_t block_size)
 {
     // It is neccesarry to swap the new SoftDevice in 3 rounds to ensure correct copy of data
-    // and verification of data in case power reset occurs during write to flash.
+    // and verifucation of data in case power reset occurs during write to flash. 
     // To ensure the robustness of swapping the images are compared backwards till start of
     // image swap. If the back is identical everything is swapped.
     uint32_t err_code = dfu_compare_block(src, dst, len);
@@ -662,9 +564,9 @@ static uint32_t dfu_sd_img_block_swap(uint32_t * src,
 
     if ((uint32_t)dst > SOFTDEVICE_REGION_START)
     {
-        err_code = dfu_sd_img_block_swap((uint32_t *)((uint32_t)src - block_size),
-                                         (uint32_t *)((uint32_t)dst - block_size),
-                                         block_size,
+        err_code = dfu_sd_img_block_swap((uint32_t *)((uint32_t)src - block_size), 
+                                         (uint32_t *)((uint32_t)dst - block_size), 
+                                         block_size, 
                                          block_size);
         VERIFY_SUCCESS(err_code);
     }
@@ -686,37 +588,37 @@ uint32_t dfu_sd_image_swap(void)
     {
         return NRF_SUCCESS;
     }
-
+    
     if ((SOFTDEVICE_REGION_START + boot_settings.sd_image_size) > boot_settings.sd_image_start)
     {
         uint32_t err_code;
         uint32_t sd_start        = SOFTDEVICE_REGION_START;
         uint32_t block_size      = (boot_settings.sd_image_start - sd_start) / 2;
-
+        
         /* ##### FIX START ##### */
-        block_size &= ~(uint32_t)(CODE_PAGE_SIZE - 1);
-        /* ##### FIX END ##### */
-
+        block_size &= ~(uint32_t)(CODE_PAGE_SIZE - 1); 
+        /* ##### FIX END ##### */       
+        
         uint32_t image_end       = boot_settings.sd_image_start + boot_settings.sd_image_size;
 
         uint32_t img_block_start = boot_settings.sd_image_start + 2 * block_size;
         uint32_t sd_block_start  = sd_start + 2 * block_size;
-
+        
         if (SD_SIZE_GET(MBR_SIZE) < boot_settings.sd_image_size)
         {
             // This will clear a page thus ensuring the old image is invalidated before swapping.
-            err_code = dfu_copy_sd((uint32_t *)(sd_start + block_size),
-                                   (uint32_t *)(sd_start + block_size),
+            err_code = dfu_copy_sd((uint32_t *)(sd_start + block_size), 
+                                   (uint32_t *)(sd_start + block_size), 
                                    sizeof(uint32_t));
             VERIFY_SUCCESS(err_code);
 
             err_code = dfu_copy_sd((uint32_t *)sd_start, (uint32_t *)sd_start, sizeof(uint32_t));
             VERIFY_SUCCESS(err_code);
         }
-
-        return dfu_sd_img_block_swap((uint32_t *)img_block_start,
-                                     (uint32_t *)sd_block_start,
-                                     image_end - img_block_start,
+        
+        return dfu_sd_img_block_swap((uint32_t *)img_block_start, 
+                                     (uint32_t *)sd_block_start, 
+                                     image_end - img_block_start, 
                                      block_size);
     }
     else
@@ -724,7 +626,7 @@ uint32_t dfu_sd_image_swap(void)
         if (boot_settings.sd_image_size != 0)
         {
             return dfu_copy_sd((uint32_t *)boot_settings.sd_image_start,
-                               (uint32_t *)SOFTDEVICE_REGION_START,
+                               (uint32_t *)SOFTDEVICE_REGION_START, 
                                boot_settings.sd_image_size);
         }
     }
@@ -744,7 +646,7 @@ uint32_t dfu_bl_image_swap(void)
     {
         uint32_t bl_image_start = (bootloader_settings.sd_image_size == 0) ?
                                   DFU_BANK_0_REGION_START :
-                                  bootloader_settings.sd_image_start +
+                                  bootloader_settings.sd_image_start + 
                                   bootloader_settings.sd_image_size;
 
         sd_mbr_cmd.command               = SD_MBR_COMMAND_COPY_BL;
@@ -756,54 +658,27 @@ uint32_t dfu_bl_image_swap(void)
     return NRF_SUCCESS;
 }
 
+
 uint32_t dfu_bl_image_validate(void)
 {
     bootloader_settings_t bootloader_settings;
-
-    sd_mbr_command_t      sd_mbr_cmd_1;
-    sd_mbr_command_t      sd_mbr_cmd_2;
+    sd_mbr_command_t      sd_mbr_cmd;
 
     bootloader_settings_get(&bootloader_settings);
 
     if (bootloader_settings.bl_image_size != 0)
     {
-		/*
-		 * The problem with updating the bootloader from a dual to single bank bootloader is that the new 
-		 * bootloader expects the firmware image to be at the start of BANK 0, while it's actually loaded 
-		 * to BANK1 by the old bootloader. After the update the new single bank bootloader verifies that 
-		 * the image was correctly written to flash by comparing itself with the firmware image that it 
-		 * expects to be located in BANK0. Since the actual firmware image is in BANK 1 this check will 
-		 * fail and the new bootloader updates itself with whatever data located in BANK0 using the MBR.
-
-		 * The fix is to modify the dfu_bl_image_validate() function in dfu_single_bank.c run verification 
-		 * on both addresses (BANK0 and BANK1)
-		*/
-        uint32_t bl_image_start_1 = (bootloader_settings.sd_image_size == 0) ?
+        uint32_t bl_image_start = (bootloader_settings.sd_image_size == 0) ?
                                   DFU_BANK_0_REGION_START :
                                   bootloader_settings.sd_image_start +
                                   bootloader_settings.sd_image_size;
 
-        sd_mbr_cmd_1.command             = SD_MBR_COMMAND_COMPARE;
-        sd_mbr_cmd_1.params.compare.ptr1 = (uint32_t *)BOOTLOADER_REGION_START;
-        sd_mbr_cmd_1.params.compare.ptr2 = (uint32_t *)(bl_image_start_1);
-        sd_mbr_cmd_1.params.compare.len  = bootloader_settings.bl_image_size / sizeof(uint32_t);
+        sd_mbr_cmd.command             = SD_MBR_COMMAND_COMPARE;
+        sd_mbr_cmd.params.compare.ptr1 = (uint32_t *)BOOTLOADER_REGION_START;
+        sd_mbr_cmd.params.compare.ptr2 = (uint32_t *)(bl_image_start);
+        sd_mbr_cmd.params.compare.len  = bootloader_settings.bl_image_size / sizeof(uint32_t);
 
-        uint32_t err_code = sd_mbr_command(&sd_mbr_cmd_1);
-        if (err_code == NRF_SUCCESS) {
-          return NRF_SUCCESS;
-        }
-
-        uint32_t bl_image_start_2 = (bootloader_settings.sd_image_size == 0) ?
-                                  DFU_BANK_1_REGION_START :
-                                  bootloader_settings.sd_image_start +
-                                  bootloader_settings.sd_image_size;
-
-        sd_mbr_cmd_2.command             = SD_MBR_COMMAND_COMPARE;
-        sd_mbr_cmd_2.params.compare.ptr1 = (uint32_t *)BOOTLOADER_REGION_START;
-        sd_mbr_cmd_2.params.compare.ptr2 = (uint32_t *)(bl_image_start_2);
-        sd_mbr_cmd_2.params.compare.len  = bootloader_settings.bl_image_size / sizeof(uint32_t);
-
-        return sd_mbr_command(&sd_mbr_cmd_2);
+        return sd_mbr_command(&sd_mbr_cmd);
     }
     return NRF_SUCCESS;
 }
@@ -820,18 +695,17 @@ uint32_t dfu_sd_image_validate(void)
     {
         return NRF_SUCCESS;
     }
-
+    
     if ((SOFTDEVICE_REGION_START + bootloader_settings.sd_image_size) > bootloader_settings.sd_image_start)
     {
         uint32_t sd_start        = SOFTDEVICE_REGION_START;
         uint32_t block_size      = (bootloader_settings.sd_image_start - sd_start) / 2;
-        uint32_t image_end       = bootloader_settings.sd_image_start +
+        uint32_t image_end       = bootloader_settings.sd_image_start + 
                                    bootloader_settings.sd_image_size;
 
         /* ##### FIX START ##### */
-        block_size &= ~(uint32_t)(CODE_PAGE_SIZE - 1);
-        /* ##### FIX END ##### */
-
+        block_size &= ~(uint32_t)(CODE_PAGE_SIZE - 1); 
+        /* ##### FIX END ##### */       
         uint32_t img_block_start = bootloader_settings.sd_image_start + 2 * block_size;
         uint32_t sd_block_start  = sd_start + 2 * block_size;
 
@@ -840,12 +714,12 @@ uint32_t dfu_sd_image_validate(void)
             return NRF_ERROR_NULL;
         }
 
-        return dfu_sd_img_block_swap((uint32_t *)img_block_start,
-                                     (uint32_t *)sd_block_start,
-                                     image_end - img_block_start,
+        return dfu_sd_img_block_swap((uint32_t *)img_block_start, 
+                                     (uint32_t *)sd_block_start, 
+                                     image_end - img_block_start, 
                                      block_size);
     }
-
+    
     sd_mbr_cmd.command             = SD_MBR_COMMAND_COMPARE;
     sd_mbr_cmd.params.compare.ptr1 = (uint32_t *)SOFTDEVICE_REGION_START;
     sd_mbr_cmd.params.compare.ptr2 = (uint32_t *)bootloader_settings.sd_image_start;

lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c

@@ -35,6 +35,11 @@
 #include "nrf_delay.h"
 #include "sdk_common.h"
 
+
+#define BLEGAP_EVENT_LENGTH             6
+#define BLEGATT_ATT_MTU_MAX             23
+enum { BLE_CONN_CFG_HIGH_BANDWIDTH = 1 };
+
 #define DFU_REV_MAJOR                        0x00                                                    /** DFU Major revision number to be exposed. */
 #define DFU_REV_MINOR                        0x08                                                    /** DFU Minor revision number to be exposed. */
 #define DFU_REVISION                         ((DFU_REV_MAJOR << 8) | DFU_REV_MINOR)                  /** DFU Revision number to be exposed. Combined of major and minor versions. */
@@ -44,17 +49,16 @@
 // limit of 8 chars
 #ifndef DEVICE_NAME
 #define DEVICE_NAME                          "AdaDFU"                                                /**< Name of device. Will be included in the advertising data. */
-#endif
+#endif //DEVICE_NAME
 
-#define MIN_CONN_INTERVAL                    (uint16_t)(MSEC_TO_UNITS(15, UNIT_1_25_MS))             /**< Minimum acceptable connection interval (11.25 milliseconds). */
+#define MIN_CONN_INTERVAL                    (uint16_t)(MSEC_TO_UNITS(10, UNIT_1_25_MS))             /**< Minimum acceptable connection interval (11.25 milliseconds). */
 #define MAX_CONN_INTERVAL                    (uint16_t)(MSEC_TO_UNITS(30, UNIT_1_25_MS))             /**< Maximum acceptable connection interval (15 milliseconds). */
-#define SLAVE_LATENCY                        4                                                       /**< Slave latency. */
-#define CONN_SUP_TIMEOUT                     MSEC_TO_UNITS(8000, UNIT_10_MS)                         /**< Connection supervisory timeout (4 seconds). */
-#define SPEEDUP_FLASH_WRITES                 1 /**< Speedup FLASH writes by changing Softdevice local latency */
+#define SLAVE_LATENCY                        0                                                       /**< Slave latency. */
+#define CONN_SUP_TIMEOUT                     (4 * 100)                                               /**< Connection supervisory timeout (4 seconds). */
 
 #define APP_ADV_INTERVAL                     MSEC_TO_UNITS(25, UNIT_0_625_MS)                        /**< The advertising interval (25 ms.). */
 #define APP_ADV_TIMEOUT                      BLE_GAP_ADV_TIMEOUT_GENERAL_UNLIMITED                   /**< The advertising timeout in units of seconds. This is set to @ref BLE_GAP_ADV_TIMEOUT_GENERAL_UNLIMITED so that the advertisement is done as long as there there is a call to @ref dfu_transport_close function.*/
-#define APP_DIRECTED_ADV_TIMEOUT             50                                                      /**< number of direct advertisement (each lasting 1.28seconds). */
+#define APP_DIRECTED_ADV_TIMEOUT             50                                                       /**< number of direct advertisement (each lasting 1.28seconds). */
 #define PEER_ADDRESS_TYPE_INVALID            0xFF                                                    /**< Value indicating that no valid peer address exists. This will be the case when a private resolvable address is used in which case there is no address available but instead an IRK is present. */
 #define PEER_ADDRESS_TYPE_INVALID            0xFF                                                    /**< Value indicating that no valid peer address exists. This will be the case when a private resolvable address is used in which case there is no address available but instead an IRK is present. */
 
@@ -73,9 +77,8 @@
 
 #define IS_CONNECTED()                       (m_conn_handle != BLE_CONN_HANDLE_INVALID)              /**< Macro to determine if the device is in connected state. */
 
-#define APP_FEATURE_NOT_SUPPORTED                                                                     \
-  (BLE_GATT_STATUS_ATTERR_APP_BEGIN + 2)       /**< Reply when unsupported features are requested. */
-#define SD_IMAGE_SIZE_OFFSET                 0 /**< Offset in start packet for the size information for SoftDevice. */
+#define APP_FEATURE_NOT_SUPPORTED            BLE_GATT_STATUS_ATTERR_APP_BEGIN + 2                    /**< Reply when unsupported features are requested. */
+#define SD_IMAGE_SIZE_OFFSET                 0                                                       /**< Offset in start packet for the size information for SoftDevice. */
 #define BL_IMAGE_SIZE_OFFSET                 4                                                       /**< Offset in start packet for the size information for bootloader. */
 #define APP_IMAGE_SIZE_OFFSET                8                                                       /**< Offset in start packet for the size information for application. */
 
@@ -207,35 +210,7 @@ static ble_dfu_resp_val_t nrf_err_code_translate(uint32_t                  err_c
     }
 }
 
-#ifdef SPEEDUP_FLASH_WRITES
-static void prioritize_ble_over_flash_writes(void) {
-  // We set the local latency to 0: That will revert latency to the negotiated one with the host.
-  //  That will increase throughput to the maximum possible
-  ble_opt_t opt;
-  varclr(&opt);
-  opt.gap_opt.local_conn_latency.conn_handle       = m_conn_handle; /**< Connection Handle */
-  opt.gap_opt.local_conn_latency.requested_latency = 0;             /**< Requested local connection latency. */
-  opt.gap_opt.local_conn_latency.p_actual_latency =
-    NULL; /**< Pointer to storage for the actual local connection latency (can be set to NULL to skip return value). */
-  sd_ble_opt_set(BLE_GAP_OPT_LOCAL_CONN_LATENCY, &opt);
-}
 
-static void prioritize_flash_writes_over_ble(void) {
-  // We set the local latency to the maximum possible: That will make FLASH writes faster, as BLE comms will
-  //  be delayed (even losing RXd packets, but this is the same as a poor connection and will be handled by
-  //  the protocol itself)
-  ble_opt_t opt;
-  varclr(&opt);
-  opt.gap_opt.local_conn_latency.conn_handle       = m_conn_handle; /**< Connection Handle */
-  opt.gap_opt.local_conn_latency.requested_latency = 50;            /**< Requested local connection latency. */
-  opt.gap_opt.local_conn_latency.p_actual_latency =
-    NULL; /**< Pointer to storage for the actual local connection latency (can be set to NULL to skip return value). */
-  sd_ble_opt_set(BLE_GAP_OPT_LOCAL_CONN_LATENCY, &opt);
-}
-#else
-  #define prioritize_ble_over_flash_writes()
-  #define prioritize_flash_writes_over_ble()
-#endif
 /**@brief     Function for handling the callback events from the dfu module.
  *            Callbacks are expected when \ref dfu_data_pkt_handle has been executed.
  *
@@ -253,9 +228,6 @@ static void dfu_cb_handler(uint32_t packet, uint32_t result, uint8_t * p_data)
         case DATA_PACKET:
             if (result != NRF_SUCCESS)
             {
-                // Restore latency to the negotiated one
-                prioritize_ble_over_flash_writes();
-
                 // Disconnect from peer.
                 if (IS_CONNECTED())
                 {
@@ -272,9 +244,6 @@ static void dfu_cb_handler(uint32_t packet, uint32_t result, uint8_t * p_data)
                 // If the callback matches final data packet received then the peer is notified.
                 if (mp_final_packet == p_data)
                 {
-                    // Restore latency to the negotiated one
-                    prioritize_ble_over_flash_writes();
-
                     // Notify the DFU Controller about the success of the procedure.
                     err_code = ble_dfu_response_send(&m_dfu,
                                                      BLE_DFU_RECEIVE_APP_PROCEDURE,
@@ -285,10 +254,6 @@ static void dfu_cb_handler(uint32_t packet, uint32_t result, uint8_t * p_data)
             break;
 
         case START_PACKET:
-
-            // Restore latency to the negotiated one
-            prioritize_ble_over_flash_writes();
-
             // Translate the err_code returned by the above function to DFU Response Value.
             resp_val = nrf_err_code_translate(result, BLE_DFU_START_PROCEDURE);
 
@@ -361,15 +326,9 @@ static void start_data_process(ble_dfu_t * p_dfu, ble_dfu_evt_t * p_evt)
         start_packet.bl_image_size  = uint32_decode(p_length_data + BL_IMAGE_SIZE_OFFSET);
         start_packet.app_image_size = uint32_decode(p_length_data + APP_IMAGE_SIZE_OFFSET);
 
-        // Prioritize FLASH writes over BLE comms
-        prioritize_flash_writes_over_ble();
-
         err_code = dfu_start_pkt_handle(&update_packet);
         if (err_code != NRF_SUCCESS)
         {
-            // Prioritize BLE over flash writes
-            prioritize_ble_over_flash_writes();
-
             // Translate the err_code returned by the above function to DFU Response Value.
             ble_dfu_resp_val_t resp_val;
 
@@ -786,22 +745,8 @@ static void on_ble_evt(ble_evt_t * p_ble_evt)
     switch (p_ble_evt->header.evt_id)
     {
         case BLE_GAP_EVT_CONNECTED:
-            {
-                m_conn_handle    = p_ble_evt->evt.gap_evt.conn_handle;
-                m_is_advertising = false;
-
-                // Force changing the slave latency to try to improve transfer throughput (bandwidth)
-                //  But Android and IOS will override it with their minimum supported value
-                ble_gap_conn_params_t p_conn_params;
-                p_conn_params.min_conn_interval = p_ble_evt->evt.gap_evt.params.connected.conn_params.min_conn_interval;
-                p_conn_params.max_conn_interval = p_ble_evt->evt.gap_evt.params.connected.conn_params.max_conn_interval;
-                p_conn_params.slave_latency     = SLAVE_LATENCY;
-                p_conn_params.conn_sup_timeout  = p_ble_evt->evt.gap_evt.params.connected.conn_params.conn_sup_timeout;
-
-                err_code = sd_ble_gap_conn_param_update(m_conn_handle, &p_conn_params);
-                APP_ERROR_CHECK(err_code);
-
-            }
+            m_conn_handle    = p_ble_evt->evt.gap_evt.conn_handle;
+            m_is_advertising = false;
             break;
 
         case BLE_GAP_EVT_DISCONNECTED:
@@ -831,9 +776,6 @@ static void on_ble_evt(ble_evt_t * p_ble_evt)
 
             break;
 
-        case BLE_GAP_EVT_CONN_PARAM_UPDATE:
-            break;
-
         case BLE_GAP_EVT_SEC_PARAMS_REQUEST:
             {
                 ble_gap_sec_keyset_t keys;
@@ -960,11 +902,6 @@ static void on_ble_evt(ble_evt_t * p_ble_evt)
         case BLE_GATTS_EVT_EXCHANGE_MTU_REQUEST:
         {
           uint16_t att_mtu = MIN(p_ble_evt->evt.gatts_evt.params.exchange_mtu_request.client_rx_mtu, BLEGATT_ATT_MTU_MAX);
-
-		  // Round it to a multiple of 4 plus 3 bytes, as we need data packets to be multiple of 4 bytes
-          att_mtu &= 0xFFFCU;
-          att_mtu |= 3;
-
           PRINTF("GAP ATT MTU is changed to %d\r\n", att_mtu);
           APP_ERROR_CHECK( sd_ble_gatts_exchange_mtu_reply(m_conn_handle, att_mtu) );
         }

lib/sdk11/components/libraries/bootloader_dfu/dfu_types.h

@@ -24,7 +24,6 @@
 #define DFU_TYPES_H__
 
 #include <stdint.h>
-#include <stdbool.h>
 #include "nrf_sdm.h"
 #include "nrf_mbr.h"
 #include "nrf.h"
@@ -75,12 +74,8 @@ static inline bool is_sd_existed(void)
 #endif
 
 #define DFU_IMAGE_MAX_SIZE_FULL         (DFU_REGION_TOTAL_SIZE - DFU_APP_DATA_RESERVED)                 /**< Maximum size of an application, excluding save data from the application. */
-#define DFU_IMAGE_MAX_SIZE_BANKED       (((DFU_IMAGE_MAX_SIZE_FULL) - \
-                                        (DFU_IMAGE_MAX_SIZE_FULL % (2 * CODE_PAGE_SIZE)))/2)            /**< Maximum size of an application, excluding save data from the application. */
-
 #define DFU_BL_IMAGE_MAX_SIZE           (BOOTLOADER_MBR_PARAMS_PAGE_ADDRESS - BOOTLOADER_REGION_START)  /**< Maximum size of a bootloader, excluding save data from the current bootloader. */
 #define DFU_BANK_0_REGION_START         CODE_REGION_1_START                                             /**< Bank 0 region start. */
-#define DFU_BANK_1_REGION_START         (DFU_BANK_0_REGION_START + DFU_IMAGE_MAX_SIZE_BANKED)           /**< Bank 1 region start. */
 
 #define EMPTY_FLASH_MASK                0xFFFFFFFF                                                      /**< Bit mask that defines an empty address in flash. */
 
@@ -155,7 +150,6 @@ typedef struct
     uint32_t                 bl_size;                                                                   /**< Size of the recieved BootLoader. */
     uint32_t                 app_size;                                                                  /**< Size of the recieved Application. */
     uint32_t                 sd_image_start;                                                            /**< Location in flash where the received SoftDevice image is stored. */
-    bool                     restart_into_bootloader;                                                   /**< If the chip must be reset and must reenter bootloader mode. */
 } dfu_update_status_t;
 
 /**@brief Update complete handler type. */

lib/softdevice/s340_nrf52_7.0.1/readme.md

@@ -1,23 +0,0 @@
-## Working with SoftDevice S340
-
-The SoftDevice S340 is closed-source, not publicly available and is only distributed by Garmin Canada Inc.
-
-In order to be able to download the required ANT+ capable SoftDevice and place SoftDevice S340 v7.0.1 files here. You need to register an 'ANT+ Adopter' account at [thisisant.com](https://www.thisisant.com/register/). After around one business day you will receive access to the resources there. Then do the following steps:
-- Download the SoftDevice S340 v7.0.1 [(here)](https://www.thisisant.com/developer/components/nrf52832#tab_protocol_stacks_tab) and extract its contents
-- Under `lib/softdevice` in this repository there is a folder called `s340_nrf52_7.0.1`
-    - Copy the API folder `ANT_s340_nrf52_7.0.1.API`, the license agreement `License_Agreement_ANT_Softdevice_rev3_3.pdf` and the hex file `ANT_s340_nrf52_7.0.1.hex` from the extracted contents to it
-    - Rename the API folder to `s340_nrf52_7.0.1_API`
-    - Rename the hex file to `s340_nrf52_7.0.1_softdevice.hex`
-    - Check `lib/softdevice/s340_nrf52_7.0.1_API/include/nrf_sdm.h` on line 191 to get an *evaluation key* for the ANT SoftDevice which can later be used for the `ANT_LICENSE_KEY` parameter
-    - **VERY IMPORTANT:** You MUST obtain a valid commercial license key BEFORE releasing a product to market that uses the ANT SoftDevice!
-
-To use the SoftDevice S340 with an existing board the `SD_NAME`, `SD_VERSION` and `ANT_LICENSE_KEY` parameters can just be passed to the command line of the `make` command, e.g.:  
-```
-make BOARD=xiao_nrf52840_ble_sense SD_NAME=s340 SD_VERSION=7.0.1 ANT_LICENSE_KEY=<YOUR_LICENSE_KEY_OR_EVALUATION_KEY> all
-```
-
-To add or modify a board with an ANT+ capable SoftDevice S340 the `SD_VERSION` and `SD_NAME` parameters in the corresponding `board.mk` file have to be set:
-```
-SD_VERSION = 7.0.1
-SD_NAME = s340
-```

linker/nrf52.ld

@@ -1,7 +1,7 @@
 /* Linker script to configure memory regions. */
 
 SEARCH_DIR(.)
-/*GROUP(-lgcc -lc -lnosys)*/
+GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
@@ -19,6 +19,8 @@ MEMORY
   /** Location of bootloader setting in flash. */
   BOOTLOADER_SETTINGS (rw) : ORIGIN = 0x7F000, LENGTH = 0x1000
 
+
+
   /** RAM Region for bootloader. */
   RAM (rwx) :  ORIGIN = 0x20008000, LENGTH = 0x20010000-0x20008000
 
@@ -28,6 +30,8 @@ MEMORY
   /** Location of non initialized RAM. Non initialized RAM is used for exchanging bond information
    *  from application to bootloader when using buttonless DFU OTA. */
   NOINIT (rwx) :  ORIGIN = 0x20007F80, LENGTH = 0x80
+
+
   
   /** Location in UICR where bootloader start address is stored. */
   UICR_BOOTLOADER (r) : ORIGIN = 0x10001014, LENGTH = 0x04

linker/nrf52833.ld

@@ -1,7 +1,7 @@
 /* Linker script to configure memory regions. */
 
 SEARCH_DIR(.)
-/*GROUP(-lgcc -lc -lnosys)*/
+GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {

linker/nrf52833_debug.ld

@@ -1,7 +1,7 @@
 /* Linker script to configure memory regions. */
 
 SEARCH_DIR(.)
-/*GROUP(-lgcc -lc)*/
+GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {

linker/nrf52840.ld

@@ -1,7 +1,7 @@
 /* Linker script to configure memory regions. */
 
 SEARCH_DIR(.)
-/*GROUP(-lgcc -lc -lnosys)*/
+GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {
@@ -21,6 +21,8 @@ MEMORY
   /** Location of bootloader setting in flash. */
   BOOTLOADER_SETTINGS (rw) : ORIGIN = 0xFF000, LENGTH = 0x1000
 
+
+
   /** RAM Region for bootloader. */
   /* Avoid conflict with NOINIT for OTA bond sharing */
   RAM (rwx) :  ORIGIN = 0x20008000, LENGTH = 0x20040000-0x20008000
@@ -31,7 +33,9 @@ MEMORY
   /** Location of non initialized RAM. Non initialized RAM is used for exchanging bond information
    *  from application to bootloader when using buttonless DFU OTA. */
   NOINIT (rwx) :  ORIGIN = 0x20007F80, LENGTH = 0x80
-
+  
+  
+  
   /** Location in UICR where bootloader start address is stored. */
   UICR_BOOTLOADER (r) : ORIGIN = 0x10001014, LENGTH = 0x04
   
@@ -87,6 +91,7 @@ SECTIONS
   {
 
   } > NOINIT
+
   /* other placements follow here... */
 }
 

linker/nrf52840_debug.ld

@@ -1,7 +1,7 @@
 /* Linker script to configure memory regions. */
 
 SEARCH_DIR(.)
-/*GROUP(-lgcc -lc)*/
+GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {

linker/nrf52_debug.ld

@@ -1,7 +1,7 @@
 /* Linker script to configure memory regions. */
 
 SEARCH_DIR(.)
-/*GROUP(-lgcc -lc)*/
+GROUP(-lgcc -lc -lnosys)
 
 MEMORY
 {

segger/Adafruit_nRF52_Bootloader.emProject

@@ -0,0 +1,363 @@
+<!DOCTYPE CrossStudio_Project_File>
+<solution Name="Adafruit_nRF52_Bootloader" target="8" version="2">
+  <project Name="Adafruit_nRF52_Bootloader">
+    <configuration
+      Name="Common"
+      Placement="Flash"
+      Target="nRF52840_xxAA"
+      arm_architecture="v7EM"
+      arm_core_type="Cortex-M4"
+      arm_endian="Little"
+      arm_fp_abi="Hard"
+      arm_fpu_type="FPv4-SP-D16"
+      arm_interwork="No"
+      arm_linker_heap_size="1024"
+      arm_linker_process_stack_size="0"
+      arm_linker_stack_size="1024"
+      arm_simulator_memory_simulation_parameter="ROM;0x00000000;0x00100000;RAM;0x20000000;0x00040000"
+      arm_target_debug_interface_type="ADIv5"
+      arm_target_device_name="nRF52840_xxAA"
+      arm_target_interface_type="SWD"
+      build_treat_warnings_as_errors="Yes"
+      c_preprocessor_definitions="__nRF_FAMILY;ARM_MATH_CM4;FLASH_PLACEMENT=1;NO_VTOR_CONFIG;MK_BOOTLOADER_VERSION=0x00020A;CONFIG_GPIO_AS_PINRESET;CONFIG_NFCT_PINS_AS_GPIOS;SOFTDEVICE_PRESENT;UF2_VERSION=&quot;Segger&quot;;BLEDIS_FW_VERSION=&quot;Segger&quot;;DFU_APP_DATA_RESERVED=7*4096;CFG_DEBUG"
+      c_user_include_directories=".;../src/;../src/usb;../src/boards;../src/cmsis/include;$(tusbDir);$(nrfxDir);$(nrfxDir)/mdk;$(nrfxDir)/hal;$(nrfxDir)/drivers/include;$(nrfxDir)/drivers/src;$(sdDir)/include;$(sdDir)/include/nrf52;$(sdk11Dir)/drivers_nrf/pstorage;$(sdk11Dir)/ble/common/;$(sdk11Dir)/ble/ble_services/ble_dfu;$(sdk11Dir)/ble/ble_services/ble_dis;$(sdk11Dir)/libraries/bootloader_dfu;$(sdk11Dir)/libraries/bootloader_dfu/hci_transport;$(sdk11Dir)/libraries/util;$(sdkDir)/toolchain/cmsis/include;$(sdkDir)/device;$(sdkDir)/toolchain;$(sdkDir)/drivers_nrf/hal;$(sdkDir)/drivers_nrf/systick;$(sdkDir)/drivers_nrf/uart;$(sdkDir)/drivers_nrf/usbd;$(sdkDir)/drivers_nrf/common;$(sdkDir)/drivers_nrf/delay;$(sdkDir)/drivers_nrf/power;$(sdkDir)/drivers_nrf/clock;$(sdkDir)/libraries/util;$(sdkDir)/libraries/timer;$(sdkDir)/libraries/scheduler;$(sdkDir)/libraries/crc16;$(sdkDir)/libraries/util;$(sdkDir)/libraries/hci/config;$(sdkDir)/libraries/uart;$(sdkDir)/libraries/hci;$(sdkDir)/external/fprintf;$(sdkDir)/libraries/strerror;$(sdkDir)/libraries/atomic;$(sdkDir)/libraries/balloc;$(sdkDir)/libraries/experimental_log/src;$(sdkDir)/libraries/experimental_log;$(sdkDir)/libraries/experimental_section_vars;$(sdkDir)/libraries/experimental_memobj"
+      debug_initial_breakpoint_set_option="Never"
+      debug_register_definition_file="$(ProjectDir)/nrf52840_Registers.xml"
+      debug_target_connection="J-Link"
+      gcc_enable_all_warnings="No"
+      gcc_entry_point="Reset_Handler"
+      gcc_optimization_level="Debug"
+      linker_memory_map_file="$(ProjectDir)/nRF52840_xxAA_MemoryMap.xml"
+      linker_printf_width_precision_supported="Yes"
+      linker_section_placement_file="$(ProjectDir)/flash_placement.xml"
+      macros="DeviceHeaderFile=$(PackagesDir)/nRF/CMSIS/Device/Include/nrf.h;DeviceLibraryIdentifier=M4lf;DeviceSystemFile=$(PackagesDir)/nRF/CMSIS/Device/Source/system_nrf52840.c;DeviceVectorsFile=$(PackagesDir)/nRF/Source/ses_nrf52840_Vectors.s;DeviceFamily=nRF;Target=nRF52840_xxAA;Placement=Flash;sdkDir=../lib/sdk/components;sdk11Dir=../lib/sdk11/components;sdDir=../lib/softdevice/s140_nrf52_6.1.1/s140_nrf52_6.1.1_API;tusbDir=../lib/tinyusb/src;nrfxDir=../lib/nrfx"
+      project_directory=""
+      project_type="Executable"
+      target_reset_script="Reset();"
+      target_script_file="$(ProjectDir)/nRF_Target.js"
+      target_trace_initialize_script="EnableTrace(&quot;$(TraceInterfaceType)&quot;)" />
+    <folder Name="RTT Files">
+      <file file_name="SEGGER_RTT.c" />
+      <file file_name="SEGGER_RTT.h" />
+      <file file_name="SEGGER_RTT_Conf.h" />
+      <file file_name="SEGGER_RTT_SES.c" />
+    </folder>
+    <folder Name="Script Files">
+      <file file_name="nRF_Target.js">
+        <configuration Name="Common" file_type="Reset Script" />
+      </file>
+    </folder>
+    <folder Name="System Files">
+      <file file_name="thumb_crt0.s" />
+      <file file_name="flash_placement.xml" />
+      <file file_name="nRF52840_xxAA_MemoryMap.xml" />
+      <file file_name="nRF52832_xxAA_MemoryMap.xml" />
+    </folder>
+    <configuration Name="Debug Single" gcc_optimization_level="Debug" />
+    <configuration
+      Name="Release Single"
+      gcc_optimization_level="Optimize For Size" />
+    <folder Name="lib">
+      <folder
+        Name="sdk"
+        exclude=""
+        filter="*.h;*.c"
+        path="../lib/sdk"
+        recurse="Yes" />
+      <folder Name="sdk11">
+        <folder Name="components">
+          <folder Name="ble">
+            <folder Name="ble_services">
+              <folder Name="ble_dfu">
+                <file file_name="../lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c" />
+                <file file_name="../lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.h" />
+              </folder>
+              <folder Name="ble_dis">
+                <file file_name="../lib/sdk11/components/ble/ble_services/ble_dis/ble_dis.c" />
+                <file file_name="../lib/sdk11/components/ble/ble_services/ble_dis/ble_dis.h" />
+              </folder>
+            </folder>
+            <folder Name="common">
+              <file file_name="../lib/sdk11/components/ble/common/ble_srv_common.h" />
+            </folder>
+          </folder>
+          <folder Name="drivers_nrf">
+            <folder Name="pstorage">
+              <file file_name="../lib/sdk11/components/drivers_nrf/pstorage/pstorage.h" />
+              <file file_name="../lib/sdk11/components/drivers_nrf/pstorage/pstorage_raw.c" />
+            </folder>
+          </folder>
+          <folder Name="libraries">
+            <folder Name="bootloader_dfu">
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader.c" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader_settings.c" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader_settings.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader_types.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader_util.c" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/bootloader_util.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_bank_internal.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_ble_svc.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_ble_svc_internal.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_init.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_transport.h" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_ble.c" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_transport_serial.c" />
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_types.h" />
+              <folder Name="ble_transport">
+                <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/ble_transport/hci_mem_pool_internal.h" />
+              </folder>
+              <folder Name="hci_transport">
+                <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/hci_transport/hci_mem_pool_internal.h" />
+                <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/hci_transport/hci_transport_config.h" />
+              </folder>
+              <file file_name="../lib/sdk11/components/libraries/bootloader_dfu/dfu_single_bank.c" />
+            </folder>
+            <folder Name="util">
+              <file file_name="../lib/sdk11/components/libraries/util/nrf_log.h" />
+            </folder>
+          </folder>
+        </folder>
+      </folder>
+      <folder Name="tinyusb">
+        <folder Name="src">
+          <file file_name="../lib/tinyusb/src/tusb.c" />
+          <file file_name="../lib/tinyusb/src/tusb.h" />
+          <file file_name="../lib/tinyusb/src/tusb_hal.h" />
+          <file file_name="../lib/tinyusb/src/tusb_option.h" />
+          <folder Name="class">
+            <folder Name="cdc">
+              <file file_name="../lib/tinyusb/src/class/cdc/cdc.h" />
+              <file file_name="../lib/tinyusb/src/class/cdc/cdc_device.c" />
+              <file file_name="../lib/tinyusb/src/class/cdc/cdc_device.h" />
+            </folder>
+            <folder Name="hid">
+              <file file_name="../lib/tinyusb/src/class/hid/hid.h" />
+              <file file_name="../lib/tinyusb/src/class/hid/hid_device.c" />
+              <file file_name="../lib/tinyusb/src/class/hid/hid_device.h" />
+            </folder>
+            <folder Name="msc">
+              <file file_name="../lib/tinyusb/src/class/msc/msc.h" />
+              <file file_name="../lib/tinyusb/src/class/msc/msc_device.c" />
+              <file file_name="../lib/tinyusb/src/class/msc/msc_device.h" />
+            </folder>
+          </folder>
+          <folder Name="common">
+            <file file_name="../lib/tinyusb/src/common/binary.h" />
+            <file file_name="../lib/tinyusb/src/common/timeout_timer.h" />
+            <file file_name="../lib/tinyusb/src/common/tusb_common.h" />
+            <file file_name="../lib/tinyusb/src/common/tusb_compiler.h" />
+            <file file_name="../lib/tinyusb/src/common/tusb_error.h" />
+            <file file_name="../lib/tinyusb/src/common/tusb_fifo.c" />
+            <file file_name="../lib/tinyusb/src/common/tusb_fifo.h" />
+            <file file_name="../lib/tinyusb/src/common/tusb_types.h" />
+            <file file_name="../lib/tinyusb/src/common/tusb_verify.h" />
+            <folder Name="compiler">
+              <file file_name="../lib/tinyusb/src/common/compiler/tusb_compiler_gcc.h" />
+              <file file_name="../lib/tinyusb/src/common/compiler/tusb_compiler_iar.h" />
+            </folder>
+          </folder>
+          <folder Name="device">
+            <file file_name="../lib/tinyusb/src/device/dcd.h" />
+            <file file_name="../lib/tinyusb/src/device/usbd.c" />
+            <file file_name="../lib/tinyusb/src/device/usbd.h" />
+            <file file_name="../lib/tinyusb/src/device/usbd_pvt.h" />
+            <file file_name="../lib/tinyusb/src/device/usbd_control.c" />
+          </folder>
+          <folder Name="osal">
+            <file file_name="../lib/tinyusb/src/osal/osal.h" />
+            <file file_name="../lib/tinyusb/src/osal/osal_none.h" />
+          </folder>
+          <folder Name="portable">
+            <folder Name="nordic">
+              <folder Name="nrf5x">
+                <file file_name="../lib/tinyusb/src/portable/nordic/nrf5x/dcd_nrf5x.c" />
+              </folder>
+            </folder>
+          </folder>
+        </folder>
+        <configuration Name="Feather52832" build_exclude_from_build="Yes" />
+      </folder>
+      <folder Name="nrfx">
+        <file file_name="../lib/nrfx/nrfx.h" />
+        <folder Name="drivers">
+          <file file_name="../lib/nrfx/drivers/nrfx_common.h" />
+          <file file_name="../lib/nrfx/drivers/nrfx_errors.h" />
+          <folder Name="include">
+            <file file_name="../lib/nrfx/drivers/include/nrf_bitmask.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_adc.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_clock.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_comp.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_gpiote.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_i2s.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_lpcomp.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_pdm.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_power.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_power_clock.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_ppi.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_pwm.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_qdec.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_qspi.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_rng.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_rtc.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_saadc.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_spi.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_spim.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_spis.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_swi.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_systick.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_timer.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_twi.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_twim.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_twis.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_uart.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_uarte.h" />
+            <file file_name="../lib/nrfx/drivers/include/nrfx_wdt.h" />
+          </folder>
+          <folder Name="src">
+            <file file_name="../lib/nrfx/drivers/src/nrfx_power.c" />
+            <file file_name="../lib/nrfx/drivers/src/nrfx_nvmc.c" />
+          </folder>
+        </folder>
+        <folder Name="hal">
+          <file file_name="../lib/nrfx/hal/nrf_adc.h" />
+          <file file_name="../lib/nrfx/hal/nrf_ccm.h" />
+          <file file_name="../lib/nrfx/hal/nrf_clock.h" />
+          <file file_name="../lib/nrfx/hal/nrf_comp.h" />
+          <file file_name="../lib/nrfx/hal/nrf_ecb.h" />
+          <file file_name="../lib/nrfx/hal/nrf_egu.h" />
+          <file file_name="../lib/nrfx/hal/nrf_gpio.h" />
+          <file file_name="../lib/nrfx/hal/nrf_gpiote.h" />
+          <file file_name="../lib/nrfx/hal/nrf_i2s.h" />
+          <file file_name="../lib/nrfx/hal/nrf_lpcomp.h" />
+          <file file_name="../lib/nrfx/hal/nrf_nvmc.h" />
+          <file file_name="../lib/nrfx/hal/nrf_pdm.h" />
+          <file file_name="../lib/nrfx/hal/nrf_power.h" />
+          <file file_name="../lib/nrfx/hal/nrf_ppi.h" />
+          <file file_name="../lib/nrfx/hal/nrf_pwm.h" />
+          <file file_name="../lib/nrfx/hal/nrf_qdec.h" />
+          <file file_name="../lib/nrfx/hal/nrf_qspi.h" />
+          <file file_name="../lib/nrfx/hal/nrf_radio.h" />
+          <file file_name="../lib/nrfx/hal/nrf_rng.h" />
+          <file file_name="../lib/nrfx/hal/nrf_rtc.h" />
+          <file file_name="../lib/nrfx/hal/nrf_saadc.h" />
+          <file file_name="../lib/nrfx/hal/nrf_spi.h" />
+          <file file_name="../lib/nrfx/hal/nrf_spim.h" />
+          <file file_name="../lib/nrfx/hal/nrf_spis.h" />
+          <file file_name="../lib/nrfx/hal/nrf_systick.h" />
+          <file file_name="../lib/nrfx/hal/nrf_temp.h" />
+          <file file_name="../lib/nrfx/hal/nrf_timer.h" />
+          <file file_name="../lib/nrfx/hal/nrf_twi.h" />
+          <file file_name="../lib/nrfx/hal/nrf_twim.h" />
+          <file file_name="../lib/nrfx/hal/nrf_twis.h" />
+          <file file_name="../lib/nrfx/hal/nrf_uart.h" />
+          <file file_name="../lib/nrfx/hal/nrf_uarte.h" />
+          <file file_name="../lib/nrfx/hal/nrf_usbd.h" />
+          <file file_name="../lib/nrfx/hal/nrf_wdt.h" />
+        </folder>
+        <folder Name="mdk">
+          <file file_name="../lib/nrfx/mdk/compiler_abstraction.h" />
+          <file file_name="../lib/nrfx/mdk/nrf.h" />
+          <file file_name="../lib/nrfx/mdk/nrf52.h" />
+          <file file_name="../lib/nrfx/mdk/nrf52832_peripherals.h" />
+          <file file_name="../lib/nrfx/mdk/nrf52840.h" />
+          <file file_name="../lib/nrfx/mdk/nrf52840_bitfields.h" />
+          <file file_name="../lib/nrfx/mdk/nrf52840_peripherals.h" />
+          <file file_name="../lib/nrfx/mdk/nrf52_bitfields.h" />
+          <file file_name="../lib/nrfx/mdk/nrf_peripherals.h" />
+          <file file_name="../lib/nrfx/mdk/ses_startup_nrf52.s">
+            <configuration
+              Name="Feather52840 Size++"
+              build_exclude_from_build="Yes" />
+            <configuration
+              Name="Feather52840"
+              build_exclude_from_build="Yes" />
+          </file>
+          <file file_name="../lib/nrfx/mdk/ses_startup_nrf52840.s">
+            <configuration
+              Name="Feather52840 Size++"
+              build_exclude_from_build="No" />
+            <configuration
+              Name="Feather52832"
+              build_exclude_from_build="Yes" />
+          </file>
+          <file file_name="../lib/nrfx/mdk/ses_startup_nrf_common.s">
+            <configuration
+              Name="Feather52840 Size++"
+              build_exclude_from_build="No" />
+          </file>
+          <file file_name="../lib/nrfx/mdk/startup_config.h" />
+          <file file_name="../lib/nrfx/mdk/system_nrf52.c">
+            <configuration
+              Name="Feather52840 Size++"
+              build_exclude_from_build="Yes" />
+            <configuration
+              Name="Feather52840"
+              build_exclude_from_build="Yes" />
+          </file>
+          <file file_name="../lib/nrfx/mdk/system_nrf52.h" />
+          <file file_name="../lib/nrfx/mdk/system_nrf52840.c">
+            <configuration
+              Name="Feather52832"
+              build_exclude_from_build="Yes" />
+          </file>
+          <file file_name="../lib/nrfx/mdk/system_nrf52840.h" />
+        </folder>
+        <folder Name="soc">
+          <file file_name="../lib/nrfx/soc/nrfx_coredep.h" />
+          <file file_name="../lib/nrfx/soc/nrfx_irqs.h" />
+          <file file_name="../lib/nrfx/soc/nrfx_irqs_nrf51.h" />
+          <file file_name="../lib/nrfx/soc/nrfx_irqs_nrf52810.h" />
+          <file file_name="../lib/nrfx/soc/nrfx_irqs_nrf52832.h" />
+          <file file_name="../lib/nrfx/soc/nrfx_irqs_nrf52840.h" />
+        </folder>
+      </folder>
+    </folder>
+    <configuration
+      Name="Feather52840"
+      c_preprocessor_definitions="NRF52840_XXAA;S140"
+      c_user_include_directories="../src/boards/feather_nrf52840_express"
+      gcc_optimization_level="Debug"
+      linker_memory_map_file="nRF52840_xxAA_MemoryMap.xml" />
+    <configuration
+      Name="Feather52832"
+      c_preprocessor_definitions="NRF52832_XXAA;S132"
+      c_user_include_directories="../src/boards/feather_nrf52832"
+      gcc_optimization_level="Debug"
+      linker_memory_map_file="nRF52832_xxAA_MemoryMap.xml" />
+    <folder Name="src">
+      <folder Name="boards">
+        <folder Name="feather_nrf52840_express">
+          <file file_name="../src/boards/feather_nrf52840_express/board.h" />
+          <file file_name="../src/boards/feather_nrf52840_express/pinconfig.c" />
+        </folder>
+        <file file_name="../src/boards/boards.c" />
+        <file file_name="../src/boards/boards.h" />
+      </folder>
+      <folder
+        Name="cmsis"
+        exclude=""
+        filter="*.c;*.h"
+        path="../src/cmsis"
+        recurse="Yes" />
+      <file file_name="../src/dfu_ble_svc.c" />
+      <file file_name="../src/dfu_init.c" />
+      <file file_name="../src/flash_nrf5x.c" />
+      <file file_name="../src/flash_nrf5x.h" />
+      <file file_name="../src/main.c" />
+      <file file_name="../src/nrfx_config.h" />
+      <file file_name="../src/nrfx_glue.h" />
+      <file file_name="../src/pstorage_platform.h" />
+      <file file_name="../src/sdk_config.h" />
+      <folder
+        Name="usb"
+        exclude=""
+        filter="*.c;*.h"
+        path="../src/usb"
+        recurse="Yes" />
+    </folder>
+  </project>
+  <configuration Name="Feather52840" />
+  <configuration Name="Feather52832" />
+</solution>

segger/SEGGER_RTT.h

@@ -0,0 +1,234 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2016  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       SEGGER RTT * Real Time Transfer for embedded targets         *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* * This software may in its unmodified form be freely redistributed *
+*   in source form.                                                  *
+* * The source code may be modified, provided the source code        *
+*   retains the above copyright notice, this list of conditions and  *
+*   the following disclaimer.                                        *
+* * Modified versions of this software in source or linkable form    *
+*   may not be distributed without prior consent of SEGGER.          *
+* * This software may only be used for communication with SEGGER     *
+*   J-Link debug probes.                                             *
+*                                                                    *
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
+* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
+* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF           *
+* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE           *
+* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF      *
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT          *
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE  *
+* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH   *
+* DAMAGE.                                                            *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       RTT version: 5.12e                                           *
+*                                                                    *
+**********************************************************************
+---------------------------END-OF-HEADER------------------------------
+File    : SEGGER_RTT.h
+Purpose : Implementation of SEGGER real-time transfer which allows
+          real-time communication on targets which support debugger 
+          memory accesses while the CPU is running.
+----------------------------------------------------------------------
+*/
+
+#ifndef SEGGER_RTT_H
+#define SEGGER_RTT_H
+
+#include "SEGGER_RTT_Conf.h"
+
+/*********************************************************************
+*
+*       Defines, fixed
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Types
+*
+**********************************************************************
+*/
+
+//
+// Description for a circular buffer (also called "ring buffer")
+// which is used as up-buffer (T->H)
+//
+typedef struct {
+  const     char*    sName;         // Optional name. Standard names so far are: "Terminal", "SysView", "J-Scope_t4i4"
+            char*    pBuffer;       // Pointer to start of buffer
+            unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
+            unsigned WrOff;         // Position of next item to be written by either target.
+  volatile  unsigned RdOff;         // Position of next item to be read by host. Must be volatile since it may be modified by host.
+            unsigned Flags;         // Contains configuration flags
+} SEGGER_RTT_BUFFER_UP;
+
+//
+// Description for a circular buffer (also called "ring buffer")
+// which is used as down-buffer (H->T)
+//
+typedef struct {
+  const     char*    sName;         // Optional name. Standard names so far are: "Terminal", "SysView", "J-Scope_t4i4"
+            char*    pBuffer;       // Pointer to start of buffer
+            unsigned SizeOfBuffer;  // Buffer size in bytes. Note that one byte is lost, as this implementation does not fill up the buffer in order to avoid the problem of being unable to distinguish between full and empty.
+  volatile  unsigned WrOff;         // Position of next item to be written by host. Must be volatile since it may be modified by host.
+            unsigned RdOff;         // Position of next item to be read by target (down-buffer).
+            unsigned Flags;         // Contains configuration flags
+} SEGGER_RTT_BUFFER_DOWN;
+
+//
+// RTT control block which describes the number of buffers available
+// as well as the configuration for each buffer
+//
+//
+typedef struct {
+  char                    acID[16];                                 // Initialized to "SEGGER RTT"
+  int                     MaxNumUpBuffers;                          // Initialized to SEGGER_RTT_MAX_NUM_UP_BUFFERS (type. 2)
+  int                     MaxNumDownBuffers;                        // Initialized to SEGGER_RTT_MAX_NUM_DOWN_BUFFERS (type. 2)
+  SEGGER_RTT_BUFFER_UP    aUp[SEGGER_RTT_MAX_NUM_UP_BUFFERS];       // Up buffers, transferring information up from target via debug probe to host
+  SEGGER_RTT_BUFFER_DOWN  aDown[SEGGER_RTT_MAX_NUM_DOWN_BUFFERS];   // Down buffers, transferring information down from host via debug probe to target
+} SEGGER_RTT_CB;
+
+/*********************************************************************
+*
+*       Global data
+*
+**********************************************************************
+*/
+extern SEGGER_RTT_CB _SEGGER_RTT;
+
+/*********************************************************************
+*
+*       RTT API functions
+*
+**********************************************************************
+*/
+#ifdef __cplusplus
+  extern "C" {
+#endif
+int          SEGGER_RTT_AllocDownBuffer  (const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags);
+int          SEGGER_RTT_AllocUpBuffer    (const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags);
+int          SEGGER_RTT_ConfigUpBuffer   (unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags);
+int          SEGGER_RTT_ConfigDownBuffer (unsigned BufferIndex, const char* sName, void* pBuffer, unsigned BufferSize, unsigned Flags);
+int          SEGGER_RTT_GetKey           (void);
+unsigned     SEGGER_RTT_HasData          (unsigned BufferIndex);
+int          SEGGER_RTT_HasKey           (void);
+void         SEGGER_RTT_Init             (void);
+unsigned     SEGGER_RTT_Read             (unsigned BufferIndex,       void* pBuffer, unsigned BufferSize);
+unsigned     SEGGER_RTT_ReadNoLock       (unsigned BufferIndex,       void* pData,   unsigned BufferSize);
+int          SEGGER_RTT_SetNameDownBuffer(unsigned BufferIndex, const char* sName);
+int          SEGGER_RTT_SetNameUpBuffer  (unsigned BufferIndex, const char* sName);
+int          SEGGER_RTT_WaitKey          (void);
+unsigned     SEGGER_RTT_Write            (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+unsigned     SEGGER_RTT_WriteNoLock      (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+unsigned     SEGGER_RTT_WriteSkipNoLock  (unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+unsigned     SEGGER_RTT_WriteString      (unsigned BufferIndex, const char* s);
+void         SEGGER_RTT_WriteWithOverwriteNoLock(unsigned BufferIndex, const void* pBuffer, unsigned NumBytes);
+//
+// Function macro for performance optimization
+//
+#define      SEGGER_RTT_HASDATA(n)       (_SEGGER_RTT.aDown[n].WrOff - _SEGGER_RTT.aDown[n].RdOff)
+
+/*********************************************************************
+*
+*       RTT "Terminal" API functions
+*
+**********************************************************************
+*/
+int     SEGGER_RTT_SetTerminal        (char TerminalId);
+int     SEGGER_RTT_TerminalOut        (char TerminalId, const char* s);
+
+/*********************************************************************
+*
+*       RTT printf functions (require SEGGER_RTT_printf.c)
+*
+**********************************************************************
+*/
+int SEGGER_RTT_printf(unsigned BufferIndex, const char * sFormat, ...);
+#ifdef __cplusplus
+  }
+#endif
+
+/*********************************************************************
+*
+*       Defines
+*
+**********************************************************************
+*/
+
+//
+// Operating modes. Define behavior if buffer is full (not enough space for entire message)
+//
+#define SEGGER_RTT_MODE_NO_BLOCK_SKIP         (0U)     // Skip. Do not block, output nothing. (Default)
+#define SEGGER_RTT_MODE_NO_BLOCK_TRIM         (1U)     // Trim: Do not block, output as much as fits.
+#define SEGGER_RTT_MODE_BLOCK_IF_FIFO_FULL    (2U)     // Block: Wait until there is space in the buffer.
+#define SEGGER_RTT_MODE_MASK                  (3U)
+
+//
+// Control sequences, based on ANSI.
+// Can be used to control color, and clear the screen
+//
+#define RTT_CTRL_RESET                ""         // Reset to default colors
+#define RTT_CTRL_CLEAR                ""         // Clear screen, reposition cursor to top left
+
+#define RTT_CTRL_TEXT_BLACK           ""
+#define RTT_CTRL_TEXT_RED             ""
+#define RTT_CTRL_TEXT_GREEN           ""
+#define RTT_CTRL_TEXT_YELLOW          ""
+#define RTT_CTRL_TEXT_BLUE            ""
+#define RTT_CTRL_TEXT_MAGENTA         ""
+#define RTT_CTRL_TEXT_CYAN            ""
+#define RTT_CTRL_TEXT_WHITE           ""
+
+#define RTT_CTRL_TEXT_BRIGHT_BLACK    ""
+#define RTT_CTRL_TEXT_BRIGHT_RED      ""
+#define RTT_CTRL_TEXT_BRIGHT_GREEN    ""
+#define RTT_CTRL_TEXT_BRIGHT_YELLOW   ""
+#define RTT_CTRL_TEXT_BRIGHT_BLUE     ""
+#define RTT_CTRL_TEXT_BRIGHT_MAGENTA  ""
+#define RTT_CTRL_TEXT_BRIGHT_CYAN     ""
+#define RTT_CTRL_TEXT_BRIGHT_WHITE    ""
+
+#define RTT_CTRL_BG_BLACK             ""
+#define RTT_CTRL_BG_RED               ""
+#define RTT_CTRL_BG_GREEN             ""
+#define RTT_CTRL_BG_YELLOW            ""
+#define RTT_CTRL_BG_BLUE              ""
+#define RTT_CTRL_BG_MAGENTA           ""
+#define RTT_CTRL_BG_CYAN              ""
+#define RTT_CTRL_BG_WHITE             ""
+
+#define RTT_CTRL_BG_BRIGHT_BLACK      ""
+#define RTT_CTRL_BG_BRIGHT_RED        ""
+#define RTT_CTRL_BG_BRIGHT_GREEN      ""
+#define RTT_CTRL_BG_BRIGHT_YELLOW     ""
+#define RTT_CTRL_BG_BRIGHT_BLUE       ""
+#define RTT_CTRL_BG_BRIGHT_MAGENTA    ""
+#define RTT_CTRL_BG_BRIGHT_CYAN       ""
+#define RTT_CTRL_BG_BRIGHT_WHITE      ""
+
+
+#endif
+
+/*************************** End of file ****************************/

segger/SEGGER_RTT_Conf.h

@@ -0,0 +1,242 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2016  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       SEGGER RTT * Real Time Transfer for embedded targets         *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* * This software may in its unmodified form be freely redistributed *
+*   in source form.                                                  *
+* * The source code may be modified, provided the source code        *
+*   retains the above copyright notice, this list of conditions and  *
+*   the following disclaimer.                                        *
+* * Modified versions of this software in source or linkable form    *
+*   may not be distributed without prior consent of SEGGER.          *
+* * This software may only be used for communication with SEGGER     *
+*   J-Link debug probes.                                             *
+*                                                                    *
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
+* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
+* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF           *
+* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE           *
+* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF      *
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT          *
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE  *
+* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH   *
+* DAMAGE.                                                            *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+*       RTT version: 5.12e                                           *
+*                                                                    *
+**********************************************************************
+----------------------------------------------------------------------
+File    : SEGGER_RTT_Conf.h
+Purpose : Implementation of SEGGER real-time transfer (RTT) which 
+          allows real-time communication on targets which support 
+          debugger memory accesses while the CPU is running.
+---------------------------END-OF-HEADER------------------------------
+*/
+
+#ifndef SEGGER_RTT_CONF_H
+#define SEGGER_RTT_CONF_H
+
+#ifdef __ICCARM__
+  #include <intrinsics.h>
+#endif
+
+/*********************************************************************
+*
+*       Defines, configurable
+*
+**********************************************************************
+*/
+
+#define SEGGER_RTT_MAX_NUM_UP_BUFFERS             (2)     // Max. number of up-buffers (T->H) available on this target    (Default: 2)
+#define SEGGER_RTT_MAX_NUM_DOWN_BUFFERS           (2)     // Max. number of down-buffers (H->T) available on this target  (Default: 2)
+
+#define BUFFER_SIZE_UP                            (1024)  // Size of the buffer for terminal output of target, up to host (Default: 1k)
+#define BUFFER_SIZE_DOWN                          (16)    // Size of the buffer for terminal input to target from host (Usually keyboard input) (Default: 16)
+
+#define SEGGER_RTT_PRINTF_BUFFER_SIZE             (64u)    // Size of buffer for RTT printf to bulk-send chars via RTT     (Default: 64)
+
+#define SEGGER_RTT_MODE_DEFAULT                   SEGGER_RTT_MODE_NO_BLOCK_SKIP // Mode for pre-initialized terminal channel (buffer 0)
+
+//
+// Target is not allowed to perform other RTT operations while string still has not been stored completely.
+// Otherwise we would probably end up with a mixed string in the buffer.
+// If using  RTT from within interrupts, multiple tasks or multi processors, define the SEGGER_RTT_LOCK() and SEGGER_RTT_UNLOCK() function here.
+// 
+// SEGGER_RTT_MAX_INTERRUPT_PRIORITY can be used in the sample lock routines on Cortex-M3/4.
+// Make sure to mask all interrupts which can send RTT data, i.e. generate SystemView events, or cause task switches.
+// When high-priority interrupts must not be masked while sending RTT data, SEGGER_RTT_MAX_INTERRUPT_PRIORITY needs to be adjusted accordingly.
+// (Higher priority = lower priority number)
+// Default value for embOS: 128u
+// Default configuration in FreeRTOS: configMAX_SYSCALL_INTERRUPT_PRIORITY: ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
+// In case of doubt mask all interrupts: 0u
+// 
+
+#define SEGGER_RTT_MAX_INTERRUPT_PRIORITY         (0x20)   // Interrupt priority to lock on SEGGER_RTT_LOCK on Cortex-M3/4 (Default: 0x20)
+
+/*********************************************************************
+*
+*       RTT lock configuration for SEGGER Embedded Studio, 
+*       Rowley CrossStudio and GCC
+*/
+#if (defined __SES_ARM) || (defined __CROSSWORKS_ARM) || (defined __GNUC__)
+  #ifdef __ARM_ARCH_6M__
+    #define SEGGER_RTT_LOCK()   {                                                                   \
+                                    unsigned int LockState;                                         \
+                                  __asm volatile ("mrs   %0, primask  \n\t"                         \
+                                                  "mov   r1, $1     \n\t"                           \
+                                                  "msr   primask, r1  \n\t"                         \
+                                                  : "=r" (LockState)                                \
+                                                  :                                                 \
+                                                  : "r1"                                            \
+                                                  );                            
+    
+    #define SEGGER_RTT_UNLOCK()   __asm volatile ("msr   primask, %0  \n\t"                         \
+                                                  :                                                 \
+                                                  : "r" (LockState)                                 \
+                                                  :                                                 \
+                                                  );                                                \
+                                }                                             
+                                  
+  #elif (defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__))
+    #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
+      #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
+    #endif
+    #define SEGGER_RTT_LOCK()   {                                                                   \
+                                    unsigned int LockState;                                         \
+                                  __asm volatile ("mrs   %0, basepri  \n\t"                         \
+                                                  "mov   r1, %1       \n\t"                         \
+                                                  "msr   basepri, r1  \n\t"                         \
+                                                  : "=r" (LockState)                                \
+                                                  : "i"(SEGGER_RTT_MAX_INTERRUPT_PRIORITY)          \
+                                                  : "r1"                                            \
+                                                  );                            
+    
+    #define SEGGER_RTT_UNLOCK()   __asm volatile ("msr   basepri, %0  \n\t"                         \
+                                                  :                                                 \
+                                                  : "r" (LockState)                                 \
+                                                  :                                                 \
+                                                  );                                                \
+                                }
+  
+  #elif defined(__ARM_ARCH_7A__)
+    #define SEGGER_RTT_LOCK() {                                                \
+                                 unsigned int LockState;                       \
+                                 __asm volatile ("mrs r1, CPSR \n\t"           \
+                                                 "mov %0, r1 \n\t"             \
+                                                 "orr r1, r1, #0xC0 \n\t"      \
+                                                 "msr CPSR_c, r1 \n\t"         \
+                                                 : "=r" (LockState)            \
+                                                 :                             \
+                                                 : "r1"                        \
+                                                 );
+
+    #define SEGGER_RTT_UNLOCK() __asm volatile ("mov r0, %0 \n\t"              \
+                                                "mrs r1, CPSR \n\t"            \
+                                                "bic r1, r1, #0xC0 \n\t"       \
+                                                "and r0, r0, #0xC0 \n\t"       \
+                                                "orr r1, r1, r0 \n\t"          \
+                                                "msr CPSR_c, r1 \n\t"          \
+                                                :                              \
+                                                : "r" (LockState)              \
+                                                : "r0", "r1"                   \
+                                                );                             \
+                            }
+#else
+    #define SEGGER_RTT_LOCK()  
+    #define SEGGER_RTT_UNLOCK()
+  #endif
+#endif
+
+/*********************************************************************
+*
+*       RTT lock configuration for IAR EWARM
+*/
+#ifdef __ICCARM__
+  #if (defined (__ARM6M__) && (__CORE__ == __ARM6M__))
+    #define SEGGER_RTT_LOCK()   {                                                                   \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_PRIMASK();                                      \
+                                  __set_PRIMASK(1);                           
+                                    
+    #define SEGGER_RTT_UNLOCK()   __set_PRIMASK(LockState);                                         \
+                                }
+  #elif ((defined (__ARM7EM__) && (__CORE__ == __ARM7EM__)) || (defined (__ARM7M__) && (__CORE__ == __ARM7M__)))
+    #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
+      #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
+    #endif
+    #define SEGGER_RTT_LOCK()   {                                                                   \
+                                  unsigned int LockState;                                           \
+                                  LockState = __get_BASEPRI();                                      \
+                                  __set_BASEPRI(SEGGER_RTT_MAX_INTERRUPT_PRIORITY);                           
+                                    
+    #define SEGGER_RTT_UNLOCK()   __set_BASEPRI(LockState);                                         \
+                                }  
+  #endif
+#endif
+
+/*********************************************************************
+*
+*       RTT lock configuration for KEIL ARM
+*/
+#ifdef __CC_ARM
+  #if (defined __TARGET_ARCH_6S_M)
+    #define SEGGER_RTT_LOCK()   {                                                                   \
+                                  unsigned int LockState;                                           \
+                                  register unsigned char PRIMASK __asm( "primask");                 \
+                                  LockState = PRIMASK;                                              \
+                                  PRIMASK = 1u;                                                     \
+                                  __schedule_barrier();
+
+    #define SEGGER_RTT_UNLOCK()   PRIMASK = LockState;                                              \
+                                  __schedule_barrier();                                             \
+                                }
+  #elif (defined(__TARGET_ARCH_7_M) || defined(__TARGET_ARCH_7E_M))
+    #ifndef   SEGGER_RTT_MAX_INTERRUPT_PRIORITY
+      #define SEGGER_RTT_MAX_INTERRUPT_PRIORITY   (0x20)
+    #endif
+    #define SEGGER_RTT_LOCK()   {                                                                   \
+                                  unsigned int LockState;                                           \
+                                  register unsigned char BASEPRI __asm( "basepri");                 \
+                                  LockState = BASEPRI;                                              \
+                                  BASEPRI = SEGGER_RTT_MAX_INTERRUPT_PRIORITY;                      \
+                                  __schedule_barrier();
+
+    #define SEGGER_RTT_UNLOCK()   BASEPRI = LockState;                                              \
+                                  __schedule_barrier();                                             \
+                                }
+  #endif
+#endif
+
+/*********************************************************************
+*
+*       RTT lock configuration fallback
+*/
+#ifndef   SEGGER_RTT_LOCK
+  #define SEGGER_RTT_LOCK()                // Lock RTT (nestable)   (i.e. disable interrupts)
+#endif
+
+#ifndef   SEGGER_RTT_UNLOCK
+  #define SEGGER_RTT_UNLOCK()              // Unlock RTT (nestable) (i.e. enable previous interrupt lock state)
+#endif
+
+#endif
+/*************************** End of file ****************************/

segger/SEGGER_RTT_SES.c

@@ -0,0 +1,76 @@
+/*********************************************************************
+*               SEGGER MICROCONTROLLER GmbH & Co. KG                 *
+*       Solutions for real time microcontroller applications         *
+**********************************************************************
+*                                                                    *
+*       (c) 2014 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+*                                                                    *
+* All rights reserved.                                               *
+*                                                                    *
+* * This software may in its unmodified form be freely redistributed *
+*   in source form.                                                  *
+* * The source code may be modified, provided the source code        *
+*   retains the above copyright notice, this list of conditions and  *
+*   the following disclaimer.                                        *
+* * Modified versions of this software in source or linkable form    *
+*   may not be distributed without prior consent of SEGGER.          *
+* * This software may only be used for communication with SEGGER     *
+*   J-Link debug probes.                                             *
+*                                                                    *
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND             *
+* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,        *
+* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF           *
+* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE           *
+* DISCLAIMED. IN NO EVENT SHALL SEGGER Microcontroller BE LIABLE FOR *
+* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR           *
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT  *
+* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;    *
+* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF      *
+* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT          *
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE  *
+* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH   *
+* DAMAGE.                                                            *
+*                                                                    *
+**********************************************************************
+--------  END-OF-HEADER  ---------------------------------------------
+File    : SEGGER_RTT_Syscalls_SES.c
+Purpose : Reimplementation of printf, puts and 
+          implementation of __putchar and __getchar using RTT in SES.
+          To use RTT for printf output, include this file in your 
+          application.
+----------------------------------------------------------------------
+*/
+#include "SEGGER_RTT.h"
+#include "__libc.h"
+#include <stdarg.h>
+#include <stdio.h>
+
+int printf(const char *fmt,...) {
+  char buffer[128];
+  va_list args;
+  va_start (args, fmt);
+  int n = vsnprintf(buffer, sizeof(buffer), fmt, args);
+  SEGGER_RTT_Write(0, buffer, n);
+  va_end(args);
+  return n;
+}
+
+int puts(const char *s) {
+  return SEGGER_RTT_WriteString(0, s);
+}
+
+int __putchar(int x, __printf_tag_ptr ctx) {
+  (void)ctx;
+  SEGGER_RTT_Write(0, (char *)&x, 1);
+  return x;
+}
+
+int __getchar() {
+  return SEGGER_RTT_WaitKey();
+}
+
+/****** End Of File *************************************************/

segger/flash_placement.xml

@@ -0,0 +1,43 @@
+<!DOCTYPE Linker_Placement_File>
+<Root name="Flash Section Placement">
+  <MemorySegment name="$(FLASH_NAME:FLASH)">
+    <ProgramSection alignment="0x100" load="Yes" name=".vectors" start="$(FLASH_START:)" />
+    <ProgramSection alignment="4" load="Yes" name=".init" />
+    <ProgramSection alignment="4" load="Yes" name=".init_rodata" />
+    <ProgramSection alignment="4" load="Yes" name=".text" />
+    <ProgramSection alignment="4" load="Yes" name=".dtors" />
+    <ProgramSection alignment="4" load="Yes" name=".ctors" />
+    <ProgramSection alignment="4" load="Yes" name=".rodata" />
+    <ProgramSection alignment="4" load="Yes" name=".ARM.exidx" address_symbol="__exidx_start" end_symbol="__exidx_end" />
+    <ProgramSection alignment="4" load="Yes" runin=".fast_run" name=".fast" />
+    <ProgramSection alignment="4" load="Yes" runin=".data_run" name=".data" />
+    <ProgramSection alignment="4" load="Yes" runin=".tdata_run" name=".tdata" />
+  </MemorySegment>
+  <MemorySegment name="$(RAM_NAME:RAM);SRAM">
+    <ProgramSection alignment="0x100" load="No" name=".vectors_ram" start="$(RAM_START:$(SRAM_START:))" />
+    <ProgramSection alignment="4" load="No" name=".fast_run" />
+    <ProgramSection alignment="4" load="No" name=".data_run" />
+    <ProgramSection alignment="4" load="No" name=".tdata_run" />
+    <ProgramSection alignment="4" load="No" name=".bss" />
+    <ProgramSection alignment="4" load="No" name=".tbss" />
+    <ProgramSection alignment="4" load="No" name=".non_init" />
+    <ProgramSection alignment="4" size="__HEAPSIZE__" load="No" name=".heap" />
+    <ProgramSection alignment="8" size="__STACKSIZE__" load="No" place_from_segment_end="Yes" name=".stack" />
+    <ProgramSection alignment="8" size="__STACKSIZE_PROCESS__" load="No" name=".stack_process" />
+  </MemorySegment>
+  <MemorySegment name="$(FLASH2_NAME:BOOTLOADER_SETTINGS)">
+    <ProgramSection alignment="4" load="No" name=".bootloaderSettings" />
+  </MemorySegment>
+  <MemorySegment name="$(FLASH3_NAME:MBR_PARAMS_PAGE)">
+    <ProgramSection alignment="4" load="No" name=".mbrParamsPage" keep="Yes" />
+  </MemorySegment>
+  <MemorySegment name="$(FLASH4_NAME:UICR_BOOTLOADER)">
+    <ProgramSection alignment="4" load="Yes" name=".uicrBootStartAddress" keep="Yes" />
+  </MemorySegment>
+  <MemorySegment name="$(FLASH5_NAME:UICR_MBR_PARAM_PAGE)">
+    <ProgramSection alignment="4" load="Yes" name=".uicrMbrParamsPageAddress" keep="Yes" />
+  </MemorySegment>
+  <MemorySegment name="$(RAM2_NAME:NOINIT)">
+    <ProgramSection alignment="4" load="No" name=".noinit" />
+  </MemorySegment>
+</Root>

segger/nRF52832_xxAA_MemoryMap.xml

@@ -0,0 +1,10 @@
+<!DOCTYPE Board_Memory_Definition_File>
+<root name="nRF52832_xxAA">
+  <MemorySegment name="FLASH" start="0x74000" size="0xA000" access="ReadOnly" />
+  <MemorySegment name="BOOTLOADER_SETTINGS" start="0x0007F000" size="0x1000" access="ReadOnly" />
+  <MemorySegment name="MBR_PARAMS_PAGE" start="0x0007E000" size="0x1000" access="ReadOnly" />
+  <MemorySegment name="UICR_BOOTLOADER" start="0x10001014" size="0x04" access="ReadOnly" />
+  <MemorySegment name="UICR_MBR_PARAM_PAGE" start="0x10001018" size="0x04" access="ReadOnly" />
+  <MemorySegment name="RAM" start="0x20003000" size="0x4F7C" access="Read/Write" />
+  <MemorySegment name="NOINIT" start="0x20007F80" size="0x80" access="Read/Write" />
+</root>

segger/nRF52840_xxAA_MemoryMap.xml

@@ -0,0 +1,10 @@
+<!DOCTYPE Board_Memory_Definition_File>
+<root name="nRF52840_xxAA">
+  <MemorySegment name="FLASH" start="0x000F4000" size="0xA000" access="ReadOnly" />
+  <MemorySegment name="BOOTLOADER_SETTINGS" start="0x000FF000" size="0x1000" access="ReadOnly" />
+  <MemorySegment name="MBR_PARAMS_PAGE" start="0x000FE000" size="0x1000" access="ReadOnly" />
+  <MemorySegment name="UICR_BOOTLOADER" start="0x10001014" size="0x04" access="ReadOnly" />
+  <MemorySegment name="UICR_MBR_PARAM_PAGE" start="0x10001018" size="0x04" access="ReadOnly" />
+  <MemorySegment name="RAM" start="0x20008000" size="0x38000" access="Read/Write" />
+  <MemorySegment name="NOINIT" start="0x20007F80" size="0x80" access="Read/Write" />
+</root>

segger/nRF_Target.js

@@ -0,0 +1,19 @@
+/*****************************************************************************
+ *                   SEGGER Microcontroller GmbH & Co. KG                    *
+ *            Solutions for real time microcontroller applications           *
+ *****************************************************************************
+ *                                                                           *
+ *               (c) 2017 SEGGER Microcontroller GmbH & Co. KG               *
+ *                                                                           *
+ *           Internet: www.segger.com   Support: support@segger.com          *
+ *                                                                           *
+ *****************************************************************************/
+
+function Reset() {
+  TargetInterface.resetAndStop();
+}
+
+function EnableTrace(traceInterfaceType) {
+  // TODO: Enable trace
+}
+

segger/thumb_crt0.s

@@ -0,0 +1,420 @@
+// SEGGER Embedded Studio, runtime support.
+//
+// Copyright (c) 2014-2017 SEGGER Microcontroller GmbH & Co KG
+// Copyright (c) 2001-2017 Rowley Associates Limited.
+//
+// This file may be distributed under the terms of the License Agreement
+// provided with this software.
+//
+// THIS FILE IS PROVIDED AS IS WITH NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+//
+//                           Preprocessor Definitions
+//                           ------------------------
+// APP_ENTRY_POINT
+//
+//   Defines the application entry point function, if undefined this setting
+//   defaults to "main".
+//
+// INITIALIZE_STACK
+//
+//   If defined, the contents of the stack will be initialized to a the
+//   value 0xCC.
+//
+// INITIALIZE_SECONDARY_SECTIONS
+//
+//   If defined, the .data2, .text2, .rodata2 and .bss2 sections will be initialized.
+//
+// INITIALIZE_TCM_SECTIONS
+//
+//   If defined, the .data_tcm, .text_tcm, .rodata_tcm and .bss_tcm sections 
+//   will be initialized.
+//
+// INITIALIZE_USER_SECTIONS
+//
+//   If defined, the function InitializeUserMemorySections will be called prior
+//   to entering main in order to allow the user to initialize any user defined
+//   memory sections.
+//
+// FULL_LIBRARY
+//
+//  If defined then 
+//    - argc, argv are setup by the debug_getargs.
+//    - the exit symbol is defined and executes on return from main.
+//    - the exit symbol calls destructors, atexit functions and then debug_exit.
+//  
+//  If not defined then
+//    - argc and argv are zero.
+//    - the exit symbol is defined, executes on return from main and loops
+//
+
+#ifndef APP_ENTRY_POINT
+#define APP_ENTRY_POINT main
+#endif
+
+#ifndef ARGSSPACE
+#define ARGSSPACE 128
+#endif
+  .syntax unified
+
+  .global _start
+  .extern APP_ENTRY_POINT
+  .global exit
+  .weak exit
+
+#ifdef INITIALIZE_USER_SECTIONS
+  .extern InitializeUserMemorySections
+#endif
+
+  .section .init, "ax"
+  .code 16
+  .align 2
+  .thumb_func
+
+_start:
+  /* Set up main stack if size > 0 */
+  ldr r1, =__stack_end__
+  ldr r0, =__stack_start__
+  subs r2, r1, r0
+  beq 1f
+#ifdef __ARM_EABI__
+  movs r2, #0x7
+  bics r1, r2
+#endif
+  mov sp, r1
+#ifdef INITIALIZE_STACK
+  movs r2, #0xCC
+  ldr r0, =__stack_start__
+  bl memory_set
+#endif
+1:
+
+  /* Set up process stack if size > 0 */
+  ldr r1, =__stack_process_end__
+  ldr r0, =__stack_process_start__
+  subs r2, r1, r0
+  beq 1f
+#ifdef __ARM_EABI__
+  movs r2, #0x7
+  bics r1, r2
+#endif
+  msr psp, r1
+  movs r2, #2
+  msr control, r2
+#ifdef INITIALIZE_STACK
+  movs r2, #0xCC
+  bl memory_set
+#endif
+1:
+
+  /* Copy initialized memory sections into RAM (if necessary). */
+  ldr r0, =__data_load_start__
+  ldr r1, =__data_start__
+  ldr r2, =__data_end__
+  bl memory_copy
+  ldr r0, =__text_load_start__
+  ldr r1, =__text_start__
+  ldr r2, =__text_end__
+  bl memory_copy
+  ldr r0, =__fast_load_start__
+  ldr r1, =__fast_start__
+  ldr r2, =__fast_end__
+  bl memory_copy
+  ldr r0, =__ctors_load_start__
+  ldr r1, =__ctors_start__
+  ldr r2, =__ctors_end__
+  bl memory_copy
+  ldr r0, =__dtors_load_start__
+  ldr r1, =__dtors_start__
+  ldr r2, =__dtors_end__
+  bl memory_copy
+  ldr r0, =__rodata_load_start__
+  ldr r1, =__rodata_start__
+  ldr r2, =__rodata_end__
+  bl memory_copy
+  ldr r0, =__tdata_load_start__
+  ldr r1, =__tdata_start__
+  ldr r2, =__tdata_end__
+  bl memory_copy
+#ifdef INITIALIZE_SECONDARY_SECTIONS
+  ldr r0, =__data2_load_start__
+  ldr r1, =__data2_start__
+  ldr r2, =__data2_end__
+  bl memory_copy
+  ldr r0, =__text2_load_start__
+  ldr r1, =__text2_start__
+  ldr r2, =__text2_end__
+  bl memory_copy
+  ldr r0, =__rodata2_load_start__
+  ldr r1, =__rodata2_start__
+  ldr r2, =__rodata2_end__
+  bl memory_copy
+#endif /* #ifdef INITIALIZE_SECONDARY_SECTIONS */
+#ifdef INITIALIZE_TCM_SECTIONS
+  ldr r0, =__data_tcm_load_start__
+  ldr r1, =__data_tcm_start__
+  ldr r2, =__data_tcm_end__
+  bl memory_copy
+  ldr r0, =__text_tcm_load_start__
+  ldr r1, =__text_tcm_start__
+  ldr r2, =__text_tcm_end__
+  bl memory_copy
+  ldr r0, =__rodata_tcm_load_start__
+  ldr r1, =__rodata_tcm_start__
+  ldr r2, =__rodata_tcm_end__
+  bl memory_copy
+#endif /* #ifdef INITIALIZE_TCM_SECTIONS */
+
+  /* Zero the bss. */
+  ldr r0, =__bss_start__
+  ldr r1, =__bss_end__
+  movs r2, #0
+  bl memory_set
+  ldr r0, =__tbss_start__
+  ldr r1, =__tbss_end__
+  movs r2, #0
+  bl memory_set
+#ifdef INITIALIZE_SECONDARY_SECTIONS
+  ldr r0, =__bss2_start__
+  ldr r1, =__bss2_end__
+  mov r2, #0
+  bl memory_set
+#endif /* #ifdef INITIALIZE_SECONDARY_SECTIONS */
+#ifdef INITIALIZE_TCM_SECTIONS
+  ldr r0, =__bss_tcm_start__
+  ldr r1, =__bss_tcm_end__
+  mov r2, #0
+  bl memory_set
+#endif /* #ifdef INITIALIZE_TCM_SECTIONS */
+
+  /* Initialize the heap */
+  ldr r0, = __heap_start__
+  ldr r1, = __heap_end__
+  subs r1, r1, r0
+  cmp r1, #8
+  blt 1f
+  movs r2, #0
+  str r2, [r0]
+  adds r0, r0, #4
+  str r1, [r0]
+1:
+
+#ifdef INITIALIZE_USER_SECTIONS
+  ldr r2, =InitializeUserMemorySections
+  blx r2
+#endif
+
+  /* Call constructors */
+  ldr r0, =__ctors_start__
+  ldr r1, =__ctors_end__
+ctor_loop:
+  cmp r0, r1
+  beq ctor_end
+  ldr r2, [r0]
+  adds r0, #4
+  push {r0-r1}  
+  blx r2
+  pop {r0-r1}
+  b ctor_loop
+ctor_end:
+
+  /* Setup initial call frame */
+  movs r0, #0
+  mov lr, r0
+  mov r12, sp
+
+  .type start, function
+start:
+  /* Jump to application entry point */
+#ifdef FULL_LIBRARY
+  movs r0, #ARGSSPACE
+  ldr r1, =args
+  ldr r2, =debug_getargs  
+  blx r2
+  ldr r1, =args
+#else
+  movs r0, #0
+  movs r1, #0
+#endif
+  ldr r2, =APP_ENTRY_POINT
+  blx r2
+
+  .thumb_func
+exit:
+#ifdef FULL_LIBRARY  
+  mov r5, r0 // save the exit parameter/return result
+
+  /* Call destructors */
+  ldr r0, =__dtors_start__
+  ldr r1, =__dtors_end__
+dtor_loop:
+  cmp r0, r1
+  beq dtor_end
+  ldr r2, [r0]
+  add r0, #4
+  push {r0-r1}
+  blx r2
+  pop {r0-r1}
+  b dtor_loop
+dtor_end:
+
+  /* Call atexit functions */
+  ldr r2, =_execute_at_exit_fns  
+  blx r2
+
+  /* Call debug_exit with return result/exit parameter */
+  mov r0, r5
+  ldr r2, =debug_exit  
+  blx r2
+#endif
+
+  /* Returned from application entry point, loop forever. */
+exit_loop:
+  b exit_loop
+
+  .thumb_func
+memory_copy:
+  cmp r0, r1
+  beq 2f
+  subs r2, r2, r1
+  beq 2f
+1:
+  ldrb r3, [r0]
+  adds r0, r0, #1
+  strb r3, [r1]
+  adds r1, r1, #1
+  subs r2, r2, #1
+  bne 1b
+2:
+  bx lr
+
+  .thumb_func
+memory_set:
+  cmp r0, r1
+  beq 1f
+  strb r2, [r0]
+  adds r0, r0, #1
+  b memory_set
+1:
+  bx lr
+
+  // default C/C++ library helpers
+
+.macro HELPER helper_name
+  .section .text.\helper_name, "ax", %progbits
+  .global \helper_name
+  .weak \helper_name  
+\helper_name:
+  .thumb_func
+.endm
+
+.macro JUMPTO name
+#if defined(__thumb__) && !defined(__thumb2__)
+  mov r12, r0
+  ldr r0, =\name
+  push {r0}
+  mov r0, r12
+  pop {pc}
+#else
+  b \name
+#endif
+.endm
+
+HELPER __aeabi_read_tp
+  ldr r0, =__tbss_start__-8
+  bx lr
+HELPER __heap_lock
+  bx lr
+HELPER __heap_unlock
+  bx lr
+HELPER __printf_lock
+  bx lr
+HELPER __printf_unlock
+  bx lr
+HELPER __scanf_lock
+  bx lr
+HELPER __scanf_unlock
+  bx lr
+HELPER __debug_io_lock
+  bx lr
+HELPER __debug_io_unlock
+  bx lr
+HELPER abort
+  b .
+HELPER __assert
+  b .
+HELPER __aeabi_assert
+  b .
+HELPER __cxa_pure_virtual
+  b .
+HELPER __cxa_guard_acquire
+  ldr r3, [r0]
+#if defined(__thumb__) && !defined(__thumb2__)
+  movs r0, #1
+  tst r3, r0
+#else
+  tst r3, #1
+#endif
+  beq 1f
+  movs r0, #0
+  bx lr
+1:
+  movs r0, #1
+  bx lr
+HELPER __cxa_guard_release
+  movs r3, #1
+  str r3, [r0]
+  bx lr
+HELPER __cxa_guard_abort
+  bx lr
+HELPER __sync_synchronize
+  bx lr
+HELPER __getchar
+  JUMPTO debug_getchar
+HELPER __putchar
+  JUMPTO debug_putchar
+HELPER __open
+  JUMPTO debug_fopen
+HELPER __close
+  JUMPTO debug_fclose
+HELPER __write   
+  mov r3, r0
+  mov r0, r1
+  movs r1, #1  
+  JUMPTO debug_fwrite
+HELPER __read  
+  mov r3, r0
+  mov r0, r1
+  movs r1, #1 
+  JUMPTO debug_fread
+HELPER __seek
+  push {r4, lr}
+  mov r4, r0
+  bl debug_fseek
+  cmp r0, #0
+  bne 1f
+  mov r0, r4
+  bl debug_ftell
+  pop {r4, pc}
+1:
+  ldr r0, =-1
+  pop {r4, pc}
+  // char __user_locale_name_buffer[];
+  .section .bss.__user_locale_name_buffer, "aw", %nobits
+  .global __user_locale_name_buffer
+  .weak __user_locale_name_buffer
+  __user_locale_name_buffer:
+  .word 0x0
+
+#ifdef FULL_LIBRARY
+  .bss
+args:
+  .space ARGSSPACE
+#endif
+
+  /* Setup attibutes of stack and heap sections so they don't take up room in the elf file */
+  .section .stack, "wa", %nobits
+  .section .stack_process, "wa", %nobits
+  .section .heap, "wa", %nobits
+

src/boards/adm_b_nrf52840_1/board.h

@@ -1,64 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef ADM_B_NRF52840_1_H
-#define ADM_B_NRF52840_1_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER     1
-#define LED_PRIMARY_PIN PINNUM(0, 19) // Red
-// #define LED_SECONDARY_PIN 12 // Blue
-#define LED_STATE_ON 0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-
-#define BUTTON_DFU     PINNUM(0, 11)
-#define BUTTON_DFU_OTA PINNUM(0, 12)
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Atelier-Du-Maker"
-#define BLEDIS_MODEL        "ADM_B_NRF52840_1"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x009F
-#define USB_DESC_CDC_ONLY_PID 0x009F
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "AtelierDuMaker NRF52840 Breakout"
-#define UF2_VOLUME_LABEL "ADM840BOOT"
-#define UF2_BOARD_ID     "ADM_B_NRF52840_1"
-#define UF2_INDEX_URL    "https://github.com/Atelier-Du-Maker/HolyIoT_NRF52840"
-
-#endif // ADM_B_NRF52840_1_H

src/boards/ae_bl652_bo/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52)

src/boards/ae_bl652_bo/board.h

@@ -1,58 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _AE_BL652_BO_H
-#define _AE_BL652_BO_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       2
-#define LED_PRIMARY_PIN   17 // LED1
-#define LED_SECONDARY_PIN 19 // LED2
-#define LED_STATE_ON      1
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     11 // BTN1
-#define BUTTON_DFU_OTA 15 // BTN2
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-/*------------------------------------------------------------------*/
-/* UART (only used by nRF52832)
- *------------------------------------------------------------------*/
-#define RX_PIN_NUMBER  8
-#define TX_PIN_NUMBER  6
-#define CTS_PIN_NUMBER 0
-#define RTS_PIN_NUMBER 0
-#define HWFC           false
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Akizuki Denshi Tsusho"
-#define BLEDIS_MODEL        "AE-BL652-BO"
-
-#endif // _AE_BL652_BO_H

src/boards/ae_bl652_bo/board.mk

@@ -1,2 +0,0 @@
-# nrf52 is nrf52832
-MCU_SUB_VARIANT = nrf52

src/boards/aramcon2_badge/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/aramcon2_badge/board.h

@@ -1,62 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Benjamin Meisels
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _ARAMCON2_BADGE_H
-#define _ARAMCON2_BADGE_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          1
-#define LED_PRIMARY_PIN      PINNUM(1, 11) // Red
-
-#define LED_NEOPIXEL         PINNUM(0, 8)
-#define NEOPIXELS_NUMBER     2
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(0, 2)  // left Button
-#define BUTTON_DFU_OTA PINNUM(0, 29) // middle button
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-// Used as model string in OTA mode
-#define BLEDIS_MANUFACTURER "ARAMCON Badge Team"
-#define BLEDIS_MODEL        "ARAMCON2 Badge"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x007B
-#define USB_DESC_CDC_ONLY_PID 0x007B
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "ARAMCON2 Badge"
-#define UF2_VOLUME_LABEL "ARAMBOOT"
-#define UF2_BOARD_ID     "nrf52840-ARAMCON2-Badge"
-#define UF2_INDEX_URL    "https://github.com/aramcon-badge"
-
-#endif // _ARAMCON2_BADGE_H

src/boards/aramcon_badge_2019/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/aramcon_badge_2019/board.h

@@ -1,65 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2019 Uri Shaked
- * Copyright (c) 2019 Benjamin Meisels
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _ARAMCON_BADGE_2019_H
-#define _ARAMCON_BADGE_2019_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          1
-#define LED_PRIMARY_PIN      PINNUM(1, 11) // Red
-
-#define LED_NEOPIXEL         PINNUM(0, 8)
-#define NEOPIXELS_NUMBER     4
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(0, 2)  // left Button
-#define BUTTON_DFU_OTA PINNUM(0, 29) // middle button
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "ARAMCON Badge Team"
-#define BLEDIS_MODEL        "ARAMCON Badge 2019"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x0079
-#define USB_DESC_CDC_ONLY_PID 0x0079
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "ARAMCON Badge 2019"
-#define UF2_VOLUME_LABEL "ARAMBOOT"
-#define UF2_BOARD_ID     "nrf52840-ARAMCON-Badge-2019"
-#define UF2_INDEX_URL    "https://github.com/aramcon-badge"
-
-#endif // _ARAMCON_BADGE_2019_H

src/boards/arduino_nano_33_ble/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/arduino_nano_33_ble/board.h

@@ -1,61 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _ARDUINOBLE33_NRF52840_H
-#define _ARDUINOBLE33_NRF52840_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER     1 // red LED
-#define LED_PRIMARY_PIN PINNUM(0, 24)
-#define LED_STATE_ON    0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(1, 11) // D2 switch
-#define BUTTON_DFU_OTA PINNUM(1, 12) // D3 switch
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Arduino"
-#define BLEDIS_MODEL        "Nano 33 BLE"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x0063
-#define USB_DESC_CDC_ONLY_PID 0x0064
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "Arduino Nano 33 BLE"
-#define UF2_VOLUME_LABEL "NANO33BOOT"
-#define UF2_BOARD_ID     "nRF52840-Nano-33"
-#define UF2_INDEX_URL    "https://www.arduino.cc/"
-
-#endif // _ITSY_NRF52840_H

src/boards/arduino_nano_33_ble/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/bast_ble/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/bast_ble/board.h

@@ -1,62 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _BASTBLE_NRF52840_H
-#define _BASTBLE_NRF52840_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER     1 // red LED
-#define LED_PRIMARY_PIN PINNUM(0, 24)
-#define LED_STATE_ON    0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(0, 05)
-#define BUTTON_DFU_OTA PINNUM(0, 10)
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "ElectronicCats"
-#define BLEDIS_MODEL        "BastBLE"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-
-// Shared VID/PID with Feather nRF52840, will be disabled for building in the future
-#define USB_DESC_VID          0x1209
-#define USB_DESC_UF2_PID      0x805A
-#define USB_DESC_CDC_ONLY_PID 0x805A
-
-#define UF2_PRODUCT_NAME      "Bast BLE"
-#define UF2_VOLUME_LABEL      "BASTBLE"
-#define UF2_BOARD_ID          "Bast-ble-v1"
-#define UF2_INDEX_URL         "https://www.electroniccats.com"
-
-#endif // _BASTBLE_NRF52840_H

src/boards/bast_ble/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/bluemicro_nrf52833/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52833)

src/boards/bluemicro_nrf52833/board.h

@@ -1,66 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Pierre Constantineau
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _BLUEMICRO_NRF52833_H
-#define _BLUEMICRO_NRF52833_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          2
-#define LED_PRIMARY_PIN      PINNUM(1, 4)
-#define LED_SECONDARY_PIN    PINNUM(0, 25)
-#define LED_STATE_ON         1
-
-#define LED_NEOPIXEL         PINNUM(0, 7)
-#define NEOPIXELS_NUMBER     1
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(0, 18) // unusable: RESET
-#define BUTTON_DFU_OTA PINNUM(1, 1)  // no connection on E73-2G4M08S1E Module
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "BlueMicro"
-#define BLEDIS_MODEL        "BlueMicro 833"
-
-//--------------------------------------------------------------------+
-// USB PID from openmoko:
-// PR https://github.com/openmoko/openmoko-usb-oui/pull/34
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x1d50
-#define USB_DESC_UF2_PID      0x616f
-#define USB_DESC_CDC_ONLY_PID 0x616f
-
-#define UF2_PRODUCT_NAME      "BlueMicro"
-#define UF2_VOLUME_LABEL      "BLUEMICRO"
-#define UF2_BOARD_ID          "nRF52833-BlueMicro-v1"
-#define UF2_INDEX_URL         "http://bluemicro.jpconstantineau.com/"
-
-#endif // _BLUEMICRO_H

src/boards/bluemicro_nrf52833/board.mk

@@ -1,2 +0,0 @@
-MCU_SUB_VARIANT = nrf52833
-SD_VERSION=7.2.0

src/boards/bluemicro_nrf52833/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x80000,                                 // FLASH_BYTES
-  205, 0x20000,                                 // RAM_BYTES
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0x621e937a,                              // UF2_FAMILY = 0x621e937a
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/bluemicro_nrf52840/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/bluemicro_nrf52840/board.h

@@ -1,62 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Pierre Constantineau
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _BLUEMICRO_NRF52840_H
-#define _BLUEMICRO_NRF52840_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       2
-#define LED_PRIMARY_PIN   PINNUM(1, 4)
-#define LED_SECONDARY_PIN PINNUM(1, 10)
-#define LED_STATE_ON      1
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(0, 18) // unusable: RESET
-#define BUTTON_DFU_OTA PINNUM(1, 1)  // no connection on E73-2G4M08S1C Module
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "BlueMicro"
-#define BLEDIS_MODEL        "BlueMicro 840"
-
-//--------------------------------------------------------------------+
-// USB PID from openmoko:
-// Approved PR https://github.com/openmoko/openmoko-usb-oui/pull/20
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x1d50
-#define USB_DESC_UF2_PID      0x6160
-#define USB_DESC_CDC_ONLY_PID 0x6160
-
-#define UF2_PRODUCT_NAME      "BlueMicro"
-#define UF2_VOLUME_LABEL      "BLUEMICRO"
-#define UF2_BOARD_ID          "nRF52840-BlueMicro-v1"
-#define UF2_INDEX_URL         "http://bluemicro.jpconstantineau.com/"
-
-#endif // _BLUEMICRO_H

src/boards/bluemicro_nrf52840/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/boards.c

@@ -50,7 +50,6 @@ void SysTick_Handler(void) {
   led_tick();
 }
 
-#if defined(BUTTON_DFU) || defined(BUTTON_DFU_OTA)
 void button_init(uint32_t pin) {
   if (BUTTON_PULL == NRF_GPIO_PIN_PULLDOWN) {
     nrf_gpio_cfg_sense_input(pin, BUTTON_PULL, NRF_GPIO_PIN_SENSE_HIGH);
@@ -63,7 +62,6 @@ bool button_pressed(uint32_t pin) {
   uint32_t const active_state = (BUTTON_PULL == NRF_GPIO_PIN_PULLDOWN ? 1 : 0);
   return nrf_gpio_pin_read(pin) == active_state;
 }
-#endif
 
 // This is declared so that a board specific init can be called from here.
 void __attribute__((weak)) board_init2(void) {}
@@ -76,12 +74,8 @@ void board_init(void) {
   NRF_CLOCK->LFCLKSRC = CLOCK_LFCLKSRC_SRC_RC;
   NRF_CLOCK->TASKS_LFCLKSTART = 1UL;
 
-#ifdef BUTTON_DFU
   button_init(BUTTON_DFU);
-#endif
-#ifdef BUTTON_DFU_OTA
-  button_init(BUTTON_DFU_OTA);
-#endif
+  button_init(BUTTON_FRESET);
   NRFX_DELAY_US(100); // wait for the pin state is stable
 
 #if LEDS_NUMBER > 0
@@ -117,12 +111,6 @@ void board_init(void) {
   //     #define UICR_REGOUT0_VALUE UICR_REGOUT0_VOUT_3V3
   // in board.h when using that power configuration.
 #ifdef UICR_REGOUT0_VALUE
-  // for some reason bellow condition is true even though debugger show 3.0V
-  // pyocd> rw 0x10001304
-  // 10001304:  fffffffc
-  // it leads to infinite boot loop. Let wait for NVM to be ready first.
-  NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos;
-  while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
   if ((NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) == (UICR_REGOUT0_VOUT_DEFAULT << UICR_REGOUT0_VOUT_Pos)){
     NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos;
     while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
@@ -131,10 +119,8 @@ void board_init(void) {
 
     NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos;
     while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
-    // to avoid infinity boot loop reset only if REGOUT0 was set correctly
-    if((NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) == (UICR_REGOUT0_VALUE << UICR_REGOUT0_VOUT_Pos)){
-      NVIC_SystemReset();
-    }
+
+    NVIC_SystemReset();
   }
 #endif
 

src/boards/boards.h

@@ -31,13 +31,20 @@
 #include "nrf.h"
 #include "nrf_gpio.h"
 
-#define PINNUM(port, pin) ((port) * 32 + (pin))
 #include "board.h"
 
 #ifndef UF2_VOLUME_LABEL
 #define UF2_VOLUME_LABEL   "NRF52BOOT  "
 #endif
 
+#ifndef BUTTON_DFU
+#define BUTTON_DFU      BUTTON_1
+#endif
+
+#ifndef BUTTON_FRESET
+#define BUTTON_FRESET   BUTTON_2
+#endif
+
 // The primary LED is usually Red but not in all cases.
 #define LED_PRIMARY 0
 // The secondary LED, when available, is usually blue.
@@ -97,10 +104,13 @@ void led_tick(void);
 //--------------------------------------------------------------------+
 // BUTTONS
 //--------------------------------------------------------------------+
-#if defined(BUTTON_DFU) || defined(BUTTON_DFU_OTA)
+// Make sure we have at least two buttons (DFU + FRESET since DFU+FRST=OTA)
+#if BUTTONS_NUMBER < 2
+#error "At least two buttons required in the BSP (see 'BUTTONS_NUMBER')"
+#endif
+
 void button_init(uint32_t pin);
 bool button_pressed(uint32_t pin);
-#endif
 
 bool is_ota(void);
 
@@ -112,6 +122,7 @@ void board_display_init(void);
 void board_display_teardown(void);
 void board_display_draw_line(uint16_t y, uint8_t const* buf, size_t nbytes);
 void screen_draw_drag(void);
+void screen_draw_ble(void);
 #endif
 
 //--------------------------------------------------------------------+

src/boards/challenger_840_ble/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/challenger_840_ble/board.h

@@ -1,70 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries, 2022 Invector Labs
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _CHALLENGER_840_BLE_H
-#define _CHALLENGER_840_BLE_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          1
-#define LED_PRIMARY_PIN      PINNUM(0, 12)
-#define LED_STATE_ON         1
-
-#define LED_NEOPIXEL         PINNUM(1, 8)
-#define NEOPIXELS_NUMBER     1
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(0, 19)
-#define BUTTON_DFU_OTA PINNUM(0, 8) // Pulls flash cs high
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-/*------------------------------------------------------------------*/
-/* On board LDO control
- *------------------------------------------------------------------*/
-#define LDO_CONTROL_PIN PINNUM(1, 9) // Enables external pwr
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Invector Labs"
-#define BLEDIS_MODEL        "Challenger 840 BLE"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x1209
-#define USB_DESC_UF2_PID      0x7380
-#define USB_DESC_CDC_ONLY_PID 0x7381
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "ILabs Challenger 840"
-#define UF2_VOLUME_LABEL "CH840BOOT"
-#define UF2_BOARD_ID     "nRF52840-Challenger-840"
-#define UF2_INDEX_URL    "https://www.ilabs.se"
-
-#endif // _CHALLENGER_840_BLE_H

src/boards/challenger_840_ble/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/challenger_840_ble/pinconfig.c

@@ -1,27 +0,0 @@
-#include "boards.h"
-#include "board.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};
-
-void board_init2(void)
-{
-  // Turn LDO on
-  nrf_gpio_cfg_output(LDO_CONTROL_PIN);
-  nrf_gpio_pin_write(LDO_CONTROL_PIN, 1);
-}

src/boards/circuitplayground_nrf52840/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/circuitplayground_nrf52840/board.h

@@ -1,65 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _CPLAY_NRF52840_H
-#define _CPLAY_NRF52840_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          1
-#define LED_PRIMARY_PIN      PINNUM(1, 14)
-#define LED_STATE_ON         1
-
-#define LED_NEOPIXEL         PINNUM(0, 13)
-#define NEOPIXELS_NUMBER     10
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(1, 02) // left button
-#define BUTTON_DFU_OTA PINNUM(1, 15) // right button
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLDOWN
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Adafruit Industries"
-#define BLEDIS_MODEL        "Circuit Playground nRF52840"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x0045
-#define USB_DESC_CDC_ONLY_PID 0x0045
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "Adafruit Circuit Playground nRF52840"
-#define UF2_VOLUME_LABEL "CPLAYBTBOOT"
-#define UF2_BOARD_ID     "nRF52840-CircuitPlayground-revD"
-#define UF2_INDEX_URL    "https://www.adafruit.com/product/4333"
-
-#endif // _CPLAY_NRF52840_H

src/boards/circuitplayground_nrf52840/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/circuitplayground_nrf52840/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/clue_nrf52840/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/clue_nrf52840/board.h

@@ -1,91 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _CLUE_NRF52840_H
-#define _CLUE_NRF52840_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          1
-#define LED_PRIMARY_PIN      PINNUM(1, 01)
-#define LED_STATE_ON         1
-
-#define LED_NEOPIXEL         PINNUM(0, 16)
-#define NEOPIXELS_NUMBER     1
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(1, 02) // left button
-#define BUTTON_DFU_OTA PINNUM(1, 10) // right button
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// Display
-//--------------------------------------------------------------------+
-#define DISPLAY_CONTROLLER_ST7789
-
-#define DISPLAY_PIN_SCK    PINNUM(0, 14)
-#define DISPLAY_PIN_MOSI   PINNUM(0, 15)
-
-#define DISPLAY_PIN_CS     PINNUM(0, 12)
-#define DISPLAY_PIN_DC     PINNUM(0, 13)
-#define DISPLAY_PIN_RST    PINNUM(1, 3)
-#define DISPLAY_PIN_BL     PINNUM(1, 5)
-#define DISPLAY_BL_ON      1 // GPIO state to enable back light
-
-#define DISPLAY_WIDTH      240
-#define DISPLAY_HEIGHT     240
-
-#define DISPLAY_COL_OFFSET 0
-#define DISPLAY_ROW_OFFSET 80
-
-// Memory Data Access Control & // Vertical Scroll Start Address
-#define DISPLAY_MADCTL (TFT_MADCTL_MY)
-#define DISPLAY_VSCSAD 0
-
-#define DISPLAY_TITLE  "CLUE"
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Adafruit Industries"
-#define BLEDIS_MODEL        "CLUE nRF52840"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x0071
-#define USB_DESC_CDC_ONLY_PID 0x0071
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "Adafruit CLUE nRF52840"
-#define UF2_VOLUME_LABEL "CLUEBOOT"
-#define UF2_BOARD_ID     "nRF52840-CLUE-revA"
-#define UF2_INDEX_URL    "https://www.adafruit.com/product/4500"
-
-#endif // _CLUE_NRF52840_H

src/boards/clue_nrf52840/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/clue_nrf52840/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/ebyte_e104_bt5032a/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52)

src/boards/ebyte_e104_bt5032a/board.h

@@ -1,66 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Pierre Constantineau
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _EBYTE_E104_BT5032A_H
-#define _EBYTE_E104_BT5032A_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       2
-#define LED_PRIMARY_PIN   31 // Red  - named "Data"
-#define LED_SECONDARY_PIN 30 // Blue - named "Link" (also a red one on the Test Board)
-#define LED_STATE_ON      0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU                                                     \
-  29                      // DISC Button on E104-BT5032A-TB Test Board
-                          // BUTTON_DFU is DFU.  The module does not have reset circuitry.
-                          // The Test Board from Ebyte (E104-BT5032A-TB) also does not have reset circuitry
-                          // To be able to upload using the Arduino IDE, (To enter DFU mode)
-                          // Press "DISC", press and release "RST", then release "DISC"
-#define BUTTON_DFU_OTA 28 // No button - WKP pin
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-/*------------------------------------------------------------------*/
-/* UART (only used by nRF52832)
- *------------------------------------------------------------------*/
-#define RX_PIN_NUMBER  14
-#define TX_PIN_NUMBER  18
-#define CTS_PIN_NUMBER 20
-#define RTS_PIN_NUMBER 19
-#define HWFC           false // leaving it false to make GPIO available
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "CDEBYTE"
-#define BLEDIS_MODEL        "E104-BT5032A"
-
-#define UF2_PRODUCT_NAME    "Ebyte E104-BT5032A nRF52832"
-#define UF2_INDEX_URL       "https://www.ebyte.com/en/product-view-news.html?id=756"
-
-#endif // _EBYTE_E104_BT5032A_H

src/boards/ebyte_e104_bt5032a/board.mk

@@ -1,2 +0,0 @@
-# nrf52 is nrf52832
-MCU_SUB_VARIANT = nrf52

src/boards/ebyte_e73_tbb/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52)

src/boards/ebyte_e73_tbb/board.h

@@ -1,67 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Pierre Constantineau
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _EBYTE_E73_TBB_H
-#define _EBYTE_E73_TBB_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       2
-#define LED_PRIMARY_PIN   17 // Red  - named "LED1"
-#define LED_SECONDARY_PIN 18 // Blue - named "LED2" (also a red one on the Test Board)
-#define LED_STATE_ON      0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU                                                          \
-  14                      // BUTTON_DFU is DFU.  SW1 on E73-TBB Test Board.
-                          // This Test board uses the E73-2G4M04S1B module which contains a nrf52832.
-                          // The module does not have reset circuitry.
-                          // The Test Board from Ebyte (E73-TBB) also does not have reset circuitry
-                          // To be able to upload using the Arduino IDE, (To enter DFU mode)
-                          // Press "SW1", momentarily ground "RST/P0.21", then release "SW1"
-#define BUTTON_DFU_OTA 13 // SW2 on board
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-/*------------------------------------------------------------------*/
-/* UART (only used by nRF52832)
- *------------------------------------------------------------------*/
-#define RX_PIN_NUMBER  8
-#define TX_PIN_NUMBER  6
-#define CTS_PIN_NUMBER 5
-#define RTS_PIN_NUMBER 7
-#define HWFC           false // leaving it false to make GPIO available
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "CDEBYTE"
-#define BLEDIS_MODEL        "E73-TBB"
-
-#define UF2_PRODUCT_NAME    "Ebyte E73-TBB nRF52832"
-#define UF2_INDEX_URL       "https://www.ebyte.com/en/product-view-news.aspx?id=889"
-
-#endif // _EBYTE_E73_TBB_H

src/boards/ebyte_e73_tbb/board.mk

@@ -1,2 +0,0 @@
-# nrf52 is nrf52832
-MCU_SUB_VARIANT = nrf52

src/boards/electronut_labs_papyr/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/electronut_labs_papyr/board.h

@@ -1,66 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * @author   Tavish Naruka <tavish@electronut.in>
- *
- * Copyright (c) 2018 Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef PAPYR_H
-#define PAPYR_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       2
-#define LED_PRIMARY_PIN   13
-#define LED_SECONDARY_PIN 14
-#define LED_STATE_ON      0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-// NOTE: USB UF2 bootloader can be triggered by double pressing RESET
-// App can trigger OTA bootloader by writing DFU_MAGIC_OTA_APPJUM to
-// GPREGRET register if softdevice is not initialized; or by
-// writing DFU_MAGIC_OTA_RESET in case softdevice is initialized.
-#define BUTTON_DFU     18 // RESET also by default
-#define BUTTON_DFU_OTA 1  // P0.1 not exposed anywhere, FRST n/a
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Electronut Labs"
-#define BLEDIS_MODEL        "Papyr"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define UF2_PRODUCT_NAME      "Electronut Labs Papyr"
-#define UF2_BOARD_ID          "nRF52840-Papyr-v1"
-#define UF2_INDEX_URL         "https://docs.electronut.in/papyr"
-
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x003B
-#define USB_DESC_CDC_ONLY_PID 0x003B
-
-#endif // PPAPYR_H

src/boards/electronut_labs_papyr/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/electronut_labs_papyr/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/feather_nrf52832/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52)

src/boards/feather_nrf52832/board.h

@@ -1,61 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _FEATHER_NRF52832_H
-#define _FEATHER_NRF52832_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       2
-#define LED_PRIMARY_PIN   17 // Red
-#define LED_SECONDARY_PIN 19 // Blue
-#define LED_STATE_ON      1
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     20
-#define BUTTON_DFU_OTA 22
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-/*------------------------------------------------------------------*/
-/* UART (only used by nRF52832)
- *------------------------------------------------------------------*/
-#define RX_PIN_NUMBER  8
-#define TX_PIN_NUMBER  6
-#define CTS_PIN_NUMBER 0
-#define RTS_PIN_NUMBER 0
-#define HWFC           false
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Adafruit Industries"
-#define BLEDIS_MODEL        "Feather nRF52832"
-
-#define UF2_PRODUCT_NAME    "Adafruit Feather nRF52832"
-#define UF2_INDEX_URL       "https://www.adafruit.com/product/3406"
-
-#endif // _FEATHER_NRF52832_H

src/boards/feather_nrf52832/board.mk

@@ -1,2 +0,0 @@
-# nrf52 is nrf52832
-MCU_SUB_VARIANT = nrf52

src/boards/feather_nrf52840_express/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/feather_nrf52840_express/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840

src/boards/feather_nrf52840_express/pinconfig.c

@@ -1,19 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-  CFG_MAGIC0, CFG_MAGIC1,                       // magic
-  5, 100,                                       // used entries, total entries
-
-  204, 0x100000,                                // FLASH_BYTES = 0x100000
-  205, 0x40000,                                 // RAM_BYTES = 0x40000
-  208, (USB_DESC_VID << 16) | USB_DESC_UF2_PID, // BOOTLOADER_BOARD_ID = USB VID+PID, used for verification when updating bootloader via uf2
-  209, 0xada52840,                              // UF2_FAMILY = 0xada52840
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/feather_nrf52840_sense/board.cmake

@@ -1 +0,0 @@
-set(MCU_VARIANT nrf52840)

src/boards/feather_nrf52840_sense/board.h

@@ -1,66 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#ifndef _FEATHER_NRF52840_SENSE_H
-#define _FEATHER_NRF52840_SENSE_H
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          2
-#define LED_PRIMARY_PIN      PINNUM(1, 9)
-#define LED_SECONDARY_PIN    PINNUM(1, 10)
-#define LED_STATE_ON         1
-
-#define LED_NEOPIXEL         PINNUM(0, 16)
-#define NEOPIXELS_NUMBER     1
-#define BOARD_RGB_BRIGHTNESS 0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTON_DFU     PINNUM(1, 02)
-#define BUTTON_DFU_OTA PINNUM(0, 10)
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER "Adafruit Industries"
-#define BLEDIS_MODEL        "Feather nRF52840 Sense"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID          0x239A
-#define USB_DESC_UF2_PID      0x0087
-#define USB_DESC_CDC_ONLY_PID 0x0088
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME "Adafruit Feather nRF52840 Sense"
-#define UF2_VOLUME_LABEL "FTHRSNSBOOT"
-#define UF2_BOARD_ID     "nRF52840-Feather-Sense"
-#define UF2_INDEX_URL    "https://www.adafruit.com/product/4516"
-
-#endif // _FEATHER_NRF52840_SENSE_H

src/boards/feather_nrf52840_sense/board.mk

@@ -1 +0,0 @@
-MCU_SUB_VARIANT = nrf52840