Merge branch 'release/v3.4.0'

Author: ivankravets

.travis.yml

@@ -16,6 +16,7 @@ env:
   - PLATFORMIO_PROJECT_DIR=examples/arduino-blink
   - PLATFORMIO_PROJECT_DIR=examples/arduino-ble-led
   - PLATFORMIO_PROJECT_DIR=examples/arduino-bluefruit-bleuart
+  - PLATFORMIO_PROJECT_DIR=examples/arduino-nina-b1-generic-example PLATFORMIO_BUILD_FLAGS="-DNRF52_S132"
   - PLATFORMIO_PROJECT_DIR=examples/mbed-ble-thermometer
   - PLATFORMIO_PROJECT_DIR=examples/mbed-blink
   - PLATFORMIO_PROJECT_DIR=examples/mbed-dsp

appveyor.yml

@@ -15,8 +15,8 @@ environment:
 
 install:
   - cmd: git submodule update --init --recursive
-  - cmd: SET PATH=%PATH%;C:\Python27\Scripts
-  - cmd: pip install -U https://github.com/platformio/platformio/archive/develop.zip
+  - cmd: SET PATH=%PATH%;C:\Python36\Scripts
+  - cmd: pip3 install -U https://github.com/platformio/platformio/archive/develop.zip
   - cmd: platformio platform install file://.
 
 test_script:

builder/frameworks/arduino

@@ -57,6 +57,9 @@
     SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
     SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',
 
+    ERASEFLAGS=["--eraseall", "-f", "nrf52"],
+    ERASECMD="nrfjprog $ERASEFLAGS",
+
     PROGSUFFIX=".elf"
 )
 
@@ -321,6 +324,15 @@ def _jlink_cmd_script(env, source):
 
 AlwaysBuild(env.Alias("upload", target_firm, upload_actions))
 
+
+#
+# Target: Erase Flash
+#
+
+AlwaysBuild(
+    env.Alias("erase", None, env.VerboseAction("$ERASECMD",
+                                               "Erasing...")))
+
 #
 # Default targets
 #

builder/main.py

@@ -14,6 +14,7 @@
 #include <bluefruit.h>
 
 // BLE Service
+BLEDfu  bledfu;  // OTA DFU service
 BLEDis  bledis;  // device information
 BLEUart bleuart; // uart over ble
 BLEBas  blebas;  // battery
@@ -41,12 +42,14 @@ void setup()
   Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
 
   Bluefruit.begin();
-  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
-  Bluefruit.setTxPower(4);
+  Bluefruit.setTxPower(4);    // Check bluefruit.h for supported values
   Bluefruit.setName("Bluefruit52");
   //Bluefruit.setName(getMcuUniqueID()); // useful testing with multiple central connections
-  Bluefruit.setConnectCallback(connect_callback);
-  Bluefruit.setDisconnectCallback(disconnect_callback);
+  Bluefruit.Periph.setConnectCallback(connect_callback);
+  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+
+  // To be consistent OTA DFU should be added first if it exists
+  bledfu.begin();
 
   // Configure and Start Device Information Service
   bledis.setManufacturer("Adafruit Industries");
@@ -67,7 +70,7 @@ void setup()
   Serial.println("Once connected, enter character(s) that you wish to send");
 }
 
-static void startAdv(void)
+void startAdv(void)
 {
   // Advertising packet
   Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
@@ -115,16 +118,16 @@ void loop()
     ch = (uint8_t) bleuart.read();
     Serial.write(ch);
   }
-
-  // Request CPU to enter low-power mode until an event/interrupt occurs
-  waitForEvent();
 }
 
 // callback invoked when central connects
-static void connect_callback(uint16_t conn_handle)
+void connect_callback(uint16_t conn_handle)
 {
+  // Get the reference to current connection
+  BLEConnection* connection = Bluefruit.Connection(conn_handle);
+
   char central_name[32] = { 0 };
-  Bluefruit.Gap.getPeerName(conn_handle, central_name, sizeof(central_name));
+  connection->getPeerName(central_name, sizeof(central_name));
 
   Serial.print("Connected to ");
   Serial.println(central_name);
@@ -134,9 +137,8 @@ static void connect_callback(uint16_t conn_handle)
  * Callback invoked when a connection is dropped
  * @param conn_handle connection where this event happens
  * @param reason is a BLE_HCI_STATUS_CODE which can be found in ble_hci.h
- * https://github.com/adafruit/Adafruit_nRF52_Arduino/blob/master/cores/nRF5/nordic/softdevice/s140_nrf52_6.1.1_API/include/ble_hci.h
  */
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
+void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {
   (void) conn_handle;
   (void) reason;

examples/arduino-bluefruit-bleuart/src/main.cpp

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 
+
+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.

examples/arduino-nina-b1-generic-example/LICENSE

@@ -0,0 +1,72 @@
+# Arduino-u-blox-NINA-B1
+
+u-blox NINA-B1 Arduino example + SHT31 temperature and humidity + Bluetooth BLE
+
+[![GitHub version](https://img.shields.io/github/release/ldab/Arduino-u-blox-NINA-B1.svg)](https://github.com/ldab/Arduino-u-blox-NINA-B1/releases/latest)
+[![Build Status](https://travis-ci.org/ldab/Arduino-u-blox-NINA-B1.svg?branch=master)](https://travis-ci.org/ldab/Arduino-u-blox-NINA-B1)
+[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://github.com/ldab/Arduino-u-blox-NINA-B1/blob/master/LICENSE)
+
+[![GitHub last commit](https://img.shields.io/github/last-commit/ldab/Arduino-u-blox-NINA-B1.svg?style=social)](https://github.com/ldab/Arduino-u-blox-NINA-B1)
+
+[![EVK-NINA-B1](https://www.u-blox.com/sites/default/files/styles/product_full/public/products/EVK-NINA-B1_2D-medium_RGB-CI.png)](https://www.u-blox.com/en/product/nina-b1-series)
+
+## How to build PlatformIO based project
+
+1. [Install PlatformIO Core](http://docs.platformio.org/page/core.html)
+2. Download [development platform with examples](https://github.com/platformio/platform-nordicnrf52/archive/develop.zip)
+3. Extract ZIP archive
+4. Run these commands:
+
+```
+# Change directory to example
+> cd platform-nordicnrf52/examples/Arduino-u-blox-NINA-B1
+
+# Build project
+> platformio run
+
+# Upload firmware
+> platformio run --target upload
+
+# Build specific environment
+> platformio run -e nina_b1
+
+# Upload firmware for the specific environment
+> platformio run -e nina_b1 --target upload
+
+# Clean build files
+> platformio run --target clean
+```
+
+## Why?
+
+This example tries to implement some key functions and key PIN atributes in order to get you started with using Arduino and the NRF52832 BLE board u-blox NINA-B1.
+
+Timer functionas are implemented intead of `delay()` and the PINs have been re-mapped on the `#define` section
+
+## Bluetooth iOS and Android app 
+
+You can download the sample Bluetooth low energy app - BLE App straight from u-blox wesite: [https://www.u-blox.com/en/product/bluetooth-ios-and-android-app](https://www.u-blox.com/en/product/bluetooth-ios-and-android-app)
+
+![App example](https://raw.githubusercontent.com/ldab/Arduino-u-blox-NINA-B1/master/extras/Screenshot_20190328-130832_u-blox%20BLE.jpg)
+
+## fatal error: ble_gatts.h: No such file or directory
+
+The arduino-nRF5x core **REQUIRES** a SoftDevice in order to successfully use this library. Please see [Flashing a SoftDevice](https://github.com/sandeepmistry/arduino-nRF5#selecting-a-softdevice).
+
+On PlatformIO and when using this example you don't need to do anything special as the `build_flags = -DNRF52_S132` has already been included on `platform.ini` file.
+
+SoftDevices contain the BLE stack and housekeeping, and must be downloaded once before a sketch using BLE can be loaded. The SD consumes ~5k of Ram + some extra based on actual BLE configuration.
+
+* SoftDevice S132 v2.0.1 supports nRF52 in peripheral and central role. It is 112k in size.
+
+## Credits
+
+Github Shields and Badges created with [Shields.io](https://github.com/badges/shields/)
+
+Sandeep Mistry's [Arduino BLE library](https://github.com/sandeepmistry/arduino-BLEPeripheral)
+
+Adafruit [SHT31 Library](https://www.adafruit.com/product/2857)
+
+u-blox NINA-B1 blueprint example [GitHub](https://github.com/u-blox/blueprint-B200-NINA-B1)
+
+u-blox official mBed [library](https://os.mbed.com/platforms/u-blox-EVK-NINA-B1/)

examples/arduino-nina-b1-generic-example/README.md

@@ -0,0 +1,25 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[env:nina_b1]
+platform    = nordicnrf52
+board       = ublox_evk_nina_b1
+framework   = arduino
+
+build_flags = -DNRF52_S132
+
+lib_deps    = 
+  Adafruit SHT31 Library
+  Ticker
+  BLEPeripheral
+
+monitor_speed = 115200
+
+# upload_protocol = blackmagic