Merge tag '1.0.0' into merge_1.0.0

changelog.md

@@ -1,5 +1,20 @@
 # Adafruit nRF52 Arduino Core Changelog
 
+## 1.0.0 - 2021.08.18
+
+Core is stable enough to be released as 1.0.0. Following is chagnes since last release
+
+- Add UART missing baudrate of 31250 and 56000
+- Fix peer bonding with public/static address
+- Fix PDM driver issue when BLE is enabled
+- Update nrfutil binary to post17 for windows 7
+- Add analogSampleTime() to set ADC sample time
+- Add readCPUTemperature() to get CPU die temperature
+- Add analogCalibrateOffset() to calibrate ADC offset
+- Fix UART is not powered down correctly
+- Update included bootlaoder binaries to 0.6.1
+- Update included TinyUSB lib to 1.4.4
+
 ## 0.24.0 - 2021.06.25
 
 - Update included TinyUSB libraries to 1.3.0

cores/nRF5/Uart.cpp

@@ -104,8 +104,12 @@ void Uart::begin(unsigned long baudrate, uint16_t config)
     nrfBaudRate = UARTE_BAUDRATE_BAUDRATE_Baud19200;
   } else if (baudrate <= 28800) {
     nrfBaudRate = UARTE_BAUDRATE_BAUDRATE_Baud28800;
+  } else if (baudrate <= 31250) {
+    nrfBaudRate = UARTE_BAUDRATE_BAUDRATE_Baud31250;
   } else if (baudrate <= 38400) {
     nrfBaudRate = UARTE_BAUDRATE_BAUDRATE_Baud38400;
+  } else if (baudrate <= 56000) {
+    nrfBaudRate = UARTE_BAUDRATE_BAUDRATE_Baud56000;
   } else if (baudrate <= 57600) {
     nrfBaudRate = UARTE_BAUDRATE_BAUDRATE_Baud57600;
   } else if (baudrate <= 76800) {
@@ -152,9 +156,17 @@ void Uart::end()
 
   nrfUart->INTENCLR = UARTE_INTENSET_ENDRX_Msk | UARTE_INTENSET_ENDTX_Msk;
 
+  nrfUart->EVENTS_RXTO = 0;
+  nrfUart->EVENTS_TXSTOPPED = 0;
+
   nrfUart->TASKS_STOPRX = 0x1UL;
   nrfUart->TASKS_STOPTX = 0x1UL;
 
+  // Wait for TXSTOPPED event and for RXTO event
+  // This is required before disabling UART to fully power down transceiver PHY.
+  // Otherwise transceiver will continue to consume ~900uA
+  while ( !(nrfUart->EVENTS_TXSTOPPED && nrfUart->EVENTS_RXTO) ) yield();
+
   nrfUart->ENABLE = UARTE_ENABLE_ENABLE_Disabled;
 
   nrfUart->PSEL.TXD = 0xFFFFFFFF;

cores/nRF5/common_func.h

@@ -39,6 +39,7 @@
 
 
 #ifdef __cplusplus
+  extern "C++" {
   // namespace and templates must be outside the `extern "C"` declaration...
   namespace ADAFRUIT_DETAIL
   {
@@ -48,6 +49,7 @@
           return N;
       }
   }
+  }
   extern "C" {
   #define arrcount(arr) ADAFRUIT_DETAIL::arrcount_fails_if_not_array(arr)
   #define ADA_STATIC_ASSERT(const_expr, message)   static_assert(const_expr, message)

cores/nRF5/wiring.c

@@ -213,3 +213,27 @@ void systemOff(uint32_t pin, uint8_t wake_logic)
     NRF_POWER->SYSTEMOFF = 1;
   }
 }
+
+
+float readCPUTemperature( void )
+{
+  uint8_t en;
+  int32_t temp;
+  (void) sd_softdevice_is_enabled(&en);
+  if (en) 
+  {
+    sd_temp_get(&temp);
+  }
+  else
+  {
+    NRF_TEMP->EVENTS_DATARDY = 0x00; // Only needed in case another function is also looking at this event flag
+    NRF_TEMP->TASKS_START = 0x01; 
+
+    while (!NRF_TEMP->EVENTS_DATARDY);
+    temp = NRF_TEMP->TEMP;                      // Per anomaly 29 (unclear whether still applicable), TASKS_STOP will clear the TEMP register.
+
+    NRF_TEMP->TASKS_STOP = 0x01;           // Per anomaly 30 (unclear whether still applicable), the temp peripheral needs to be shut down
+    NRF_TEMP->EVENTS_DATARDY = 0x00;
+  }
+  return temp / 4.0F;
+}

cores/nRF5/wiring.h

@@ -42,6 +42,12 @@ static inline bool isInISR(void)
   return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) != 0 ;
 }
 
+/*
+ * \brief Reads the on-chip temperature sensor, returning the temperature in degrees C
+ * with a resolution of 0.25 degrees.
+*/
+float readCPUTemperature( void );
+
 #ifdef __cplusplus
 }
 #endif

