From b4d288ae4478886a0d547a176f090de678bff70e Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 23 Nov 2023 15:56:11 +1100 Subject: [PATCH] nrf: Use MICROPY_PY_MACHINE_SPI instead of MICROPY_PY_MACHINE_HW_SPI. MICROPY_PY_MACHINE_SPI is defined in mpconfigport.h to be equal to MICROPY_PY_MACHINE_HW_SPI, so they are equivalent options. The former one is preferred because it's used by all other ports. The default in mpconfigport.h is to enable this option, and all boards that enable SPI have this removed from their mpconfigboard.h file so they pick up the default. Signed-off-by: Damien George --- ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h | 1 - ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h | 1 - ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h | 1 - ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h | 1 - ports/nrf/boards/DVK_BL652/mpconfigboard.h | 1 - ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h | 1 - ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h | 1 - ports/nrf/boards/FEATHER52/mpconfigboard.h | 1 - ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h | 1 - ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h | 1 - ports/nrf/boards/MICROBIT/mpconfigboard.h | 1 - ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h | 1 - ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h | 1 - ports/nrf/boards/PCA10000/mpconfigboard.h | 2 +- ports/nrf/boards/PCA10001/mpconfigboard.h | 2 +- ports/nrf/boards/PCA10028/mpconfigboard.h | 1 - ports/nrf/boards/PCA10031/mpconfigboard.h | 1 - ports/nrf/boards/PCA10040/mpconfigboard.h | 1 - ports/nrf/boards/PCA10056/mpconfigboard.h | 1 - ports/nrf/boards/PCA10059/mpconfigboard.h | 1 - ports/nrf/boards/PCA10090/mpconfigboard.h | 1 - ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h | 1 - ports/nrf/boards/WT51822_S4AT/mpconfigboard.h | 1 - ports/nrf/main.c | 2 +- ports/nrf/modules/machine/modmachine.c | 2 +- ports/nrf/modules/machine/spi.c | 4 ++-- ports/nrf/mpconfigport.h | 6 ++---- ports/nrf/nrfx_config.h | 6 +++--- 28 files changed, 11 insertions(+), 34 deletions(-) diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h index 9bf2a8d19..87e9f8ed2 100644 --- a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h +++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.h @@ -31,7 +31,6 @@ #define MICROPY_PY_SYS_PLATFORM "nrf9160" #define MICROPY_PY_MACHINE_UART (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (0) diff --git a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h index 0e6c5a44a..69d715f18 100644 --- a/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h +++ b/ports/nrf/boards/ARDUINO_NANO_33_BLE_SENSE/mpconfigboard.h @@ -15,7 +15,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h index a16ce1a20..6b1b4e007 100644 --- a/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h +++ b/ports/nrf/boards/ARDUINO_PRIMO/mpconfigboard.h @@ -33,7 +33,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h index b69f6a882..417b49fce 100644 --- a/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h +++ b/ports/nrf/boards/BLUEIO_TAG_EVIM/mpconfigboard.h @@ -33,7 +33,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/DVK_BL652/mpconfigboard.h b/ports/nrf/boards/DVK_BL652/mpconfigboard.h index 5eb666c97..fe77fe195 100644 --- a/ports/nrf/boards/DVK_BL652/mpconfigboard.h +++ b/ports/nrf/boards/DVK_BL652/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h index 8d3b3688f..dd64ffb8b 100644 --- a/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h +++ b/ports/nrf/boards/EVK_NINA_B1/mpconfigboard.h @@ -32,7 +32,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h index 17903e576..98bd71eec 100644 --- a/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h +++ b/ports/nrf/boards/EVK_NINA_B3/mpconfigboard.h @@ -47,7 +47,6 @@ // Peripherals Config #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/FEATHER52/mpconfigboard.h b/ports/nrf/boards/FEATHER52/mpconfigboard.h index f653832c6..7dcc7357a 100644 --- a/ports/nrf/boards/FEATHER52/mpconfigboard.h +++ b/ports/nrf/boards/FEATHER52/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h index 85b48e1fb..6d1c5364b 100644 --- a/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h +++ b/ports/nrf/boards/IBK_BLYST_NANO/mpconfigboard.h @@ -33,7 +33,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h index 1f47e9b06..aacb49e71 100644 --- a/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h +++ b/ports/nrf/boards/IDK_BLYST_NANO/mpconfigboard.h @@ -33,7 +33,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/MICROBIT/mpconfigboard.h b/ports/nrf/boards/MICROBIT/mpconfigboard.h index 63f45587a..3f9f873ff 100644 --- a/ports/nrf/boards/MICROBIT/mpconfigboard.h +++ b/ports/nrf/boards/MICROBIT/mpconfigboard.h @@ -31,7 +31,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MUSIC (1) #define MICROPY_PY_MACHINE_SOFT_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h index d502c8657..94624be02 100644 --- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h +++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h index d77e104ce..343fa4c2f 100644 --- a/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h +++ b/ports/nrf/boards/PARTICLE_XENON/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10000/mpconfigboard.h b/ports/nrf/boards/PCA10000/mpconfigboard.h index 2f551612e..a450c3c36 100644 --- a/ports/nrf/boards/PCA10000/mpconfigboard.h +++ b/ports/nrf/boards/PCA10000/mpconfigboard.h @@ -30,7 +30,7 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_SOFT_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (0) +#define MICROPY_PY_MACHINE_SPI (0) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (0) #define MICROPY_PY_MACHINE_ADC (0) diff --git a/ports/nrf/boards/PCA10001/mpconfigboard.h b/ports/nrf/boards/PCA10001/mpconfigboard.h index 2120ee0a8..929189188 100644 --- a/ports/nrf/boards/PCA10001/mpconfigboard.h +++ b/ports/nrf/boards/PCA10001/mpconfigboard.h @@ -30,7 +30,7 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_SOFT_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (0) +#define MICROPY_PY_MACHINE_SPI (0) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10028/mpconfigboard.h b/ports/nrf/boards/PCA10028/mpconfigboard.h index f8e3541f3..3dc8ed345 100644 --- a/ports/nrf/boards/PCA10028/mpconfigboard.h +++ b/ports/nrf/boards/PCA10028/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_SOFT_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10031/mpconfigboard.h b/ports/nrf/boards/PCA10031/mpconfigboard.h index b618f61b5..e74e83c66 100644 --- a/ports/nrf/boards/PCA10031/mpconfigboard.h +++ b/ports/nrf/boards/PCA10031/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_SOFT_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10040/mpconfigboard.h b/ports/nrf/boards/PCA10040/mpconfigboard.h index 7202f6a0b..b965bf319 100644 --- a/ports/nrf/boards/PCA10040/mpconfigboard.h +++ b/ports/nrf/boards/PCA10040/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10056/mpconfigboard.h b/ports/nrf/boards/PCA10056/mpconfigboard.h index f7daf48a6..5b1b3a36e 100644 --- a/ports/nrf/boards/PCA10056/mpconfigboard.h +++ b/ports/nrf/boards/PCA10056/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10059/mpconfigboard.h b/ports/nrf/boards/PCA10059/mpconfigboard.h index f4c78915c..1c8773158 100644 --- a/ports/nrf/boards/PCA10059/mpconfigboard.h +++ b/ports/nrf/boards/PCA10059/mpconfigboard.h @@ -30,7 +30,6 @@ #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/PCA10090/mpconfigboard.h b/ports/nrf/boards/PCA10090/mpconfigboard.h index f58ac8989..1989fd047 100644 --- a/ports/nrf/boards/PCA10090/mpconfigboard.h +++ b/ports/nrf/boards/PCA10090/mpconfigboard.h @@ -31,7 +31,6 @@ #define MICROPY_PY_SYS_PLATFORM "nrf9160-DK" #define MICROPY_PY_MACHINE_UART (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_TIMER_NRF (0) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) diff --git a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h index 1a2d14f1d..25a34541a 100644 --- a/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h +++ b/ports/nrf/boards/SEEED_XIAO_NRF52/mpconfigboard.h @@ -35,7 +35,6 @@ #define MICROPY_HW_USB_CDC (1) #define MICROPY_PY_MACHINE_UART (1) #define MICROPY_PY_MACHINE_HW_PWM (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h index 7997aa269..e9865cb4d 100644 --- a/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h +++ b/ports/nrf/boards/WT51822_S4AT/mpconfigboard.h @@ -31,7 +31,6 @@ #define MICROPY_PY_SYS_PLATFORM "nrf51" #define MICROPY_PY_MACHINE_UART (1) -#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_RTCOUNTER (1) #define MICROPY_PY_MACHINE_I2C (1) #define MICROPY_PY_MACHINE_ADC (1) diff --git a/ports/nrf/main.c b/ports/nrf/main.c index 959c31e2e..8e57be8de 100644 --- a/ports/nrf/main.c +++ b/ports/nrf/main.c @@ -137,7 +137,7 @@ soft_reset: mp_init(); readline_init0(); - #if MICROPY_PY_MACHINE_HW_SPI + #if MICROPY_PY_MACHINE_SPI spi_init0(); #endif diff --git a/ports/nrf/modules/machine/modmachine.c b/ports/nrf/modules/machine/modmachine.c index 9043b7a44..0bacc24ee 100644 --- a/ports/nrf/modules/machine/modmachine.c +++ b/ports/nrf/modules/machine/modmachine.c @@ -219,7 +219,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = { #if MICROPY_PY_MACHINE_UART { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&machine_uart_type) }, #endif -#if MICROPY_PY_MACHINE_HW_SPI +#if MICROPY_PY_MACHINE_SPI { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&machine_spi_type) }, #endif #if MICROPY_PY_MACHINE_I2C diff --git a/ports/nrf/modules/machine/spi.c b/ports/nrf/modules/machine/spi.c index d0234244a..cb09a2349 100644 --- a/ports/nrf/modules/machine/spi.c +++ b/ports/nrf/modules/machine/spi.c @@ -31,7 +31,7 @@ #include "py/runtime.h" -#if MICROPY_PY_MACHINE_HW_SPI +#if MICROPY_PY_MACHINE_SPI #include "py/nlr.h" #include "py/mphal.h" @@ -347,4 +347,4 @@ MP_DEFINE_CONST_OBJ_TYPE( locals_dict, &mp_machine_spi_locals_dict ); -#endif // MICROPY_PY_MACHINE_HW_SPI +#endif // MICROPY_PY_MACHINE_SPI diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h index 61e242103..e18e55fb3 100644 --- a/ports/nrf/mpconfigport.h +++ b/ports/nrf/mpconfigport.h @@ -183,11 +183,9 @@ #define MICROPY_PY_MACHINE_I2C (0) #endif -#ifndef MICROPY_PY_MACHINE_HW_SPI -#define MICROPY_PY_MACHINE_HW_SPI (1) +#ifndef MICROPY_PY_MACHINE_SPI +#define MICROPY_PY_MACHINE_SPI (1) #endif - -#define MICROPY_PY_MACHINE_SPI (MICROPY_PY_MACHINE_HW_SPI) #define MICROPY_PY_MACHINE_SPI_MIN_DELAY (0) #ifndef MICROPY_PY_MACHINE_HW_PWM diff --git a/ports/nrf/nrfx_config.h b/ports/nrf/nrfx_config.h index 4669a0905..c38af6214 100644 --- a/ports/nrf/nrfx_config.h +++ b/ports/nrf/nrfx_config.h @@ -103,7 +103,7 @@ #endif #if defined(NRF51) || defined(NRF52832) - #define NRFX_SPI_ENABLED (MICROPY_PY_MACHINE_HW_SPI) + #define NRFX_SPI_ENABLED (MICROPY_PY_MACHINE_SPI) #define NRFX_SPI0_ENABLED 1 #define NRFX_SPI1_ENABLED 1 @@ -111,13 +111,13 @@ #define NRFX_SPI2_ENABLED 1 #endif #elif defined(NRF52840) - #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_HW_SPI) + #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_SPI) #define NRFX_SPIM0_ENABLED 1 #define NRFX_SPIM1_ENABLED 1 #define NRFX_SPIM2_ENABLED 1 #define NRFX_SPIM3_ENABLED (NRF52840) #elif defined(NRF9160_XXAA) - #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_HW_SPI) + #define NRFX_SPIM_ENABLED (MICROPY_PY_MACHINE_SPI) #define NRFX_SPIM0_ENABLED 1 #define NRFX_SPIM1_ENABLED 1