Skip to content

Commit c62b724

Browse files
committed
Merge remote-tracking branch 'circuitpython/master' into jgillick/circuitpython/stm32f412c
2 parents d9e491a + 7e56f6e commit c62b724

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1348
-811
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,10 @@ jobs:
232232
- "trellis_m4_express"
233233
- "trinket_m0"
234234
- "trinket_m0_haxpress"
235+
- "uartlogger2"
235236
- "uchip"
236237
- "ugame10"
238+
- "winterbloom_big_honking_button"
237239
- "winterbloom_sol"
238240
- "xinabox_cc03"
239241
- "xinabox_cs11"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(BASEOPTS)
3636
# the i18n builder cannot share the environment and doctrees with the others
3737
I18NSPHINXOPTS = $(BASEOPTS)
3838

39-
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm32f4 py shared-bindings shared-module supervisor
39+
TRANSLATE_SOURCES = extmod lib main.c ports/atmel-samd ports/cxd56 ports/mimxrt10xx ports/nrf ports/stm py shared-bindings shared-module supervisor
4040

4141
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext stubs
4242

0 commit comments

Comments
 (0)