cores/nRF5/wiring_analog.h

@@ -107,6 +107,23 @@ extern void analogReadResolution(int res);
  */
 extern void analogWriteResolution(uint8_t res);
 
+/*
+ * \brief Set the ADC sample time. Default is 3us (appropriate for low source resistance).
+ * See the chart of appropriate sample time vs. source resistance in the SAADC section
+ * of the Nordic nrf52 product specification.
+ *
+ * \param time Should be set to 3, 5, 10, 15, 20 or 40.
+ */
+extern void analogSampleTime(uint8_t sTime);
+
+/*
+ * \brief Calibrate the ADC offset. This is recommended occasionally, or any time the
+ * chip temperature changes by more than 10 C.  See the SAADC section of the Nordic
+ * nrf52 product pecification.
+ * 
+ */
+extern void analogCalibrateOffset( void );
+
 extern void analogOutputInit( void ) ;
 
 #ifdef __cplusplus

cores/nRF5/wiring_analog_nRF52.c

@@ -30,6 +30,7 @@ extern "C" {
 
 static uint32_t saadcReference = SAADC_CH_CONFIG_REFSEL_Internal;
 static uint32_t saadcGain      = SAADC_CH_CONFIG_GAIN_Gain1_6;
+static uint32_t saadcSampleTime = SAADC_CH_CONFIG_TACQ_3us;
 
 static bool saadcBurst = SAADC_CH_CONFIG_BURST_Disabled;
 
@@ -140,6 +141,28 @@ void analogOversampling( uint32_t ulOversampling )
 	}
 }
 
+void analogSampleTime( uint8_t sTime)
+{
+  saadcSampleTime = SAADC_CH_CONFIG_TACQ_3us; // default is 3 us
+  switch (sTime) {
+    case 5:
+      saadcSampleTime = SAADC_CH_CONFIG_TACQ_5us;
+      break;
+    case 10:
+      saadcSampleTime = SAADC_CH_CONFIG_TACQ_10us;
+      break;
+    case 15:
+      saadcSampleTime = SAADC_CH_CONFIG_TACQ_15us;
+      break;
+    case 20:
+      saadcSampleTime = SAADC_CH_CONFIG_TACQ_20us;
+      break;
+    case 40:
+      saadcSampleTime = SAADC_CH_CONFIG_TACQ_40us;
+      break;
+  }
+}
+
 static uint32_t analogRead_internal( uint32_t psel )
 {
   uint32_t saadcResolution;
@@ -171,7 +194,7 @@ static uint32_t analogRead_internal( uint32_t psel )
                             | ((SAADC_CH_CONFIG_RESP_Bypass   << SAADC_CH_CONFIG_RESN_Pos)   & SAADC_CH_CONFIG_RESN_Msk)
                             | ((saadcGain                     << SAADC_CH_CONFIG_GAIN_Pos)   & SAADC_CH_CONFIG_GAIN_Msk)
                             | ((saadcReference                << SAADC_CH_CONFIG_REFSEL_Pos) & SAADC_CH_CONFIG_REFSEL_Msk)
-                            | ((SAADC_CH_CONFIG_TACQ_3us      << SAADC_CH_CONFIG_TACQ_Pos)   & SAADC_CH_CONFIG_TACQ_Msk)
+                            | ((saadcSampleTime               << SAADC_CH_CONFIG_TACQ_Pos)   & SAADC_CH_CONFIG_TACQ_Msk)
                             | ((SAADC_CH_CONFIG_MODE_SE       << SAADC_CH_CONFIG_MODE_Pos)   & SAADC_CH_CONFIG_MODE_Msk)
                             | ((saadcBurst                    << SAADC_CH_CONFIG_BURST_Pos)   & SAADC_CH_CONFIG_BURST_Msk);
   NRF_SAADC->CH[0].PSELN = psel;
@@ -261,6 +284,25 @@ uint32_t analogReadVDD( void )
   return analogRead_internal(SAADC_CH_PSELP_PSELP_VDD);
 }
 
+void analogCalibrateOffset( void )
+{
+  // Enable the SAADC
+  NRF_SAADC->ENABLE = 0x01;
+
+  // Be sure the done flag is cleared, then trigger offset calibration
+  NRF_SAADC->EVENTS_CALIBRATEDONE = 0x00;
+  NRF_SAADC->TASKS_CALIBRATEOFFSET = 0x01;
+
+  // Wait for completion
+  while (!NRF_SAADC->EVENTS_CALIBRATEDONE);
+
+  // Clear the done flag  (really shouldn't have to do this both times)
+  NRF_SAADC->EVENTS_CALIBRATEDONE = 0x00;
+
+  // Disable the SAADC
+  NRF_SAADC->ENABLE = 0x00;
+}
+
 #ifdef __cplusplus
 }
 #endif

libraries/Bluefruit52Lib/examples/Peripheral/blinky_ota/blinky_ota.ino

