Hugo Dahl
8094435193
Merge branch 'main' of https://github.com/adafruit/circuitpython into add-translation-for-builtin-object-help
2021-01-14 22:12:30 -06:00
Dan Halbert
c4f0325ff8
Merge pull request #3991 from TG-Techie/main
...
Revision to TG-Watch
2021-01-14 18:43:52 -05:00
Dan Halbert
8c0a9a2486
Merge pull request #4004 from jepler/fix-parallel-build-main
...
ports/unix: Fix parallel build problem
2021-01-14 18:00:46 -05:00
Dan Halbert
0ef73fba54
Merge pull request #4002 from jepler/update-uzlib
...
update uzlib to v2.9.5
2021-01-14 17:11:53 -05:00
Scott Shawcroft
e6b49d95ee
Merge pull request #3993 from dhalbert/gattc-write-lengths
...
don't check length for remote characteristic or descriptor
2021-01-14 12:56:29 -08:00
Dan Halbert
59003e96af
Merge pull request #4001 from dhalbert/magtag-a1-pin
...
MagTag: Add pin A1 as alias for AD1; A1 is preferred
2021-01-14 15:54:37 -05:00
Jeff Epler
059363f0e2
ports/unix: Fix parallel build problem
...
This is the same as I added to mpy-cross at e666e86035
, see #3074
2021-01-14 14:13:31 -06:00
Jeff Epler
8e51139da0
update uzlib to v2.9.5
...
uzlib isn't actually used in any firmwares, but is built into the
"unix" port used for testing.
The main benefit of the update is to fix problems encountered on
Windows, as the old ref of uzlib had filenames with embedded colons;
this has been fixed upstream.
uzlib seems to have been reabsed since the version that we took; this
doesn't really matter to us.
2021-01-14 13:45:42 -06:00
Dan Halbert
aedc8efeda
Add pin A1 as alias for AD1; A1 is preferred
2021-01-14 14:43:47 -05:00
Dan Halbert
90a6581acb
Merge pull request #3997 from dhalbert/change-xtensa-build-cache-key
...
change extensa github actions cache key to avoid bad cache
2021-01-14 14:20:26 -05:00
Dan Halbert
54cc9ab4b9
change extensa github actions cache key to avoid bad cache
2021-01-14 11:29:21 -05:00
Dan Halbert
b05c6bac21
change extensa github actions cache key to avoid bad cache
2021-01-14 11:04:36 -05:00
Jonah Yolles-Murphy
c63d5a44a0
restore TG-Watch USB_PID from accidental overwrite
2021-01-14 00:08:34 -05:00
Jonah Yolles-Murphy
5f8ad0c5e6
correct USB_PRODUCT for TG-Watch
2021-01-14 00:02:56 -05:00
Jonah Yolles-Murphy
8f8af90098
final name and extra board
2021-01-13 23:51:34 -05:00
Jeff Epler
47015d7789
Merge pull request #3974 from weblate/weblate-circuitpython-main
...
Translations update from Weblate
2021-01-13 20:57:24 -06:00
Dan Halbert
ccace62ac9
don't check length for remote characteristic or dedescriptor
2021-01-13 15:35:51 -05:00
Hosted Weblate
3c474204a4
Merge branch 'origin/main' into Weblate.
2021-01-13 17:08:20 +01:00
Dan Halbert
92a4398996
Merge pull request #3982 from jepler/esp32s2-make-flash
...
esp32s2: Fix 'make flash'
2021-01-13 11:08:15 -05:00
Hosted Weblate
a1d685b947
Merge branch 'origin/main' into Weblate.
2021-01-13 17:07:47 +01:00
Hugo Dahl
b4eb46b9ef
Translated using Weblate (French)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
2021-01-13 17:07:47 +01:00
Dan Halbert
8f9db7717e
Merge pull request #3985 from jepler/revert-precommit-translate
...
Revert "pre-commit: Add checking of 'make translate' status"
2021-01-13 11:07:41 -05:00
Hosted Weblate
1d75e55bb5
Merge branch 'origin/main' into Weblate.
2021-01-13 03:19:48 +01:00
Jeff Epler
c44c99398d
Merge pull request #3983 from dhalbert/6.1.0-shrink-builds
...
shrink some de_DE builds
2021-01-12 20:19:43 -06:00
Hosted Weblate
35a10952b2
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-01-13 03:19:08 +01:00
Hosted Weblate
e33a421785
Merge branch 'origin/main' into Weblate.
2021-01-13 03:19:06 +01:00
Wellington Terumi Uemura
0a13eff940
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 100.0% (913 of 913 strings)
Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/
2021-01-13 03:19:06 +01:00
Jeff Epler
8d24e72981
Merge pull request #3978 from ladyada/neotrinkey
...
samd21 board with only 4 neopixels + two touchpads
2021-01-12 20:19:01 -06:00
Jeff Epler
88ce6911b7
Revert "pre-commit: Add checking of 'make translate' status"
...
This reverts commit 1dda33dc41
.
2021-01-12 18:52:39 -06:00
Dan Halbert
5e52ca0530
make translate
2021-01-12 18:41:50 -05:00
Dan Halbert
4b30412871
shrink some de_DE builds
2021-01-12 18:23:37 -05:00
Jeff Epler
f95d10b2a6
make translate
2021-01-12 16:30:20 -06:00
Jeff Epler
ed0cb248e9
esp32s2: Fix 'make flash'
...
As reported by @jerryneedell, this change was incorrect; the given
ESPTOOL_FLAGS caused `write_flash` to be repeated twice, which doesn't
work.
Closes #3981 .
2021-01-12 16:04:29 -06:00
Hosted Weblate
a07b59552d
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-01-12 19:25:50 +01:00
Hosted Weblate
9b6cad380a
Merge branch 'origin/main' into Weblate.
2021-01-12 19:25:48 +01:00
Dan Halbert
f9c762256f
Merge pull request #3733 from jepler/audioout-esp32
...
esp32s2: Add I2SAudioOut
2021-01-12 13:25:40 -05:00
Hosted Weblate
1b54597789
Merge branch 'origin/main' into Weblate.
2021-01-12 19:01:57 +01:00
Dan Halbert
4be5e914ac
Merge pull request #3966 from dhalbert/samd-dac-channels
...
fix atmel-samd DAC channel selection logic
2021-01-12 13:01:50 -05:00
lady ada
748d44892d
fix some precommit complaints
2021-01-12 12:55:02 -05:00
lady ada
f7f97ae1b7
samd21 board with only 4 neopixels + two touchpads
2021-01-12 12:50:08 -05:00
Hosted Weblate
db40f004c2
Merge branch 'origin/main' into Weblate.
2021-01-12 17:26:38 +01:00
Scott Shawcroft
bfdaa6eb9c
Merge pull request #3959 from ladyada/main
...
try adding new feather def
2021-01-12 08:26:29 -08:00
Hosted Weblate
af4732a716
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-01-12 16:40:07 +01:00
Hosted Weblate
b8fa8198f0
Merge branch 'origin/main' into Weblate.
2021-01-12 16:40:04 +01:00
Hugo Dahl
1f53d5a4b9
Translated using Weblate (French)
...
Currently translated at 100.0% (898 of 898 strings)
Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/fr/
2021-01-12 16:40:04 +01:00
Dan Halbert
679b465d96
Merge pull request #3969 from microDev1/TouchAlarm
...
Fixes and Enhancement for Touch Alarm
2021-01-12 10:39:55 -05:00
Jeff Epler
1ca29ec47c
Merge remote-tracking branch 'origin/main' into audioout-esp32
2021-01-12 09:23:07 -06:00
Hugo Dahl
87849fb62c
Fix pre-commit hook issue
2021-01-12 07:31:56 -06:00
microDev
cd16f29efd
Merge branch 'main' into TouchAlarm
2021-01-12 18:28:38 +05:30
Hugo Dahl
5949516ece
Update circuitpython.pot
...
Fix missing closing quote
2021-01-11 20:46:02 -06:00