merge similar fix in

Author: dhalbert

ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c

@@ -35,7 +35,7 @@
 
 void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t* self,
     const mcu_pin_obj_t* pin_a, const mcu_pin_obj_t* pin_b) {
-    if (!pin_a->has_extint || !pin_a->has_extint) {
+    if (!pin_a->has_extint || !pin_b->has_extint) {
         mp_raise_RuntimeError(translate("Both pins must support hardware interrupts"));
     }
 

ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h

@@ -36,6 +36,9 @@
 
 #define MICROPY_HW_LED_STATUS       (&pin_P1_14)
 
+// Unusually, board does not have a 32 kHz xtal. Nearly all boards do.
+#define BOARD_HAS_32KHZ_XTAL (0)
+
 #if QSPI_FLASH_FILESYSTEM
 #define MICROPY_QSPI_DATA0                NRF_GPIO_PIN_MAP(0, 21)
 #define MICROPY_QSPI_DATA1                NRF_GPIO_PIN_MAP(0, 23)

ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.mk

@@ -10,9 +10,6 @@ MCU_CHIP = nrf52840
 SD ?= s140
 SOFTDEV_VERSION ?= 6.1.0
 
-# Unusually, board does not have a 32 kHz xtal.
-BOARD_HAS_32KHZ_XTAL = 0
-
 BOOT_SETTING_ADDR = 0xFF000
 
 ifeq ($(SD),)

ports/nrf/mpconfigport.h

@@ -38,6 +38,11 @@
 #define MICROPY_PY_UBINASCII                     (1)
 #define MICROPY_PY_UJSON                         (1)
 
+#ifndef BOARD_HAS_32KHZ_XTAL
+// Assume crystal is present, which is the most common case.
+#define BOARD_HAS_32KHZ_XTAL (0)
+#endif
+
 // TODO this is old BLE stuff
 #if BLUETOOTH_SD
     #define MICROPY_PY_BLEIO                     (1)

ports/nrf/mpconfigport.mk

@@ -28,11 +28,6 @@ CIRCUITPY_RTC = 1
 # frequencyio not yet implemented
 CIRCUITPY_FREQUENCYIO = 0
 
-ifndef BOARD_HAS_32KHZ_XTAL
-# Assume crystal is present, which is the most common case.
-BOARD_HAS_32KHZ_XTAL = 1
-endif
-
 # CircuitPython doesn't yet support NFC so force the NFC antenna pins to be GPIO.
 # See https://github.com/adafruit/circuitpython/issues/1300
 # Defined here because system_nrf52840.c doesn't #include any of our own include files.

ports/nrf/peripherals/nrf/clocks.c

@@ -26,6 +26,7 @@
  */
 
 #include "nrfx.h"
+#include "mpconfigboard.h"
 
 void nrf_peripherals_clocks_init(void) {