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

Merge branch 'master' into circuitpython-nickzoic-1046-nrf-rtc

This commit is contained in:
Nick Moore 2019-03-28 14:48:10 +11:00
parent 02f1939df2 fd134df552
commit 54a41e0812
22 changed files with 11 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -29,6 +29,8 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(BASEOPTS)
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/nrf py shared-bindings shared-module supervisor
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
help:
@ -194,7 +196,7 @@ pseudoxml:
all-source:
locale/circuitpython.pot: all-source
find . -iname "*.c" | xargs xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
find $(TRANSLATE_SOURCES) -iname "*.c" | xargs xgettext -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
translate: locale/circuitpython.pot
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done

2
ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
View File

@ -11,5 +11,3 @@ LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/meowmeow/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
View File

@ -12,5 +12,3 @@ LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

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

@ -20,4 +20,3 @@ CIRCUITPY_RTC = 0
CIRCUITPY_SAMD = 0
CIRCUITPY_USB_MIDI = 0
CIRCUITPY_SMALL_BUILD = 1
CIRCUITPY_FREQUENCYIO = 0

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

@ -17,12 +17,11 @@ CIRCUITPY_RTC = 0
CIRCUITPY_SAMD = 0
CIRCUITPY_USB_MIDI = 0
CIRCUITPY_SMALL_BUILD = 1
CIRCUITPY_FREQUENCYIO = 0
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21
CFLAGS_INLINE_LIMIT = 45
CFLAGS_INLINE_LIMIT = 35
# Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar

2
ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
View File

@ -11,5 +11,3 @@ LONGINT_IMPL = MPZ
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

2
ports/atmel-samd/boards/uchip/mpconfigboard.mk
View File

@ -10,5 +10,3 @@ CIRCUITPY_SMALL_BUILD = 1
CHIP_VARIANT = SAMD21E18A
CHIP_FAMILY = samd21
CIRCUITPY_FREQUENCYIO = 0

6
ports/atmel-samd/mpconfigport.mk
View File

@ -14,6 +14,12 @@ ifeq ($(LONGINT_IMPL),LONGLONG)
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=longlong
endif
# Put samd21-only choices here.
ifeq ($(CHIP_FAMILY),samd21)
# frequencyio not yet verified as working on SAMD21.
CIRCUITPY_FRQUENCYIO = 0
endif
# Put samd51-only choices here.
ifeq ($(CHIP_FAMILY),samd51)
CIRCUITPY_SAMD = 1

2
py/circuitpy_mpconfig.mk
View File

@ -93,7 +93,7 @@ endif
CFLAGS += -DCIRCUITPY_DISPLAYIO=$(CIRCUITPY_DISPLAYIO)
ifndef CIRCUITPY_FREQUENCYIO
CIRCUITPY_FREQUENCYIO = 1
CIRCUITPY_FREQUENCYIO = $(CIRCUITPY_FULL_BUILD)
endif
CFLAGS += -DCIRCUITPY_FREQUENCYIO=$(CIRCUITPY_FREQUENCYIO)