Merge branch 'master' of github.com:adafruit/Adafruit_nRF52_Arduino

Author: hathach

cores/nRF5/HardwarePWM.cpp

@@ -78,14 +78,20 @@ void HardwarePWM::setClockDiv(uint8_t div)
  */
 bool HardwarePWM::addPin(uint8_t pin)
 {
-  VERIFY( isPinValid(pin) && (_count < MAX_CHANNELS) );
+  VERIFY( isPinValid(pin) && (_count <= MAX_CHANNELS) );
 
   // Check if pin is already configured
   for(uint8_t i=0; i<_count; i++)
   {
     if (_pwm->PSEL.OUT[i] == pin) return true;
   }
 
+  if ((_count >= MAX_CHANNELS))
+  {
+    //Pin not already configured, but this HardwarePWM is full
+    return false;
+  }
+
   pinMode(pin, OUTPUT);
   digitalWrite(pin, LOW);
 

cores/nRF5/Uart.cpp

@@ -186,6 +186,7 @@ void Uart::end()
 
 void Uart::flush()
 {
+	rxBuffer.clear();
 }
 
 void Uart::IrqHandler()

cores/nRF5/wiring_analog.h

@@ -61,6 +61,13 @@ typedef enum _eAnalogReference
  */
 extern void analogReference( eAnalogReference ulMode ) ;
 
+/*
+* \brief Configures the oversampling amount used to sample analog input.
+*
+* \param ulOversampling Should be set to 1, 2, 4, 8, 16, 32, 64, 128 or 256.
+*/
+extern void analogOversampling( uint32_t ulOversampling );
+
 /*
  * \brief Writes an analog value (PWM wave) to a pin.
  *

cores/nRF5/wiring_analog_nRF52.c

@@ -31,6 +31,8 @@ extern "C" {
 static uint32_t saadcReference = SAADC_CH_CONFIG_REFSEL_Internal;
 static uint32_t saadcGain      = SAADC_CH_CONFIG_GAIN_Gain1_6;
 
+static bool saadcBurst = SAADC_CH_CONFIG_BURST_Disabled;
+
 #if 0 // Note: Adafruit use seperated HardwarePWM class
 #define PWM_COUNT 3
 
@@ -124,6 +126,44 @@ void analogReference( eAnalogReference ulMode )
   }
 }
 
+void analogOversampling( uint32_t ulOversampling )
+{
+	saadcBurst = SAADC_CH_CONFIG_BURST_Enabled;
+
+	switch (ulOversampling) {
+		case 0:
+		case 1:
+			saadcBurst = SAADC_CH_CONFIG_BURST_Disabled;
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Bypass;
+			return;
+			break;
+		case 2:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over2x;
+			break;
+		case 4:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over4x;
+			break;
+		case 8:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over8x;
+			break;
+		case 16:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over16x;
+			break;
+		case 32:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over32x;
+			break;
+		case 64:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over64x;
+			break;
+		case 128:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over128x;
+			break;
+		case 256:
+			NRF_SAADC->OVERSAMPLE = SAADC_OVERSAMPLE_OVERSAMPLE_Over256x;
+			break;
+	}
+}
+
 uint32_t analogRead( uint32_t ulPin )
 {
   uint32_t pin = SAADC_CH_PSELP_PSELP_NC;
@@ -200,7 +240,8 @@ uint32_t analogRead( uint32_t ulPin )
                             | ((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)
-                            | ((SAADC_CH_CONFIG_MODE_SE       << SAADC_CH_CONFIG_MODE_Pos)   & SAADC_CH_CONFIG_MODE_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 = pin;
   NRF_SAADC->CH[0].PSELP = pin;
 

libraries/Bluefruit52Lib/src/services/BLEHidAdafruit.cpp

@@ -70,9 +70,9 @@ uint8_t const hid_report_descriptor[] =
     // 6-byte Keycodes
     HID_USAGE_PAGE (HID_USAGE_PAGE_KEYBOARD),
       HID_USAGE_MIN    ( 0                                   ),
-      HID_USAGE_MAX    ( 101                                 ),
+      HID_USAGE_MAX    ( 255                                 ),
       HID_LOGICAL_MIN  ( 0                                   ),
-      HID_LOGICAL_MAX  ( 101                                 ),
+      HID_LOGICAL_MAX  ( 255                                 ),
 
       HID_REPORT_COUNT ( 6                                   ),
       HID_REPORT_SIZE  ( 8                                   ),