Merge branch 'master' into develop

Author: hathach

.github/workflows/githubci.yml

@@ -52,7 +52,10 @@ jobs:
         rm -r $HOME/$BSP_PATH/*
         ln -s $GITHUB_WORKSPACE $HOME/$BSP_PATH/$BSP_VERSION
         # Install library dependency
-        arduino-cli lib install "Adafruit AHRS" "Adafruit APDS9960 Library" "Adafruit Arcada Library" "Adafruit BMP280 Library" "Adafruit Circuit Playground" "Adafruit EPD" "Adafruit GFX Library" "Adafruit HX8357 Library" "Adafruit ILI9341" "Adafruit LIS3MDL" "Adafruit LSM6DS" "Adafruit NeoPixel" "Adafruit NeoMatrix" "Adafruit nRFCrypto" "Adafruit Sensor Calibration" "Adafruit SHT31 Library" "Adafruit SSD1306" "Adafruit ST7735 and ST7789 Library" "Firmata" "MIDI Library"  "SdFat - Adafruit Fork"
+        arduino-cli lib install "Adafruit AHRS" "Adafruit APDS9960 Library" "Adafruit BMP280 Library" "Adafruit Circuit Playground" "Adafruit EPD" "Adafruit GFX Library" "Adafruit HX8357 Library" "Adafruit ILI9341" "Adafruit LIS3MDL" "Adafruit LSM6DS" "Adafruit NeoPixel" "Adafruit NeoMatrix" "Adafruit nRFCrypto" "Adafruit Sensor Calibration" "Adafruit SHT31 Library" "Adafruit SSD1306" "Adafruit ST7735 and ST7789 Library" "Firmata" "SdFat - Adafruit Fork"
+        
+        # TODO update to support MIDI version 5 later on
+        arduino-cli lib install "MIDI Library"@4.3.1
 
     - name: Build examples
       run: python3 tools/build_all.py ${{ matrix.arduino-platform }}

boards.txt

@@ -40,8 +40,8 @@ feather52832.build.f_cpu=64000000
 feather52832.build.board=NRF52832_FEATHER
 feather52832.build.core=nRF5
 feather52832.build.variant=feather_nrf52832
-feather52840.build.usb_manufacturer="Adafruit LLC"
-feather52840.build.usb_product="Feather nRF52832"
+feather52832.build.usb_manufacturer="Adafruit LLC"
+feather52832.build.usb_product="Feather nRF52832"
 feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52
 feather52832.build.ldscript=nrf52832_s132_v6.ld
 
@@ -60,6 +60,7 @@ feather52832.menu.debug.l2=Level 2 (Full Debug)
 feather52832.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 feather52832.menu.debug.l3=Level 3 (Segger SystemView)
 feather52832.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+feather52832.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Bluefruit Feather nRF52840 Express
@@ -113,6 +114,7 @@ feather52840.menu.debug.l2=Level 2 (Full Debug)
 feather52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 feather52840.menu.debug.l3=Level 3 (Segger SystemView)
 feather52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+feather52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 # ----------------------------------
@@ -167,6 +169,7 @@ feather52840sense.menu.debug.l2=Level 2 (Full Debug)
 feather52840sense.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 feather52840sense.menu.debug.l3=Level 3 (Segger SystemView)
 feather52840sense.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+feather52840sense.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 # ---------------------------------------------
@@ -221,6 +224,7 @@ itsybitsy52840.menu.debug.l2=Level 2 (Full Debug)
 itsybitsy52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 itsybitsy52840.menu.debug.l3=Level 3 (Segger SystemView)
 itsybitsy52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+itsybitsy52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ---------------------------------------------
 # Bluefruit Circuit Playground nRF52840 Express
@@ -274,6 +278,7 @@ cplaynrf52840.menu.debug.l2=Level 2 (Full Debug)
 cplaynrf52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 cplaynrf52840.menu.debug.l3=Level 3 (Segger SystemView)
 cplaynrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+cplaynrf52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 # ---------------------------------------------
@@ -298,7 +303,7 @@ cluenrf52840.upload.protocol=nrfutil
 cluenrf52840.upload.use_1200bps_touch=true
 cluenrf52840.upload.wait_for_upload_port=true
 cluenrf52840.upload.maximum_size=815104
-cluenrf52840.upload.maximum_data_size=248832
+cluenrf52840.upload.maximum_data_size=237568
 
 # Build
 cluenrf52840.build.mcu=cortex-m4
@@ -328,6 +333,7 @@ cluenrf52840.menu.debug.l2=Level 2 (Full Debug)
 cluenrf52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 cluenrf52840.menu.debug.l3=Level 3 (Segger SystemView)
 cluenrf52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+cluenrf52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Bluefruit Metro nRF52840 Express
@@ -381,6 +387,7 @@ metro52840.menu.debug.l2=Level 2 (Full Debug)
 metro52840.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 metro52840.menu.debug.l3=Level 3 (Segger SystemView)
 metro52840.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+metro52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 
 
@@ -434,6 +441,7 @@ pca10056.menu.debug.l2=Level 2 (Full Debug)
 pca10056.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 pca10056.menu.debug.l3=Level 3 (Segger SystemView)
 pca10056.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+pca10056.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Particle Xenon
@@ -457,7 +465,7 @@ particle_xenon.upload.protocol=nrfutil
 particle_xenon.upload.use_1200bps_touch=true
 particle_xenon.upload.wait_for_upload_port=true
 particle_xenon.upload.maximum_size=815104
-particle_xenon.upload.maximum_data_size=248832
+particle_xenon.upload.maximum_data_size=237568
 
 # Build
 particle_xenon.build.mcu=cortex-m4
@@ -487,6 +495,7 @@ particle_xenon.menu.debug.l2=Level 2 (Full Debug)
 particle_xenon.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 particle_xenon.menu.debug.l3=Level 3 (Segger SystemView)
 particle_xenon.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+particle_xenon.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
 
 # ----------------------------------
 # Raytac MDBT50Q - RX
@@ -510,7 +519,7 @@ mdbt50qrx.upload.protocol=nrfutil
 mdbt50qrx.upload.use_1200bps_touch=true
 mdbt50qrx.upload.wait_for_upload_port=true
 mdbt50qrx.upload.maximum_size=815104
-mdbt50qrx.upload.maximum_data_size=248832
+mdbt50qrx.upload.maximum_data_size=237568
 
 # Build
 mdbt50qrx.build.mcu=cortex-m4
@@ -540,3 +549,4 @@ mdbt50qrx.menu.debug.l2=Level 2 (Full Debug)
 mdbt50qrx.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
 mdbt50qrx.menu.debug.l3=Level 3 (Segger SystemView)
 mdbt50qrx.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
+mdbt50qrx.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1

changelog.md

@@ -1,6 +1,6 @@
 # Adafruit nRF52 Arduino Core Changelog
 
-## 0.20.0
+## 0.21.0
 
 This version implement comprehensive LESC and Legacy pairing using dynamic & staic Passkey.
 
@@ -50,6 +50,30 @@ A new class BLESecurity (access with Bluefruit.Security) is added to handle secu
 - **cental_pairing** similar to pairing_passkey but for nRF running central role
 - **ancs_arcada** for displaying ancs on arcada such CLUE and/or CPB.
 
+## 0.20.5 - 2020.07.05
+
+- Updated toolchain from gcc 7-2017q4 to 9-2019q4
+- Fixed GPIOTE channel conflict between libraries
+- Added type-safe for arrcount() macros
+- Added truncate() and rename() to Internal Filesystem (LittleFS).
+- Update CMSIS from v4 to v5 to build with TensorFlow
+- Update TinyUSB core to commit 0749077
+
+Special thanks to @henrygab, @pyro9, @geeksville for contributing and helping with this release.
+
+## 0.20.1 - 2020.04.23
+
+- Update TinyUSB to commit c59fa77 due to a bug in the stack
+
+## 0.20.0 - 2020.04.21
+
+- Fixed Wire write ambiguous
+- Improved debugging with log and sysview, thanks to @henrygab
+- Fixed recipe to compute SRAM and ROM of sketch
+- Removed the force waiting Serial when debug is enabled
+- Updated nrfx to v2.1.0
+- Updated TinyUSB to commit 718db7e
+
 ## 0.19.0 - 2020.03.12
 
 - Add BLECharacteristic::isFixedLen()

cores/nRF5/TinyUSB/Adafruit_TinyUSB_ArduinoCore

@@ -30,6 +30,22 @@
 #include "Arduino.h"
 #include "Adafruit_TinyUSB_Core.h"
 
+//--------------------------------------------------------------------+
+// Forward USB interrupt events to TinyUSB IRQ Handler
+//--------------------------------------------------------------------+
+extern "C" void USBD_IRQHandler(void)
+{
+#if CFG_SYSVIEW
+  SEGGER_SYSVIEW_RecordEnterISR();
+#endif
+
+  tud_int_handler(0);
+
+#if CFG_SYSVIEW
+    SEGGER_SYSVIEW_RecordExitISR();
+#endif
+}
+
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
 //--------------------------------------------------------------------+
@@ -106,15 +122,6 @@ void Adafruit_TinyUSB_Core_touch1200(void)
 //--------------------------------------------------------------------+
 // Adafruit_USBD_Device platform dependent
 //--------------------------------------------------------------------+
-void Adafruit_USBD_Device::detach(void)
-{
-  NRF_USBD->USBPULLUP = 0;
-}
-
-void Adafruit_USBD_Device::attach(void)
-{
-  NRF_USBD->USBPULLUP = 1;
-}
 
 uint8_t Adafruit_USBD_Device::getSerialDescriptor(uint16_t* serial_str)
 {

cores/nRF5/TinyUSB/Adafruit_TinyUSB_nRF.cpp

@@ -68,8 +68,8 @@
 #define CFG_TUD_HID_BUFSIZE         64
 
 // MIDI FIFO size of TX and RX
-#define CFG_TUD_MIDI_RX_BUFSIZE     64
-#define CFG_TUD_MIDI_TX_BUFSIZE     64
+#define CFG_TUD_MIDI_RX_BUFSIZE     128
+#define CFG_TUD_MIDI_TX_BUFSIZE     128
 
 // Vendor FIFO size of TX and RX
 #define CFG_TUD_VENDOR_RX_BUFSIZE   64

cores/nRF5/TinyUSB/tusb_config.h

@@ -21,6 +21,7 @@
 
 #include "Arduino.h"
 #include "wiring_private.h"
+#include "nrf_gpiote.h"
 
 #include <string.h>
 
@@ -95,25 +96,59 @@ int attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
       return 0;
   }
 
-  for (int ch = 0; ch < NUMBER_OF_GPIO_TE; ch++) {
-    if (channelMap[ch] == -1 || (uint32_t)channelMap[ch] == pin) {
-      channelMap[ch] = pin;
-      callbacksInt[ch] = callback;
-      callbackDeferred[ch] = deferred;
-
-      NRF_GPIOTE->CONFIG[ch] &= ~(GPIOTE_CONFIG_PORT_PIN_Msk | GPIOTE_CONFIG_POLARITY_Msk);
-      NRF_GPIOTE->CONFIG[ch] |= ((pin << GPIOTE_CONFIG_PSEL_Pos) & GPIOTE_CONFIG_PORT_PIN_Msk) |
-                              ((polarity << GPIOTE_CONFIG_POLARITY_Pos) & GPIOTE_CONFIG_POLARITY_Msk);
+  // All information for the configuration is known, except the prior values
+  // of the config register.  Pre-compute the mask and new bits for later use.
+  //     CONFIG[n] = (CONFIG[n] & oldRegMask) | newRegBits;
+  //
+  // Three fields are configured here: PORT/PIN, POLARITY, MODE
+  const uint32_t oldRegMask = ~(GPIOTE_CONFIG_PORT_PIN_Msk | GPIOTE_CONFIG_POLARITY_Msk | GPIOTE_CONFIG_MODE_Msk);
+  const uint32_t newRegBits =
+    ((pin                      << GPIOTE_CONFIG_PSEL_Pos    ) & GPIOTE_CONFIG_PORT_PIN_Msk) |
+    ((polarity                 << GPIOTE_CONFIG_POLARITY_Pos) & GPIOTE_CONFIG_POLARITY_Msk) |
+    ((GPIOTE_CONFIG_MODE_Event << GPIOTE_CONFIG_MODE_Pos    ) & GPIOTE_CONFIG_MODE_Msk    ) ;
+
+  int ch = -1;
+  int newChannel = 0;
+
+  // Find channel where pin is already assigned, if any
+  for (int i = 0; i < NUMBER_OF_GPIO_TE; i++) {
+    if ((uint32_t)channelMap[i] != pin) continue;
+    ch = i;
+    break;
+  }
+  // else, find one not already mapped and also not in use by others
+  if (ch == -1) {
+    for (int i = 0; i < NUMBER_OF_GPIO_TE; i++) {
+      if (channelMap[i] != -1) continue;
+      if (nrf_gpiote_te_is_enabled(NRF_GPIOTE, i)) continue;
+      
+      ch = i;
+      newChannel = 1;
+      break;
+    }
+  }
+  // if no channel found, exit
+  if (ch == -1) {
+    return 0; // no channel available
+  }
 
-      NRF_GPIOTE->CONFIG[ch] |= GPIOTE_CONFIG_MODE_Event;
+  channelMap[ch]         = pin;      // harmless for existing channel
+  callbacksInt[ch]       = callback; // caller might be updating this for existing channel
+  callbackDeferred[ch]   = deferred; // caller might be updating this for existing channel
 
-      NRF_GPIOTE->INTENSET = (1 << ch);
+  uint32_t tmp = NRF_GPIOTE->CONFIG[ch];
+  tmp &= oldRegMask;
+  tmp |= newRegBits;                 // for existing channel, effectively updates only the polarity
+  NRF_GPIOTE->CONFIG[ch] = tmp;
 
-      return (1 << ch);
-    }
+  // For a new channel, additionally ensure no old events existed, and enable the interrupt
+  if (newChannel) {
+    NRF_GPIOTE->EVENTS_IN[ch] = 0;
+    NRF_GPIOTE->INTENSET = (1 << ch);
   }
 
-  return 0;
+  // Finally, indicate to caller the allocated / updated channel
+  return (1 << ch);
 }
 
 /*
@@ -129,49 +164,58 @@ void detachInterrupt(uint32_t pin)
 
   for (int ch = 0; ch < NUMBER_OF_GPIO_TE; ch++) {
     if ((uint32_t)channelMap[ch] == pin) {
+      NRF_GPIOTE->INTENCLR = (1 << ch);
+      NRF_GPIOTE->CONFIG[ch] = 0;
+      NRF_GPIOTE->EVENTS_IN[ch] = 0; // clear any final events
+
+      // now cleanup the rest of the use of the channel
       channelMap[ch] = -1;
       callbacksInt[ch] = NULL;
       callbackDeferred[ch] = false;
-
-      NRF_GPIOTE->CONFIG[ch] &= ~GPIOTE_CONFIG_MODE_Event;
-
-      NRF_GPIOTE->INTENCLR = (1 << ch);
-
       break;
     }
   }
 }
 
 void GPIOTE_IRQHandler()
 {
-#if CFG_DEBUG >= 3
+#if CFG_SYSVIEW
   SEGGER_SYSVIEW_RecordEnterISR();
 #endif
 
-  uint32_t event = offsetof(NRF_GPIOTE_Type, EVENTS_IN[0]);
-
+  // Read this once (not 8x), as it's a volatile read
+  // across the AHB, which adds up to 3 cycles.
+  uint32_t const enabledInterruptMask = NRF_GPIOTE->INTENSET;
   for (int ch = 0; ch < NUMBER_OF_GPIO_TE; ch++) {
-    if ((*(uint32_t *)((uint32_t)NRF_GPIOTE + event) == 0x1UL) && (NRF_GPIOTE->INTENSET & (1 << ch))) {
-      if (channelMap[ch] != -1 && callbacksInt[ch]) {
-        if ( callbackDeferred[ch] )  {
-          // Adafruit defer callback to non-isr if configured so
-          ada_callback(NULL, 0, callbacksInt[ch]);
-        }else{
-         callbacksInt[ch]();
-        }
+    // only process where the interrupt is enabled and the event register is set
+    // check interrupt enabled mask first, as already read that IOM value, to
+    // reduce delays from AHB (16MHz) reads.
+    if ( 0 == (enabledInterruptMask & (1 << ch))) continue;
+    if ( 0 == NRF_GPIOTE->EVENTS_IN[ch]) continue;
+
+    // If the event was set and interrupts are enabled,
+    // call the callback function only if it exists,
+    // but ALWAYS clear the event to prevent an interrupt storm.
+    if (channelMap[ch] != -1 && callbacksInt[ch]) {
+      if ( callbackDeferred[ch] ) {
+        // Adafruit defer callback to non-isr if configured so
+        ada_callback(NULL, 0, callbacksInt[ch]);
+      } else {
+        callbacksInt[ch]();
       }
-
-    *(uint32_t *)((uint32_t)NRF_GPIOTE + event) = 0;
-#if __CORTEX_M == 0x04
-    volatile uint32_t dummy = *((volatile uint32_t *)((uint32_t)NRF_GPIOTE + event));
-    (void)dummy;
-#endif
     }
 
-    event = (uint32_t)((uint32_t)event + 4);
+    // clear the event
+    NRF_GPIOTE->EVENTS_IN[ch] = 0;
   }
+#if __CORTEX_M == 0x04
+  // See note at nRF52840_PS_v1.1.pdf section 6.1.8 ("interrupt clearing")
+  // See also https://gcc.gnu.org/onlinedocs/gcc/Volatiles.html for why
+  // using memory barrier instead of read of an unrelated volatile
+  __DSB(); __NOP();__NOP();__NOP();__NOP();
+#endif
 
-#if CFG_DEBUG >= 3
-    SEGGER_SYSVIEW_RecordExitISR();
+#if CFG_SYSVIEW
+  SEGGER_SYSVIEW_RecordExitISR();
 #endif
 }

cores/nRF5/WInterrupts.c

@@ -33,7 +33,7 @@ extern "C" {
 
 #define ISR_DEFERRED  0x0100
 
-#define DEFAULT 1
+//#define DEFAULT 1
 #define EXTERNAL 0
 
 typedef void (*voidFuncPtr)(void);