Merge branch 'master' into cplay_nrf

Author: Ladyada

.travis.yml

@@ -4,6 +4,9 @@ git:
   depth: false
   quiet: true
 
+env:
+  - BSP_PATH="$HOME/.arduino15/packages/adafruit/hardware/nrf52"
+  
 addons:
   apt:
     packages:
@@ -19,8 +22,12 @@ install:
   - umake electronics arduino $HOME/arduino_ide
   - export PATH=$HOME/arduino_ide:$PATH
   - arduino --pref "boardsmanager.additional.urls=https://adafruit.github.io/arduino-board-index/package_adafruit_index.json" --save-prefs
+  # Install BSP for tools, then remove and create symlink the git code
   - arduino --install-boards adafruit:nrf52
-  - arduino --install-library "Adafruit NeoPixel","Adafruit NeoMatrix","Adafruit GFX Library","Adafruit SSD1306","MIDI Library",
+  - BSP_VERSION=`eval ls $BSP_PATH`
+  - rm -r $BSP_PATH/*
+  - ln -s $TRAVIS_BUILD_DIR $BSP_PATH/$BSP_VERSION
+  - arduino --install-library "Adafruit NeoPixel","Adafruit NeoMatrix","Adafruit GFX Library","Adafruit SSD1306","MIDI Library","Adafruit ILI9341"
 
 before_script:
 

README.md

@@ -8,7 +8,7 @@ This repository contains the Arduino BSP for Adafruit Bluefruit nRF52 series:
 
 Following boards are also included but are not officially supported:
 
-- [Noric nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
+- [Nordic nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
 
 ## BSP Installation
 
@@ -115,4 +115,3 @@ The following libraries are used:
 - [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
-- [fatfs by elm-chan](http://elm-chan.org/fsw/ff/00index_e.html) for external file system

bootloader/particle_xenon/particle_xenon_bootloader-0.2.11_s140_6.1.1.hex

@@ -1,13 +1,30 @@
 # Adafruit nRF52 Arduino Core Changelog
 
-# 0.11.1
+## Next Release
 
+## 0.12.0 - 2019.08.05
+
+- Update tinyusb core to support webUSB & vendor class
+- Added a couple delete operators to make std=gnu++14/17, PR #312 thanks to @kevinfrei
+- Fix Serial.read() return clean 8-bit, PR #308 thanks to @pyro9
+- Added availableForWrite(), PR #311 thanks to @pyro9
+
+## 0.11.1 - 2019.07.10
+
+- Update tinyusb core to support USB MIDI
 - Refactor Ada Callback, use ISCR to detect isr context. Use function instead of macro
 - Implement #240 run travis test with all example sketches
-- Fix auto-start of advertising when central is connected, thanks to @ogatatsu PR #268
+- Fixed auto-start of advertising when central is connected, thanks to @ogatatsu PR #268
 - Added Tone()/noTone() functions
+- Travis-ci builds all sketches when commit code
+- Fixed setAppearance/getAppearance() typo, thanks to @paulmand3l PR #292
+- Fixed rssi_proximity_peripheral sketch, thanks to @dicobrazz PR #295
+- Fixed doc typo, thanks to @yvadher PR #296
+- Fixed HID usage code location comment in exmaple sketch, thanks to @stefandz PR #297
+- Fixed #277 conn LED doesn't stop when scanner is time out
+- Added connection handle to Bluefruit.connParied()
 
-# 0.11.0
+## 0.11.0
 
 - Rework USB driver to support Adafruit_TinyUSB library (support HID and MSC)
 - Added Metro nRF52840 Express
@@ -29,7 +46,7 @@
 - enhance Serial.available()/write() to prevent blocking wait without yield/delay
 - Clean up compiler warnings
 
-# 0.10.1
+## 0.10.1
 
 This release added multiple concurrent peripheral connections support, allow Bluefruit device to multiple central (phones/PC) simultaneously. It introduces new BLE class: BLEPeriph, BLEConnection, remove BLEGap, refactor/rename/move functions and callbacks.     
 
@@ -72,7 +89,7 @@ This release added multiple concurrent peripheral connections support, allow Blu
   - Removed keyboardReport() variant with flat keycode parameters
   - Added conn_handle parameter to keyboard led callback
 
-# 0.9.3
+## 0.9.3
 
 - Correct bootloader version text in IDE to 0.2.6
 - Fixed #173 bleuart return incorrect value when failed to send (PR #178 thanks Nenik)

bootloader/particle_xenon/particle_xenon_bootloader-0.2.11_s140_6.1.1.zip

@@ -37,10 +37,11 @@ Adafruit_USBD_CDC::Adafruit_USBD_CDC(void)
 
 }
 
-uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t* buf, uint16_t bufsize)
+uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize)
 {
   // CDC is mostly always existed for DFU
-  uint8_t desc[] = { TUD_CDC_DESCRIPTOR(0, 0, EPIN, 8, EPOUT, EPIN, 64) };
+  // usb core will automatically update endpoint number
+  uint8_t desc[] = { TUD_CDC_DESCRIPTOR(itfnum, 0, EPIN, 8, EPOUT, EPIN, 64) };
   uint16_t const len = sizeof(desc);
 
   if ( bufsize < len ) return 0;
@@ -52,9 +53,13 @@ uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t* buf, uint16_t bufsize)
 // Baud and config is ignore in CDC
 void Adafruit_USBD_CDC::begin (uint32_t baud)
 {
+  (void) baud;
 }
+
 void Adafruit_USBD_CDC::begin (uint32_t baud, uint8_t config)
 {
+  (void) baud;
+  (void) config;
 }
 
 void Adafruit_USBD_CDC::end(void)
@@ -86,7 +91,8 @@ int Adafruit_USBD_CDC::available(void)
 
 int Adafruit_USBD_CDC::peek(void)
 {
-  return tud_cdc_peek(0);
+  uint8_t ch;
+  return tud_cdc_peek(0, &ch) ? (int) ch : -1;
 }
 
 int Adafruit_USBD_CDC::read(void)
@@ -101,7 +107,7 @@ void Adafruit_USBD_CDC::flush(void)
 
 size_t Adafruit_USBD_CDC::write(uint8_t ch)
 {
-  return tud_cdc_write_char((char) ch);
+  return write(&ch, 1);
 }
 
 size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size)
@@ -120,6 +126,11 @@ size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size)
   return size - remain;
 }
 
+int Adafruit_USBD_CDC::availableForWrite(void)
+{
+  return tud_cdc_write_available();
+}
+
 extern "C"
 {
 
@@ -128,6 +139,7 @@ extern "C"
 void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts)
 {
   (void) itf;  // interface ID, not used
+  (void) rts;
 
   // DTR = false is counted as disconnected
   if ( !dtr )

changelog.md

@@ -34,22 +34,24 @@ class Adafruit_USBD_CDC : public Stream, Adafruit_USBD_Interface
 	Adafruit_USBD_CDC(void);
 
 	// fron Adafruit_USBD_Interface
-	virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
+	virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize);
 
 	void setPins(uint8_t pin_rx, uint8_t pin_tx) { (void) pin_rx; (void) pin_tx; }
 	void begin(uint32_t baud_count);
 	void begin(uint32_t baud, uint8_t config);
 	void end(void);
 
-	virtual int available(void);
-	virtual int peek(void);
-	virtual int read(void);
-	virtual void flush(void);
+	virtual int    available(void);
+	virtual int    peek(void);
+	virtual int    read(void);
+	virtual void   flush(void);
 	virtual size_t write(uint8_t);
+
 	virtual size_t write(const uint8_t *buffer, size_t size);
 	size_t write(const char *buffer, size_t size) {
 	  return write((const uint8_t *)buffer, size);
 	}
+	virtual int availableForWrite(void);
 	operator bool();
 };
 

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.cpp

@@ -40,7 +40,7 @@ Adafruit_USBD_Device USBDevice;
 
 Adafruit_USBD_Device::Adafruit_USBD_Device(void)
 {
-  tusb_desc_device_t  desc_dev =
+  tusb_desc_device_t const desc_dev =
   {
     .bLength            = sizeof(tusb_desc_device_t),
     .bDescriptorType    = TUSB_DESC_DEVICE,
@@ -57,25 +57,22 @@ Adafruit_USBD_Device::Adafruit_USBD_Device(void)
     .idVendor           = 0,
     .idProduct          = 0,
     .bcdDevice          = 0x0100,
-
     .iManufacturer      = 0x01,
     .iProduct           = 0x02,
     .iSerialNumber      = 0x03,
-
     .bNumConfigurations = 0x01
   };
 
   _desc_device = desc_dev;
 
-  tusb_desc_configuration_t dev_cfg =
+  tusb_desc_configuration_t const dev_cfg =
   {
     .bLength             = sizeof(tusb_desc_configuration_t),
     .bDescriptorType     = TUSB_DESC_CONFIGURATION,
 
     // Total Length & Interface Number will be updated later
     .wTotalLength        = 0,
     .bNumInterfaces      = 0,
-
     .bConfigurationValue = 1,
     .iConfiguration      = 0x00,
     .bmAttributes        = TU_BIT(7) | TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP,
@@ -95,26 +92,17 @@ Adafruit_USBD_Device::Adafruit_USBD_Device(void)
 bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
 {
   uint8_t* desc = _desc_cfg+_desc_cfglen;
-  uint16_t const len = itf.getDescriptor(desc, sizeof(_desc_cfg)-_desc_cfglen);
+  uint16_t const len = itf.getDescriptor(_itf_count, desc, sizeof(_desc_cfg)-_desc_cfglen);
   uint8_t* desc_end = desc+len;
 
   if ( !len ) return false;
 
-  // Handle IAD
-  if ( desc[1] == TUSB_DESC_INTERFACE_ASSOCIATION )
-  {
-    // update starting interface
-    ((tusb_desc_interface_assoc_t*) desc)->bFirstInterface = _itf_count;
-
-    desc += desc[0]; // next
-  }
-
   while (desc < desc_end)
   {
     if (desc[1] == TUSB_DESC_INTERFACE)
     {
-      // No alternate interface support
-      ((tusb_desc_interface_t*) desc)->bInterfaceNumber = _itf_count++;
+      tusb_desc_interface_t* desc_itf = (tusb_desc_interface_t*) desc;
+      if (desc_itf->bAlternateSetting == 0) _itf_count++;
     }else if (desc[1] == TUSB_DESC_ENDPOINT)
     {
       tusb_desc_endpoint_t* desc_ep = (tusb_desc_endpoint_t*) desc;
@@ -127,7 +115,7 @@ bool Adafruit_USBD_Device::addInterface(Adafruit_USBD_Interface& itf)
 
   _desc_cfglen += len;
 
-  // Update config descriptor
+  // Update configuration descriptor
   tusb_desc_configuration_t* config = (tusb_desc_configuration_t*)_desc_cfg;
   config->wTotalLength = _desc_cfglen;
   config->bNumInterfaces = _itf_count;
@@ -141,6 +129,11 @@ void Adafruit_USBD_Device::setID(uint16_t vid, uint16_t pid)
   _desc_device.idProduct = pid;
 }
 
+void Adafruit_USBD_Device::setVersion(uint16_t bcd)
+{
+  _desc_device.bcdUSB = bcd;
+}
+
 bool Adafruit_USBD_Device::begin(void)
 {
   return true;

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_CDC.h

@@ -30,7 +30,7 @@
 class Adafruit_USBD_Interface
 {
   public:
-    virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize) = 0;
+    virtual uint16_t getDescriptor(uint8_t itfnum, uint8_t* buf, uint16_t bufsize) = 0;
 };
 
 class Adafruit_USBD_Device
@@ -52,12 +52,13 @@ class Adafruit_USBD_Device
     bool addInterface(Adafruit_USBD_Interface& itf);
 
     void setID(uint16_t vid, uint16_t pid);
+    void setVersion(uint16_t bcd);
     bool begin(void);
 
-    bool mounted(void) { return tud_mounted(); }
-    bool suspended(void) { return tud_suspended(); }
-    bool ready(void) { return tud_ready(); }
-    bool remoteWakeup(void) { return tud_remote_wakeup(); }
+    bool mounted      (void) { return tud_mounted(); }
+    bool suspended    (void) { return tud_suspended(); }
+    bool ready        (void) { return tud_ready(); }
+    bool remoteWakeup (void) { return tud_remote_wakeup(); }
 
     friend uint8_t const * tud_descriptor_device_cb(void);
     friend uint8_t const * tud_descriptor_configuration_cb(uint8_t index);

cores/nRF5/Adafruit_TinyUSB_Core/Adafruit_USBD_Device.cpp

@@ -29,8 +29,8 @@
  *            Currently only MIDI subclass is supported
  *  @{ */
 
