Merge pull request #257 from adafruit/develop

update usb, add Adafruit_TinyUSB_core support

Author: hathach

.travis.yml

@@ -0,0 +1,19 @@
+language: c
+sudo: false
+cache:
+  directories:
+    - ~/arduino_ide
+
+git:
+  depth: false
+  quiet: true
+
+before_install:
+#  - source <(curl -SLs https://raw.githubusercontent.com/hathach/travis-ci-arduino/test-nrf52/install.sh)
+script:
+#  - build_platform adafruit:nrf52:feather52840
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change

README.md

@@ -4,6 +4,9 @@ This repository contains the Arduino BSP for Adafruit nRF52 series:
 
 - [Bluefruit Feather nRF52832](https://www.adafruit.com/product/3406)
 - [Bluefruit Feather nRF52840](https://www.adafruit.com/product/4062)
+
+Following boards are also included but are not officially supported:
+
 - [Noric nRF52840DK PCA10056](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52840-DK)
 
 ## BSP Installation

boards.txt

@@ -68,21 +68,21 @@ feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 #**********************************************
 feather52840.name=Adafruit Bluefruit nRF52840 Feather Express
 
-# DFU Mode with CDC only
+# DFU Mode with CDC + MSC (UF2)
 feather52840.vid.0=0x239A
-feather52840.pid.0=0x002A
+feather52840.pid.0=0x0029
 
-# DFU Mode with CDC + MSC (UF2)
+# DFU Mode with CDC only
 feather52840.vid.1=0x239A
-feather52840.pid.1=0x0029
+feather52840.pid.1=0x002A
 
-# Arduino Application with CDC + MSC
+# Arduino Application
 feather52840.vid.2=0x239A
 feather52840.pid.2=0x8029
 
 # CircuitPython
-feather52840.vid.2=0x239A
-feather52840.pid.2=0x802A
+feather52840.vid.3=0x239A
+feather52840.pid.3=0x802A
 
 feather52840.bootloader.tool=bootburn
 
@@ -125,44 +125,60 @@ feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 #**********************************************
 # Bluefruit Metro nRF52840 Express Board
 #**********************************************
-#metro52840.name=Adafruit Bluefruit nRF52840 Metro Express
-#metro52840.bootloader.tool=bootburn
+metro52840.name=Adafruit Bluefruit nRF52840 Metro Express
+metro52840.bootloader.tool=bootburn
+
+# DFU Mode with CDC + MSC (UF2)
+metro52840.vid.0=0x239A
+metro52840.pid.0=0x003F
+
+# DFU Mode with CDC only
+metro52840.vid.1=0x239A
+metro52840.pid.1=0x0040
+
+# Arduino Application
+metro52840.vid.2=0x239A
+metro52840.pid.2=0x803F
+
+# CircuitPython
+metro52840.vid.3=0x239A
+metro52840.pid.3=0x8040
 
 # Upload
-#metro52840.upload.tool=nrfutil
-#metro52840.upload.protocol=nrfutil
-#metro52840.upload.use_1200bps_touch=true
-#metro52840.upload.wait_for_upload_port=true
+metro52840.upload.tool=nrfutil
+metro52840.upload.protocol=nrfutil
+metro52840.upload.use_1200bps_touch=true
+metro52840.upload.wait_for_upload_port=true
 
 # Build
-#metro52840.build.mcu=cortex-m4
-#metro52840.build.f_cpu=64000000
-#metro52840.build.board=NRF52840_METRO
-#metro52840.build.core=nRF5
-#metro52840.build.variant=metro_nrf52840_express
-#metro52840.build.extra_flags=-DNRF52840_XXAA
+metro52840.build.mcu=cortex-m4
+metro52840.build.f_cpu=64000000
+metro52840.build.board=NRF52840_METRO
+metro52840.build.core=nRF5
+metro52840.build.variant=metro_nrf52840_express
+metro52840.build.extra_flags=-DNRF52840_XXAA -DARDUINO_NRF52_FEATHER
 
 # SofDevice Menu
 # Ram & ROM size varies depending on SoftDevice (check linker script)
 
-#metro52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
-#metro52840.menu.softdevice.s140v6.build.sd_flags=-DS140
-#metro52840.menu.softdevice.s140v6.build.sd_name=s140
-#metro52840.menu.softdevice.s140v6.build.sd_version=6.1.1
-#metro52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
-#metro52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
-#metro52840.menu.softdevice.s140v6.upload.maximum_size=815104
-#metro52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
+metro52840.menu.softdevice.s140v6=0.2.9 (s140 6.1.1)
+metro52840.menu.softdevice.s140v6.build.sd_flags=-DS140
+metro52840.menu.softdevice.s140v6.build.sd_name=s140
+metro52840.menu.softdevice.s140v6.build.sd_version=6.1.1
+metro52840.menu.softdevice.s140v6.build.sd_fwid=0x00B6
+metro52840.menu.softdevice.s140v6.build.ldscript=nrf52840_s140_v6.ld
+metro52840.menu.softdevice.s140v6.upload.maximum_size=815104
+metro52840.menu.softdevice.s140v6.upload.maximum_data_size=248832
 
 # Debug Menu
-#metro52840.menu.debug.l0=Level 0 (Release)
-#metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
-#metro52840.menu.debug.l1=Level 1 (Error Message)
-#metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
-#metro52840.menu.debug.l2=Level 2 (Full Debug)
-#metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
-#metro52840.menu.debug.l3=Level 3 (Segger SystemView)
-#metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
+metro52840.menu.debug.l0=Level 0 (Release)
+metro52840.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0 -Os
+metro52840.menu.debug.l1=Level 1 (Error Message)
+metro52840.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1 -Os
+metro52840.menu.debug.l2=Level 2 (Full Debug)
+metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2 -Os
+metro52840.menu.debug.l3=Level 3 (Segger SystemView)
+metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3 -Os
 
 #**********************************************
 # Nordic nRF52840DK (PCA10056)

changelog.md

@@ -1,6 +1,6 @@
 # Adafruit nRF52 Arduino Core Changelog
 
-# 0.10.1
+# 0.10.5
 
 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.     
 

cores/nRF5/Arduino.h

@@ -36,7 +36,6 @@ void setup( void ) ;
 void loop( void ) ;
 
 void suspendLoop(void);
-uint32_t setLoopStacksize(void);
 
 #include "WVariant.h"
 
@@ -69,12 +68,7 @@ uint32_t setLoopStacksize(void);
 #include "utility/AdaCallback.h"
 
 #ifdef NRF52840_XXAA
-  #include "tusb.h"
-
-#ifdef __cplusplus
-  #include "USBSerial.h"
-#endif
-
+  #include "Adafruit_TinyUSB_core.h"
 #endif
 
 // Include board variant

cores/nRF5/common_func.h

@@ -115,7 +115,7 @@
 // DEBUG HELPER
 //--------------------------------------------------------------------+
 #if CFG_DEBUG == 2
-  #define malloc_named( name, size )            ({ ::printf("[malloc] %s : %d\r\n", name, size); malloc(size); })
+  #define malloc_named( name, size )            ({ PRINTF("[malloc] %s : %d\r\n", name, size); malloc(size); })
 #else
   #define malloc_named( name, size )            malloc ( size )
 #endif
@@ -140,38 +140,44 @@ const char* dbg_err_str(int32_t err_id); // TODO move to other place
 
 #if CFG_DEBUG
 
-#define PRINT_LOCATION()      ::printf("%s: %d:\n", __PRETTY_FUNCTION__, __LINE__)
-#define PRINT_MESS(x)         ::printf("%s: %d: %s \n"   , __FUNCTION__, __LINE__, (char*)(x))
-#define PRTNT_HEAP()          if (CFG_DEBUG == 3) ::printf("\n%s: %d: Heap free: %d\n", __FUNCTION__, __LINE__, util_heap_get_free_size())
-#define PRINT_STR(x)          ::printf("%s: %d: " #x " = %s\n"   , __FUNCTION__, __LINE__, (char*)(x) )
-#define PRINT_INT(x)          ::printf("%s: %d: " #x " = %ld\n"  , __FUNCTION__, __LINE__, (uint32_t) (x) )
+#if __cplusplus
+#define PRINTF    ::printf
+#else
+#define PRINTF    printf
+#endif
+
+#define PRINT_LOCATION()      PRINTF("%s: %d:\n", __PRETTY_FUNCTION__, __LINE__)
+#define PRINT_MESS(x)         PRINTF("%s: %d: %s \n"   , __FUNCTION__, __LINE__, (char*)(x))
+#define PRTNT_HEAP()          if (CFG_DEBUG == 3) PRINTF("\n%s: %d: Heap free: %d\n", __FUNCTION__, __LINE__, util_heap_get_free_size())
+#define PRINT_STR(x)          PRINTF("%s: %d: " #x " = %s\n"   , __FUNCTION__, __LINE__, (char*)(x) )
+#define PRINT_INT(x)          PRINTF("%s: %d: " #x " = %ld\n"  , __FUNCTION__, __LINE__, (uint32_t) (x) )
 
 #define PRINT_HEX(x) \
   do {\
-    ::printf("%s: %d: " #x " = 0x", __PRETTY_FUNCTION__, __LINE__);\
+    PRINTF("%s: %d: " #x " = 0x", __PRETTY_FUNCTION__, __LINE__);\
     char fmt[] = "%00X\n";\
     fmt[2] += 2*sizeof(x); /* Hex with correct size */\
-    ::printf(fmt, (x) );\
+    PRINTF(fmt, (x) );\
   }while(0)
 
 #define PRINT_BUFFER(buf, n) \
   do {\
     uint8_t const* p8 = (uint8_t const*) (buf);\
-    ::printf(#buf ": ");\
-    for(uint32_t i=0; i<(n); i++) ::printf("%02x ", p8[i]);\
-    ::printf("\n");\
+    PRINTF(#buf ": ");\
+    for(uint32_t i=0; i<(n); i++) PRINTF("%02x ", p8[i]);\
+    PRINTF("\n");\
   }while(0)
 
 #define ADALOG(tag, ...) \
   do { \
-    if ( tag ) ::printf("[%-6s] ", tag);\
-    ::printf(__VA_ARGS__);\
-    ::printf("\n");\
+    if ( tag ) PRINTF("[%-6s] ", tag);\
+    PRINTF(__VA_ARGS__);\
+    PRINTF("\n");\
   }while(0)
 
 #define ADALOG_BUFFER(_tag, _buf, _n) \
   do {\
-    if ( _tag ) ::printf("%-6s: len = %d\n", _tag, _n);\
+    if ( _tag ) PRINTF("%-6s: len = %d\n", _tag, _n);\
     dbgDumpMemory(_buf, 1, _n, true);\
   }while(0)
 

cores/nRF5/flash/flash_cache.c

@@ -1,38 +1,26 @@
-/**************************************************************************/
-/*!
-    @file     flash_cache.c
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2018, Adafruit Industries (adafruit.com)
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/**************************************************************************/
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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.
+ */
 
 #include "flash_cache.h"
 #include "common_func.h"

cores/nRF5/flash/flash_cache.h

@@ -1,38 +1,26 @@
-/**************************************************************************/
-/*!
-    @file     flash_cache.h
-    @author   hathach (tinyusb.org)
-
-    @section LICENSE
-
-    Software License Agreement (BSD License)
-
-    Copyright (c) 2018, Adafruit Industries (adafruit.com)
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    3. Neither the name of the copyright holders nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ''AS IS'' AND ANY
-    EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-/**************************************************************************/
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 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 FLASH_CACHE_H_
 #define FLASH_CACHE_H_