Commit Graph

23610 Commits

Author SHA1 Message Date
Lucian Copeland
849e3a7319 Style fixes, submodules 2021-05-13 11:24:27 -04:00
Hosted Weblate
61f63e0ab5 Merge remote-tracking branch 'origin/main' into main 2021-05-13 03:52:23 +02:00
Jeff Epler
47947dc23c
Merge pull request #4749 from tannewt/merge_1.15
Merge in MicroPython 1.15
2021-05-12 20:52:11 -05:00
Scott Shawcroft
966d25c6a5
Merge MicroPython v1.15 into CircuitPython 2021-05-12 17:51:42 -07:00
Hosted Weblate
ba0c941939 Merge remote-tracking branch 'origin/main' into main 2021-05-12 23:48:12 +02:00
hexthat
e57ef5871d
Translated using Weblate (Chinese (Pinyin))
Currently translated at 100.0% (988 of 988 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
2021-05-12 23:48:12 +02:00
Wellington Terumi Uemura
44aff11f4d
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (988 of 988 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-05-12 23:48:11 +02:00
Dan Halbert
53eeb72a65
Merge pull request #4741 from lesamouraipourpre/patch-1
Minor typo in struct_time documentation
2021-05-12 17:48:06 -04:00
Dan Halbert
0651ef17dd Fix endpoint checking; Clean up safe mode printing. 2021-05-12 15:53:52 -04:00
Hosted Weblate
68aa770246 Merge remote-tracking branch 'origin/main' into main 2021-05-12 16:12:27 +02:00
Limor "Ladyada" Fried
fa485aa2bd
Merge pull request #4751 from jepler/fix-cp1252-build
Fix cp1252 build
2021-05-12 10:12:23 -04:00
Hosted Weblate
e7f0847bcb Merge remote-tracking branch 'origin/main' into main 2021-05-12 16:07:09 +02:00
Alvaro Figueroa
154b302830
Translated using Weblate (Spanish)
Currently translated at 100.0% (988 of 988 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-05-12 16:07:08 +02:00
Limor "Ladyada" Fried
24b1b7c908
Merge pull request #4750 from ladyada/moretrinkey
moar trinkz
2021-05-12 10:07:00 -04:00
Jeff Epler
45dc0953a5 makeqstrdata.py: Remove a problematic print
.. it contained non-ASCII characters, even when building the standard
English translation.

This may help resolve the build problems reported at #4750.
2021-05-11 21:48:21 -05:00
Jeff Epler
35f1da4c1a gen_display_resources: Always treat the sample file as utf-8.
This may help resolve the build problems reported at
#4750.
2021-05-11 21:48:06 -05:00
lady ada
502b66eac0 moar trinkz 2021-05-11 22:03:05 -04:00
Hosted Weblate
9e5b63090f
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-12 01:12:15 +02:00
Hosted Weblate
70a325b077 Merge remote-tracking branch 'origin/main' into main 2021-05-12 01:12:12 +02:00
Alvaro Figueroa
6a502a92d2
Translated using Weblate (Spanish)
Currently translated at 100.0% (985 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-05-12 01:12:12 +02:00
Scott Shawcroft
a70fc0caee
Merge pull request #4744 from tannewt/merge_1.14
Merge MicroPython 1.14
2021-05-11 16:11:58 -07:00
Scott Shawcroft
e02a26453c
Merge MicroPython 1.14 into CircuitPython 2021-05-11 15:07:40 -07:00
Hosted Weblate
3f6fc218bd
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-11 19:56:40 +02:00
Scott Shawcroft
de26e3ac7b
Merge pull request #4745 from ajs256/lowercase_error
Make two error messages in USB sentence case
2021-05-11 10:56:30 -07:00
Dan Halbert
0eb4b9b982
Merge pull request #4742 from kattni/led
Add LED pin to Adafruit boards.
2021-05-10 21:12:02 -04:00
ajs256
3c8b8cdba7 make translate 2021-05-10 16:57:38 -07:00
ajs256
7cd8e98962 Make two error messages sentence case 2021-05-10 16:51:13 -07:00
Lucian Copeland
525b34b042 Fix formatting and broken links
Implmements missed pre-commit changes for all files, and fixes links broken by
cleanup in #4698
2021-05-10 18:04:43 -04:00
Lucian Copeland
f59a19847c Merge branch 'stm-alarm' of https://github.com/hierophect/circuitpython into stm-alarm 2021-05-10 17:55:52 -04:00
Lucian Copeland
0d3c5222d8 Merge remote-tracking branch 'upstream/main' into stm-alarm 2021-05-10 17:30:33 -04:00
Kattni Rembor
294ef59f27 Add LED pin to Adafruit boards. 2021-05-10 16:39:01 -04:00
James Carr
106429a5e6
Update __init__.c
Minor typo.
2021-05-10 21:13:05 +01:00
Scott Shawcroft
4eb4f14840
Merge pull request #4734 from dhalbert/dynamic-usb-fixes
fix HID; fix interface name table creation
2021-05-10 12:55:29 -07:00
Scott Shawcroft
51120a9cf0
Merge pull request #4730 from dhalbert/fix-usb-safe-mode
Do USB init even in safe mode
2021-05-10 12:40:38 -07:00
Scott Shawcroft
80f9f51297
Merge pull request #4732 from jepler/fix-natmod-1.13
Fix all "natmod" (native module) examples
2021-05-10 12:37:44 -07:00
Scott Shawcroft
bc18cbd5bd
Merge pull request #4740 from jepler/modmath-pragma
modmath: Remove stray "pragma GCC diagnostic pop"
2021-05-10 12:34:54 -07:00
Scott Shawcroft
dc94f591a6
Merge pull request #4737 from weblate/weblate-circuitpython-main
Translations update from Weblate
2021-05-10 12:34:23 -07:00
Hosted Weblate
604cf644d9 Merge remote-tracking branch 'origin/main' into main 2021-05-10 18:38:08 +02:00
Kattni
054317d47d
Merge pull request #4735 from bleything/bhb-unreserve-pa00-pa01
free up PA00 and PA01 on BHB
2021-05-10 12:38:02 -04:00
Jeff Epler
ca74f282fd modmath: Remove stray "pragma GCC diagnostic pop"
This caused an error when building on macos:

```
../../py/modmath.c:247:36: error: pragma diagnostic pop could not pop, no matching push [-Werror,-Wunknown-pragmas]
            #pragma GCC diagnostic pop
                                   ^
1 error generated.
```

The pragma was half-removed during the merge of micropython.
2021-05-10 11:05:10 -05:00
Hosted Weblate
eacc8a4333 Merge remote-tracking branch 'origin/main' into main 2021-05-10 15:32:25 +02:00
Dan Halbert
256fcd6cc9
Merge pull request #4736 from Neradoc/patch-2
fix FunHome to FunHouse
2021-05-10 09:32:20 -04:00
hexthat
693b4689ad
Translated using Weblate (Chinese (Pinyin))
Currently translated at 100.0% (985 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/zh_Latn/
2021-05-10 13:33:23 +02:00
Jonny Bergdahl
30f03c219e
Translated using Weblate (Swedish)
Currently translated at 100.0% (985 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/sv/
2021-05-10 13:33:22 +02:00
Wellington Terumi Uemura
e311c6b554
Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (985 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-05-10 13:33:22 +02:00
Alvaro Figueroa
1f9b982119
Translated using Weblate (Spanish)
Currently translated at 100.0% (985 of 985 strings)

Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/es/
2021-05-10 13:33:22 +02:00
Neradoc
dcfb7949d7
fix FunHome to FunHouse
FunHouse, sweet FunHouse.
2021-05-10 05:34:03 +02:00
Ben Bleything
44f162bb64
free up PA00 and PA01 on BHB 2021-05-09 10:19:48 -07: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
Dan Halbert
becff6f93d restore pulseio to pirkey 2021-05-09 11:33:35 -04:00