Skip to content

Merge latest changes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 281 commits into from
Jan 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
281 commits
Select commit Hold shift + click to select a range
6d2329f
add blank lines after all comment sections
ha-rvc Dec 10, 2020
d29184b
try without ... in docs
ha-rvc Dec 10, 2020
344d3c5
Merge branch 'main' into msgpack
tannewt Dec 11, 2020
1d37d3f
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 15, 2020
10d735d
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 16, 2020
8eaf2b0
implement touch alarm
microdev1 Dec 18, 2020
a60fabd
add touch alarm support for esp32s2
microdev1 Dec 19, 2020
ecd7c08
expose wake pin parameter and more tweaks
microdev1 Dec 19, 2020
c875d7c
speedup pack_bin, ext, str; catch short reads
ha-rvc Dec 20, 2020
737828c
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 22, 2020
f814a34
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Dec 22, 2020
9c14593
Merge pull request #36 from adafruit/main
DavePutz Dec 28, 2020
d024df6
esp32s2: Use better optimizer flags in debug builds
jepler Nov 12, 2020
05ba143
esp32s2: espidf: Add IDFError
jepler Nov 20, 2020
b40a579
esp32s2: espidf: Consistent error checking of esp-idf calls
jepler Oct 30, 2020
537a4da
mark script as executable
jepler Oct 28, 2020
2cd377f
audiobusio: Make PDMIn optional
jepler Oct 28, 2020
a754259
esp32s2: add I2SOut
jepler Oct 30, 2020
42cad23
make translate
jepler Dec 29, 2020
72cad49
Fix minor typo in ESP32S2 readme
hugodahl Dec 30, 2020
0914b71
remove unneeded set_config (wrong param; called in connect anyway)
anecdata Dec 30, 2020
d537d94
see what we're missing
anecdata Dec 30, 2020
c7f6802
add pretend-to-sleep functionality
microdev1 Dec 30, 2020
83c6774
Revert "Removing frozen libs"
jepler Dec 30, 2020
28ce5e8
Merge branch 'main' into touch-s2
microdev1 Dec 30, 2020
fc20a37
Merge pull request #3896 from hugodahl/fix-esp32-s2-readme-typo
ladyada Dec 30, 2020
fb21614
Merge pull request #3900 from jepler/restore-frozen-busdevice
dhalbert Dec 30, 2020
3b72d50
update frozen libs for 6.1.0-beta.3
dhalbert Dec 30, 2020
b83bdc5
enable light-sleep functionality
microdev1 Dec 30, 2020
0bad611
update wake-alarm implementation
microdev1 Dec 30, 2020
7e78af7
Merge pull request #3905 from dhalbert/update-frozen-6.1.0-beta.3
jepler Dec 30, 2020
5698b8b
Merge pull request #3850 from microDev1/touch-s2
jepler Dec 30, 2020
7cae612
Translated using Weblate (Indonesian)
oonid Dec 30, 2020
c27030b
Translated using Weblate (Spanish)
hugodahl Dec 29, 2020
334207c
Translated using Weblate (French)
hugodahl Dec 30, 2020
70bd3c5
Merge branch 'origin/main' into Weblate.
weblate Dec 30, 2020
c056ac3
Update translation files
weblate Dec 30, 2020
9e559ac
Merge branch 'main' of https://github.com/adafruit/circuitpython into…
askpatrickw Jan 1, 2021
d0bc5e4
Merge pull request #3909 from weblate/weblate-circuitpython-main
jepler Jan 1, 2021
43f93b0
release and pre-release FeatherS2 NSync
askpatrickw Jan 1, 2021
220501e
dupe LED entries
askpatrickw Jan 1, 2021
80e5899
Translated using Weblate (French)
hugodahl Dec 31, 2020
71cc9b6
Translated using Weblate (Portuguese (Brazil))
wtuemura Dec 31, 2020
df4c028
_pixelbuf: error check in brightness setter (fix #3753)
brrzap Jan 2, 2021
2ce0720
changes based on UM's input
askpatrickw Jan 2, 2021
ad2ee09
Merge pull request #3917 from brrzap/fix-3753
dhalbert Jan 2, 2021
3a51ffe
Merge branch 'origin/main' into Weblate.
weblate Jan 2, 2021
80fa60d
Merge pull request #3915 from weblate/weblate-circuitpython-main
dhalbert Jan 2, 2021
9d5587f
Translated using Weblate (Indonesian)
oonid Jan 2, 2021
8c8961a
Merge pull request #3 from adafruit/main
bwshockley Jan 3, 2021
9286f26
Added CP Dotstart Lib to Build
bwshockley Jan 3, 2021
d0e5499
Merge pull request #3914 from askpatrickw/feathers2-Nsync
ladyada Jan 3, 2021
d8721e3
Merge branch 'origin/main' into Weblate.
weblate Jan 3, 2021
2a5f3de
Merge pull request #3608 from adafruit/6.0.x
jepler Oct 27, 2020
10f178d
Fixed incorrect pin assignment on header
UnexpectedMaker Jan 3, 2021
46ec95d
Merge pull request #3925 from UnexpectedCircuitPython/main
ladyada Jan 4, 2021
dfcdad3
Merge branch 'origin/main' into Weblate.
weblate Jan 4, 2021
dcf88e1
Merge pull request #3923 from bwshockley/Add_dotstar_mini_sam_m4
ladyada Jan 4, 2021
4a9f33a
Merge branch 'origin/main' into Weblate.
weblate Jan 4, 2021
ec02102
implment use of DotStar for staus led
jerryneedell Jan 4, 2021
09bf584
ulab: update to 1.6.0
jepler Jan 4, 2021
f87ce01
make translate
jepler Jan 4, 2021
f6f1ef7
Merge pull request #3929 from jepler/update-ulab3
dhalbert Jan 4, 2021
d2c71fd
Merge branch 'origin/main' into Weblate.
weblate Jan 4, 2021
4135ccb
Update translation files
weblate Jan 4, 2021
bbd4de3
Add adafruit_bus_device to CPX builds.
kattni Jan 4, 2021
76e9f49
Merge pull request #37 from adafruit/main
DavePutz Jan 4, 2021
ce55822
Fix size of memset in board_reset_user_neopixels()
DavePutz Jan 4, 2021
79e3c3d
Merge branch 'msgpack' of github.com:iot49/iotpython into msgpack
ha-rvc Jan 5, 2021
90a299b
added //| to (hopefully) get CI to pass
ha-rvc Jan 5, 2021
1a82555
Merge branch 'main' into msgpack
Jan 5, 2021
69de4f9
Merge pull request #3932 from kattni/circuit-playground-bus-device
dhalbert Jan 5, 2021
0057e1d
Translated using Weblate (Portuguese (Brazil))
wtuemura Jan 5, 2021
7943272
Translated using Weblate (Swedish)
bergdahl Jan 4, 2021
03a6db3
Merge branch 'origin/main' into Weblate.
weblate Jan 5, 2021
9eb2ca0
Update translation files
weblate Jan 5, 2021
590fe8e
Merge pull request #3934 from DavePutz/issue_3807
dhalbert Jan 5, 2021
8c25f54
Merge branch 'origin/main' into Weblate.
weblate Jan 5, 2021
7e59ff3
Merge pull request #3921 from weblate/weblate-circuitpython-main
tannewt Jan 5, 2021
98c9492
change ESP_EARLY_LOG* to ESP_LOG* throughout event_handler
anecdata Jan 6, 2021
14e2a02
Merge remote-tracking branch 'upstream/main' into jerryn_feathers2_led
jerryneedell Jan 6, 2021
9a1d864
overflowed tick counter needs 64 bits everywhere
dhalbert Jan 6, 2021
a333597
Merge pull request #3903 from anecdata/reasons
tannewt Jan 6, 2021
cdad59f
Fix doc build with extra blank lines
tannewt Jan 6, 2021
9db0a4f
add magtag accelo irq pin
caternuson Jan 6, 2021
66d8778
Adding authmode keyword
BennyE Jan 6, 2021
092331e
convert esp32s2 readme to rst
2bndy5 Jan 6, 2021
18122e0
missed a couple inline code snippets
2bndy5 Jan 6, 2021
30ed8d1
Translated using Weblate (French)
hugodahl Jan 6, 2021
5358524
Merge pull request #3939 from dhalbert/tick-overflow
dhalbert Jan 7, 2021
a03f35e
Translated using Weblate (German)
Jan 7, 2021
0476e4f
Merge branch 'origin/main' into Weblate.
weblate Jan 7, 2021
0b0b476
Merge pull request #3940 from caternuson/magtag_accelo_irq_pin
tannewt Jan 7, 2021
2719411
Merge branch 'origin/main' into Weblate.
weblate Jan 7, 2021
55c8075
Merge pull request #3945 from 2bndy5/fix-table-in-a-readme
tannewt Jan 7, 2021
b65d91d
Merge branch 'origin/main' into Weblate.
weblate Jan 7, 2021
6976ec6
Merge remote-tracking branch 'upstream/main' into jerryn_feathers2_led
jerryneedell Jan 7, 2021
30c6dd3
Merge remote-tracking branch 'origin/main' into audioout-esp32
jepler Jan 7, 2021
e4129ec
Makefile: Remove POT-Creation-Date from circuitpython.pot
jepler Jan 7, 2021
e79ee78
circuitpython.pot: regenerate without timestamp
jepler Jan 7, 2021
1dda33d
pre-commit: Add checking of 'make translate' status
jepler Jan 7, 2021
7bb196b
esp32s2: 'make flash': Allow customizing the esptool flags
jepler Jan 7, 2021
115f3e0
Updated code as per helpful suggestion
BennyE Jan 7, 2021
010a4e7
esp32s2: port: Ensure JTAG pins are available for debugging
jepler Jan 7, 2021
3522264
esp32s2: i2s: fix accounting for "stretched" frames
jepler Jan 7, 2021
d3afda6
esp32s2: i2s: must reset buffer, otherwise wave samples don't start
jepler Jan 7, 2021
cfd8288
esp2s2: enlarge stack-buffer, use it instead of i2s_zero_dma_buffer
jepler Jan 7, 2021
873a300
i2s_fill_buffer: Need to fill with zeros when stopping
jepler Jan 8, 2021
0b7a4c4
i2s_fill_buffer: remove debug print
jepler Jan 8, 2021
12264cc
port_i2s_play: remove build error
jepler Jan 8, 2021
430bcdb
port_i2s_play: fill the initial buffer via background callback
jepler Jan 8, 2021
5f0e41a
I2SOut: Enable ticks during audio playback
jepler Jan 8, 2021
39c166b
update tinyusb; _ticks_enabled only for SAMD21
dhalbert Jan 8, 2021
7556f38
initialize LDO2 in board_init()
jerryneedell Jan 8, 2021
de5b138
remove commented line
jerryneedell Jan 8, 2021
06ab848
added platform
anecdata Jan 8, 2021
7b4558b
Fix socket.recvfrom_into()
lonelykitty Jan 9, 2021
96dd3d3
ensure gettext program is available to pre-commit
jepler Jan 9, 2021
288c54c
need to find strings in ulab
jepler Jan 9, 2021
dd10c53
restore len(alarm.sleep_memory) and bool(alarm.sleep_memory)
dhalbert Jan 9, 2021
255ffa9
avoid inline compile errors
dhalbert Jan 9, 2021
13efbf2
disable msgpack on boards without room
FoamyGuy Jan 9, 2021
999ee68
try adding new feather def
ladyada Jan 9, 2021
9253351
Merge branch 'main' into main
ladyada Jan 9, 2021
813fa67
nowhitespace
ladyada Jan 9, 2021
7de1da4
woops out of sync header, plus... i dunno add some frozen modules cau…
ladyada Jan 9, 2021
301facf
newline
ladyada Jan 9, 2021
a600fd3
forgot deinit
ladyada Jan 9, 2021
10861b4
esp32s2: Rename ESP_CALL_RAISE to CHECK_ESP_RESULT
jepler Jan 9, 2021
4735cf4
esp32s2: audiobusio: move i2s_common inside
jepler Jan 9, 2021
e20c65d
background tasks: Add, use port_wake_main_task
jepler Jan 9, 2021
908e024
Look up TCC resolution as necessary
dhalbert Jan 9, 2021
68a5e6d
copypaste typo
ladyada Jan 9, 2021
b5b0d45
add tft
ladyada Jan 10, 2021
5b9ce9e
fix dup usb
ladyada Jan 10, 2021
d036620
compilier
ladyada Jan 10, 2021
8652d69
update TG-Watch pins, name, and frozen libraries
Jan 10, 2021
53e4d78
Update ports/esp32s2/common-hal/wifi/Network.c
BennyE Jan 10, 2021
c87e1a6
ok lets try without auto-display
ladyada Jan 10, 2021
a397af9
Round BLE timing values; fix timeout check
dhalbert Jan 10, 2021
ce59b54
Merge remote-tracking branch 'adafruit/main' into robots.txt
dhalbert Jan 10, 2021
6928de0
merge from upstream and update to 6.0.x
dhalbert Jan 10, 2021
316bd0c
fix atmel-samd DAC channel selection logic
dhalbert Jan 11, 2021
5f44813
fixes and enhancement for touch alarm
microdev1 Jan 11, 2021
0593e46
ulab: bump to version 1.6.1
jepler Jan 11, 2021
9e92917
Update created code.py file formatting.
kattni Jan 11, 2021
09596dd
Adding escape characters.
kattni Jan 11, 2021
95d32a9
Merge pull request #3946 from weblate/weblate-circuitpython-main
tannewt Jan 11, 2021
1c12d83
Merge pull request #3953 from dhalbert/update-tinyusb-to-fix-_ticks_e…
tannewt Jan 11, 2021
b0eb91d
Merge pull request #3955 from caiokat/fix_recvfrom_into
tannewt Jan 11, 2021
1fb3d24
Merge pull request #3958 from dhalbert/sleep_memory-len-and-bool
tannewt Jan 11, 2021
9124529
Merge pull request #3659 from iot49/msgpack
tannewt Jan 11, 2021
0bc5461
Update translation files
weblate Jan 11, 2021
3a7755b
Merge pull request #3930 from jerryneedell/jerryn_feathers2_led
tannewt Jan 11, 2021
6b260e6
Merge branch 'origin/main' into Weblate.
weblate Jan 11, 2021
a92712a
Merge pull request #3949 from jepler/pre-commit-translations
tannewt Jan 11, 2021
43e0cd5
Merge branch 'origin/main' into Weblate.
weblate Jan 11, 2021
10093d3
Merge pull request #3960 from dhalbert/pwmout-tcc-resolution
tannewt Jan 11, 2021
d0527dd
Merge branch 'origin/main' into Weblate.
weblate Jan 11, 2021
ba507a8
Merge pull request #3957 from dhalbert/gcc10-debug-builds
tannewt Jan 11, 2021
ddddaf0
Merge branch 'origin/main' into Weblate.
weblate Jan 11, 2021
b669b62
Merge pull request #3291 from dhalbert/robots.txt
tannewt Jan 11, 2021
c784edf
Merge branch 'origin/main' into Weblate.
weblate Jan 11, 2021
3cf4d9c
Merge pull request #3954 from anecdata/mpconfigport
tannewt Jan 12, 2021
7709327
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
081249f
Merge pull request #3944 from BennyE/wifi-authmode
tannewt Jan 12, 2021
ceb81b0
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
452d66d
Update ports/atmel-samd/common-hal/analogio/AnalogOut.c
dhalbert Jan 12, 2021
2e1d332
Merge pull request #3972 from jepler/update-ulab-1.6.1
tannewt Jan 12, 2021
8b26cae
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
4db5565
Merge pull request #3964 from dhalbert/ble-timing-fixes
tannewt Jan 12, 2021
9bdae2f
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
047708e
Merge pull request #3973 from kattni/update-code-py
dhalbert Jan 12, 2021
bc3a40f
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
cd16f29
Merge branch 'main' into TouchAlarm
microdev1 Jan 12, 2021
1ca29ec
Merge remote-tracking branch 'origin/main' into audioout-esp32
jepler Jan 12, 2021
679b465
Merge pull request #3969 from microDev1/TouchAlarm
dhalbert Jan 12, 2021
1f53d5a
Translated using Weblate (French)
hugodahl Jan 12, 2021
b8fa819
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
af4732a
Update translation files
weblate Jan 12, 2021
bfdaa6e
Merge pull request #3959 from ladyada/main
tannewt Jan 12, 2021
db40f00
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
f7f97ae
samd21 board with only 4 neopixels + two touchpads
ladyada Jan 12, 2021
748d448
fix some precommit complaints
ladyada Jan 12, 2021
4be5e91
Merge pull request #3966 from dhalbert/samd-dac-channels
dhalbert Jan 12, 2021
1b54597
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
f9c7622
Merge pull request #3733 from jepler/audioout-esp32
dhalbert Jan 12, 2021
9b6cad3
Merge branch 'origin/main' into Weblate.
weblate Jan 12, 2021
a07b595
Update translation files
weblate Jan 12, 2021
ed0cb24
esp32s2: Fix 'make flash'
jepler Jan 12, 2021
f95d10b
make translate
jepler Jan 12, 2021
4b30412
shrink some de_DE builds
dhalbert Jan 12, 2021
5e52ca0
make translate
dhalbert Jan 12, 2021
88ce691
Revert "pre-commit: Add checking of 'make translate' status"
jepler Jan 13, 2021
8d24e72
Merge pull request #3978 from ladyada/neotrinkey
jepler Jan 13, 2021
0a13eff
Translated using Weblate (Portuguese (Brazil))
wtuemura Jan 12, 2021
e33a421
Merge branch 'origin/main' into Weblate.
weblate Jan 13, 2021
35a1095
Update translation files
weblate Jan 13, 2021
c44c993
Merge pull request #3983 from dhalbert/6.1.0-shrink-builds
jepler Jan 13, 2021
1d75e55
Merge branch 'origin/main' into Weblate.
weblate Jan 13, 2021
8f9db77
Merge pull request #3985 from jepler/revert-precommit-translate
dhalbert Jan 13, 2021
b4eb46b
Translated using Weblate (French)
hugodahl Jan 13, 2021
a1d685b
Merge branch 'origin/main' into Weblate.
weblate Jan 13, 2021
92a4398
Merge pull request #3982 from jepler/esp32s2-make-flash
dhalbert Jan 13, 2021
3c47420
Merge branch 'origin/main' into Weblate.
weblate Jan 13, 2021
ccace62
don't check length for remote characteristic or dedescriptor
dhalbert Jan 13, 2021
47015d7
Merge pull request #3974 from weblate/weblate-circuitpython-main
jepler Jan 14, 2021
8f8af90
final name and extra board
Jan 14, 2021
5f8ad0c
correct USB_PRODUCT for TG-Watch
Jan 14, 2021
c63d5a4
restore TG-Watch USB_PID from accidental overwrite
Jan 14, 2021
e519dd3
Retry on all disconnect reasons other than: 2 exception reasons & 1 m…
anecdata Jan 14, 2021
f75bb5c
Rename to match WIFI_REASON. Also return specific reason code.
anecdata Jan 14, 2021
d1249fb
Include all reason codes.
anecdata Jan 14, 2021
8febdee
Rename to match WIFI_REASON. Also include specific error code in "Unk…
anecdata Jan 14, 2021
b05c6ba
change extensa github actions cache key to avoid bad cache
dhalbert Jan 14, 2021
54cc9ab
change extensa github actions cache key to avoid bad cache
dhalbert Jan 14, 2021
90a6581
Merge pull request #3997 from dhalbert/change-xtensa-build-cache-key
dhalbert Jan 14, 2021
aedc8ef
Add pin A1 as alias for AD1; A1 is preferred
dhalbert Jan 14, 2021
8e51139
update uzlib to v2.9.5
jepler Jan 14, 2021
059363f
ports/unix: Fix parallel build problem
jepler Jan 13, 2021
ad87f37
ulab: update to 1.7.0
jepler Jan 14, 2021
59003e9
Merge pull request #4001 from dhalbert/magtag-a1-pin
dhalbert Jan 14, 2021
e6b49d9
Merge pull request #3993 from dhalbert/gattc-write-lengths
tannewt Jan 14, 2021
0ef73fb
Merge pull request #4002 from jepler/update-uzlib
dhalbert Jan 14, 2021
8c0a9a2
Merge pull request #4004 from jepler/fix-parallel-build-main
dhalbert Jan 14, 2021
c4f0325
Merge pull request #3991 from TG-Techie/main
dhalbert Jan 14, 2021
564dce8
Update translations
anecdata Jan 14, 2021
d85e071
Hard code new copyright date
hugodahl Jan 15, 2021
d88bb0b
Set year from execution date
hugodahl Jan 15, 2021
a98df72
Update to 1.7.1
jepler Jan 15, 2021
c843122
fix doc build
jepler Jan 15, 2021
03e9415
Merge pull request #4005 from jepler/update-ulab-1.7.0
tannewt Jan 15, 2021
fac4d9c
Merge pull request #4006 from hugodahl/Update-documentation-copyright…
tannewt Jan 15, 2021
816cbe4
Merge pull request #3992 from anecdata/reason4
tannewt Jan 15, 2021
a938934
Revert "UMFEATHERS2 - implement use of DotStar for status led"
jerryneedell Jan 17, 2021
6a76b60
Merge pull request #4013 from adafruit/revert-3930-jerryn_feathers2_led
dhalbert Jan 17, 2021
dea2bcd
Fixed comment in mpconfigboard.h
mrangen Jan 18, 2021
ee48e4b
ESP32-S2: Initialize touch in proper order
dhalbert Jan 18, 2021
41459d1
handle exttype & chunk long reads
ha-rvc Jan 18, 2021
ebb4df8
Add support for a 'haxpress' external SPI flash build for the stm32f4…
djix123 Jan 19, 2021
368751b
Add support for a 'haxpress' external SPI flash build for the stm32f4…
djix123 Jan 19, 2021
9143268
Merge pull request #4021 from dhalbert/esp32-s2-touch-init-order
jepler Jan 19, 2021
35c836f
Update .github/workflows/build.yml
djix123 Jan 19, 2021
c8046af
Update ports/stm/boards/stm32f411ce_blackpill_haxpress/mpconfigboard.h
djix123 Jan 19, 2021
4804032
Update ports/stm/boards/stm32f411ce_blackpill_haxpress/mpconfigboard.mk
djix123 Jan 19, 2021
b4bdf55
Update ports/stm/boards/stm32f411ce_blackpill_haxpress/mpconfigboard.mk
djix123 Jan 19, 2021
55c6d3e
1. Rename 'stm32f411ce_blackpill_haxpress' to 'stm32f411ce_blackpill_…
djix123 Jan 19, 2021
409b5ff
Merge pull request #4028 from djix123/stm32411ce_blackpill_haxpress
dhalbert Jan 19, 2021
54e2f85
Merge pull request #4022 from iot49/cp-msgpack
tannewt Jan 20, 2021
f1e4960
Merge pull request #4019 from mrangen/QSPI-comment-fix
tannewt Jan 20, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ jobs:
board:
- "8086_commander"
- "ADM_B_NRF52840_1"
- "TG-Watch02A"
- "TG-Watch"
- "aloriumtech_evo_m51"
- "aramcon_badge_2019"
- "arduino_mkr1300"
Expand Down Expand Up @@ -261,6 +261,7 @@ jobs:
- "monster_m4sk"
- "ndgarage_ndbit6"
- "ndgarage_ndbit6_v2"
- "neopixel_trinkey_m0"
- "nfc_copy_cat"
- "nice_nano"
- "nucleo_f746zg"
Expand Down Expand Up @@ -314,6 +315,7 @@ jobs:
- "spresense"
- "stackrduino_m0_pro"
- "stm32f411ce_blackpill"
- "stm32f411ce_blackpill_with_flash"
- "stm32f411ve_discovery"
- "stm32f412zg_discovery"
- "stm32f4_discovery"
Expand Down Expand Up @@ -431,6 +433,8 @@ jobs:
fail-fast: false
matrix:
board:
- "adafruit_feather_esp32s2_nopsram"
- "adafruit_feather_esp32s2_tftback_nopsram"
- "adafruit_magtag_2.9_grayscale"
- "adafruit_metro_esp32s2"
- "electroniccats_bastwifi"
Expand Down Expand Up @@ -461,7 +465,7 @@ jobs:
id: idf-cache
with:
path: ${{ github.workspace }}/.idf_tools
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20200801
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210114
- name: Clone IDF submodules
run: |
(cd $IDF_PATH && git submodule update --init)
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ jobs:
steps:
- uses: actions/checkout@v1
- uses: actions/setup-python@v1
- name: Install deps
run: sudo apt-get update && sudo apt-get install -y gettext
- name: Populate selected submodules
run: git submodule update --init extmod/ulab
- name: set PY
run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
- uses: actions/cache@v1
Expand Down
15 changes: 15 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,18 @@
[submodule "ports/esp32s2/certificates/nina-fw"]
path = ports/esp32s2/certificates/nina-fw
url = https://github.com/adafruit/nina-fw.git
[submodule "frozen/Adafruit_CircuitPython_ST7789"]
path = frozen/Adafruit_CircuitPython_ST7789
url = https://github.com/adafruit/Adafruit_CircuitPython_ST7789
[submodule "frozen/Adafruit_CircuitPython_Display_Shapes"]
path = frozen/Adafruit_CircuitPython_Display_Shapes
url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Shapes
[submodule "frozen/Adafruit_CircuitPython_Display_Text"]
path = frozen/Adafruit_CircuitPython_Display_Text
url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Text
[submodule "frozen/Adafruit_CircuitPython_ProgressBar"]
path = frozen/Adafruit_CircuitPython_ProgressBar
url = https://github.com/adafruit/Adafruit_CircuitPython_ProgressBar
[submodule "frozen/Adafruit_CircuitPython_LC709203F"]
path = frozen/Adafruit_CircuitPython_LC709203F
url = https://github.com/adafruit/Adafruit_CircuitPython_LC709203F
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ pseudoxml:
all-source:

locale/circuitpython.pot: all-source
find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o - | sed -e '/"POT-Creation-Date: /d' > $@

# Historically, `make translate` updated the .pot file and ran msgmerge.
# However, this was a frequent source of merge conflicts. Weblate can perform
Expand Down
8 changes: 6 additions & 2 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import subprocess
import sys
import urllib.parse
import time

import recommonmark
from sphinx.transforms import SphinxTransform
Expand Down Expand Up @@ -101,9 +102,12 @@
# The master toctree document.
#master_doc = 'index'

# Get current date (execution) for copyright year
current_date = time.localtime()

# General information about the project.
project = 'Adafruit CircuitPython'
copyright = '2014-2020, MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)'
copyright = f'2014-{current_date.tm_year}, MicroPython & CircuitPython contributors (https://github.com/adafruit/circuitpython/graphs/contributors)'

# These are overwritten on ReadTheDocs.
# The version info for the project you're documenting, acts as replacement for
Expand Down Expand Up @@ -276,7 +280,7 @@
# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
# directly to the root of the documentation.
#html_extra_path = []
html_extra_path = ["docs/robots.txt"]

# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
Expand Down
6 changes: 6 additions & 0 deletions docs/robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
User-agent: *
Allow: /*/latest/
Allow: /en/latest/ # Fallback for bots that don't understand wildcards
Allow: /*/6.0.x/
Allow: /en/6.0.x/ # Fallback for bots that don't understand wildcards
Disallow: /
2 changes: 1 addition & 1 deletion extmod/ulab
Submodule ulab updated 102 files
2 changes: 1 addition & 1 deletion frozen/Adafruit_CircuitPython_DRV2605
1 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_Display_Shapes
1 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_Display_Text
1 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_LC709203F
1 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_ProgressBar
2 changes: 1 addition & 1 deletion frozen/Adafruit_CircuitPython_RFM9x
1 change: 1 addition & 0 deletions frozen/Adafruit_CircuitPython_ST7789
2 changes: 1 addition & 1 deletion lib/tinyusb
Submodule tinyusb updated 40 files
+0 −10 .github/ISSUE_TEMPLATE/question.md
+3 −0 CONTRIBUTORS.md
+3 −2 README.md
+5 −0 docs/boards.md
+0 −0 examples/device/cdc_msc_freertos/.skip.MCU_MKL25ZXX
+6 −1 examples/device/hid_composite_freertos/src/main.c
+0 −0 examples/device/msc_dual_lun/.skip.MCU_MKL25ZXX
+0 −0 examples/device/net_lwip_webserver/.skip.MCU_MKL25ZXX
+1 −1 hw/bsp/board_mcu.h
+234 −0 hw/bsp/double_m33_express/LPC55S69_cm33_core0_uf2.ld
+51 −0 hw/bsp/double_m33_express/board.mk
+400 −0 hw/bsp/double_m33_express/double_m33_express.c
+46 −0 hw/bsp/frdm_kl25z/board.mk
+148 −0 hw/bsp/frdm_kl25z/frdm_kl25z.c
+1 −1 hw/mcu/nxp
+1 −1 src/class/hid/hid_device.h
+1 −1 src/class/msc/msc.h
+193 −191 src/class/msc/msc_device.c
+0 −871 src/common/sys_queue.h
+1 −0 src/common/tusb_compiler.h
+8 −2 src/common/tusb_fifo.c
+21 −1 src/device/usbd.c
+8 −0 src/device/usbd_control.c
+3 −4 src/portable/dialog/da146xx/dcd_da146xx.c
+19 −4 src/portable/espressif/esp32s2/dcd_esp32s2.c
+12 −3 src/portable/microchip/samd/dcd_samd.c
+1 −1 src/portable/microchip/samg/dcd_samg.c
+1 −1 src/portable/nordic/nrf5x/dcd_nrf5x.c
+1 −2 src/portable/nuvoton/nuc120/dcd_nuc120.c
+1 −1 src/portable/nuvoton/nuc121/dcd_nuc121.c
+477 −0 src/portable/nxp/khci/dcd_khci.c
+1 −1 src/portable/nxp/lpc17_40/dcd_lpc17_40.c
+2 −2 src/portable/nxp/lpc_ip3511/dcd_lpc_ip3511.c
+1 −1 src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c
+128 −93 src/portable/st/synopsys/dcd_synopsys.c
+3 −3 src/portable/ti/msp430x5xx/dcd_msp430x5xx.c
+1 −1 src/portable/valentyusb/eptri/dcd_eptri.c
+10 −6 src/tusb_option.h
+1 −1 test/test/device/msc/test_msc_device.c
+3 −3 test/test/support/tusb_config.h
2 changes: 1 addition & 1 deletion lib/uzlib
Submodule uzlib updated 248 files
Loading