add rak4631 board

fix: array subscript 0 outside array bounds

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,10 +3,8 @@
 *By completing this PR sufficiently, you help us to review this Pull Request quicker and also help improve the quality of Release Notes*
 
 - [ ] Please provide specific title of the PR describing the change
-- [ ] Please provide related links (*eg. Issue which will be closed by this Pull Request*)
 - [ ] If you are adding an new boards, please make sure
   - [ ] Provide link to your allocated VID/PID if applicable
-  - [ ] Add your board to [action ci](/.github/workflows) in correct workflow and alphabet order for release binary
   - [ ] `UF2_BOARD_ID` in your board.h follow correct format from [uf2 specs](https://github.com/microsoft/uf2#files-exposed-by-bootloaders)
 
 *This checklist items that are not applicable to your PR can be deleted.*

.github/workflows/githubci.yml

@@ -1,104 +1,59 @@
 name: Build
 
 on:
-  pull_request:
-  push:
-  repository_dispatch:
+  #  pull_request:
+  #  push:
+  #  repository_dispatch:
   release:
     types:
       - created
 
 jobs:
+  set-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set matrix
+        id: set-matrix
+        working-directory: src/boards
+        run: |
+          MATRIX_JSON=$(ls -d */ | sed 's/\/$//' | jq -R -s -c 'split("\n")[:-1]')
+          echo "matrix=$MATRIX_JSON"
+          echo "matrix=$MATRIX_JSON" >> $GITHUB_OUTPUT
+
   build:
+    needs: set-matrix
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        board:
-          # Adafruit Boards
-          - 'circuitplayground_nrf52840'
-          - 'clue_nrf52840'
-          - 'feather_nrf52832'
-          - 'feather_nrf52833_express'
-          - 'feather_nrf52840_express'
-          - 'feather_nrf52840_sense'
-          - 'feather_nrf52840_sense_tft'
-          - 'itsybitsy_nrf52840_express'
-          - 'metro_nrf52840_express'
-          - 'ledglasses_nrf52840'
-          # Other Makers (Alphabetical order)
-          - 'adm_b_nrf52840_1'
-          - 'ae_bl652_bo'
-          - 'aramcon_badge_2019'
-          - 'aramcon2_badge'
-          - 'arcade_feather_nrf52840_express'
-          - 'arduino_nano_33_ble'
-          - 'bast_ble'
-          - 'bluemicro_nrf52833'
-          - 'bluemicro_nrf52840'
-          - 'challenger_840_ble'
-          - 'ebyte_e104_bt5032a'
-          - 'ebyte_e73_tbb'
-          - 'electronut_labs_papyr'
-          - 'ikigaisense_vita'
-          - 'm60_keyboard'
-          - 'mdk_nrf52840_dongle'
-          - 'mikoto'
-          - 'nice_nano'
-          - 'nrf52840_bboard'
-          - 'nRF52840_connect_kit'
-          - 'nrf52840_m2'
-          - 'ohs2020_badge'
-          - 'particle_argon'
-          - 'particle_boron'
-          - 'particle_xenon'
-          - 'pca10056'
-          - 'pca10059'
-          - 'pca10100'
-          - 'pitaya_go'
-          - 'raytac_mdbt50q_db_40'
-          - 'raytac_mdbt50q_rx'
-          - 'sparkfun_nrf52840_micromod'
-          - 'waveshare_nrf52840_eval'
-          - 'xiao_nrf52840_ble'
-          - 'xiao_nrf52840_ble_sense'
-                    
+        board: ${{ fromJSON(needs.set-matrix.outputs.matrix) }}
     steps:
-    - name: Setup Python
-      uses: actions/setup-python@v3
-
     - name: Checkout Code
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
         submodules: true
 
-    - name: Checkout linkermap
-      uses: actions/checkout@v4
-      with:
-         repository: hathach/linkermap
-         path: linkermap
-
     - name: Install ARM GCC
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
-        release: '10-2020-q4'
+        release: '12.3.Rel1'
 
     - name: Install Tools
       run: |
         pip3 install adafruit-nrfutil uritemplate requests intelhex setuptools
-        pip3 install linkermap/
 
     - name: Build
       run: |
-        arm-none-eabi-gcc --version
         make BOARD=${{ matrix.board }} all
         make BOARD=${{ matrix.board }} copy-artifact
 
-    - name: Linker Map
-      run: make BOARD=${{ matrix.board }} linkermap
-
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.board }}
         path: _bin/${{ matrix.board }}

CMakeLists.txt

@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.17)
+find_package(Python COMPONENTS Interpreter)
 
 if (NOT DEFINED BOARD)
   message(FATAL_ERROR "BOARD is not defined")
