Merge branch 'master' into fork/JuergenLeber/add-sd-s340-support

# Conflicts:
#	README.md

Author: hathach

CMakeLists.txt

@@ -34,6 +34,10 @@ 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)
 
+if (NOT DEFINED CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
+  set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "Build type" FORCE)
+endif ()
+
 #-------------------
 # Bootloader
 #-------------------
@@ -131,7 +135,6 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   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
@@ -175,6 +178,7 @@ target_compile_options(bootloader PUBLIC
   )
 target_compile_definitions(bootloader PUBLIC
   SOFTDEVICE_PRESENT
+  CONFIG_GPIO_AS_PINRESET
   )
 
 if (TRACE_ETM STREQUAL "1")
@@ -348,4 +352,11 @@ add_custom_target(flash-mbr
 
 add_custom_target(flash-erase
   COMMAND ${NRFJPROG} -f nrf52 --eraseall
-  )
+  )
+
+# flash skip crc magic ( app valid = 0x0001, crc = 0x0000 )
+#add_custom_target(flash-skip-crc
+#  #COMMAND ${NRFJPROG} --memwr $(BOOT_SETTING_ADDR) --val 0x00000001 -f nrf52
+#  COMMAND ${NRFJPROG} --memwr 0xFF000 --val 0x00000001 -f nrf52
+#  #COMMAND ${NRFJPROG} --memwr 0x7F000 --val 0x00000001 -f nrf52
+#  )

README.md

@@ -114,14 +114,20 @@ You must have have a J-Link available to "unbrick" your device.
 
 ### Build:
 
-Firstly clone this repo with following commands
+Firstly clone this repo including its submodules with following command:
 
+```
+git clone --recurse-submodules https://github.com/adafruit/Adafruit_nRF52_Bootloader
+```
+
+For git versions before `2.13.0` you have to do that manually:
 ```
 git clone https://github.com/adafruit/Adafruit_nRF52_Bootloader
 cd Adafruit_nRF52_Bootloader
 git submodule update --init
 ```
 
+#### Build using `make`
 Then build it with `make BOARD={board} all`, for example:
 
 ```
@@ -137,24 +143,36 @@ Supported boards are: feather_nrf52840_express feather_nrf52840_express pca10056
 Makefile:90: *** BOARD not defined.  Stop
 ```
 
-#### Working with SoftDevice S340:
-The SoftDevice S340 is closed-source, not publicly available and is only distributed by Garmin Canada Inc.  
+#### Build using `cmake`
+
+Firstly initialize your build environment by passing your board to `cmake` via `-DBOARD={board}`:
+
+```bash
+mkdir build
+cd build
+cmake .. -DBOARD=feather_nrf52840_express 
+```
 
