Merge pull request #215 from adafruit/develop

Develop

Author: hathach

README.md

@@ -149,7 +149,7 @@ which in turn is based on the [Arduino SAMD Core](https://github.com/arduino/Ard
 The following libraries are used:
 
 - adafruit-nrfutil is based on Nordic Semiconductor ASA's [pc-nrfutil](https://github.com/NordicSemiconductor/pc-nrfutil)
-- freeRTOS as operating system
+- [freeRTOS](https://www.freertos.org/) as operating system
 - [tinyusb](https://github.com/hathach/tinyusb) as usb stack
 - [nrfx](https://github.com/NordicSemiconductor/nrfx) for peripherals driver
 - [littlefs](https://github.com/ARMmbed/littlefs) for internal file system

boards.txt

@@ -43,7 +43,7 @@ feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)
 
-feather52832.menu.softdevice.s132v6=0.2.5 (s132 6.1.1)
+feather52832.menu.softdevice.s132v6=0.2.6 (s132 6.1.1)
 feather52832.menu.softdevice.s132v6.build.sd_flags=-DS132
 feather52832.menu.softdevice.s132v6.build.sd_name=s132
 feather52832.menu.softdevice.s132v6.build.sd_version=6.1.1
@@ -104,7 +104,7 @@ feather52840.build.extra_flags=-DNRF52840_XXAA
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)
 
-feather52840.menu.softdevice.s140v6=0.2.5 (s140 6.1.1)
+feather52840.menu.softdevice.s140v6=0.2.6 (s140 6.1.1)
 feather52840.menu.softdevice.s140v6.build.sd_flags=-DS140
 feather52840.menu.softdevice.s140v6.build.sd_name=s140
 feather52840.menu.softdevice.s140v6.build.sd_version=6.1.1
@@ -149,7 +149,7 @@ pca10056.build.extra_flags=-DNRF52840_XXAA
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)
 
-pca10056.menu.softdevice.s140v6=0.2.5 (s140 6.1.1)
+pca10056.menu.softdevice.s140v6=0.2.6 (s140 6.1.1)
 pca10056.menu.softdevice.s140v6.build.sd_flags=-DS140
 pca10056.menu.softdevice.s140v6.build.sd_name=s140
 pca10056.menu.softdevice.s140v6.build.sd_version=6.1.1

changelog.md

@@ -1,5 +1,13 @@
 # Adafruit nRF52 Arduino Core Changelog
 
+# 0.9.3
+
+- Correct bootloader version text in IDE to 0.2.6
+- Fixed #173  ( PR #178 thanks Nenik)
+- Added Client Battery support BLEClientBas
+- Added BLE_GAP_EVT_CONN_PARAM_UPDATE_REQUEST event support for Central
+- Added Jlink as programmer to upload sketch (#133)
+
 ## 0.9.2
 
 - Fully support Feather nRF52840

libraries/BLEHomekit/src/crypto/crypto.c

@@ -13,7 +13,7 @@
 //#include <pstorage.h>
 //#include <app_scheduler.h>
 #include <nrf_soc.h>
-#include "nffs/nffs.h"
+#include "Bluefruit_FileIO.h"
 #include "utility/debug.h"
 
 #include "rtos.h"
@@ -107,7 +107,13 @@ static uint8_t crypto_loadKeys(void)
   crypto_persistent_keys_t keys = {};
 
   uint32_t keylen = sizeof(keys);
-  fsutil_read_file(CRYPTO_KEYFILE, 0, keylen, &keys, &keylen);
+
+  File file(CRYPTO_KEYFILE, FILE_READ, InternalFS);
+  VERIFY(file, 0);
+
+  keylen = file.read(&keys, keylen);
+
+  file.close();
 
   if (keys.valid0 == 0x55 && keys.valid1 == 0xAA && keys.instance == CRYPTO_INSTANCE)
   {
@@ -156,7 +162,12 @@ void crypto_storeKeys(void)
     keys.valid0 = 0x55;
     keys.valid1 = 0xAA;
 
-    fsutil_write_file(CRYPTO_KEYFILE, &keys, sizeof(keys));
+    File file(CRYPTO_KEYFILE, FILE_WRITE, InternalFS);
+    VERIFY(file,);
+
+    file.write(&keys, sizeof(keys));
+
+    file.close();
 
 //    err_code = pstorage_update(&handle, (uint8_t*)&keys, sizeof(keys), 0);
 //    APP_ERROR_CHECK(err_code);

libraries/BLEHomekit/src/service/HAPPairing.cpp

@@ -37,7 +37,7 @@
 #include <bluefruit.h>
 #include "HAPUuid.h"
 #include "HAPPairing.h"
-#include <Nffs.h>
+#include "Bluefruit_FileIO.h"
 
 #include "crypto/crypto.h"
 
@@ -159,7 +159,8 @@ err_t HAPPairing::begin(void)
   setDeviceID(mac);
 
   // Init cryptography
-  Nffs.mkdir_p("/adafruit/homekit");
+  if ( !InternalFS.exists("/adafruit/homekit") ) InternalFS.mkdir("/adafruit/homekit");
+
   crypto_init();
 
   return ERROR_NONE;

libraries/Bluefruit52Lib/examples/Central/central_bleuart/central_bleuart.ino

@@ -18,8 +18,9 @@
  */
 #include <bluefruit.h>
 
-BLEClientDis  clientDis;
-BLEClientUart clientUart;
+BLEClientBas  clientBas;  // battery client
+BLEClientDis  clientDis;  // device information client
+BLEClientUart clientUart; // bleuart client
 
 void setup()
 {
@@ -35,6 +36,9 @@ void setup()
 
   Bluefruit.setName("Bluefruit52 Central");
 
+  // Configure Battyer client
+  clientBas.begin();  
+
   // Configure DIS client
   clientDis.begin();
 
@@ -91,7 +95,7 @@ void connect_callback(uint16_t conn_handle)
 {
   Serial.println("Connected");
 
-  Serial.print("Dicovering DIS ... ");
+  Serial.print("Dicovering Device Information ... ");
   if ( clientDis.discover(conn_handle) )
   {
     Serial.println("Found it");
@@ -114,10 +118,19 @@ void connect_callback(uint16_t conn_handle)
     }
 
     Serial.println();
-  }  
+  }
 
-  Serial.print("Discovering BLE Uart Service ... ");
+  Serial.print("Dicovering Battery ... ");
+  if ( clientBas.discover(conn_handle) )
+  {
+    Serial.println("Found it");
+    Serial.print("Battery level: ");
+    Serial.print(clientBas.read());
+    Serial.println("%");
+  }
+  
 
+  Serial.print("Discovering BLE Uart Service ... ");
   if ( clientUart.discover(conn_handle) )
   {
     Serial.println("Found it");
@@ -139,6 +152,7 @@ void connect_callback(uint16_t conn_handle)
  * Callback invoked when a connection is dropped
  * @param conn_handle
  * @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
  */
 void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {

libraries/Bluefruit52Lib/examples/Central/central_bleuart_multi/central_bleuart_multi.ino

@@ -188,6 +188,7 @@ void connect_callback(uint16_t conn_handle)
  * Callback invoked when a connection is dropped
  * @param conn_handle
  * @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
  */
 void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {

libraries/Bluefruit52Lib/examples/Central/central_custom_hrm/central_custom_hrm.ino

@@ -118,7 +118,6 @@ void connect_callback(uint16_t conn_handle)
 
   // Once HRM service is found, we continue to discover its characteristic
   Serial.println("Found it");
-
 
   Serial.print("Discovering Measurement characteristic ... ");
   if ( !hrmc.discover() )
@@ -166,6 +165,7 @@ void connect_callback(uint16_t conn_handle)
  * Callback invoked when a connection is dropped
  * @param conn_handle
  * @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
  */
 void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {

libraries/Bluefruit52Lib/examples/Central/central_hid/central_hid.ino

@@ -135,6 +135,7 @@ void connect_callback(uint16_t conn_handle)
  * Callback invoked when a connection is dropped
  * @param conn_handle
  * @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
  */
 void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {

libraries/Bluefruit52Lib/examples/Central/central_ti_sensortag_optical/central_ti_sensortag_optical.ino

@@ -237,7 +237,8 @@ void connect_callback(uint16_t conn_handle)
 /**
  * Callback invoked when a connection is dropped
  * @param conn_handle
- * @param reason
+ * @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
  */
 void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {