djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4696 from dhalbert/no-pulseio-on-small-boards

Browse Source 
Include pulseio only on CIRCUITPY_FULL_BUILD
This commit is contained in:
Dan Halbert 2021-05-03 09:35:29 -04:00 committed by GitHub
commit 94ed5e0048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
View File

@ -15,6 +15,7 @@ LONGINT_IMPL = NONE
CIRCUITPY_ANALOGIO = 0 CIRCUITPY_ANALOGIO = 0
CIRCUITPY_MATH = 0 CIRCUITPY_MATH = 0
CIRCUITPY_NEOPIXEL_WRITE = 0 CIRCUITPY_NEOPIXEL_WRITE = 0
CIRCUITPY_PULSEIO = 1
CIRCUITPY_ROTARYIO = 0 CIRCUITPY_ROTARYIO = 0
CIRCUITPY_RTC = 0 CIRCUITPY_RTC = 0
CIRCUITPY_SAMD = 0 CIRCUITPY_SAMD = 0

1
ports/atmel-samd/boards/xinabox_cc03/mpconfigboard.mk
View File

@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
CIRCUITPY_FULL_BUILD = 0 CIRCUITPY_FULL_BUILD = 0
SUPEROPT_GC = 0 SUPEROPT_GC = 0
SUPEROPT_VM = 0
# Make room for frozen libs. # Make room for frozen libs.
CIRCUITPY_FREQUENCYIO = 0 CIRCUITPY_FREQUENCYIO = 0

1
ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
View File

@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
CIRCUITPY_FULL_BUILD = 0 CIRCUITPY_FULL_BUILD = 0
SUPEROPT_GC = 0 SUPEROPT_GC = 0
SUPEROPT_VM = 0
# Make room for frozen libs. # Make room for frozen libs.
CIRCUITPY_FREQUENCYIO = 0 CIRCUITPY_FREQUENCYIO = 0

2
ports/litex/mpconfigport.mk
View File

@ -28,7 +28,9 @@ CIRCUITPY_DISPLAYIO = 0
CIRCUITPY_FREQUENCYIO = 0 CIRCUITPY_FREQUENCYIO = 0
CIRCUITPY_I2CPERIPHERAL = 0 CIRCUITPY_I2CPERIPHERAL = 0
CIRCUITPY_NVM = 0 CIRCUITPY_NVM = 0
CIRCUITPY_PWMIO = 0
CIRCUITPY_PULSEIO = 0 CIRCUITPY_PULSEIO = 0
CIRCUITPY_PWMIO = 0
CIRCUITPY_ROTARYIO = 0 CIRCUITPY_ROTARYIO = 0
CIRCUITPY_RTC = 0 CIRCUITPY_RTC = 0
CIRCUITPY_SDCARDIO = 0 CIRCUITPY_SDCARDIO = 0

99
ports/stm/mpconfigport.mk
View File

