Merge branch 'master' into develop

Author: hathach

cores/nRF5/utility/utilities.c

@@ -93,7 +93,7 @@ const char* getMcuUniqueID(void)
   // Skip if already created
   if ( serial_str[0] == 0 )
   {
-    sprintf(serial_str, "%08lu%08lu", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);
+    sprintf(serial_str, "%08lX%08lX", NRF_FICR->DEVICEID[1], NRF_FICR->DEVICEID[0]);
   }
 
   return serial_str;

cores/nRF5/wiring_constants.h

@@ -30,6 +30,8 @@ extern "C"{
 #define OUTPUT          (0x1)
 #define INPUT_PULLUP    (0x2)
 #define INPUT_PULLDOWN  (0x3)
+#define INPUT_PULLUP_SENSE    (0x4)
+#define INPUT_PULLDOWN_SENSE  (0x5)
 
 #define PI 3.1415926535897932384626433832795
 #define HALF_PI 1.5707963267948966192313216916398

cores/nRF5/wiring_digital.c

@@ -55,6 +55,15 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
                            | ((uint32_t)GPIO_PIN_CNF_DRIVE_S0S1       << GPIO_PIN_CNF_DRIVE_Pos)
                            | ((uint32_t)GPIO_PIN_CNF_SENSE_Disabled   << GPIO_PIN_CNF_SENSE_Pos);
     break;
+    
+    case INPUT_PULLUP_SENSE:
+      // Set pin to input mode with pull-up resistor enabled and sense when Low
+      port->PIN_CNF[ulPin] = ((uint32_t)GPIO_PIN_CNF_DIR_Input        << GPIO_PIN_CNF_DIR_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_INPUT_Connect    << GPIO_PIN_CNF_INPUT_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_PULL_Pullup      << GPIO_PIN_CNF_PULL_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_DRIVE_S0S1       << GPIO_PIN_CNF_DRIVE_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_SENSE_Low        << GPIO_PIN_CNF_SENSE_Pos);
+    break;
 
     case INPUT_PULLDOWN:
       // Set pin to input mode with pull-down resistor enabled
@@ -65,6 +74,15 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
                            | ((uint32_t)GPIO_PIN_CNF_SENSE_Disabled   << GPIO_PIN_CNF_SENSE_Pos);
     break;
 
+    case INPUT_PULLDOWN_SENSE:
+      // Set pin to input mode with pull-down resistor enabled
+      port->PIN_CNF[ulPin] = ((uint32_t)GPIO_PIN_CNF_DIR_Input        << GPIO_PIN_CNF_DIR_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_INPUT_Connect    << GPIO_PIN_CNF_INPUT_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_PULL_Pulldown    << GPIO_PIN_CNF_PULL_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_DRIVE_S0S1       << GPIO_PIN_CNF_DRIVE_Pos)
+                           | ((uint32_t)GPIO_PIN_CNF_SENSE_High       << GPIO_PIN_CNF_SENSE_Pos);
+    break;
+
     case OUTPUT:
       // Set pin to output mode
       port->PIN_CNF[ulPin] = ((uint32_t)GPIO_PIN_CNF_DIR_Output       << GPIO_PIN_CNF_DIR_Pos)

libraries/Bluefruit52Lib/examples/Central/central_hid/central_hid.ino

@@ -41,7 +41,7 @@ void setup()
 
   Bluefruit.setName("Bluefruit52 Central");
 
-  // Init BLE Central Uart Serivce
+  // Init BLE Central Hid Serivce
   hid.begin();
 
   #if POLLING == 0  
@@ -126,7 +126,7 @@ void connect_callback(uint16_t conn_handle)
   {
     Serial.println("Found NONE");
 
-    // disconnect since we couldn't find bleuart service
+    // disconnect since we couldn't find blehid service
     Bluefruit.disconnect(conn_handle);
   }  
 }

libraries/Bluefruit52Lib/examples/Hardware/blink_sleep/blink_sleep.ino

