nrf/modules/machine/pwm: Use extmod/machine_pwm.c for PWM module.

This is a breaking change, making the hardware PWM on the nrf port compatible with the other ports providing machine.PWM. Frequency range 4Hz - ~5.4 MHz. The base clock range is 125kHz to 16 MHz, and the divider range is 3 - 32767. The hardware supports up to four outputs per PWM device with different duty cycles, but only one output is (and was) supported.

nrf/modules/machine/pwm: Use extmod/machine_pwm.c for PWM module.
This is a breaking change, making the hardware PWM on the nrf port compatible with the other ports providing machine.PWM. Frequency range 4Hz - ~5.4 MHz. The base clock range is 125kHz to 16 MHz, and the divider range is 3 - 32767. The hardware supports up to four outputs per PWM device with different duty cycles, but only one output is (and was) supported.
a1f838cd · robert-hh · Damien George · cf43df4c · a1f838cd · a1f838cd
Commit a1f838cd authored Mar 04, 2023 by robert-hh Committed by Damien George Mar 10, 2023
18 changed files
--- a/ports/nrf/Makefile
+++ b/ports/nrf/Makefile
@@ -330,7 +330,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
 	machine/pin.c \
 	machine/timer.c \
 	machine/rtcounter.c \
-	machine/pwm.c \
 	machine/temp.c \
 	uos/moduos.c \
 	uos/microbitfs.c \

--- a/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
+++ b/ports/nrf/boards/arduino_nano_33_ble_sense/mpconfigboard.h
@@ -14,6 +14,7 @@
 #define MICROPY_BOARD_ENTER_BOOTLOADER(nargs, args) NANO33_board_enter_bootloader()

 #define MICROPY_PY_MACHINE_UART         (1)
+#define MICROPY_PY_MACHINE_PWM          (1)
 #define MICROPY_PY_MACHINE_HW_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_SPI       (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER    (1)

--- a/ports/nrf/boards/arduino_primo/mpconfigboard.h
+++ b/ports/nrf/boards/arduino_primo/mpconfigboard.h
@@ -32,6 +32,7 @@
 #define MICROPY_PY_MUSIC            (1)

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
+++ b/ports/nrf/boards/blueio_tag_evim/mpconfigboard.h
@@ -32,6 +32,7 @@
 #define MICROPY_PY_MUSIC            (1)

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
+++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h
@@ -46,6 +46,7 @@

 // Peripherals Config
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/feather52/mpconfigboard.h
+++ b/ports/nrf/boards/feather52/mpconfigboard.h
@@ -29,6 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52"

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
+++ b/ports/nrf/boards/ibk_blyst_nano/mpconfigboard.h
@@ -32,6 +32,7 @@
 #define MICROPY_PY_MUSIC            (1)

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
+++ b/ports/nrf/boards/idk_blyst_nano/mpconfigboard.h
@@ -32,6 +32,7 @@
 #define MICROPY_PY_MUSIC            (1)

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
+++ b/ports/nrf/boards/nrf52840-mdk-usb-dongle/mpconfigboard.h
@@ -29,6 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM      "nrf52840-MDK-USB-Dongle"

 #define MICROPY_PY_MACHINE_UART      (1)
+#define MICROPY_PY_MACHINE_PWM       (1)
 #define MICROPY_PY_MACHINE_HW_PWM    (1)
 #define MICROPY_PY_MACHINE_HW_SPI    (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/particle_xenon/mpconfigboard.h
+++ b/ports/nrf/boards/particle_xenon/mpconfigboard.h
@@ -29,6 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "PARTICLE-XENON"

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/pca10040/mpconfigboard.h
+++ b/ports/nrf/boards/pca10040/mpconfigboard.h
@@ -29,6 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52-DK"

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@@ -29,6 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52840-PDK"

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/pca10059/mpconfigboard.h
+++ b/ports/nrf/boards/pca10059/mpconfigboard.h
@@ -29,6 +29,7 @@
 #define MICROPY_PY_SYS_PLATFORM     "nrf52840-Dongle"

 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
+++ b/ports/nrf/boards/seeed_xiao_nrf52/mpconfigboard.h
@@ -34,6 +34,7 @@

 #define MICROPY_HW_USB_CDC          (1)
 #define MICROPY_PY_MACHINE_UART     (1)
+#define MICROPY_PY_MACHINE_PWM      (1)
 #define MICROPY_PY_MACHINE_HW_PWM   (1)
 #define MICROPY_PY_MACHINE_HW_SPI   (1)
 #define MICROPY_PY_MACHINE_RTCOUNTER (1)

--- a/ports/nrf/main.c
+++ b/ports/nrf/main.c
@@ -280,6 +280,10 @@ soft_reset:
        }
    }

+    #if MICROPY_PY_MACHINE_HW_PWM
+    pwm_deinit_all();
+    #endif
+
    mp_deinit();

    printf("MPY: soft reboot\n");

--- a/ports/nrf/modules/machine/pwm.c
+++ b/ports/nrf/modules/machine/pwm.c
--- a/ports/nrf/modules/machine/pwm.h
+++ b/ports/nrf/modules/machine/pwm.h
@@ -25,5 +25,6 @@
 */

 void pwm_init0(void);
+void pwm_deinit_all(void);

 extern const mp_obj_type_t machine_pwm_type;
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -196,6 +196,14 @@
 #define MICROPY_PY_MACHINE_SOFT_PWM (0)
 #endif

+#define MICROPY_PY_MACHINE_PWM_INIT (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY (1)
+#define MICROPY_PY_MACHINE_PWM_DUTY_U16_NS (1)
+
+#if MICROPY_PY_MACHINE_HW_PWM
+#define MICROPY_PY_MACHINE_PWM_INCLUDEFILE "ports/nrf/modules/machine/pwm.c"
+#endif
+
 #ifndef MICROPY_PY_MACHINE_TIMER_NRF
 #define MICROPY_PY_MACHINE_TIMER_NRF (1)
 #endif