Merge pull request #516 from adafruit/minor-cleanup

fix typo

Author: hathach

boards.txt

@@ -40,8 +40,8 @@ feather52832.build.f_cpu=64000000
 feather52832.build.board=NRF52832_FEATHER
 feather52832.build.core=nRF5
 feather52832.build.variant=feather_nrf52832
-feather52840.build.usb_manufacturer="Adafruit LLC"
-feather52840.build.usb_product="Feather nRF52832"
+feather52832.build.usb_manufacturer="Adafruit LLC"
+feather52832.build.usb_product="Feather nRF52832"
 feather52832.build.extra_flags=-DNRF52832_XXAA -DNRF52
 feather52832.build.ldscript=nrf52832_s132_v6.ld
 

changelog.md

@@ -6,7 +6,7 @@
 
 ## 0.20.0 - 2020.04.21
 
-- Fixed Wire write ambigou
+- Fixed Wire write ambiguous
 - Improved debugging with log and sysview, thanks to @henrygab
 - Fixed recipe to compute SRAM and ROM of sketch
 - Removed the force waiting Serial when debug is enabled

libraries/Bluefruit52Lib/src/services/BLEDfu.cpp

@@ -164,18 +164,12 @@ static void bledfu_control_wr_authorize_cb(uint16_t conn_hdl, BLECharacteristic*
       VERIFY_STATUS( sd_softdevice_disable(),  );
 
       // Disable all interrupts
-      #if defined(NRF52832_XXAA)
-      #define MAX_NUMBER_INTERRUPTS  39
-      #elif defined(NRF52840_XXAA)
-      #define MAX_NUMBER_INTERRUPTS  48
-      #endif
-
-      NVIC_ClearPendingIRQ(SD_EVT_IRQn);
-      for(int i=0; i < MAX_NUMBER_INTERRUPTS; i++)
-      {
-        NVIC_DisableIRQ( (IRQn_Type) i );
-      }
-
+      NVIC->ICER[0]=0xFFFFFFFF;
+      NVIC->ICPR[0]=0xFFFFFFFF;
+#if defined(__NRF_NVIC_ISER_COUNT) && __NRF_NVIC_ISER_COUNT == 2
+      NVIC->ICER[1]=0xFFFFFFFF;
+      NVIC->ICPR[1]=0xFFFFFFFF;
+#endif
       // Clear RTC1 timer to prevent Interrupt happens after changing vector table
 //      NRF_RTC1->EVTENCLR    = RTC_EVTEN_COMPARE0_Msk;
 //      NRF_RTC1->INTENCLR    = RTC_INTENSET_COMPARE0_Msk;