@@ -0,0 +1,51 @@
+/*
+  Blink_sleep
+  Turns on an LED on for one second, then off for one second, until the time to go to sleep runs out.
+  You can wake up the feather by pressing a key/switch connecting the WAKE_LOW_PIN to GND and the WAKE_HIGH_PIN to 3.3V (VCC)
+
+  Based on the blinky arduino example 
+  
+  This example code is in the public domain.
+
+  created 19 Jan 2010
+  by Pierre Constantineau
+
+*/
+#include <bluefruit.h>
+
+#define WAKE_LOW_PIN  PIN_A0
+#define WAKE_HIGH_PIN PIN_A1
+
+#define SLEEPING_DELAY 30000                                // sleep after 30 seconds of blinking
+
+void gotoSleep(unsigned long time)
+{
+  // shutdown when time reaches SLEEPING_DELAY ms
+  if ((time>SLEEPING_DELAY))
+  {
+    // to reduce power consumption when sleeping, turn off all your LEDs (and other power hungry devices)
+    digitalWrite(LED_BUILTIN, LOW);                     
+
+    // setup your wake-up pins.
+    pinMode(WAKE_LOW_PIN,  INPUT_PULLUP_SENSE);    // this pin (WAKE_LOW_PIN) is pulled up and wakes up the feather when externally connected to ground.
+    pinMode(WAKE_HIGH_PIN, INPUT_PULLDOWN_SENSE);  // this pin (WAKE_HIGH_PIN) is pulled down and wakes up the feather when externally connected to 3.3v.
+ 
+    // power down nrf52.
+    sd_power_system_off();                              // this function puts the whole nRF52 to deep sleep (no Bluetooth).  If no sense pins are setup (or other hardware interrupts), the nrf52 will not wake up.
+  } 
+}
+
+// the setup function runs once when you press reset or power the board
+void setup() {
+  Bluefruit.begin();          // Sleep functions need the softdevice to be active.
+
+  // initialize digital pin LED_BUILTIN as an output.
+  pinMode(LED_BUILTIN, OUTPUT);
+}
+     
+// the loop function runs over and over again forever
+void loop() {
+  digitalToggle(LED_BUILTIN); // turn the LED on (HIGH is the voltage level)
+  gotoSleep(millis());        // call millis() and pass it to the sleep function.  On wake-up, millis will start at 0 again.
+  delay(1000);                // wait for a second
+}

libraries/Bluefruit52Lib/src/BLEClientCharacteristic.cpp

@@ -155,6 +155,8 @@ bool BLEClientCharacteristic::_discoverDescriptor(uint16_t conn_handle, ble_gatt
     {
       LOG_LV2("DISC", "Found CCDD: handle = %d", disc_rsp.descs[i].handle);
       _cccd_handle = disc_rsp.descs[i].handle;
+
+      break;
     }
   }
 

libraries/Bluefruit52Lib/src/BLEDiscovery.cpp

@@ -134,6 +134,9 @@ uint8_t BLEDiscovery::discoverCharacteristic(uint16_t conn_handle, BLEClientChar
     {
       for (uint8_t i=0; i<count; i++)
       {
+        if ( chr[i]->discovered() )
+          continue;
+
         if ( chr[i]->uuid == disc_chr->chars[d].uuid )
         {
           LOG_LV2("DISC", "[CHR] Found 0x%04X, handle = %d\n-----------------", disc_chr->chars[d].uuid.uuid,  disc_chr->chars[d].handle_value);

libraries/Bluefruit52Lib/src/BLEGatt.cpp

@@ -184,20 +184,20 @@ void BLEGatt::_eventHandler(ble_evt_t* evt)
   if ( evt_id == BLE_GAP_EVT_DISCONNECTED )
   {
     // Client
-    for(uint8_t i=0; i<_client.svc_count; i++)
+    for(uint8_t i=0; i<_client.chr_count; i++)
     {
-      if ( evt_conn_hdl == _client.svc_list[i]->_conn_hdl)
+      if ( evt_conn_hdl == _client.chr_list[i]->connHandle() )
       {
-        _client.svc_list[i]->disconnect();
+        _client.chr_list[i]->disconnect();
       }
     }
 
     // TODO merge to above loop
-    for(uint8_t i=0; i<_client.chr_count; i++)
+    for(uint8_t i=0; i<_client.svc_count; i++)
     {
-      if ( evt_conn_hdl == _client.chr_list[i]->connHandle() )
+      if ( evt_conn_hdl == _client.svc_list[i]->_conn_hdl)
       {
-        _client.chr_list[i]->disconnect();
+        _client.svc_list[i]->disconnect();
       }
     }
   }

variants/clue_nrf52840/variant.cpp

@@ -67,8 +67,8 @@ const uint32_t g_ADigitalPinMap[] =
   37, // P1.05 (TFT LITE)
 
   // 35 & 36 - PDM mic
-  40,  // D35 is P1.08 (PDM DAT)
-  11,  // D36 is P0.11 (PDM CLK)
+  0,   // D35 is P0.00 (PDM DAT)
+  1,   // D36 is P0.01 (PDM CLK)
 
   // QSPI pins (not exposed via any header / test point)
   19,  // D37 is P0.19 (QSPI CLK)
@@ -81,6 +81,7 @@ const uint32_t g_ADigitalPinMap[] =
   10,  // D43 is P0.10 white LED control
    9,  // D44 is P0.09 APDS IRQ
   38,  // D45 is P1.06 LSM6DS33 IRQ
+  32,  // D46 is P1.00 Speaker/buzzer
 };
 
 void initVariant()

variants/clue_nrf52840/variant.h

@@ -35,8 +35,8 @@ extern "C"
 #endif // __cplusplus
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (46)
-#define NUM_DIGITAL_PINS     (46)
+#define PINS_COUNT           (47)
+#define NUM_DIGITAL_PINS     (47)
 #define NUM_ANALOG_INPUTS    (8)
 #define NUM_ANALOG_OUTPUTS   (0)