Merge branch 'master' into develop

Author: hathach

cores/nRF5/nordic/nrfx_config.h

@@ -1,15 +1,26 @@
 #ifndef NRFX_CONFIG_H__
 #define NRFX_CONFIG_H__
 
-#define NRFX_POWER_ENABLED 1
-#define NRFX_POWER_CONFIG_IRQ_PRIORITY 7
+#define NRFX_POWER_ENABLED              1
+#define NRFX_POWER_CONFIG_IRQ_PRIORITY  7
 
 //#define NRFX_CLOCK_ENABLED 0
 
+#define NRFX_SPIM_ENABLED            1
+#define NRFX_SPIM_MISO_PULL_CFG      1 // pulldown
+#define NRFX_SPIM_EXTENDED_ENABLED   0
+
+#define NRFX_SPIM0_ENABLED           0 // used as I2C
+#define NRFX_SPIM1_ENABLED           0 // used as I2C
+#define NRFX_SPIM2_ENABLED           1
+
 #ifdef NRF52840_XXAA
-#define NRFX_QSPI_ENABLED   1
+  #define NRFX_QSPI_ENABLED   1
+  #define NRFX_SPIM3_ENABLED  1
 #else
-#define NRFX_QSPI_ENABLED   0
+  #define NRFX_QSPI_ENABLED   0
+  #define NRFX_SPIM3_ENABLED  0
 #endif
 
+
 #endif // NRFX_CONFIG_H__

libraries/Bluefruit52Lib/examples/Peripheral/image_upload/image_upload.ino

@@ -239,6 +239,7 @@ void bleuart_rx_callback(uint16_t conn_hdl)
   if ( totalPixel == imageWidth*imageHeight )
   {
     uint8_t crc = bleuart.read();
+    (void) crc;
     // do checksum later
 
     // print speed summary
@@ -310,6 +311,9 @@ void print_summary(uint32_t count, uint32_t ms)
 
 void bleuart_overflow_callback(uint16_t conn_hdl, uint16_t leftover)
 {
+  (void) conn_hdl;
+  (void) leftover;
+  
   Serial.println("BLEUART rx buffer OVERFLOWED!");
   Serial.println("Please increase buffer size for bleuart");
 
@@ -335,6 +339,7 @@ void bleuart_overflow_callback(uint16_t conn_hdl, uint16_t leftover)
  */
 void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 {
+  (void) conn_handle;
   (void) reason;
 
   tft.fillScreen(COLOR_BLACK);

libraries/Bluefruit52Lib/examples/Projects/homekit/homekit_lightbulb/.skip

@@ -12,7 +12,7 @@
 
 // The default Circuit Playground Bluefruit pins 
 // data pin, clock pin, power pin (-1 if not used)
-PDMClass PDM(33, 34, -1);
+PDMClass PDM(24, 25, -1);
 
 // buffer to read samples into, each sample is 16-bits
 short sampleBuffer[256];
@@ -41,13 +41,13 @@ void setup() {
 
 void loop() {
   // wait for samples to be read
-  if (samplesRead) {
+  PDM.IrqHandler();
 
+  if (samplesRead) {
     // print samples to the serial monitor or plotter
     for (int i = 0; i < samplesRead; i++) {
       Serial.println(sampleBuffer[i]);
     }
-
     // clear the read count
     samplesRead = 0;
   }
@@ -62,4 +62,4 @@ void onPDMdata() {
 
   // 16-bit, 2 bytes per sample
   samplesRead = bytesAvailable / 2;
-}
+}