@ -4,66 +4,67 @@ INTERNAL_LIBM ?= 1
USB_SERIAL_NUMBER_LENGTH ?= 24 USB_SERIAL_NUMBER_LENGTH ?= 24
ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx)) ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
CIRCUITPY_CANIO = 1 CIRCUITPY_CANIO = 1
CIRCUITPY_FRAMEBUFFERIO ?= 1 CIRCUITPY_FRAMEBUFFERIO ?= 1
CIRCUITPY_SDIOIO ?= 1 CIRCUITPY_SDIOIO ?= 1
# Number of USB endpoint pairs. # Number of USB endpoint pairs.
USB_NUM_EP = 4 USB_NUM_EP = 4
endif endif
ifeq ($(MCU_SERIES),F4) ifeq ($(MCU_SERIES),F4)
# Audio via PWM # Audio via PWM
CIRCUITPY_AUDIOIO = 0 CIRCUITPY_AUDIOIO = 0
CIRCUITPY_AUDIOCORE ?= 1 CIRCUITPY_AUDIOCORE ?= 1
CIRCUITPY_AUDIOPWMIO ?= 1 CIRCUITPY_AUDIOPWMIO ?= 1
# Not yet implemented common-hal modules: # Not yet implemented common-hal modules:
CIRCUITPY_AUDIOBUSIO ?= 0 CIRCUITPY_AUDIOBUSIO ?= 0
CIRCUITPY_COUNTIO ?= 0 CIRCUITPY_COUNTIO ?= 0
CIRCUITPY_FREQUENCYIO ?= 0 CIRCUITPY_FREQUENCYIO ?= 0
CIRCUITPY_I2CPERIPHERAL ?= 0 CIRCUITPY_I2CPERIPHERAL ?= 0
CIRCUITPY_NVM ?= 0 CIRCUITPY_NVM ?= 0
CIRCUITPY_ROTARYIO ?= 0 CIRCUITPY_ROTARYIO ?= 0
CIRCUITPY_RTC ?= 0 CIRCUITPY_RTC ?= 0
CIRCUITPY_USB_MIDI ?= 0 CIRCUITPY_USB_MIDI ?= 0
CIRCUITPY_USB_HID ?= 0 CIRCUITPY_USB_HID ?= 0
USB_NUM_EP = 4 USB_NUM_EP = 4
endif endif
ifeq ($(MCU_SERIES),H7) ifeq ($(MCU_SERIES),H7)
# Not yet implemented common-hal modules: # Not yet implemented common-hal modules:
CIRCUITPY_ANALOGIO ?= 0 CIRCUITPY_ANALOGIO ?= 0
CIRCUITPY_AUDIOBUSIO ?= 0 CIRCUITPY_AUDIOBUSIO ?= 0
CIRCUITPY_AUDIOIO ?= 0 CIRCUITPY_AUDIOIO ?= 0
CIRCUITPY_COUNTIO ?= 0 CIRCUITPY_COUNTIO ?= 0
CIRCUITPY_FREQUENCYIO ?= 0 CIRCUITPY_FREQUENCYIO ?= 0
CIRCUITPY_I2CPERIPHERAL ?= 0 CIRCUITPY_I2CPERIPHERAL ?= 0
CIRCUITPY_NEOPIXEL_WRITE ?= 0 CIRCUITPY_NEOPIXEL_WRITE ?= 0
CIRCUITPY_NVM ?= 0 CIRCUITPY_NVM ?= 0
CIRCUITPY_PULSEIO ?= 0 CIRCUITPY_PULSEIO ?= 0
CIRCUITPY_ROTARYIO ?= 0 CIRCUITPY_PWMIO ?= 0
CIRCUITPY_RTC ?= 0 CIRCUITPY_ROTARYIO ?= 0
CIRCUITPY_USB_HID ?= 0 CIRCUITPY_RTC ?= 0
CIRCUITPY_USB_MIDI ?= 0 CIRCUITPY_USB_HID ?= 0
CIRCUITPY_USB_MIDI ?= 0
USB_NUM_EP = 9 USB_NUM_EP = 9
endif endif
ifeq ($(MCU_SERIES),F7) ifeq ($(MCU_SERIES),F7)
# Not yet implemented common-hal modules: # Not yet implemented common-hal modules:
CIRCUITPY_ANALOGIO ?= 0 CIRCUITPY_ANALOGIO ?= 0
CIRCUITPY_AUDIOBUSIO ?= 0 CIRCUITPY_AUDIOBUSIO ?= 0
CIRCUITPY_AUDIOIO ?= 0 CIRCUITPY_AUDIOIO ?= 0
CIRCUITPY_COUNTIO ?= 0 CIRCUITPY_COUNTIO ?= 0
CIRCUITPY_FREQUENCYIO ?= 0 CIRCUITPY_FREQUENCYIO ?= 0
CIRCUITPY_I2CPERIPHERAL ?= 0 CIRCUITPY_I2CPERIPHERAL ?= 0
CIRCUITPY_NEOPIXEL_WRITE ?= 0 CIRCUITPY_NEOPIXEL_WRITE ?= 0
CIRCUITPY_NVM ?= 0 CIRCUITPY_NVM ?= 0
CIRCUITPY_ROTARYIO ?= 0 CIRCUITPY_ROTARYIO ?= 0
CIRCUITPY_RTC ?= 0 CIRCUITPY_RTC ?= 0
CIRCUITPY_USB_HID ?= 0 CIRCUITPY_USB_HID ?= 0
CIRCUITPY_USB_MIDI ?= 0 CIRCUITPY_USB_MIDI ?= 0
USB_NUM_EP = 6 USB_NUM_EP = 6
endif endif

6
py/circuitpy_mpconfig.mk
View File

@ -231,12 +231,10 @@ CFLAGS += -DCIRCUITPY_PIXELBUF=$(CIRCUITPY_PIXELBUF)
CIRCUITPY_PS2IO ?= 0 CIRCUITPY_PS2IO ?= 0
CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO) CFLAGS += -DCIRCUITPY_PS2IO=$(CIRCUITPY_PS2IO)
CIRCUITPY_PULSEIO ?= 1 CIRCUITPY_PULSEIO ?= $(CIRCUITPY_FULL_BUILD)
CFLAGS += -DCIRCUITPY_PULSEIO=$(CIRCUITPY_PULSEIO) CFLAGS += -DCIRCUITPY_PULSEIO=$(CIRCUITPY_PULSEIO)
# For now we tie PWMIO to PULSEIO so they always both exist. In CircuitPython 7 CIRCUITPY_PWMIO ?= 1
# we can enable and disable them separately once PWMOut is removed from `pulseio`.
CIRCUITPY_PWMIO ?= $(CIRCUITPY_PULSEIO)
CFLAGS += -DCIRCUITPY_PWMIO=$(CIRCUITPY_PWMIO) CFLAGS += -DCIRCUITPY_PWMIO=$(CIRCUITPY_PWMIO)
CIRCUITPY_RANDOM ?= 1 CIRCUITPY_RANDOM ?= 1