@@ -20,7 +20,11 @@ BLEDfu bledfu;
 void setup() 
 {
   Serial.begin(115200);
-  while ( !Serial ) delay(10);   // for nrf52840 with native usb
+
+#if CFG_DEBUG
+  // Blocking wait for connection when debug mode is enabled via IDE
+  while ( !Serial ) yield();
+#endif
 
   Serial.println("Bluefruit52 Blinky Example");
   Serial.println("--------------------------\n");

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

@@ -531,6 +531,7 @@ void BLECharacteristic::_eventHandler(ble_evt_t* event)
       {
         LOG_LV2("GATTS", "attr's value, uuid = 0x%04X, len = %d", request->uuid.uuid, request->len);
         LOG_LV2_BUFFER(NULL, request->data, request->len);
+        LOG_LV2(NULL, "\r\n");
 
         if (_wr_cb)
         {

libraries/Bluefruit52Lib/src/BLESecurity.cpp

@@ -360,6 +360,13 @@ void BLESecurity::_eventHandler(ble_evt_t* evt)
       // Pairing succeeded --> save encryption keys ( Bonding )
       if (BLE_GAP_SEC_STATUS_SUCCESS == status->auth_status)
       {
+        if (!status->kdist_peer.id)
+        {
+          // Peer does not provide IRK, it is possible that device uses Public/Static address which
+          // IRK is not needed. We will use the connect address instead
+          _bond_keys.peer_id.id_addr_info = conn->getPeerAddr();
+        }
+
         conn->saveBondKey(&_bond_keys);
       }
 

libraries/Bluefruit52Lib/src/bluefruit.cpp

@@ -598,8 +598,14 @@ void AdafruitBluefruit::_ble_handler(ble_evt_t* evt)
       _setConnLed(true);
 
       ble_gap_evt_connected_t const * para = &evt->evt.gap_evt.params.connected;
+      ble_gap_addr_t const* peer_addr = &para->peer_addr;
 
-      LOG_LV1("GAP", "Conn Interval= %.2f ms, Latency = %d, Supervisor Timeout = %d ms",
+      (void) peer_addr;
+
+      LOG_LV2("GAP", "MAC = %02X:%02X:%02X:%02X:%02X:%02X, Type = %d, Resolved = %d",
+              peer_addr->addr[5], peer_addr->addr[4], peer_addr->addr[3], peer_addr->addr[2], peer_addr->addr[1], peer_addr->addr[0],
+              peer_addr->addr_type, peer_addr->addr_id_peer);
+      LOG_LV2("GAP", "Conn Interval = %.2f ms, Latency = %d, Supervisor Timeout = %d ms",
               para->conn_params.max_conn_interval*1.25f, para->conn_params.slave_latency, 10*para->conn_params.conn_sup_timeout);
 
       if ( _connection[conn_hdl] )

libraries/PDM/examples/PDMSerialPlotter/PDMSerialPlotter.ino

@@ -18,7 +18,7 @@ volatile int samplesRead;
 
 void setup() {
   Serial.begin(9600);
-  while (!Serial);
+  while (!Serial) yield();
 
   // configure the data receive callback
   PDM.onReceive(onPDMdata);
@@ -31,7 +31,7 @@ void setup() {
   // - a 16 kHz sample rate
   if (!PDM.begin(1, 16000)) {
     Serial.println("Failed to start PDM!");
-    while (1);
+    while (1) yield();
   }
 }
 

libraries/PDM/src/PDM.cpp

@@ -58,9 +58,29 @@ int PDMClass::begin(int channels, long sampleRate)
   _channels = channels;
 
   // Enable high frequency oscillator if not already enabled
-  if (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) {
-    NRF_CLOCK->TASKS_HFCLKSTART    = 1;
-    while (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) { }
+  uint8_t sd_en = 0;
+  sd_softdevice_is_enabled(&sd_en);
+
+  if (sd_en)
+  {
+    uint32_t is_running;
+    sd_clock_hfclk_is_running(&is_running);
+
+    if (!is_running) {
+      sd_clock_hfclk_request();
+
+      while(!is_running) {
+        yield();
+        sd_clock_hfclk_is_running(&is_running);
+      }
+    }
+  }
+  else
+  {
+    if (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) {
+      NRF_CLOCK->TASKS_HFCLKSTART    = 1;
+      while (NRF_CLOCK->EVENTS_HFCLKSTARTED == 0) yield();
+    }
   }
 
   // configure the sample rate and channels

tools/update_bootloader.py

@@ -35,6 +35,9 @@
     with zipfile.ZipFile(name, "r") as zip_ref:
         zip_ref.extractall("bootloader/{}".format(variant))
 
-    # Remove update.uf2
+    # Remove update.uf2 for 832
     if variant == 'feather_nrf52832':
         os.remove("bootloader/{}/update-{}_nosd.uf2".format(variant, name[:-4]))
+
+    # remove zip file
+    os.remove(name)