-#ifndef _TUSB_CDC_H__
-#define _TUSB_CDC_H__
+#ifndef _TUSB_AUDIO_H__
+#define _TUSB_AUDIO_H__
 
 #include "common/tusb_common.h"
 
@@ -41,9 +41,9 @@
 /// Audio Interface Subclass Codes
 typedef enum
 {
-  AUDIO_SUBCLASS_AUDIO_CONTROL = 0x01  , ///< Audio Control
-  AUDIO_SUBCLASS_AUDIO_STREAMING       , ///< Audio Streaming
-  AUDIO_SUBCLASS_MIDI_STREAMING       ,  ///< MIDI Streaming
+  AUDIO_SUBCLASS_CONTROL = 0x01  , ///< Audio Control
+  AUDIO_SUBCLASS_STREAMING       , ///< Audio Streaming
+  AUDIO_SUBCLASS_MIDI_STREAMING  , ///< MIDI Streaming
 } audio_subclass_type_t;
 
 /// Audio Protocol Codes
@@ -54,6 +54,40 @@ typedef enum
   AUDIO_PROTOCOL_V3                   = 0x30, ///< Version 3.0
 } audio_protocol_type_t;
 
+/// Audio Function Category Codes
+typedef enum
+{
+  AUDIO_FUNC_DESKTOP_SPEAKER    = 0x01,
+  AUDIO_FUNC_HOME_THEATER       = 0x02,
+  AUDIO_FUNC_MICROPHONE         = 0x03,
+  AUDIO_FUNC_HEADSET            = 0x04,
+  AUDIO_FUNC_TELEPHONE          = 0x05,
+  AUDIO_FUNC_CONVERTER          = 0x06,
+  AUDIO_FUNC_SOUND_RECODER      = 0x07,
+  AUDIO_FUNC_IO_BOX             = 0x08,
+  AUDIO_FUNC_MUSICAL_INSTRUMENT = 0x09,
+  AUDIO_FUNC_PRO_AUDIO          = 0x0A,
+  AUDIO_FUNC_AUDIO_VIDEO        = 0x0B,
+  AUDIO_FUNC_CONTROL_PANEL      = 0x0C
+} audio_function_t;
+
+/// Audio Class-Specific AC Interface Descriptor Subtypes
+typedef enum
+{
+  AUDIO_CS_INTERFACE_HEADER                = 0x01,
+  AUDIO_CS_INTERFACE_INPUT_TERMINAL        = 0x02,
+  AUDIO_CS_INTERFACE_OUTPUT_TERMINAL       = 0x03,
+  AUDIO_CS_INTERFACE_MIXER_UNIT            = 0x04,
+  AUDIO_CS_INTERFACE_SELECTOR_UNIT         = 0x05,
+  AUDIO_CS_INTERFACE_FEATURE_UNIT          = 0x06,
+  AUDIO_CS_INTERFACE_EFFECT_UNIT           = 0x07,
+  AUDIO_CS_INTERFACE_PROCESSING_UNIT       = 0x08,
+  AUDIO_CS_INTERFACE_EXTENSION_UNIT        = 0x09,
+  AUDIO_CS_INTERFACE_CLOCK_SOURCE          = 0x0A,
+  AUDIO_CS_INTERFACE_CLOCK_SELECTOR        = 0x0B,
+  AUDIO_CS_INTERFACE_CLOCK_MULTIPLIER      = 0x0C,
+  AUDIO_CS_INTERFACE_SAMPLE_RATE_CONVERTER = 0x0D,
+} audio_cs_interface_subtype_t;
 
 /** @} */