@@ -24,26 +25,31 @@ set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_LIST_DIR}/cmake/toolchain/arm_${TOOLCHA
 
 project(Adafruit_nRF52_Bootloader C ASM)
 
-set(NRFX ${CMAKE_CURRENT_LIST_DIR}/lib/nrfx)
-set(SDK11 ${CMAKE_CURRENT_LIST_DIR}/lib/sdk11/components)
-set(SDK ${CMAKE_CURRENT_LIST_DIR}/lib/sdk/components)
-set(SOFTDEVICE ${CMAKE_CURRENT_LIST_DIR}/lib/softdevice)
-set(TUSB ${CMAKE_CURRENT_LIST_DIR}/lib/tinyusb/src)
+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(TINYUSB_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/tinyusb/src)
+
+set(UF2CONV_PY ${CMAKE_CURRENT_LIST_DIR}/lib/uf2/utils/uf2conv.py)
+set(UF2_FAMILY_ID_BOOTLOADER 0xd663823c)
 
 #-------------------
 # Bootloader
 #-------------------
 set(CMAKE_EXECUTABLE_SUFFIX .elf)
 add_executable(bootloader)
-#set_target_properties(bootloader PROPERTIES OUTPUT_NAME "${BOARD}_bootloader.elf")
-
 
 # SD_VERSION can be overwritten by board.cmake
 if(NOT DEFINED SD_VERSION)
-  set(SD_VERSION 6.1.1)
+  if(MCU_VARIANT STREQUAL "nrf52833")
+    set(SD_VERSION 7.3.0)
+  else()
+    set(SD_VERSION 6.1.1)
+  endif()
 endif ()
 
-set(MBR_HEX ${SOFTDEVICE}/mbr/hex/mbr_nrf52_2.4.1_mbr.hex)
+set(MBR_HEX ${SOFTDEVICE_DIR}/mbr/hex/mbr_nrf52_2.4.1_mbr.hex)
 
 target_sources(bootloader PUBLIC
   # src
@@ -51,33 +57,35 @@ target_sources(bootloader PUBLIC
   src/dfu_init.c
   src/flash_nrf5x.c
   src/main.c
+  src/screen.c
+  src/images.c
   src/boards/boards.c
   # nrfx
-  ${NRFX}/drivers/src/nrfx_power.c
-  ${NRFX}/drivers/src/nrfx_nvmc.c
-  ${NRFX}/mdk/system_${MCU_VARIANT}.c
+  ${NRFX_DIR}/drivers/src/nrfx_power.c
+  ${NRFX_DIR}/drivers/src/nrfx_nvmc.c
+  ${NRFX_DIR}/mdk/system_${MCU_VARIANT}.c
   # sdk 11
-  ${SDK11}/libraries/bootloader_dfu/bootloader.c
-  ${SDK11}/libraries/bootloader_dfu/bootloader_settings.c
-  ${SDK11}/libraries/bootloader_dfu/bootloader_util.c
-  ${SDK11}/libraries/bootloader_dfu/dfu_transport_serial.c
-  ${SDK11}/libraries/bootloader_dfu/dfu_transport_ble.c
-  ${SDK11}/libraries/bootloader_dfu/dfu_single_bank.c
-  ${SDK11}/ble/ble_services/ble_dfu/ble_dfu.c
-  ${SDK11}/ble/ble_services/ble_dis/ble_dis.c
-  ${SDK11}/drivers_nrf/pstorage/pstorage_raw.c
+  ${SDK11_DIR}/libraries/bootloader_dfu/bootloader.c
+  ${SDK11_DIR}/libraries/bootloader_dfu/bootloader_settings.c
+  ${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
   # latest sdk
-  ${SDK}/libraries/timer/app_timer.c
-  ${SDK}/libraries/scheduler/app_scheduler.c
-  ${SDK}/libraries/util/app_error.c
-  ${SDK}/libraries/util/app_util_platform.c
-  ${SDK}/libraries/crc16/crc16.c
-  ${SDK}/libraries/hci/hci_mem_pool.c
-  ${SDK}/libraries/hci/hci_slip.c
-  ${SDK}/libraries/hci/hci_transport.c
-  ${SDK}/libraries/util/nrf_assert.c
+  ${SDK_DIR}/libraries/timer/app_timer.c
+  ${SDK_DIR}/libraries/scheduler/app_scheduler.c
+  ${SDK_DIR}/libraries/util/app_error.c
+  ${SDK_DIR}/libraries/util/app_util_platform.c
+  ${SDK_DIR}/libraries/crc16/crc16.c
+  ${SDK_DIR}/libraries/hci/hci_mem_pool.c
+  ${SDK_DIR}/libraries/hci/hci_slip.c
+  ${SDK_DIR}/libraries/hci/hci_transport.c
+  ${SDK_DIR}/libraries/util/nrf_assert.c
   # ASM
-  ${NRFX}/mdk/gcc_startup_${MCU_VARIANT}.S
+  ${NRFX_DIR}/mdk/gcc_startup_${MCU_VARIANT}.S
   )
 target_include_directories(bootloader PUBLIC
   src
@@ -85,46 +93,64 @@ target_include_directories(bootloader PUBLIC
   src/boards/${BOARD}
   src/cmsis/include
   src/usb
-  ${TUSB}
+  ${TINYUSB_DIR}
   # nrfx
-  ${NRFX}
-  ${NRFX}/mdk
-  ${NRFX}/hal
-  ${NRFX}/drivers/include
-  ${NRFX}/drivers/src
+  ${NRFX_DIR}
+  ${NRFX_DIR}/mdk
+  ${NRFX_DIR}/hal
+  ${NRFX_DIR}/drivers/include
+  ${NRFX_DIR}/drivers/src
   # sdk 11 for cdc/ble dfu
-  ${SDK11}/libraries/bootloader_dfu
-  ${SDK11}/libraries/bootloader_dfu/hci_transport
-  ${SDK11}/drivers_nrf/pstorage
-  ${SDK11}/ble/common
-  ${SDK11}/ble/ble_services/ble_dfu
-  ${SDK11}/ble/ble_services/ble_dis
+  ${SDK11_DIR}/libraries/bootloader_dfu
+  ${SDK11_DIR}/libraries/bootloader_dfu/hci_transport
+  ${SDK11_DIR}/drivers_nrf/pstorage
+  ${SDK11_DIR}/ble/common
+  ${SDK11_DIR}/ble/ble_services/ble_dfu
+  ${SDK11_DIR}/ble/ble_services/ble_dis
   # later sdk with updated drivers
-  ${SDK}/libraries/timer
-  ${SDK}/libraries/scheduler
-  ${SDK}/libraries/crc16
-  ${SDK}/libraries/util
-  ${SDK}/libraries/hci/config
-  ${SDK}/libraries/hci
-  ${SDK}/libraries/uart
-  ${SDK}/drivers_nrf/delay
+  ${SDK_DIR}/libraries/timer
+  ${SDK_DIR}/libraries/scheduler
+  ${SDK_DIR}/libraries/crc16
+  ${SDK_DIR}/libraries/util
+  ${SDK_DIR}/libraries/hci/config
+  ${SDK_DIR}/libraries/hci
+  ${SDK_DIR}/libraries/uart
+  ${SDK_DIR}/drivers_nrf/delay
   # Softdevice
-  ${SOFTDEVICE}/mbr/headers
+  ${SOFTDEVICE_DIR}/mbr/headers
   )
 
+# 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)
-  message(FATAL_ERROR "Debug build not supported yet")
+
+  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 ()
 
 target_link_options(bootloader PUBLIC
   "LINKER:--script=${LD_FILE}"
-  -L${NRFX}/mdk
-  --specs=nosys.specs
-  --specs=nano.specs
+  -L${NRFX_DIR}/mdk
+  --specs=nosys.specs --specs=nano.specs
   )
 target_compile_options(bootloader PUBLIC
   -fno-builtin
@@ -145,11 +171,10 @@ target_compile_options(bootloader PUBLIC
   -Wno-endif-labels
   -Wunreachable-code
   # Suppress warning caused by SDK
-  -Wno-unused-parameter -Wno-expansion-to-defined
+  -Wno-unused-parameter -Wno-expansion-to-defined -Wno-array-bounds
   )
 target_compile_definitions(bootloader PUBLIC
   SOFTDEVICE_PRESENT
-  DFU_APP_DATA_RESERVED=7*4096
   )
 
 if (TRACE_ETM STREQUAL "1")
@@ -160,14 +185,14 @@ endif ()
 if (MCU_VARIANT STREQUAL "nrf52")
   # UART transport
   target_sources(bootloader PUBLIC
-    ${SDK}/libraries/uart/app_uart.c
-    ${SDK}/drivers_nrf/uart/nrf_drv_uart.c
-    ${SDK}/drivers_nrf/common/nrf_drv_common.c
+    ${SDK_DIR}/libraries/uart/app_uart.c
+    ${SDK_DIR}/drivers_nrf/uart/nrf_drv_uart.c
+    ${SDK_DIR}/drivers_nrf/common/nrf_drv_common.c
     )
   target_include_directories(bootloader PUBLIC
-    ${SDK11}/libraries/util
-    ${SDK}/drivers_nrf/common
-    ${SDK}/drivers_nrf/uart
+    ${SDK11_DIR}/libraries/util
+    ${SDK_DIR}/drivers_nrf/common
+    ${SDK_DIR}/drivers_nrf/uart
     )
 else ()
   # USB transport
@@ -178,13 +203,13 @@ else ()
     src/usb/usb_desc.c
     src/usb/uf2/ghostfat.c
     # TinyUSB
-    ${TUSB}/portable/nordic/nrf5x/dcd_nrf5x.c
-    ${TUSB}/common/tusb_fifo.c
-    ${TUSB}/device/usbd.c
-    ${TUSB}/device/usbd_control.c
-    ${TUSB}/class/cdc/cdc_device.c
-    ${TUSB}/class/msc/msc_device.c
-    ${TUSB}/tusb.c
+    ${TINYUSB_DIR}/portable/nordic/nrf5x/dcd_nrf5x.c
+    ${TINYUSB_DIR}/common/tusb_fifo.c
+    ${TINYUSB_DIR}/device/usbd.c
+    ${TINYUSB_DIR}/device/usbd_control.c
+    ${TINYUSB_DIR}/class/cdc/cdc_device.c
+    ${TINYUSB_DIR}/class/msc/msc_device.c
+    ${TINYUSB_DIR}/tusb.c
     )
 endif ()
 
@@ -195,43 +220,43 @@ 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
     S132
     )
-  target_include_directories(bootloader PUBLIC
-    ${SOFTDEVICE}/s132_nrf52_6.1.1/s132_nrf52_6.1.1_API/include
-    )
-
 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
     S140
     )
-  target_include_directories(bootloader PUBLIC
-    ${SOFTDEVICE}/s140_nrf52_6.1.1/s140_nrf52_6.1.1_API/include
-    )
-
 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
     S140
     )
-  target_include_directories(bootloader PUBLIC
-    ${SOFTDEVICE}/s140_nrf52_6.1.1/s140_nrf52_6.1.1_API/include
-    )
-
 else ()
   message(FATAL_ERROR "MCU_VARIANT ${MCU_VARIANT} is unknown")
 endif ()
 
 set(SD_FILENAME ${SD_NAME}_nrf52_${SD_VERSION})
-set(SD_HEX ${SOFTDEVICE}/${SD_FILENAME}/${SD_FILENAME}_softdevice.hex)
+set(SD_HEX ${SOFTDEVICE_DIR}/${SD_FILENAME}/${SD_FILENAME}_softdevice.hex)
+
+target_include_directories(bootloader PUBLIC
+  ${SOFTDEVICE_DIR}/${SD_FILENAME}/${SD_FILENAME}_API/include
+  )
+
+if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+  target_compile_definitions(bootloader PUBLIC DFU_APP_DATA_RESERVED=${DFU_APP_DATA_RESERVED})
+endif ()
 
 #----------------------------------
 # Get UF2 version from git
@@ -257,12 +282,12 @@ math(EXPR MK_BOOTLOADER_VERSION "(${RELEASE_VERSION_MAJOR} << 16) + (${RELEASE_V
 cmake_print_variables(GIT_VERSION GIT_SUBMODULE_VERSIONS MK_BOOTLOADER_VERSION)
 
 target_compile_definitions(bootloader PUBLIC
+  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
 #----------------------------------
@@ -276,6 +301,8 @@ add_custom_command(TARGET bootloader POST_BUILD
 add_custom_command(TARGET bootloader POST_BUILD
   COMMAND ${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:bootloader> $<TARGET_FILE_DIR:bootloader>/bootloader.bin
   COMMAND ${CMAKE_OBJCOPY} -Oihex $<TARGET_FILE:bootloader> $<TARGET_FILE_DIR:bootloader>/bootloader.hex
+  COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/tools/hexmerge.py --overlap=replace -o $<TARGET_FILE_DIR:bootloader>/bootloader_mbr.hex $<TARGET_FILE_DIR:bootloader>/bootloader.hex ${MBR_HEX}
+  COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} -f ${UF2_FAMILY_ID_BOOTLOADER} -c -o $<TARGET_FILE_DIR:bootloader>/bootloader_mbr.uf2 $<TARGET_FILE_DIR:bootloader>/bootloader_mbr.hex
   VERBATIM)
 
 #----------------------------------
@@ -286,11 +313,16 @@ if (NOT DEFINED NRFJPROG)
   set(NRFJPROG nrfjprog)
 endif()
 
-add_custom_target(flash
+add_custom_target(flash-jlink
   DEPENDS bootloader
   COMMAND ${NRFJPROG} --program $<TARGET_FILE:bootloader> --verify --sectoranduicrerase -f nrf52 --reset
   )
 
+add_custom_target(flash-uf2
+  DEPENDS bootloader
+  COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} -f ${UF2_FAMILY_ID_BOOTLOADER} --deploy $<TARGET_FILE_DIR:bootloader>/bootloader_mbr.uf2
+  )
+
 add_custom_target(flash-sd
   COMMAND ${NRFJPROG} --program ${SD_HEX} --verify --sectorerase -f nrf52 --reset
   )

Makefile

@@ -10,6 +10,9 @@
 # local customization
 -include Makefile.user
 
+# Board specific
+-include src/boards/$(BOARD)/board.mk
+
 SDK_PATH     = lib/sdk/components
 SDK11_PATH   = lib/sdk11/components
 TUSB_PATH    = lib/tinyusb/src
@@ -18,7 +21,11 @@ SD_PATH      = lib/softdevice/$(SD_FILENAME)
 
 # SD_VERSION can be overwritten by board.mk
 ifndef SD_VERSION
-SD_VERSION   = 6.1.1
+	ifeq ($(MCU_SUB_VARIANT),nrf52833)
+	SD_VERSION = 7.3.0
+	else
+	SD_VERSION = 6.1.1
+	endif
 endif
 
 SD_FILENAME  = $(SD_NAME)_nrf52_$(SD_VERSION)
@@ -42,6 +49,8 @@ OUT_NAME = $(BOARD)_bootloader-$(GIT_VERSION)
 # merged file = compiled + sd
 MERGED_FILE = $(OUT_NAME)_$(SD_NAME)_$(SD_VERSION)
 
+UF2_FAMILY_ID_BOOTLOADER = 0xd663823c
+
 #------------------------------------------------------------------------------
 # Tool Configure
 #------------------------------------------------------------------------------
@@ -89,25 +98,10 @@ endif
 BMP_PORT ?= $(shell ls -1 /dev/cu.usbmodem????????1 | head -1)
 GDB_BMP = $(GDB) -ex 'target extended-remote $(BMP_PORT)' -ex 'monitor swdp_scan' -ex 'attach 1'
 
-#---------------------------------
-# Select the board to build
-#---------------------------------
-# Note: whitespace is not allowed in the filenames... it WILL break this part of the script
-BOARD_LIST = $(sort $(filter-out boards.h boards.c,$(notdir $(wildcard src/boards/*))))
-
-ifeq ($(filter $(BOARD),$(BOARD_LIST)),)
-  $(info You must provide a BOARD parameter with 'BOARD='. Supported boards are:)
-  $(foreach b,$(BOARD_LIST),$(info - $(b)))
-  $(error Invalid BOARD specified)
-endif
-
 # Build directory
 BUILD = _build/build-$(BOARD)
 BIN = _bin/$(BOARD)
 
-# Board specific
--include src/boards/$(BOARD)/board.mk
-
 # MCU_SUB_VARIANT can be nrf52 (nrf52832), nrf52833, nrf52840
 ifeq ($(MCU_SUB_VARIANT),nrf52)
   SD_NAME = s132
@@ -123,7 +117,7 @@ else ifeq ($(MCU_SUB_VARIANT),nrf52840)
   SD_NAME = s140
   DFU_DEV_REV = 52840
   CFLAGS += -DNRF52840_XXAA -DS140
-  # App reserved 40KB to match circuitpython for 840
+  # App reserved 40KB (8+32) to match circuitpython for 840
   DFU_APP_DATA_RESERVED=10*4096
 else
   $(error Sub Variant $(MCU_SUB_VARIANT) is unknown)
@@ -139,6 +133,8 @@ C_SRC += \
   src/dfu_init.c \
   src/flash_nrf5x.c \
   src/main.c \
+  src/screen.c \
+  src/images.c \
 
 # all files in boards
 C_SRC += src/boards/boards.c
@@ -314,6 +310,7 @@ ifneq ($(USE_NFCT),yes)
 endif
 
 CFLAGS += -DSOFTDEVICE_PRESENT
+CFLAGS += -DUF2_VERSION_BASE='"$(GIT_VERSION)"'
 CFLAGS += -DUF2_VERSION='"$(GIT_VERSION) $(GIT_SUBMODULE_VERSIONS)"'
 CFLAGS += -DBLEDIS_FW_VERSION='"$(GIT_VERSION) $(SD_NAME) $(SD_VERSION)"'
 
@@ -328,9 +325,9 @@ ifeq ($(DEBUG), 1)
   C_SRC += $(RTT_SRC)/RTT/SEGGER_RTT.c
   DFU_APP_DATA_RESERVED = 0
 
-	# expand bootloader address to 28KB of reserved app
+	# expand bootloader address to 28KB/40KB of reserved app
   ifeq ($(MCU_SUB_VARIANT),nrf52840)
-    CFLAGS += -DBOOTLOADER_REGION_START=0xED000
+    CFLAGS += -DBOOTLOADER_REGION_START=0xEA000
   else
     CFLAGS += -DBOOTLOADER_REGION_START=0x6D000
   endif
@@ -339,7 +336,8 @@ endif
 CFLAGS += -DDFU_APP_DATA_RESERVED=$(DFU_APP_DATA_RESERVED)
 
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
-ifneq ($(findstring 12.,$(shell $(CC) --version 2>/dev/null)),)
+# 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
 
@@ -439,7 +437,7 @@ $(BUILD)/$(OUT_NAME)_nosd.hex: $(BUILD)/$(OUT_NAME).hex
 # Bootolader self-update uf2
 $(BUILD)/update-$(OUT_NAME)_nosd.uf2: $(BUILD)/$(OUT_NAME)_nosd.hex
 	@echo Create $(notdir $@)
-	@python3 lib/uf2/utils/uf2conv.py -f 0xd663823c -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
@@ -492,12 +490,17 @@ flash-mbr:
 	@echo Flashing: $(MBR_HEX)
 	$(call FLASH_NOUICR_CMD,$(MBR_HEX))
 
+# flash using uf2
+flash-uf2: $(BUILD)/update-$(OUT_NAME)_nosd.uf2
+	@echo Flashing: $(notdir $<)
+	python lib/uf2/utils/uf2conv.py -f $(UF2_FAMILY_ID_BOOTLOADER) --deploy $<
+
 # dfu with adafruit-nrfutil using CDC interface
 dfu-flash: flash-dfu
 flash-dfu: $(BUILD)/$(MERGED_FILE).zip
 	@:$(call check_defined, SERIAL, example: SERIAL=/dev/ttyACM0)
 	$(NRFUTIL) --verbose dfu serial --package $< -p $(SERIAL) -b 115200 --singlebank --touch 1200
-	
+
 # flash skip crc magic ( app valid = 0x0001, crc = 0x0000 )
 #flash-skip-crc:
 # nrfjprog --memwr $(BOOT_SETTING_ADDR) --val 0x00000001 -f nrf52

README.md

@@ -1,204 +1,67 @@
-# 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 purpose of this fork is to include a few additions/fixes to the bootloader BLE OTA code for NRF52840 based devices which I've noticed around github.
 
-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:
+- Nologo ProMicro NRF52840 (aka SuperMini NRF52840)
+- Seeed Studio XIAO nRF52840 BLE
+- Seeed Studio XIAO nRF52840 BLE SENSE
+- RAK 4631 ([See note](#notes-on-RAK4631-bootloader))
 
-```
-$ pip3 install --user adafruit-nrfutil
-```
+Any board already supported by the Adafruit nrf52 bootloader can be added of course.
 
-## Supported Boards
+---
+#### Installation:
+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.
 
-Officially supported boards are:
+It's also possible to flash the zip or hex file but this is **not recommended** as on the offchance you get a bad flash you will need a JLink or SWD to recover.
 
-- [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)
+---
+#### 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.
 
-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](/src/boards).
+I use the following settings with the nRF Device Firmware Update app. Note that with the exception of "Force scanning" these are not set in stone.<br/><br/>
 
-## Features
+![DFU Settings Part 1/2](docs/dfu_settings_01.png) ![DFU Settings Part 2/2](docs/dfu_settings_01.png)
 
-- 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)
 
-## How to use
+Notes on settings:
+ - Force scanning (called Scan for bootloader in Legacy DFU in nRF Connect) is required, because when initiating OTA DFU mode the device will reboot and start advertising as AdaDFU with a different MAC address, Force scanning is what allows the app to find the device after it reboots.
+ - Packets receipt notification is not strictly required but in my experience it makes the update less likely to fail, at the cost of being much slower.
 
-There are two pins, `DFU` and `FRST` that bootloader will check upon reset/power:
+**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.
 
-- `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.
+---
+#### Performing an OTA update on a MeshCore repeater
+First you will need to login to the repeater and issue the 'start ota' CLI command.
 
-```c
-#include "nrf_nvic.h"
-void reset_to_uf2(void) {
-  NRF_POWER->GPREGRET = 0x57; // 0xA8 OTA, 0x4e Serial
-  NVIC_SystemReset();         // or sd_nvic_SystemReset();
-}
-```
+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.
 
-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.
+Now cross your fingers and hope for the best!
 
-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.
+---
+#### 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.1??-need to check).
 
-For other boards, please check the board definition for details.
+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).
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
+\
 
-### Making your own UF2
-
-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).
-
-```
-nRF52840
-uf2conv.py firmware.hex -c -f 0xADA52840
-
-nRF52833
-uf2conv.py firmware.hex -c -f 0x621E937A
-```
-
-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
-
-```
-nRF52840
-uf2conv.py firmware.bin -c -b 0x26000 -f 0xADA52840
-
-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**
-
-```
-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 with following commands
-
-```
-git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader
-cd Adafruit_nRF52_Bootloader
-git submodule update --init
-```
-
-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
-```
-
-### 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
-```
-
-### 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.

linker/nrf52840_debug.ld

@@ -12,7 +12,7 @@ MEMORY
    *  APP_ERROR_CHECK_BOOL(*((uint32_t *)NRF_UICR_BOOT_START_ADDRESS) == BOOTLOADER_REGION_START);
    */
   /* due to lack of flash for debug, we will use reserved app to extend bootloader size */
-  FLASH (rx) : ORIGIN = 0xF4000-28K, LENGTH = 0xFE000-0xF4000 - 2K + 28K /* 38 KB */
+  FLASH (rx) : ORIGIN = 0xF4000 - 40K, LENGTH = 0xFE000-0xF4000 - 2K + 40K /* 38 KB */
 
   BOOTLOADER_CONFIG (r): ORIGIN = 0xFE000 - 2K, LENGTH = 2K
 

src/boards/adm_b_nrf52840_1/board.h

@@ -1,67 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER  2
-
-#define BUTTON_1       _PINNUM(0, 11)
-#define BUTTON_2       _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.h

@@ -1,59 +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 BUTTONS_NUMBER     2
-#define BUTTON_1           11 // BTN1
-#define BUTTON_2           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.h

@@ -1,65 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 2) // left Button
-#define BUTTON_2              _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.h

@@ -1,68 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 2) // left Button
-#define BUTTON_2              _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/aramcon_badge_2019/board.mk

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

src/boards/aramcon_badge_2019/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/arcade_feather_nrf52840_express/board.mk

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

src/boards/arcade_feather_nrf52840_express/pinconfig.c

@@ -1,62 +0,0 @@
-#include "boards.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] = {
-    /* CF2 START */
-    513675505, 539130489, // magic
-    49, 100,  // used entries, total entries
-    4, 0x18, // PIN_BTN_A = PIN_RX
-    5, 0xa, // PIN_BTN_B = PIN_D2
-    13, 0x29, // PIN_LED = PIN_D13
-    18, 0xf, // PIN_MISO = PA15
-    19, 0xd, // PIN_MOSI = PA13
-    20, 0x23, // PIN_NEOPIXEL = PB03
-    21, 0x18, // PIN_RX = PA24
-    23, 0xe, // PIN_SCK = PA14
-    24, 0xb, // PIN_SCL = PA11
-    25, 0xc, // PIN_SDA = PA12
-    28, 0x19, // PIN_TX = PA25
-    32, 0xe, // PIN_DISPLAY_SCK = PIN_SCK
-    34, 0xd, // PIN_DISPLAY_MOSI = PIN_MOSI
-    35, 0x1e, // PIN_DISPLAY_CS = PIN_A2
-    36, 0x1c, // PIN_DISPLAY_DC = PIN_A3
-    37, 0xa0, // DISPLAY_WIDTH = 160
-    38, 0x80, // DISPLAY_HEIGHT = 128
-    39, 0x80, // DISPLAY_CFG0 = 0x80
-    40, 0x603, // DISPLAY_CFG1 = 0x603
-    41, 0x20, // DISPLAY_CFG2 = 0x20
-    43, 0x2, // PIN_DISPLAY_RST = PIN_A4
-    44, 0x3, // PIN_DISPLAY_BL = PIN_A5
-    47, 0x6, // PIN_BTN_LEFT = PIN_D11
-    48, 0x1a, // PIN_BTN_RIGHT = PIN_D9
-    49, 0x1b, // PIN_BTN_UP = PIN_D10
-    50, 0x7, // PIN_BTN_DOWN = PIN_D6
-    51, 0x8, // PIN_BTN_MENU = PIN_D12
-    56, 0x2a, // PIN_LED2 = PB10
-    60, 0x19, // PIN_JACK_TX = PIN_TX
-    100, 0x4, // PIN_A0 = PA04
-    101, 0x5, // PIN_A1 = PA05
-    102, 0x1e, // PIN_A2 = PA30
-    103, 0x1c, // PIN_A3 = PA28
-    104, 0x2, // PIN_A4 = PA02
-    105, 0x3, // PIN_A5 = PA03
-    152, 0xa, // PIN_D2 = PA10
-    155, 0x28, // PIN_D5 = PB08
-    156, 0x7, // PIN_D6 = PA07
-    159, 0x1a, // PIN_D9 = PA26
-    160, 0x1b, // PIN_D10 = PA27
-    161, 0x6, // PIN_D11 = PA06
-    162, 0x8, // PIN_D12 = PA08
-    163, 0x29, // PIN_D13 = PB09
-    200, 0x1, // NUM_NEOPIXELS = 1
-    204, 0x100000, // FLASH_BYTES = 0x100000
-    205, 0x40000, // RAM_BYTES = 0x40000
-    208, 0xd7688ea1, // BOOTLOADER_BOARD_ID = 0xd7688ea1
-    209, 0xada52840, // UF2_FAMILY = 0xada52840
-    210, 0x20, // PINS_PORT_SIZE = PA_32
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0,
-    /* CF2 END */
-};

src/boards/arduino_nano_33_ble/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 _ARDUINOBLE33_NRF52840_H
-#define _ARDUINOBLE33_NRF52840_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1  // red LED
-#define LED_PRIMARY_PIN       _PINNUM(0, 24)
-#define LED_STATE_ON          0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 11)  // D2 switch
-#define BUTTON_2              _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/arduino_nano_33_ble/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/bast_ble/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 _BASTBLE_NRF52840_H
-#define _BASTBLE_NRF52840_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1  // red LED
-#define LED_PRIMARY_PIN       _PINNUM(0, 24)
-#define LED_STATE_ON          0
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER      2
-#define BUTTON_1            _PINNUM(0, 05)
-#define BUTTON_2            _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/bast_ble/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/bluemicro_nrf52833/board.h

@@ -1,69 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER    2                 // none connected at all
-#define BUTTON_1          _PINNUM(0, 18)    // unusable: RESET
-#define BUTTON_2          _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.h

@@ -1,65 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER    2                 // none connected at all
-#define BUTTON_1          _PINNUM(0, 18)    // unusable: RESET
-#define BUTTON_2          _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/board.mk

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

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

@@ -27,23 +27,29 @@
 #include "app_scheduler.h"
 #include "app_timer.h"
 
-#ifdef LED_APA102
+#ifdef LED_APA102_CLK
 #include "nrf_spim.h"
 #endif
 
-//--------------------------------------------------------------------+
-// MACRO TYPEDEF CONSTANT ENUM DECLARATION
-//--------------------------------------------------------------------+
 #define SCHED_MAX_EVENT_DATA_SIZE           sizeof(app_timer_event_t)        /**< Maximum size of scheduler events. */
 #define SCHED_QUEUE_SIZE                    30                               /**< Maximum number of events in the scheduler queue. */
 
-#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102)
+#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102_CLK)
 void neopixel_init(void);
 void neopixel_write(uint8_t* pixels);
 void neopixel_teardown(void);
 #endif
 
-//------------- IMPLEMENTATION -------------//
+//--------------------------------------------------------------------+
+// IMPLEMENTATION
+//--------------------------------------------------------------------+
+
+static uint32_t _systick_count = 0;
+void SysTick_Handler(void) {
+  _systick_count++;
+  led_tick();
+}
+
 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);
@@ -80,7 +86,7 @@ void board_init(void) {
   #endif
 #endif
 
-#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102)
+#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102_CLK)
   // use neopixel for use enumeration
   #ifdef NEOPIXEL_POWER_PIN
   nrf_gpio_cfg_output(NEOPIXEL_POWER_PIN);
@@ -96,6 +102,7 @@ void board_init(void) {
 #if ENABLE_DCDC_1 == 1
   NRF_POWER->DCDCEN = 1;
 #endif
+
   // Make sure any custom inits are performed
   board_init2();
 
@@ -104,7 +111,7 @@ void board_init(void) {
   //     #define UICR_REGOUT0_VALUE UICR_REGOUT0_VOUT_3V3
   // in board.h when using that power configuration.
 #ifdef UICR_REGOUT0_VALUE
-  if ((NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) != (UICR_REGOUT0_VALUE << UICR_REGOUT0_VOUT_Pos)){
+  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){}
     NRF_UICR->REGOUT0 = (NRF_UICR->REGOUT0 & ~((uint32_t)UICR_REGOUT0_VOUT_Msk)) |
@@ -140,10 +147,14 @@ void board_teardown(void) {
   led_pwm_teardown();
 #endif
 
-#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102)
+#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102_CLK)
   neopixel_teardown();
 #endif
 
+#ifdef DISPLAY_PIN_SCK
+  board_display_teardown();
+#endif
+
   // Stop RTC1 used by app_timer
   NVIC_DisableIRQ(RTC1_IRQn);
   NRF_RTC1->EVTENCLR = RTC_EVTEN_COMPARE0_Msk;
@@ -164,13 +175,127 @@ void board_teardown(void) {
   board_teardown2();
 }
 
-static uint32_t _systick_count = 0;
+//--------------------------------------------------------------------+
+// Display
+//--------------------------------------------------------------------+
+#ifdef DISPLAY_PIN_SCK
+#include "nrf_spim.h"
 
-void SysTick_Handler(void) {
-  _systick_count++;
-  led_tick();
+#define TFT_MADCTL_MY  0x80  ///< Page addr order: Bottom to top
+#define TFT_MADCTL_MX  0x40  ///< Column addr order: Right to left
+#define TFT_MADCTL_MV  0x20  ///< Page/Column order: Reverse Mode ( X <-> Y )
+#define TFT_MADCTL_ML  0x10  ///< LCD refresh Bottom to top
+#define TFT_MADCTL_MH  0x04  ///< LCD refresh right to left
+#define TFT_MADCTL_RGB 0x00  ///< Red-Green-Blue pixel order
+#define TFT_MADCTL_BGR 0x08  ///< Blue-Green-Red pixel order
+
+// Note don't use SPIM3 since it has lots of errata
+NRF_SPIM_Type* _spim = NRF_SPIM0;
+
+static void spi_write(NRF_SPIM_Type *p_spim, uint8_t const *tx_buf, size_t tx_len) {
+  nrf_spim_tx_buffer_set(p_spim, tx_buf, tx_len);
+  nrf_spim_rx_buffer_set(p_spim, NULL, 0);
+
+  nrf_spim_event_clear(p_spim, NRF_SPIM_EVENT_ENDTX);
+  nrf_spim_event_clear(p_spim, NRF_SPIM_EVENT_END);
+  nrf_spim_task_trigger(p_spim, NRF_SPIM_TASK_START);
+
+  // blocking wait until xfer complete
+  while (!nrf_spim_event_check(p_spim, NRF_SPIM_EVENT_END)){}
 }
 
+static void tft_controller_init(void);
+
+static inline void tft_cs(bool state) {
+  nrf_gpio_pin_write(DISPLAY_PIN_CS, state);
+}
+
+static inline void tft_dc(bool state) {
+  nrf_gpio_pin_write(DISPLAY_PIN_DC, state);
+}
+
+static void tft_cmd(uint8_t cmd, uint8_t const* data, size_t narg) {
+  tft_cs(false);
+
+  // send command
+  tft_dc(false);
+  spi_write(_spim, &cmd, 1);
+
+  // send data
+  if (narg > 0) {
+    tft_dc(true);
+    spi_write(_spim, data, narg);
+  }
+
+  tft_cs(true);
+}
+
+void board_display_init(void) {
+  //------------- SPI init -------------//
+  // highspeed SPIM should set SCK and MOSI to high drive
+  nrf_gpio_cfg(DISPLAY_PIN_SCK, NRF_GPIO_PIN_DIR_OUTPUT, NRF_GPIO_PIN_INPUT_CONNECT,
+               NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_H0H1, NRF_GPIO_PIN_NOSENSE);
+  nrf_gpio_cfg(DISPLAY_PIN_MOSI, NRF_GPIO_PIN_DIR_OUTPUT, NRF_GPIO_PIN_INPUT_DISCONNECT,
+               NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_H0H1, NRF_GPIO_PIN_NOSENSE);
+  nrf_gpio_cfg_output(DISPLAY_PIN_CS);
+  nrf_gpio_pin_set(DISPLAY_PIN_CS);
+
+  nrf_spim_pins_set(_spim, DISPLAY_PIN_SCK, DISPLAY_PIN_MOSI, NRF_SPIM_PIN_NOT_CONNECTED);
+  nrf_spim_frequency_set(_spim, NRF_SPIM_FREQ_4M);
+  nrf_spim_configure(_spim, NRF_SPIM_MODE_0, NRF_SPIM_BIT_ORDER_MSB_FIRST);
+  nrf_spim_orc_set(_spim, 0xFF);
+
+  nrf_spim_enable(_spim);
+
+  //------------- Display Init -------------//
+  nrf_gpio_cfg_output(DISPLAY_PIN_DC);
+
+#if defined(DISPLAY_VSENSOR_PIN) && DISPLAY_VSENSOR_PIN >= 0
+  nrf_gpio_cfg_output(DISPLAY_VSENSOR_PIN);
+  nrf_gpio_pin_write(DISPLAY_VSENSOR_PIN, DISPLAY_VSENSOR_ON);
+#endif
+
+#if defined(DISPLAY_PIN_RST) && DISPLAY_PIN_RST >= 0
+  nrf_gpio_cfg_output(DISPLAY_PIN_RST);
+  nrf_gpio_pin_clear(DISPLAY_PIN_RST);
+  NRFX_DELAY_MS(10);
+  nrf_gpio_pin_set(DISPLAY_PIN_RST);
+  NRFX_DELAY_MS(20);
+#endif
+
+#if defined(DISPLAY_PIN_BL) && DISPLAY_PIN_BL >= 0
+  nrf_gpio_cfg_output(DISPLAY_PIN_BL);
+  nrf_gpio_pin_write(DISPLAY_PIN_BL, DISPLAY_BL_ON);
+#endif
+
+  tft_controller_init();
+}
+
+void board_display_teardown(void) {
+  nrf_spim_disable(_spim);
+}
+
+void board_display_draw_line(uint16_t y, uint8_t const* buf, size_t nbytes) {
+  // column and row address set
+  uint32_t xa32 = DISPLAY_COL_OFFSET << 16 | DISPLAY_WIDTH;
+  xa32 = __builtin_bswap32(xa32);
+
+  y += DISPLAY_ROW_OFFSET;
+  uint32_t ya32 = (y << 16) | (y + 1);
+  ya32 = __builtin_bswap32(ya32);
+
+  tft_cmd(0x2A, (uint8_t*) &xa32, 4);
+  tft_cmd(0x2B, (uint8_t*) &ya32, 4);
+
+  // command: memory write
+  tft_cmd(0x2C, buf, nbytes);
+}
+
+#endif
+
+//--------------------------------------------------------------------+
+// LED Indicator
+//--------------------------------------------------------------------+
 void pwm_teardown(NRF_PWM_Type* pwm) {
   pwm->TASKS_SEQSTART[0] = 0;
   pwm->ENABLE = 0;
@@ -237,7 +362,7 @@ static uint32_t primary_cycle_length;
 static uint32_t secondary_cycle_length;
 #endif
 
-void led_tick() {
+void led_tick(void) {
   uint32_t millis = _systick_count;
 
   uint32_t cycle = millis % primary_cycle_length;
@@ -327,7 +452,7 @@ void led_state(uint32_t state) {
     final_color = (uint8_t*) &rgb_color;
   }
 
-#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102)
+#if defined(LED_NEOPIXEL) || defined(LED_RGB_RED_PIN) || defined(LED_APA102_CLK)
   if (final_color != NULL) {
     neopixel_write(final_color);
   }
@@ -435,7 +560,7 @@ void neopixel_write(uint8_t* pixels) {
 
 #endif
 
-#ifdef LED_APA102
+#ifdef LED_APA102_CLK
 #define BYTE_PER_PIXEL  4
 
 // 4 zero bytes are required to initiate update
@@ -547,3 +672,108 @@ void neopixel_write (uint8_t *pixels) {
   led_pwm_duty_cycle(LED_RGB_BLUE, pixels[0]);
 }
 #endif
+
+//--------------------------------------------------------------------+
+// Display controller
+//--------------------------------------------------------------------+
+
+#ifdef DISPLAY_CONTROLLER_ST7789
+
+#define ST_CMD_DELAY 0x80 // special signifier for command lists
+
+#define ST77XX_NOP 0x00
+#define ST77XX_SWRESET 0x01
+#define ST77XX_RDDID 0x04
+#define ST77XX_RDDST 0x09
+
+#define ST77XX_SLPIN 0x10
+#define ST77XX_SLPOUT 0x11
+#define ST77XX_PTLON 0x12
+#define ST77XX_NORON 0x13
+
+#define ST77XX_INVOFF 0x20
+#define ST77XX_INVON 0x21
+#define ST77XX_DISPOFF 0x28
+#define ST77XX_DISPON 0x29
+#define ST77XX_CASET 0x2A
+#define ST77XX_RASET 0x2B
+#define ST77XX_RAMWR 0x2C
+#define ST77XX_RAMRD 0x2E
+
+#define ST77XX_PTLAR 0x30
+#define ST77XX_TEOFF 0x34
+#define ST77XX_TEON 0x35
+#define ST77XX_MADCTL 0x36
+#define ST77XX_VSCSAD 0x37
+#define ST77XX_COLMOD 0x3A
+
+#define ST77XX_MADCTL_MY 0x80
+#define ST77XX_MADCTL_MX 0x40
+#define ST77XX_MADCTL_MV 0x20
+#define ST77XX_MADCTL_ML 0x10
+#define ST77XX_MADCTL_RGB 0x00
+
+#define ST77XX_RDID1 0xDA
+#define ST77XX_RDID2 0xDB
+#define ST77XX_RDID3 0xDC
+#define ST77XX_RDID4 0xDD
+
+// Some ready-made 16-bit ('565') color settings:
+#define ST77XX_BLACK 0x0000
+#define ST77XX_WHITE 0xFFFF
+#define ST77XX_RED 0xF800
+#define ST77XX_GREEN 0x07E0
+#define ST77XX_BLUE 0x001F
+#define ST77XX_CYAN 0x07FF
+#define ST77XX_MAGENTA 0xF81F
+#define ST77XX_YELLOW 0xFFE0
+#define ST77XX_ORANGE 0xFC00
+
+static void tft_controller_init(void) {
+  // Init commands for 7789 screens
+  uint8_t cmdinit_st7789[] = {
+      #if !defined(DISPLAY_PIN_RST) || (DISPLAY_PIN_RST < 0)
+      // Software reset if rst pin not available, no args, w/delay ~150 ms delay
+      ST77XX_SWRESET, ST_CMD_DELAY, 150,
+      #endif
+      // Out of sleep mode, no args, w/delay 10 ms delay
+      ST77XX_SLPOUT, ST_CMD_DELAY, 10,
+      // Set color mode, 1 arg + delay: 16-bit color, 10 ms delay
+      ST77XX_COLMOD, 1 + ST_CMD_DELAY, 0x55, 10,
+      // Mem access ctrl (directions), 1 arg: Row/col addr, bottom-top refresh
+      ST77XX_MADCTL, 1, DISPLAY_MADCTL,
+      // Vertical Scroll Start Address of RAM
+      // ST77XX_VSCSAD, 2, DISPLAY_VSCSAD >> 8, DISPLAY_VSCSAD & 0xFF,
+      // Column addr set, 4 args, no delay: XSTART = 0, XEND = 240
+      ST77XX_CASET, 4, 0x00, 0, 0, 240,
+      // Row addr set, 4 args, no delay: YSTART = 0 YEND = 320
+      ST77XX_RASET, 4, 0x00, 0, 320 >> 8, 320 & 0xFF,
+      // Inversion on
+      ST77XX_INVON, ST_CMD_DELAY, 10,
+      // Normal display on, no args, w/delay 10 ms delay
+      ST77XX_NORON, ST_CMD_DELAY, 10,
+      // Main screen turn on, no args, delay 10 ms delay
+      ST77XX_DISPON, ST_CMD_DELAY, 10
+  };
+
+  size_t count = 0;
+  while (count < sizeof(cmdinit_st7789)) {
+    uint8_t const cmd = cmdinit_st7789[count++];
+    uint8_t const cmd_arg = cmdinit_st7789[count++];
+    uint8_t const has_delay = cmd_arg & ST_CMD_DELAY;
+    uint8_t const narg = cmd_arg & ~ST_CMD_DELAY;
+
+    tft_cmd(cmd, cmdinit_st7789 + count, narg);
+    count += narg;
+
+    if (has_delay) {
+      uint16_t delay = (uint16_t) cmdinit_st7789[count++];
+      if (delay == 255) {
+        delay = 500; // If 255, delay for 500 ms
+      }
+      NRFX_DELAY_MS(delay);
+    }
+  }
+}
+
+#endif

src/boards/boards.h

@@ -114,6 +114,16 @@ bool button_pressed(uint32_t pin);
 
 bool is_ota(void);
 
+//--------------------------------------------------------------------+
+// Display
+//--------------------------------------------------------------------+
+#ifdef DISPLAY_PIN_SCK
+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);
+#endif
+
 //--------------------------------------------------------------------+
 // DEBUG
 //--------------------------------------------------------------------+

src/boards/challenger_840_ble/board.h

@@ -1,73 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 19)
-#define BUTTON_2              _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.h

@@ -1,68 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 02)     // left button
-#define BUTTON_2              _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.h

@@ -1,68 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 02)     // left button
-#define BUTTON_2              _PINNUM(1, 10)     // right button
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// 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.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 BUTTONS_NUMBER     2
-#define BUTTON_1           29 // DISC Button on E104-BT5032A-TB Test Board
-                              // BUTTON_1 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_2           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.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 BUTTONS_NUMBER     2
-#define BUTTON_1           14 // BUTTON_1 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_2           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.h

@@ -1,67 +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 BUTTONS_NUMBER      2
-#define BUTTON_1            18 // RESET also by default
-#define BUTTON_2            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.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 _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 BUTTONS_NUMBER     2
-#define BUTTON_1           20
-#define BUTTON_2           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_nrf52833_express/board.h

@@ -1,69 +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_NRF52833_H
-#define _FEATHER_NRF52833_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           2
-#define LED_PRIMARY_PIN       _PINNUM(1, 15)
-#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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 02)
-#define BUTTON_2              _PINNUM(0, 10)
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "Feather nRF52833 Express"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x0029 // TODO change later
-#define USB_DESC_CDC_ONLY_PID  0x002A // TODO change later
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME      "Adafruit Feather nRF52833 Express"
-#define UF2_VOLUME_LABEL      "FTHR833BOOT"
-#define UF2_BOARD_ID          "nRF52833-Feather-revD"
-#define UF2_INDEX_URL         "https://www.adafruit.com/product/4062" // TODO change later
-
-#endif

src/boards/feather_nrf52833_express/board.mk

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

src/boards/feather_nrf52833_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, 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
-  210, 0x20,                                    // PINS_PORT_SIZE = PA_32
-
-  0, 0, 0, 0, 0, 0, 0, 0
-  /* CF2 END */
-};

src/boards/feather_nrf52840_express/board.cmake

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

src/boards/feather_nrf52840_express/board.h

@@ -1,69 +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_H
-#define _FEATHER_NRF52840_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           2
-#define LED_PRIMARY_PIN       _PINNUM(1, 15)
-#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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 02)
-#define BUTTON_2              _PINNUM(0, 10)
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "Feather nRF52840 Express"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x0029
-#define USB_DESC_CDC_ONLY_PID  0x002A
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME      "Adafruit Feather nRF52840 Express"
-#define UF2_VOLUME_LABEL      "FTHR840BOOT"
-#define UF2_BOARD_ID          "nRF52840-Feather-revD"
-#define UF2_INDEX_URL         "https://www.adafruit.com/product/4062"
-
-#endif // _FEATHER_NRF52840_H

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.h

@@ -1,69 +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
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 02)
-#define BUTTON_2              _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

src/boards/feather_nrf52840_sense/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_tft/board.cmake

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

src/boards/feather_nrf52840_sense_tft/board.h

@@ -1,69 +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_TFT_H
-#define _FEATHER_NRF52840_SENSE_TFT_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 11)
-#define LED_STATE_ON          1
-
-#define LED_NEOPIXEL          _PINNUM(1, 8)
-#define NEOPIXEL_POWER_PIN    _PINNUM(1, 2)
-#define NEOPIXELS_NUMBER      1
-#define BOARD_RGB_BRIGHTNESS  0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 6)
-#define BUTTON_2              _PINNUM(1, 10) // DFU pin
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "Feather nRF52840 Sense TFT"
-
-//--------------------------------------------------------------------+
-// 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 TFT"
-#define UF2_VOLUME_LABEL      "FTHRSNSBOOT"
-#define UF2_BOARD_ID          "nRF52840-FeatherSenseTFT-revA"
-#define UF2_INDEX_URL         "https://www.adafruit.com/product/"
-
-#endif

src/boards/feather_nrf52840_sense_tft/board.mk

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

src/boards/feather_nrf52840_sense_tft/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/ikigaisense_vita/board.h

@@ -1,69 +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 _IKIGAISENSE_VITA_NRF52840_H
-#define _IKIGAISENSE_VITA_NRF52840_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           2
-#define LED_PRIMARY_PIN       _PINNUM(1, 15)
-#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 BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 02)
-#define BUTTON_2              _PINNUM(0, 10)
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "IkigaiSense Technologies"
-#define BLEDIS_MODEL          "Vita nRF52840"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x0093
-#define USB_DESC_CDC_ONLY_PID  0x0093
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME      "IkigaiSense Vita nRF52840"
-#define UF2_VOLUME_LABEL      "ISVITABoot"
-#define UF2_BOARD_ID          "nRF52840-isVITA-revA"
-#define UF2_INDEX_URL         "https://github.com/ikigaisense/vita"
-
-#endif // _IKIGAISENSE_VITA_NRF52840_H

src/boards/ikigaisense_vita/board.mk

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

src/boards/ikigaisense_vita/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/itsybitsy_nrf52840_express/board.h

@@ -1,68 +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 _ITSYBITSY_NRF52840_H
-#define _ITSYBITSY_NRF52840_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 6)
-#define LED_STATE_ON          1
-
-#define LED_NEOPIXEL           _PINNUM(0, 8)
-#define NEOPIXELS_NUMBER      1
-#define BOARD_RGB_BRIGHTNESS  0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 29)  // user switch
-#define BUTTON_2              _PINNUM(1, 02)  // D2 breakout
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "ItsyBitsy nRF52840 Express"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x0051
-#define USB_DESC_CDC_ONLY_PID  0x0052
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME   "Adafruit ItsyBitsy nRF52840 Express"
-#define UF2_VOLUME_LABEL   "ITSY840BOOT"
-#define UF2_BOARD_ID       "nRF52840-ItsyBitsy-revA"
-#define UF2_INDEX_URL      "https://www.adafruit.com/"
-
-#endif // _ITSY_NRF52840_H

src/boards/itsybitsy_nrf52840_express/board.mk

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

src/boards/itsybitsy_nrf52840_express/pinconfig.c

@@ -1,47 +0,0 @@
-#include "boards.h"
-#include "uf2/configkeys.h"
-
-__attribute__((used, section(".bootloaderConfig")))
-const uint32_t bootloaderConfig[] =
-{
-  /* CF2 START */
-    CFG_MAGIC0, CFG_MAGIC1, // magic
-    31, 100,  // used entries, total entries
-    4, 0x1d, // PIN_BTN_A = PA29
-    7, 0x29, // PIN_DOTSTAR_CLOCK = PB09
-    8, 0x8, // PIN_DOTSTAR_DATA = PA08
-    13, 0x6, // PIN_LED = PA06
-    18, 0x14, // PIN_MISO = PA20
-    19, 0xf, // PIN_MOSI = PA15
-    21, 0x19, // PIN_RX = PA25
-    23, 0xd, // PIN_SCK = PA13
-    24, 0xe, // PIN_SCL = PA14
-    25, 0x10, // PIN_SDA = PA16
-    28, 0x18, // PIN_TX = PA24
-    100, 0x4, // PIN_A0 = PA04
-    101, 0x1e, // PIN_A1 = PA30
-    102, 0x1c, // PIN_A2 = PA28
-    103, 0x1f, // PIN_A3 = PA31
-    104, 0x2, // PIN_A4 = PA02
-    105, 0x3, // PIN_A5 = PA03
-    152, 0x22, // PIN_D2 = PB02
-    155, 0x1b, // PIN_D5 = PA27
-    157, 0x28, // PIN_D7 = PB08
-    159, 0x7, // PIN_D9 = PA07
-    160, 0x5, // PIN_D10 = PA05
-    161, 0x1a, // PIN_D11 = PA26
-    162, 0xb, // PIN_D12 = PA11
-    163, 0xc, // PIN_D13 = PA12
-    201, 0x1, // NUM_DOTSTARS = 1
-    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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  /* CF2 END */
-};

src/boards/ledglasses_nrf52840/board.h

@@ -1,68 +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 _LEDGLASSES_NRF52840_H
-#define _LEDGLASSES_NRF52840_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 31)
-#define LED_STATE_ON          1
-
-#define LED_NEOPIXEL           _PINNUM(1, 15)
-#define NEOPIXELS_NUMBER      1
-#define BOARD_RGB_BRIGHTNESS  0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 30)  // user switch
-#define BUTTON_2              _PINNUM(0, 28)  // NC
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "LED Glasses Driver nRF52840"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x010D
-#define USB_DESC_CDC_ONLY_PID  0x010E
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME   "Adafruit LED Glasses Driver nRF52840"
-#define UF2_VOLUME_LABEL   "GLASSESBOOT"
-#define UF2_BOARD_ID       "nRF52840-LedGlasses-revA"
-#define UF2_INDEX_URL      "https://www.adafruit.com/product/5217"
-
-#endif // _LEDGLASSES_NRF52840_H

src/boards/ledglasses_nrf52840/board.mk

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

src/boards/ledglasses_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/m60_keyboard/board.h

@@ -1,76 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Yihui Xiong for Makerdiary
- *
- * 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 _MAKERDIARY_M60_KEYBOARD_H_
-#define _MAKERDIARY_M60_KEYBOARD_H_
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 30)  // Red
-#define LED_STATE_ON          0
-
-#define LED_RGB_RED_PIN       _PINNUM(0, 30)
-#define LED_RGB_GREEN_PIN     _PINNUM(0, 29)
-#define LED_RGB_BLUE_PIN      _PINNUM(0, 31)
-#define BOARD_RGB_BRIGHTNESS  0x404040
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 27)
-#define BUTTON_2              _PINNUM(0, 19)  // ESC
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-/*------------------------------------------------------------------*/
-/* On board regulator control
- *------------------------------------------------------------------*/
-#define LDO_CONTROL_PIN       _PINNUM(0, 28)  // Enables external pwr
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Makerdiary"
-#define BLEDIS_MODEL          "M60 Mechanical Keyboard"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID            0x2886
-#define USB_DESC_UF2_PID        0xF00F
-#define USB_DESC_CDC_ONLY_PID   0xF00F
-
-//--------------------------------------------------------------------+
-// UF2
-//--------------------------------------------------------------------+
-#define UF2_PRODUCT_NAME        "MakerDiary M60 Mechanical Keyboard"
-#define UF2_VOLUME_LABEL        "M60KEYBOARD"
-#define UF2_BOARD_ID            "M60KEYBOARD"
-#define UF2_INDEX_URL           "https://wiki.makerdiary.com/m60/"
-
-
-#endif /* _MAKERDIARY_M60_KEYBOARD_H_ */

src/boards/m60_keyboard/board.mk

@@ -1,2 +0,0 @@
-MCU_SUB_VARIANT = nrf52840
-USE_NFCT = yes

src/boards/m60_keyboard/pinconfig.c

@@ -1,57 +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 */
-};
-
-static void power_on(void)
-{
-  // Turn on the regulator
-  nrf_gpio_cfg_output(LDO_CONTROL_PIN);
-  nrf_gpio_pin_write(LDO_CONTROL_PIN, 1);
-}
-
-void board_init2(void)
-{
-  power_on();
-
-  // configure P0.05 for ESC/BUTTON_2
-  // P0.05 --- |<- --- / --- P0.19
-  //         diode  sw(esc)
-  // mode: output, push-pull, low
-  nrf_gpio_cfg(
-    _PINNUM(0, 5),
-    NRF_GPIO_PIN_DIR_OUTPUT,
-    NRF_GPIO_PIN_INPUT_DISCONNECT,
-    NRF_GPIO_PIN_NOPULL,
-    NRF_GPIO_PIN_H0D1,
-    NRF_GPIO_PIN_NOSENSE
-  );
-  nrf_gpio_pin_write(_PINNUM(0, 5), 0);
-
-  // Wait the buttons stable.
-  // This is mandatory, or the keyboard will enter bootloader whenever
-  // booted by pressing the button at back (same with BUTTON_1)
-  NRFX_DELAY_MS(300);
-}
-
-void board_teardown2(void)
-{
-  // re-enable the battery
-  power_on();
-}

src/boards/mdk_nrf52840_dongle/board.h

@@ -1,72 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 gpshead (krypto.org) 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 _MDK_NRF52840_DONGLE_H_
-#define _MDK_NRF52840_DONGLE_H_
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           2  // TODO(gpshead): support 0.
-#define LED_PRIMARY_PIN       _PINNUM(0, 23)  // Red
-#define LED_SECONDARY_PIN     _PINNUM(0, 24)  // Blue
-#define LED_STATE_ON          0
-
-//#define LED_RGB_RED_PIN       _PINNUM(0, 23)
-//#define LED_RGB_GREEN_PIN     _PINNUM(0, 22)
-//#define LED_RGB_BLUE_PIN      _PINNUM(0, 24)
-#define BOARD_RGB_BRIGHTNESS  0x404040
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-// TODO(gpshead): simplify, have code support 0.  double reset only.
-#define BUTTONS_NUMBER        2  // none connected at all
-#define BUTTON_1              _PINNUM(0, 18)  // unusable: RESET
-#define BUTTON_2              _PINNUM(0, 19)  // no connection
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "MakerDiary"
-#define BLEDIS_MODEL          "nRF52840 Micro Dev Kit USB Dongle"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-
-// Shared VID/PID with Feather nRF52840, will be disabled for building in the future
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x0029
-#define USB_DESC_CDC_ONLY_PID  0x0029
-
-#define UF2_PRODUCT_NAME   "MDK nRF52840 USB Dongle"
-#define UF2_VOLUME_LABEL   "MDK840DONGL"
-#define UF2_BOARD_ID       "nRF52840-Dongle-v1"
-#define UF2_INDEX_URL      "https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/"
-
-#endif /* _MDK_NRF52840_DONGLE_H_ */

src/boards/mdk_nrf52840_dongle/board.mk

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

src/boards/mdk_nrf52840_dongle/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/metro_nrf52840_express/board.h

@@ -1,70 +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 _METRO_NRF52840_H_
-#define _METRO_NRF52840_H_
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           2
-#define LED_PRIMARY_PIN       _PINNUM(1, 13)
-#define LED_SECONDARY_PIN     _PINNUM(1, 15)
-#define LED_STATE_ON          1
-
-#define LED_NEOPIXEL          _PINNUM(0, 13)
-#define NEOPIXELS_NUMBER      1
-#define BOARD_RGB_BRIGHTNESS  0x040404
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 0)
-#define BUTTON_2              _PINNUM(2, 2)
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Adafruit Industries"
-#define BLEDIS_MODEL          "Metro nRF52840 Express"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x003F
-#define USB_DESC_CDC_ONLY_PID  0x0040
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME       "Adafruit Metro nRF52840 Express"
-#define UF2_VOLUME_LABEL       "METR840BOOT"
-#define UF2_BOARD_ID           "nRF52840-Metro-revA"
-
-#define UF2_INDEX_URL          "https://www.adafruit.com/"
-
-#endif /* _METRO_NRF52840_H_ */

src/boards/metro_nrf52840_express/board.mk

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

src/boards/metro_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/mikoto/board.h

@@ -1,65 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 Hai-Ninh Dang
- *
- * 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 _MIKOTO_H
-#define _MIKOTO_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-#define UICR_REGOUT0_VALUE UICR_REGOUT0_VOUT_3V3
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER       1
-#define LED_PRIMARY_PIN   _PINNUM(0, 15) // Blue
-#define LED_STATE_ON      1
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER    2  // none connected at all
-#define BUTTON_1          _PINNUM(0, 18)  // unusable: RESET
-#define BUTTON_2          _PINNUM(0, 19)  // no connection
-#define BUTTON_PULL       NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER  "zhiayang"
-#define BLEDIS_MODEL         "mikoto"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x1209
-#define USB_DESC_UF2_PID       0x7A01
-#define USB_DESC_CDC_ONLY_PID  0x7A01
-
-#define UF2_PRODUCT_NAME  "Mikoto nRF52840"
-#define UF2_VOLUME_LABEL  "MIKOTO-BOOT"
-#define UF2_BOARD_ID      "nRF52840-mikoto-rev520"
-#define UF2_INDEX_URL     "https://github.com/zhiayang/mikoto"
-
-#endif // _MIKOTO_H

src/boards/mikoto/board.mk

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

src/boards/mikoto/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/nRF52840_connect_kit/board.h

@@ -1,71 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Yihui Xiong for Makerdiary
- *
- * 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 _MAKERDIARY_NRF82540_CONNECT_KIT_H_
-#define _MAKERDIARY_NRF82540_CONNECT_KIT_H_
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(1, 15)  // Green
-#define LED_STATE_ON          0
-
-#define LED_RGB_RED_PIN       _PINNUM(1, 10)
-#define LED_RGB_GREEN_PIN     _PINNUM(1, 11)
-#define LED_RGB_BLUE_PIN      _PINNUM(1, 12)
-#define BOARD_RGB_BRIGHTNESS  0x404040
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(1, 0)  // P1.00: User Button
-#define BUTTON_2              _PINNUM(1, 7)  // P1.07: NC
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Makerdiary"
-#define BLEDIS_MODEL          "nRF52840 Connect Kit"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID            0x2886
-#define USB_DESC_UF2_PID        0xF00F
-#define USB_DESC_CDC_ONLY_PID   0xF00F
-
-//--------------------------------------------------------------------+
-// UF2
-//--------------------------------------------------------------------+
-#define UF2_PRODUCT_NAME        "nRF52840 Connect Kit"
-#define UF2_VOLUME_LABEL        "CONNECTKIT"
-#define UF2_BOARD_ID            "nRF52840-Connect-Kit"
-#define UF2_INDEX_URL           "https://wiki.makerdiary.com/nrf52840-connectkit/"
-
-
-#endif /* _MAKERDIARY_NRF82540_CONNECT_KIT_H_ */

src/boards/nRF52840_connect_kit/board.mk

@@ -1,2 +0,0 @@
-MCU_SUB_VARIANT = nrf52840
-USE_NFCT = yes

src/boards/nRF52840_connect_kit/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/nice_nano/board.mk

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

src/boards/nice_nano/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/nrf52840_bboard/board.h

@@ -1,68 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2021 ddB0515(Dario Budimir)
- *
- * 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 _NRF52840_BBOARD_H
-#define _NRF52840_BBOARD_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 7)
-#define LED_STATE_ON          1
-
-/*------------------------------------------------------------------*/
-/* 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 BUTTONS_NUMBER      2
-#define BUTTON_1            18 // RESET also by default
-#define BUTTON_2            1  // P0.1 not exposed anywhere, FRST n/a
-#define BUTTON_PULL         NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "ddB0515"
-#define BLEDIS_MODEL          "nRF52840 BBoard"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x1d50
-#define USB_DESC_UF2_PID       0x6157
-#define USB_DESC_CDC_ONLY_PID  0x6157
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME   "nRF52840 BBoard"
-#define UF2_VOLUME_LABEL   "BBOARDBOOT"
-#define UF2_BOARD_ID       "nRF52840-BBoard-rev2"
-#define UF2_INDEX_URL      "https://github.com/ddB0515/nRF52840-BBoard"
-
-#endif // _NRF52840_BBOARD_H

src/boards/nrf52840_bboard/board.mk

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

src/boards/nrf52840_bboard/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/nrf52840_m2/board.h

@@ -1,72 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2020 Yihui Xiong for Makerdiary
- *
- * 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 _MAKERDIARY_NRF52840_M2_H_
-#define _MAKERDIARY_NRF52840_M2_H_
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 30)  // Red
-#define LED_DOCK_GREEN_PIN    _PINNUM(1, 7)   // Only available on the M.2 Dock
-#define LED_STATE_ON          0
-
-#define LED_RGB_RED_PIN       _PINNUM(0, 30)
-#define LED_RGB_GREEN_PIN     _PINNUM(0, 29)
-#define LED_RGB_BLUE_PIN      _PINNUM(0, 31)
-#define BOARD_RGB_BRIGHTNESS  0x404040
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 19)
-#define BUTTON_2              _PINNUM(1, 7)
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Makerdiary"
-#define BLEDIS_MODEL          "nRF52840 M.2"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID            0x2886
-#define USB_DESC_UF2_PID        0xF00F
-#define USB_DESC_CDC_ONLY_PID   0xF00F
-
-//--------------------------------------------------------------------+
-// UF2
-//--------------------------------------------------------------------+
-#define UF2_PRODUCT_NAME        "MakerDiary nRF52840 M.2 Module"
-#define UF2_VOLUME_LABEL        "nRF52840M2"
-#define UF2_BOARD_ID            "nRF52840M2"
-#define UF2_INDEX_URL           "https://wiki.makerdiary.com/nrf52840-m2"
-
-
-#endif /* _MAKERDIARY_NRF52840_M2_H_ */

src/boards/nrf52840_m2/board.mk

@@ -1,2 +0,0 @@
-MCU_SUB_VARIANT = nrf52840
-USE_NFCT = yes

src/boards/nrf52840_m2/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/ohs2020_badge/board.h

@@ -1,65 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Ha Thach for Adafruit Industries
- * Copyright (c) 2020 Michael Welling
- *
- * 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 _OHS2020_BADGE_H
-#define _OHS2020_BADGE_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER           1
-#define LED_PRIMARY_PIN       _PINNUM(0, 04)	// fake LED since we have none 
-#define LED_STATE_ON          1
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER        2
-#define BUTTON_1              _PINNUM(0, 29)     // SW2
-#define BUTTON_2              _PINNUM(0, 03)     // SW1
-#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "OSHWA"
-#define BLEDIS_MODEL          "OHS2020 Badge"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x007F
-#define USB_DESC_CDC_ONLY_PID  0x007F
-
-//------------- UF2 -------------//
-#define UF2_PRODUCT_NAME   "OHS2020 Badge"
-#define UF2_VOLUME_LABEL   "BADGEBOOT"
-#define UF2_BOARD_ID       "OHS2020-Badge-revA"
-#define UF2_INDEX_URL      "https://2020.oshwa.org/"
-
-#endif // _OHS2020_BADGE_H

src/boards/ohs2020_badge/board.mk

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

src/boards/ohs2020_badge/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/particle_argon/board.h

@@ -1,70 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2018 Scott Shawcroft 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 _PARTICLE_ARGON_H
-#define _PARTICLE_ARGON_H
-
-#define _PINNUM(port, pin)    ((port)*32 + (pin))
-
-/*------------------------------------------------------------------*/
-/* LED
- *------------------------------------------------------------------*/
-#define LEDS_NUMBER          1
-#define LED_PRIMARY_PIN      _PINNUM(1, 12)
-#define LED_STATE_ON         1
-
-#define LED_RGB_RED_PIN      _PINNUM(0, 13)
-#define LED_RGB_GREEN_PIN    _PINNUM(0, 14)
-#define LED_RGB_BLUE_PIN     _PINNUM(0, 15)
-#define BOARD_RGB_BRIGHTNESS 0x202020
-
-/*------------------------------------------------------------------*/
-/* BUTTON
- *------------------------------------------------------------------*/
-#define BUTTONS_NUMBER 2
-#define BUTTON_DFU     _PINNUM(0, 11)
-#define BUTTON_FRESET  _PINNUM(0, 03) // A0
-#define BUTTON_PULL    NRF_GPIO_PIN_PULLUP
-
-//--------------------------------------------------------------------+
-// BLE OTA
-//--------------------------------------------------------------------+
-#define BLEDIS_MANUFACTURER   "Particle Industries"
-#define BLEDIS_MODEL          "Argon"
-
-//--------------------------------------------------------------------+
-// USB
-//--------------------------------------------------------------------+
-
-// Shared VID/PID with Feather nRF52840, will be disabled for building in the future
-#define USB_DESC_VID           0x239A
-#define USB_DESC_UF2_PID       0x0029
-#define USB_DESC_CDC_ONLY_PID  0x0029
-
-#define UF2_PRODUCT_NAME   "Particle Argon"
-#define UF2_VOLUME_LABEL   "ARGONBOOT  "
-#define UF2_BOARD_ID       "nRF52840-Argon-v1"
-#define UF2_INDEX_URL      "https://www.particle.io/mesh/"
-
-#endif // _PARTICLE_ARGON_H

src/boards/particle_argon/board.mk

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