From cae31d6762c99a9784b031a51429e214e9866802 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 30 Apr 2021 22:38:03 -0400 Subject: [PATCH] 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);