Merge branch 'master' into develop

Author: hathach

boards.txt

@@ -35,10 +35,10 @@ feather52832.upload.native_usb=false
 # Build
 feather52832.build.mcu=cortex-m4
 feather52832.build.f_cpu=64000000
-feather52832.build.board=NRF52_FEATHER
+feather52832.build.board=NRF52832_FEATHER
 feather52832.build.core=nRF5
 feather52832.build.variant=feather_nrf52832
-feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52
+feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52 -DARDUINO_NRF52_FEATHER
 
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)
@@ -98,7 +98,7 @@ feather52840.build.f_cpu=64000000
 feather52840.build.board=NRF52840_FEATHER
 feather52840.build.core=nRF5
 feather52840.build.variant=feather_nrf52840_express
-feather52840.build.extra_flags=-DNRF52840_XXAA
+feather52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER
 
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)

cores/nRF5/WInterrupts.c

@@ -86,7 +86,7 @@ int attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
       break;
 
     default:
-      return;
+      return 0;
   }
 
   for (int ch = 0; ch < NUMBER_OF_GPIO_TE; ch++) {

cores/nRF5/main.cpp

@@ -114,8 +114,9 @@ int _write (int fd, const void *buf, size_t count)
 
   if ( Serial )
   {
-    Serial.write( (const uint8_t *) buf, count);
+    return Serial.write( (const uint8_t *) buf, count);
   }
+  return 0;
 }
 
 }

cores/nRF5/utility/AdaCallback.h

@@ -38,9 +38,18 @@
 
 #include "common_inc.h"
 
+#ifndef CFG_CALLBACK_TASK_STACKSIZE
 #define CFG_CALLBACK_TASK_STACKSIZE     (512*2)
+#endif
+
+#ifndef CFG_CALLBACK_QUEUE_LENGTH
 #define CFG_CALLBACK_QUEUE_LENGTH       20
+#endif
+
+#ifndef CFG_CALLBACK_TIMEOUT
 #define CFG_CALLBACK_TIMEOUT            100
+#endif
+
 
 #ifdef __cplusplus
 extern "C"{

libraries/Bluefruit52Lib/examples/Hardware/SerialEcho/SerialEcho.ino

@@ -24,6 +24,7 @@ const int baudrate = 115200;
 void setup()
 {
   Serial.begin (baudrate);
+  while ( !Serial ) delay(10);   // for nrf52840 with native usb
 
   Serial.println("Serial Echo demo");
   Serial.print("Badurate : ");

libraries/Bluefruit52Lib/examples/Hardware/digital_interrupt_deferred/digital_interrupt_deferred.ino

@@ -23,6 +23,7 @@ int interruptPin = A0;
 void setup()
 {
   Serial.begin(115200);
+  while ( !Serial ) delay(10);   // for nrf52840 with native usb
 
   pinMode(interruptPin, INPUT_PULLUP);
 

libraries/Bluefruit52Lib/examples/Peripheral/hid_keyscan/hid_keyscan.ino

@@ -19,6 +19,7 @@
 
 #include <bluefruit.h>
 
+BLEDis bledis;
 BLEHidAdafruit blehid;
 
 // Array of pins and its keycode
@@ -56,6 +57,11 @@ void setup()
   Bluefruit.setTxPower(4);
   Bluefruit.setName("Bluefruit52");
 
+  // Configure and Start Device Information Service
+  bledis.setManufacturer("Adafruit Industries");
+  bledis.setModel("Bluefruit Feather 52");
+  bledis.begin();
+
   // set up pin as input
   for (uint8_t i=0; i<pincount; i++)
   {

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

@@ -596,7 +596,7 @@ uint16_t BLECharacteristic::read16(void)
 
 uint32_t BLECharacteristic::read32(void)
 {
-  uint16_t num;
+  uint32_t num;
   return read(&num, sizeof(num)) ? num : 0;
 }
 

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -42,11 +42,23 @@
 #include "usb/usb.h"
 #endif
 
+#ifndef CFG_BLE_TX_POWER_LEVEL
 #define CFG_BLE_TX_POWER_LEVEL           0
+#endif
+
+#ifndef CFG_DEFAULT_NAME
 #define CFG_DEFAULT_NAME                 "Bluefruit52"
+#endif
+
 
+#ifndef CFG_BLE_TASK_STACKSIZE
 #define CFG_BLE_TASK_STACKSIZE          (512*3)
+#endif
+
+#ifndef CFG_SOC_TASK_STACKSIZE
 #define CFG_SOC_TASK_STACKSIZE          (200)
+#endif
+
 
 AdafruitBluefruit Bluefruit;
 

libraries/Bluefruit52Lib/src/clients/BLEClientHidAdafruit.cpp

@@ -81,6 +81,8 @@ bool BLEClientHidAdafruit::begin(void)
   // set notify callback
   _kbd_boot_input.setNotifyCallback(kbd_client_notify_cb);
   _mse_boot_input.setNotifyCallback(mse_client_notify_cb);
+
+  return true;
 }
 
 void BLEClientHidAdafruit::setKeyboardReportCallback(kbd_callback_t fp)
@@ -140,12 +142,12 @@ bool BLEClientHidAdafruit::keyboardPresent(void)
 
 bool BLEClientHidAdafruit::enableKeyboard(void)
 {
-  _kbd_boot_input.enableNotify();
+  return _kbd_boot_input.enableNotify();
 }
 
 bool BLEClientHidAdafruit::disableKeyboard(void)
 {
-  _kbd_boot_input.disableNotify();
+  return _kbd_boot_input.disableNotify();
 }
 
 void BLEClientHidAdafruit::_handle_kbd_input(uint8_t* data, uint16_t len)
@@ -171,12 +173,12 @@ bool BLEClientHidAdafruit::mousePresent(void)
 
 bool BLEClientHidAdafruit::enableMouse(void)
 {
-  _mse_boot_input.enableNotify();
+  return _mse_boot_input.enableNotify();
 }
 
 bool BLEClientHidAdafruit::disableMouse(void)
 {
-  _mse_boot_input.disableNotify();
+  return _mse_boot_input.disableNotify();
 }
 
 void BLEClientHidAdafruit::_handle_mse_input(uint8_t* data, uint16_t len)