-In order to be able to download the required ANT+ capable SoftDevice, you need to register an 'ANT+ Adopter' account at [thisisant.com](https://www.thisisant.com/register/). After around one business day you will receive access to the resources there. Then do the following steps:
-- Download the SoftDevice S340 v7.0.1 [(here)](https://www.thisisant.com/developer/components/nrf52832#tab_protocol_stacks_tab) and extract its contents
-- Under `lib/softdevice` in this repository there is a folder called `s340_nrf52_7.0.1`
-  - Copy the API folder `ANT_s340_nrf52_7.0.1.API`, the license agreement `License_Agreement_ANT_Softdevice_rev3_3.pdf` and the hex file `ANT_s340_nrf52_7.0.1.hex` from the extracted contents to it.
-  - Rename the API folder to `s340_nrf52_7.0.1_API`
-  - Rename the hex file to `s340_nrf52_7.0.1_softdevice.hex`
-  - Modify `lib/softdevice/s340_nrf52_7.0.1_API/include/nrf_sdm.h` on line 191 and remove the two slashes at the beginning of `//#define...` to use the *evaluation key* for the ANT SoftDevice.
-  - **VERY IMPORTANT:** You MUST obtain a valid commercial license key BEFORE releasing a product to market that uses the ANT SoftDevice!
+And then build it with:
 
-To add or modify a board with an ANT+ capable SoftDevice S340 the `SD_VERSION` and `SD_NAME` parameters in the corresponding `board.mk` file have to be set:
+```bash
+make
 ```
-SD_VERSION = 7.0.1
-SD_NAME = s340
+
+You can also use the generator of your choice. For example adding the `-GNinja` and then you can invoke `ninja build` instead of `make`.
+
+To list all supported targets, run:
+
+```bash
+cmake --build . --target help
+``` 
+
+To build individual targets, you can specify it directly with `make` or using `cmake --build`:
+
+```bash
+make bootloader
+cmake --build . --target bootloader
 ```
-**Important:** When adding a new board you must add the suffix `_s340` to the folder name to exclude it from automatic builds.
 
 ### Flash
 

lib/softdevice/s340_nrf52_7.0.1/readme.md

@@ -0,0 +1,19 @@
+## Working with SoftDevice S340
+
+The SoftDevice S340 is closed-source, not publicly available and is only distributed by Garmin Canada Inc.
+
+In order to be able to download the required ANT+ capable SoftDevice and place SoftDevice S340 v7.0.1 files here. You need to register an 'ANT+ Adopter' account at [thisisant.com](https://www.thisisant.com/register/). After around one business day you will receive access to the resources there. Then do the following steps:
+- Download the SoftDevice S340 v7.0.1 [(here)](https://www.thisisant.com/developer/components/nrf52832#tab_protocol_stacks_tab) and extract its contents
+- Under `lib/softdevice` in this repository there is a folder called `s340_nrf52_7.0.1`
+    - Copy the API folder `ANT_s340_nrf52_7.0.1.API`, the license agreement `License_Agreement_ANT_Softdevice_rev3_3.pdf` and the hex file `ANT_s340_nrf52_7.0.1.hex` from the extracted contents to it.
+    - Rename the API folder to `s340_nrf52_7.0.1_API`
+    - Rename the hex file to `s340_nrf52_7.0.1_softdevice.hex`
+    - Modify `lib/softdevice/s340_nrf52_7.0.1_API/include/nrf_sdm.h` on line 191 and remove the two slashes at the beginning of `//#define...` to use the *evaluation key* for the ANT SoftDevice.
+    - **VERY IMPORTANT:** You MUST obtain a valid commercial license key BEFORE releasing a product to market that uses the ANT SoftDevice!
+
+To add or modify a board with an ANT+ capable SoftDevice S340 the `SD_VERSION` and `SD_NAME` parameters in the corresponding `board.mk` file have to be set:
+```
+SD_VERSION = 7.0.1
+SD_NAME = s340
+```
+**Important:** When adding a new board you must add the suffix `_s340` to the folder name to exclude it from automatic builds.

lib/softdevice/s340_nrf52_7.0.1/readme.txt

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

lib/uf2

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

linker/nrf52833_debug.ld

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

linker/nrf52840_debug.ld

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

linker/nrf52_debug.ld

@@ -0,0 +1,72 @@
+/*
+ * 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 _OMNIMO_NRF52840_H
+#define _OMNIMO_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(1, 07) 
+#define BUTTON_PULL           NRF_GPIO_PIN_PULLUP
+
+//--------------------------------------------------------------------+
+// BLE OTA
+//--------------------------------------------------------------------+
+#define BLEDIS_MANUFACTURER   "eAFAQ"
+#define BLEDIS_MODEL          "OMNIMO nRF52840"
+
+//--------------------------------------------------------------------+
+// USB
+//--------------------------------------------------------------------+
+
+//Shared VID/PID with pca10056 
+#define USB_DESC_VID           0x1209
+#define USB_DESC_UF2_PID       0xCECE
+#define USB_DESC_CDC_ONLY_PID  0xCECE
+
+//------------- UF2 -------------//
+#define UF2_PRODUCT_NAME      "Omnimo nRF52840"
+#define UF2_VOLUME_LABEL      "OMNIn52BOOT"
+#define UF2_BOARD_ID          "nRF52840-Omnimo"
+#define UF2_INDEX_URL         "https://www.crowdsupply.com/eafaq/omnimo-nrf52840"
+
+#endif // _OMNIMO_NRF52840_H