Commit Graph

20971 Commits

Author SHA1 Message Date
Lucian Copeland
9fe8d61656 Fix broken MP macros from 1.11 merge 2021-04-28 18:26:52 -04:00
Lucian Copeland
9feef41c82 Merge remote-tracking branch 'upstream/main' into stm-alarm 2021-04-28 15:10:55 -04:00
Dan Halbert
d4d96bb25f
Merge pull request #4236 from jun2sak/nrf52-sleep
sleep and wakeup for nrf52
2021-04-28 12:11:31 -04:00
Jeff Epler
fcabbe90d4
Merge pull request #4675 from weblate/weblate-circuitpython-main
Translations update from Weblate
2021-04-27 16:15:10 -05:00
Hosted Weblate
cbb2ff4ce7
Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
2021-04-27 20:02:10 +02:00
Scott Shawcroft
17fcd499b2
Merge pull request #4649 from tannewt/merge_1.11_2
Merge MicroPython v1.11 into CircuitPython
2021-04-27 11:02:02 -07:00
Scott Shawcroft
f99deeda68
Merge pull request #4668 from DavePutz/issue_4659
Increased possible pulsein length to ~65 ms.
2021-04-27 11:01:51 -07:00
Scott Shawcroft
9e183bbbba
Merge pull request #4674 from kattni/dotstar-pins
Adding clearer on-board DotStar pin names.
2021-04-27 10:56:47 -07:00
Melissa LeBlanc-Williams
36f1ac38cb
Merge pull request #4673 from makermelissa/main
Release display on FunHouse when entering DeepSleep
2021-04-27 10:15:50 -07:00
Kattni Rembor
4e1d2fa056 Adding clearer on-board DotStar pin names. 2021-04-27 12:52:24 -04:00
Melissa LeBlanc-Williams
d7faac11b8 Release display on FunHouse for DeepSleep 2021-04-27 09:09:23 -07:00
root
91739de71a Increased max pulse to 65535 us 2021-04-26 18:52:15 -05:00
Scott Shawcroft
76033d5115
Merge MicroPython v1.11 into CircuitPython 2021-04-26 15:47:41 -07:00
Lucian Copeland
43840363c2 Fix submodule 2021-04-26 17:59:21 -04:00
Kattni
65c1ddb570
Merge pull request #4667 from ajs256/trinkey_pixel_fixes
Trinkey pixel fixes
2021-04-26 17:19:14 -04:00
root
5bd1da21a2 Increased possible pulsein length to 32 ms. 2021-04-25 21:38:57 -05:00
Jeff Epler
92919c25c2
Merge pull request #4666 from DavePutz/issue_4660
Reset buffer index in PulseIn clear
2021-04-25 20:33:58 -05:00
Jeff Epler
7cf8f79dbf
Merge pull request #4656 from weblate/weblate-circuitpython-main
Translations update from Weblate
2021-04-25 20:33:34 -05:00
ajs256
de3c5ff976
oh crud, i forgot a semicolon 2021-04-25 16:42:58 -07:00
ajs256
4bafbca0c3 Trinkeys: Clear neopixels on board reset 2021-04-25 12:58:52 -07:00
ajs256
453fd9234f
Merge pull request #2 from adafruit/main
update fork
2021-04-25 12:36:53 -07:00
root
d1861a6b9c Reset buffer index in PulseIn clear 2021-04-25 14:24:21 -05:00
Hosted Weblate
6571e6d7b5 Merge remote-tracking branch 'origin/main' into main 2021-04-25 21:09:16 +02:00
Limor "Ladyada" Fried
f7f6a42f3d
Merge pull request #4663 from zapwizard/patch-1
Update pins.c
2021-04-25 15:09:13 -04:00
Hosted Weblate
7f81e15007 Merge remote-tracking branch 'origin/main' into main 2021-04-25 20:43:12 +02:00
Wellington Terumi Uemura
38f6b9c969
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (974 of 974 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-04-25 20:43:11 +02:00
Alvaro Figueroa
9700295ebe
Translated using Weblate (Spanish)
Currently translated at 100.0% (974 of 974 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-04-25 20:43:11 +02:00
Mark
927d5a0455
Merge pull request #4662 from gamblor21/rp2040_pulsein_fix_4657
Added statemachine deinit
2021-04-25 13:43:06 -05:00
zapwizard
889da596ff
Update pins.c
Both D0 and D1 were assigned to pin_GPIO7, fixed D0 to pin_GPIO6, which also matches the comment.
2021-04-25 13:10:52 -05:00
gamblor21
30f31639d3 Added statemachine deinit 2021-04-25 11:58:22 -05:00
jun2sak
872fff7fbb simplify system_on_idle_until_alarm() 2021-04-25 23:59:21 +09:00
jun2sak
8bd77b79ea fix conflicts. 2021-04-25 20:16:43 +09:00
jun2sak
7daba64cb1 merge. 2021-04-25 20:12:20 +09:00
jun2sak
7accb8b173 modify copyright notice. 2021-04-25 19:57:21 +09:00
jun2sak
a17fcb6d1a add copyright notice. remove obsolete comments. 2021-04-25 19:19:11 +09:00
Hosted Weblate
75349191a6 Merge remote-tracking branch 'origin/main' into main 2021-04-24 17:45:14 +02:00
Mark
ed374a89fb
Merge pull request #4655 from DavePutz/issue_4602
Issue 4602 - Correct timing of PulseOut on SAMD21
2021-04-24 10:45:10 -05:00
Hosted Weblate
929485e7ce Merge remote-tracking branch 'origin/main' into main 2021-04-24 16:31:32 +02:00
Dan Halbert
2ba2574ebf
Merge pull request #4619 from tyomitch/microbit
[build] Allow USB to be set to 0
2021-04-24 10:31:29 -04:00
Hosted Weblate
ccbd1073cc Merge remote-tracking branch 'origin/main' into main 2021-04-24 16:29:57 +02:00
Jonny Bergdahl
a680b37232
Translated using Weblate (Swedish)
Currently translated at 100.0% (974 of 974 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/
2021-04-24 16:29:57 +02:00
Hugo Dahl
7b492773e3
Translated using Weblate (French)
Currently translated at 100.0% (974 of 974 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
2021-04-24 16:29:57 +02:00
Dan Halbert
80f05c76a8
Merge pull request #4654 from dhalbert/6.2.x-merge-1
Port #4645 to main
2021-04-24 10:29:52 -04:00
Hosted Weblate
b21afac006
Update translation files
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/
2021-04-23 22:32:05 +02:00
Hosted Weblate
63fd57a5bc Merge remote-tracking branch 'origin/main' into main 2021-04-23 22:32:02 +02:00
Wellington Terumi Uemura
7e5f00a0e2
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (970 of 970 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-04-23 22:32:02 +02:00
Jose David M
79fb03c240
Translated using Weblate (Spanish)
Currently translated at 100.0% (970 of 970 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-04-23 22:32:02 +02:00
Scott Shawcroft
80e8b4ac14
Merge pull request #4635 from jepler/pcc
WIP: Implement 'ParallelImageCapture' for samd51
2021-04-23 13:31:53 -07:00
Jeff Epler
8565a9ab90 shared-bindings: Fix type of Colorspace values in docs 2021-04-23 12:39:37 -05:00
Dan Halbert
454e78f41f merge #4645 from 6.2.x to main 2021-04-23 13:33:58 -04:00