Commit Graph

22979 Commits

Author SHA1 Message Date
Dan Halbert 256fcd6cc9
Merge pull request #4736 from Neradoc/patch-2
fix FunHome to FunHouse
2021-05-10 09:32:20 -04:00
Neradoc dcfb7949d7
fix FunHome to FunHouse
FunHouse, sweet FunHouse.
2021-05-10 05:34:03 +02:00
Limor "Ladyada" Fried af6d97f67f
Merge pull request #4733 from nm3210/sparkfunpromicrorp2040_boardupdate
Swap mis-labelled D0/D1 pins on SparkFun Pro Micro RP2040
2021-05-09 12:13:04 -04:00
nm3210 a3de9bda5f Swap mis-labelled D0/D1 pins on SparkFun Pro Micro RP2040 2021-05-08 21:35:37 -04:00
Jeff Epler 026cd5914d
Merge pull request #4725 from tannewt/merge_helper
Add Python helper tool for MicroPython merges.
2021-05-08 11:10:42 -05:00
Jeff Epler ec897038be
Merge pull request #4729 from weblate/weblate-circuitpython-main
Translations update from Weblate
2021-05-08 10:40:19 -05:00
Hosted Weblate affc9da56c Merge remote-tracking branch 'origin/main' into main 2021-05-08 15:47:32 +02:00
Jeff Epler 5e06c91244
Merge pull request #4716 from tyomitch/main
s/Circuit Python/CircuitPython/g
2021-05-08 08:47:29 -05:00
Hosted Weblate 296a9b828f
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-05-08 15:46:26 +02:00
Hosted Weblate 8974ef3782 Merge remote-tracking branch 'origin/main' into main 2021-05-08 15:46:24 +02:00
Jeff Epler 446169e078
Merge pull request #4720 from tannewt/merge_1.13
Merge in MicroPython 1.13
2021-05-08 08:46:03 -05:00
Hosted Weblate b02e3fdaf0 Merge remote-tracking branch 'origin/main' into main 2021-05-08 15:45:58 +02:00
Jeff Epler 9f3ae54dcc
Merge pull request #4726 from jposada202020/design_guide_string_formatting
adding_string_format_explanation
2021-05-08 08:45:50 -05:00
Jonny Bergdahl 6643de2fca
Translated using Weblate (Swedish)
Currently translated at 100.0% (980 of 980 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/
2021-05-08 15:32:42 +02:00
Wellington Terumi Uemura e3f319f446
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (980 of 980 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-05-08 15:32:41 +02:00
jposada202020 bba0afa464 adding_string_format_explanation 2021-05-07 15:15:05 -04:00
Scott Shawcroft 20c4a325a4
Add Python helper tool for MicroPython merges.
It automates ignoring parts of MP we don't use.

Related to #2999
2021-05-07 10:21:35 -07:00
Scott Shawcroft 5c736835de
Fix esp32s2 builds after AP changes 2021-05-07 10:03:02 -07:00
Scott Shawcroft f761292c72
Merge pull request #4718 from weblate/weblate-circuitpython-main
Translations update from Weblate
2021-05-07 09:49:01 -07:00
Scott Shawcroft cebb10ddae
Fixes from review 2021-05-07 09:31:59 -07:00
Hosted Weblate df5c30e0a8 Merge remote-tracking branch 'origin/main' into main 2021-05-07 12:32:31 +02:00
Dan Halbert 2fe1df4668
Merge pull request #4719 from hierophect/stm-espr-pico-fix
Espruino Pico: Remove settings for DNP oscillator
2021-05-07 06:32:19 -04:00
Lucian Copeland 9920741c2f Merge remote-tracking branch 'upstream/main' into stm-espr-pico-fix 2021-05-06 17:43:38 -04:00
Hosted Weblate 3e879fa279 Merge remote-tracking branch 'origin/main' into main 2021-05-06 22:48:27 +02:00
hexthat ae79096e34
Translated using Weblate (Chinese (Pinyin))
Currently translated at 100.0% (980 of 980 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
2021-05-06 22:48:26 +02:00
Alvaro Figueroa cce8096395
Translated using Weblate (Spanish)
Currently translated at 100.0% (980 of 980 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-05-06 22:48:26 +02:00
Dan Halbert c6b9885573
Merge pull request #4721 from dhalbert/update-xtensa-cache-id
update github actions xtensa cache id; fix a typo
2021-05-06 16:48:20 -04:00
Scott Shawcroft b19c1a310e
mpy M -> C 2021-05-06 13:31:20 -07:00
Dan Halbert 0773e355a7 update github actions xtensa cache id; fix a typo 2021-05-06 15:10:45 -04:00
Scott Shawcroft 42f4065c8a
Merge remote-tracking branch 'adafruit/main' into merge_1.13 2021-05-06 11:17:53 -07:00
Lucian Copeland 80a459d1f8 Remove settings for DNP oscillator 2021-05-06 13:52:07 -04:00
Hosted Weblate 51645bc094
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-05-06 19:51:53 +02:00
Hosted Weblate 0b8824313a Merge remote-tracking branch 'origin/main' into main 2021-05-06 19:51:51 +02:00
Wellington Terumi Uemura 45cf638ba0
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (973 of 973 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-05-06 19:51:51 +02:00
Hugo Dahl 8de14446cd
Translated using Weblate (French)
Currently translated at 100.0% (973 of 973 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
2021-05-06 19:51:50 +02:00
Jose David M bd731a14bb
Translated using Weblate (Spanish)
Currently translated at 100.0% (973 of 973 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-05-06 19:51:50 +02:00
Dan Halbert ebf9dcb47a
Merge pull request #4689 from dhalbert/dynamic-usb-descriptors
Dynamic USB descriptors
2021-05-06 13:51:38 -04:00
Scott Shawcroft 71d2536725
Build fixes thanks to jepler 2021-05-06 09:04:56 -07:00
Artyom Skrobov 908d83d1f2 s/Circuit Python/CircuitPython/g
Some comments and messages used the non-standard spelling
2021-05-06 16:22:35 +03:00
Jeff Epler 03a4f85556
Merge pull request #4713 from jepler/mpy-magic-number
Change the first byte of CircuitPython 'mpy' files to "C"
2021-05-06 08:01:22 -05:00
Scott Shawcroft 59c2787702
Fix esp32s2 build 2021-05-05 18:27:21 -07:00
Scott Shawcroft 3fda0c0a1b
Fix board builds and use MP_ERROR_TEXT in py and extmod 2021-05-05 17:51:52 -07:00
Scott Shawcroft 7f2f8e2d58
Turn off CPython warnings in tests 2021-05-05 17:26:39 -07:00
Lucian Copeland 22feda1066
Merge pull request #4708 from hierophect/supervisor-run-reason
Remove overwrite of run_reason in main
2021-05-05 19:18:16 -04:00
Jeff Epler ef3ec93c8b Change the first byte of CircuitPython 'mpy' files to "C"
.. and also distinguish CircuitPython better in `mpy-cross --version`
2021-05-05 18:06:06 -05:00
Scott Shawcroft d8701e5136
Update binary path 2021-05-05 15:48:01 -07:00
Dan Halbert 843598ec3a fix more board builds 2021-05-05 18:44:27 -04:00
Scott Shawcroft c34ddf14d6
Switch from recommonmark to myst-parser
It's the *future* and fixes a doc build error.

Related to https://github.com/readthedocs/recommonmark/issues/221
2021-05-05 15:25:37 -07:00
Scott Shawcroft 3dad2cbb56
Merge pull request #9 from jepler/1.13_test_fixes
1.13 test fixes
2021-05-05 14:29:04 -07:00
Jeff Epler 3e1c3547bd
Merge pull request #4712 from jepler/mpy-cross-aarch64
Build an aarch64 version of mpy-cross
2021-05-05 16:14:40 -05:00