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

Author: hathach

cores/nRF5/wiring_analog_nRF52.c

@@ -98,7 +98,7 @@ void analogReference( eAnalogReference ulMode )
   switch ( ulMode ) {
     case AR_VDD4:
       saadcReference = SAADC_CH_CONFIG_REFSEL_VDD1_4;
-      saadcGain      = SAADC_CH_CONFIG_GAIN_Gain4;
+      saadcGain      = SAADC_CH_CONFIG_GAIN_Gain1_4;
       break;
     case AR_INTERNAL_3_0:
       saadcReference = SAADC_CH_CONFIG_REFSEL_Internal;

libraries/Bluefruit52Lib/keywords.txt

@@ -148,7 +148,7 @@ setPresentationFormatDescriptor	KEYWORD2
 setWriteCallback	KEYWORD2
 setCccdWriteCallback	KEYWORD2
 setReadAuthorizeCallback	KEYWORD2
-setWriteAuthorizeCallbak	KEYWORD2
+setWriteAuthorizeCallback	KEYWORD2
 handles	KEYWORD2
 
 write	KEYWORD2

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

@@ -150,7 +150,7 @@ void BLECharacteristic::setReadAuthorizeCallback(read_authorize_cb_t fp)
   _rd_authorize_cb = fp;
 }
 
-void BLECharacteristic::setWriteAuthorizeCallbak(write_authorize_cb_t fp)
+void BLECharacteristic::setWriteAuthorizeCallback(write_authorize_cb_t fp)
 {
   _attr_meta.wr_auth = (fp ? 1 : 0);
   _wr_authorize_cb = fp;

libraries/Bluefruit52Lib/src/BLECharacteristic.h

@@ -108,7 +108,7 @@ class BLECharacteristic
     void setWriteCallback        (write_cb_t fp);
     void setCccdWriteCallback    (write_cccd_cb_t fp);
     void setReadAuthorizeCallback(read_authorize_cb_t fp);
-    void setWriteAuthorizeCallbak(write_authorize_cb_t fp);
+    void setWriteAuthorizeCallback(write_authorize_cb_t fp);
 
     virtual err_t begin(void);
 

libraries/Bluefruit52Lib/src/services/BLEDfu.cpp

@@ -202,11 +202,11 @@ err_t BLEDfu::begin(void)
 
   _chr_control.setProperties(CHR_PROPS_WRITE | CHR_PROPS_NOTIFY);
   _chr_control.setMaxLen(23);
-  _chr_control.setWriteAuthorizeCallbak(bledfu_control_wr_authorize_cb);
+  _chr_control.setWriteAuthorizeCallback(bledfu_control_wr_authorize_cb);
   VERIFY_STATUS( _chr_control.begin() );
 
   BLECharacteristic chr_revision(UUID128_CHR_DFU_REVISON);
-  chr_packet.setTempMemory();
+  chr_revision.setTempMemory();
   chr_revision.setProperties(CHR_PROPS_READ);
   chr_revision.setFixedLen(2);
   VERIFY_STATUS( chr_revision.begin());