Commit Graph

23336 Commits

Author SHA1 Message Date
Scott Shawcroft e02a26453c
Merge MicroPython 1.14 into CircuitPython 2021-05-11 15:07:40 -07: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
Dan Halbert f504af3127 fix HID; fix interface name table creation 2021-05-09 00:42:45 -04:00
Jeff Epler d9ee63b0c1 run updated black 2021-05-08 20:42:52 -05:00
nm3210 a3de9bda5f Swap mis-labelled D0/D1 pins on SparkFun Pro Micro RP2040 2021-05-08 21:35:37 -04:00
Jeff Epler aca9d5bc40 Fix up all natmod examples
* modframebuf: _mp_framebuf_p_t is not "really" a protocol, but the
   QSTR assignment caused problems when building as a dynamic module
 * modure: str_index_to_ptr is not in the natmod API, disable URE match
   spans when dynamic.  mp_obj_len() is a bugfix, we should throw here
   if the object is not string-like
 * moduzlib: Correct paths to uzlib headers & sources.  this relative
   path (from moduzlib.c to the referenced file) works in all cases,
   the other only worked from ports/PORTNAME.
 * dynruntime: Handle 2-arg m_malloc, assert_native_inited, add a
   micropythonish mp_arg_check_num_mp, fix mp_raise_msg to use dumb
   strings, add mp_raise_arg1
 * nativeglue: ad assert_native_inited
 * translate: MP_ERROR_TEXT evaluates to its argument for DYNRUNTIME
 * mpy-tool: A straggling magic number change
 * mpy_ld: Have to renumber manually after dynruntime change
 * import_mpy_native_gc.py: Update copy of features0 baked into this test
2021-05-08 20:17:16 -05: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
Dan Halbert 4b45c37516 Do USB init even in safe mode 2021-05-08 11:03:05 -04: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