From cae31d6762c99a9784b031a51429e214e9866802 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 30 Apr 2021 22:38:03 -0400 Subject: [PATCH 1/2] remove PWMOut from pulseio --- py/circuitpy_mpconfig.mk | 4 +--- shared-bindings/pulseio/__init__.c | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/py/circuitpy_mpconfig.mk b/py/circuitpy_mpconfig.mk index 7dd44f4172..003c5235c4 100644 --- a/py/circuitpy_mpconfig.mk +++ b/py/circuitpy_mpconfig.mk @@ -234,9 +234,7 @@ CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO) CIRCUITPY_PULSEIO ?= 1 CFLAGS += -DCIRCUITPY_PULSEIO=$(CIRCUITPY_PULSEIO) -# For now we tie PWMIO to PULSEIO so they always both exist. In CircuitPython 7 -# we can enable and disable them separately once PWMOut is removed from `pulseio`. -CIRCUITPY_PWMIO ?= $(CIRCUITPY_PULSEIO) +CIRCUITPY_PWMIO ?= 1 CFLAGS += -DCIRCUITPY_PWMIO=$(CIRCUITPY_PWMIO) CIRCUITPY_RANDOM ?= 1 diff --git a/shared-bindings/pulseio/__init__.c b/shared-bindings/pulseio/__init__.c index 44a07fafc6..12050c9d36 100644 --- a/shared-bindings/pulseio/__init__.c +++ b/shared-bindings/pulseio/__init__.c @@ -33,7 +33,6 @@ #include "shared-bindings/pulseio/__init__.h" #include "shared-bindings/pulseio/PulseIn.h" #include "shared-bindings/pulseio/PulseOut.h" -#include "shared-bindings/pwmio/PWMOut.h" //| """Support for individual pulse based protocols //| @@ -41,10 +40,6 @@ //| Individual pulses are commonly used in infrared remotes and in DHT //| temperature sensors. //| -//| -//| .. warning:: PWMOut is moving to `pwmio` and will be removed from `pulseio` -//| in CircuitPython 7. -//| //| All classes change hardware state and should be deinitialized when they //| are no longer needed if the program continues after use. To do so, either //| call :py:meth:`!deinit` or use a context manager. See @@ -55,7 +50,6 @@ STATIC const mp_rom_map_elem_t pulseio_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_pulseio) }, { MP_ROM_QSTR(MP_QSTR_PulseIn), MP_ROM_PTR(&pulseio_pulsein_type) }, { MP_ROM_QSTR(MP_QSTR_PulseOut), MP_ROM_PTR(&pulseio_pulseout_type) }, - { MP_ROM_QSTR(MP_QSTR_PWMOut), MP_ROM_PTR(&pwmio_pwmout_type) }, }; STATIC MP_DEFINE_CONST_DICT(pulseio_module_globals, pulseio_module_globals_table); From 1ca805887f9f7f32536827190059ffc0f8c9a844 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sat, 1 May 2021 13:49:18 -0400 Subject: [PATCH 2/2] Fix broken builds --- .../boards/xinabox_cc03/mpconfigboard.mk | 1 + .../boards/xinabox_cs11/mpconfigboard.mk | 1 + ports/litex/mpconfigport.mk | 1 + ports/stm/mpconfigport.mk | 99 ++++++++++--------- 4 files changed, 53 insertions(+), 49 deletions(-) diff --git a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk index d6f333b5be..9497bf78cb 100644 --- a/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk +++ b/ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk @@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ CIRCUITPY_FULL_BUILD = 0 SUPEROPT_GC = 0 +SUPEROPT_VM = 0 # Make room for frozen libs. CIRCUITPY_FREQUENCYIO = 0 diff --git a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk index fd2fa044a8..eb43bd8afd 100644 --- a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk +++ b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk @@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ CIRCUITPY_FULL_BUILD = 0 SUPEROPT_GC = 0 +SUPEROPT_VM = 0 # Make room for frozen libs. CIRCUITPY_FREQUENCYIO = 0 diff --git a/ports/litex/mpconfigport.mk b/ports/litex/mpconfigport.mk index af6a94e64a..61a4937473 100644 --- a/ports/litex/mpconfigport.mk +++ b/ports/litex/mpconfigport.mk @@ -29,6 +29,7 @@ CIRCUITPY_FREQUENCYIO = 0 CIRCUITPY_I2CPERIPHERAL = 0 CIRCUITPY_NVM = 0 CIRCUITPY_PULSEIO = 0 +CIRCUITPY_PWMIO = 0 CIRCUITPY_ROTARYIO = 0 CIRCUITPY_RTC = 0 CIRCUITPY_SDCARDIO = 0 diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk index a3216f2678..abddd63a63 100644 --- a/ports/stm/mpconfigport.mk +++ b/ports/stm/mpconfigport.mk @@ -4,66 +4,67 @@ INTERNAL_LIBM ?= 1 USB_SERIAL_NUMBER_LENGTH ?= 24 ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx)) - CIRCUITPY_CANIO = 1 - CIRCUITPY_FRAMEBUFFERIO ?= 1 - CIRCUITPY_SDIOIO ?= 1 - # Number of USB endpoint pairs. - USB_NUM_EP = 4 + CIRCUITPY_CANIO = 1 + CIRCUITPY_FRAMEBUFFERIO ?= 1 + CIRCUITPY_SDIOIO ?= 1 + # Number of USB endpoint pairs. + USB_NUM_EP = 4 endif ifeq ($(MCU_SERIES),F4) - # Audio via PWM - CIRCUITPY_AUDIOIO = 0 - CIRCUITPY_AUDIOCORE ?= 1 - CIRCUITPY_AUDIOPWMIO ?= 1 + # Audio via PWM + CIRCUITPY_AUDIOIO = 0 + CIRCUITPY_AUDIOCORE ?= 1 + CIRCUITPY_AUDIOPWMIO ?= 1 - # Not yet implemented common-hal modules: - CIRCUITPY_AUDIOBUSIO ?= 0 - CIRCUITPY_COUNTIO ?= 0 - CIRCUITPY_FREQUENCYIO ?= 0 - CIRCUITPY_I2CPERIPHERAL ?= 0 - CIRCUITPY_NVM ?= 0 - CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 - CIRCUITPY_USB_MIDI ?= 0 - CIRCUITPY_USB_HID ?= 0 + # Not yet implemented common-hal modules: + CIRCUITPY_AUDIOBUSIO ?= 0 + CIRCUITPY_COUNTIO ?= 0 + CIRCUITPY_FREQUENCYIO ?= 0 + CIRCUITPY_I2CPERIPHERAL ?= 0 + CIRCUITPY_NVM ?= 0 + CIRCUITPY_ROTARYIO ?= 0 + CIRCUITPY_RTC ?= 0 + CIRCUITPY_USB_MIDI ?= 0 + CIRCUITPY_USB_HID ?= 0 - USB_NUM_EP = 4 + USB_NUM_EP = 4 endif ifeq ($(MCU_SERIES),H7) - # Not yet implemented common-hal modules: - CIRCUITPY_ANALOGIO ?= 0 - CIRCUITPY_AUDIOBUSIO ?= 0 - CIRCUITPY_AUDIOIO ?= 0 - CIRCUITPY_COUNTIO ?= 0 - CIRCUITPY_FREQUENCYIO ?= 0 - CIRCUITPY_I2CPERIPHERAL ?= 0 - CIRCUITPY_NEOPIXEL_WRITE ?= 0 - CIRCUITPY_NVM ?= 0 - CIRCUITPY_PULSEIO ?= 0 - CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 - CIRCUITPY_USB_HID ?= 0 - CIRCUITPY_USB_MIDI ?= 0 + # Not yet implemented common-hal modules: + CIRCUITPY_ANALOGIO ?= 0 + CIRCUITPY_AUDIOBUSIO ?= 0 + CIRCUITPY_AUDIOIO ?= 0 + CIRCUITPY_COUNTIO ?= 0 + CIRCUITPY_FREQUENCYIO ?= 0 + CIRCUITPY_I2CPERIPHERAL ?= 0 + CIRCUITPY_NEOPIXEL_WRITE ?= 0 + CIRCUITPY_NVM ?= 0 + CIRCUITPY_PULSEIO ?= 0 + CIRCUITPY_PWMIO ?= 0 + CIRCUITPY_ROTARYIO ?= 0 + CIRCUITPY_RTC ?= 0 + CIRCUITPY_USB_HID ?= 0 + CIRCUITPY_USB_MIDI ?= 0 - USB_NUM_EP = 9 + USB_NUM_EP = 9 endif ifeq ($(MCU_SERIES),F7) - # Not yet implemented common-hal modules: - CIRCUITPY_ANALOGIO ?= 0 - CIRCUITPY_AUDIOBUSIO ?= 0 - CIRCUITPY_AUDIOIO ?= 0 - CIRCUITPY_COUNTIO ?= 0 - CIRCUITPY_FREQUENCYIO ?= 0 - CIRCUITPY_I2CPERIPHERAL ?= 0 - CIRCUITPY_NEOPIXEL_WRITE ?= 0 - CIRCUITPY_NVM ?= 0 - CIRCUITPY_ROTARYIO ?= 0 - CIRCUITPY_RTC ?= 0 - CIRCUITPY_USB_HID ?= 0 - CIRCUITPY_USB_MIDI ?= 0 + # Not yet implemented common-hal modules: + CIRCUITPY_ANALOGIO ?= 0 + CIRCUITPY_AUDIOBUSIO ?= 0 + CIRCUITPY_AUDIOIO ?= 0 + CIRCUITPY_COUNTIO ?= 0 + CIRCUITPY_FREQUENCYIO ?= 0 + CIRCUITPY_I2CPERIPHERAL ?= 0 + CIRCUITPY_NEOPIXEL_WRITE ?= 0 + CIRCUITPY_NVM ?= 0 + CIRCUITPY_ROTARYIO ?= 0 + CIRCUITPY_RTC ?= 0 + CIRCUITPY_USB_HID ?= 0 + CIRCUITPY_USB_MIDI ?= 0 - USB_NUM_EP = 6 + USB_NUM_EP = 6 endif