Scott Shawcroft
605753cd7d
Merge pull request #5771 from hathach/s3-familyid
...
use family id for s2 and s3 depending on IDF_TARGET
2021-12-23 11:08:41 -08:00
Dan Halbert
35f0330d16
Merge pull request #5773 from dhalbert/update-frozen-libraries-2021-12-23-7.1.x
...
Update frozen libraries in preparation for 7.1.0-rc.0
2021-12-23 14:00:31 -05:00
Dan Halbert
325c2161e9
shrink CPX crickit build
2021-12-23 12:24:16 -05:00
Dan Halbert
7ecd7bcac1
Update frozen libraries
2021-12-23 11:50:40 -05:00
Jeff Epler
900ec91fa6
Merge pull request #5761 from adafruit/7.1.x
...
Bring 7.1.x changes into main - cascadetoml undo + alarm fixes
2021-12-23 06:30:05 -07:00
hathach
53869d71fd
use family id for s2 and s3 depending on IDF_TARGET
2021-12-23 14:53:00 +07:00
Dan Halbert
41db3f6fb6
Merge pull request #5765 from adafruit/revert-5755-fix-cascadetoml-more
...
Revert "Fix cascadetoml more"
2021-12-22 22:35:27 -05:00
Jeff Epler
c1236fb4d6
Merge pull request #5766 from tannewt/rp2040_sideset_enable
...
Add sideset_enable support to PIO
2021-12-22 20:17:33 -07:00
Scott Shawcroft
827ad327a5
Only ignore warnings if in gcc >= 11
2021-12-22 18:21:18 -08:00
Scott Shawcroft
674c845fb6
Merge pull request #5760 from jepler/rename_under_typing
...
circuitpython_stubs: Use `circuitpython_typing` for cp-specific typing
2021-12-22 14:05:04 -08:00
Scott Shawcroft
3e13d4f5b5
Add sideset_enable support to PIO
...
This allows for UART TX via PIO
2021-12-22 12:00:19 -08:00
Scott Shawcroft
9d5ae2e072
Merge pull request #5762 from dhalbert/stale-wakeup-reasons
...
Fix recording of wake_alarm
2021-12-22 10:21:50 -08:00
Scott Shawcroft
936644c157
Revert "Fix cascadetoml more"
2021-12-22 10:07:30 -08:00
Jeff Epler
828b7d88d8
update sphinx
...
note that per the https://docs.readthedocs.io/en/stable/config-file/v2.html#build-tools-python
specify "3" for the latest python version (not 3.x as on github actions)
2021-12-22 11:32:54 -06:00
Jeff Epler
fb79d1c1d1
bitmaptools: add missing types
...
These diagnostics occurred, but weren't treated as errors:
```
[WARN] Missing return type: alphablend on line 38
[WARN] Missing argument type: dest_bitmap on line 38
[WARN] Missing argument type: source_bitmap_1 on line 38
[WARN] Missing argument type: source_bitmap_2 on line 38
```
2021-12-22 11:16:38 -06:00
Jeff Epler
166793f843
circuitpython_stubs: Use circuitpython_typing
for cp-specific typing
...
Installing stubs for a module named `_typing` seems like a dubious
decision.
2021-12-22 11:14:21 -06:00
Dan Halbert
3bb9a4439d
Fix recording of wake_alarm
2021-12-21 21:48:36 -05:00
Scott Shawcroft
bea0526954
Merge pull request #5751 from weblate/weblate-circuitpython-main
...
Translations update from Hosted Weblate
2021-12-21 16:23:16 -08:00
Dan Halbert
c27c6155e6
Merge pull request #5758 from adafruit/revert-5750-pin-cascadetoml
...
Revert "pin specific versions of cascadetoml & tomlkit, temporarily"
2021-12-21 17:55:58 -05:00
Scott Shawcroft
0db83f42a4
Revert "pin specific versions of cascadetoml & tomlkit, temporarily"
2021-12-21 11:17:10 -08:00
Jeff Epler
05b70f3a42
Merge pull request #5755 from jepler/fix-cascadetoml-more
...
Fix cascadetoml more
2021-12-21 09:23:21 -07:00
Hosted Weblate
ff33231c2f
Merge remote-tracking branch 'origin/main'
2021-12-21 17:00:55 +01:00
Dan Halbert
a17d39f989
Merge pull request #5754 from adafruit/7.1.x
...
Merge 7.1.x to main for cascadetoml workaround
2021-12-21 11:00:47 -05:00
Jeff Epler
f527ef0eb8
pin cascadetoml for windows build too
2021-12-21 08:43:35 -06:00
Jeff Epler
ced98381f1
Merge pull request #5750 from jepler/pin-cascadetoml
...
pin specific versions of cascadetoml & tomlkit, temporarily
2021-12-21 07:08:29 -07:00
Hosted Weblate
5d4fbec072
Merge remote-tracking branch 'origin/main'
2021-12-21 03:24:54 +01:00
Dan Halbert
b60a806968
Merge pull request #5752 from jepler/ci-python3
...
make github-ci install python version "3.x" everywhere we use actions/setup-python (and upgrade to setup-python@v2)
2021-12-20 21:24:47 -05:00
Jeff Epler
d61d8b1020
set up python 3.x and use setup-python@v2
2021-12-20 19:05:51 -06:00
Hosted Weblate
99ada903d1
Merge remote-tracking branch 'origin/main'
2021-12-21 00:41:55 +01:00
Jeff Epler
6072016c7b
Merge pull request #5749 from FoamyGuy/tilegrid_size_props
...
Tilegrid size properties
2021-12-20 16:41:45 -07:00
dronecz
5e523c498d
Translated using Weblate (Czech)
...
Currently translated at 4.5% (47 of 1029 strings)
Translation: CircuitPython/main
Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/cs/
2021-12-20 22:53:46 +01:00
Scott Shawcroft
bd207e4ef9
Merge pull request #5735 from tannewt/kb2040_clk_pin
...
Add alternative clock pin name to match silkscreen
2021-12-20 12:37:10 -08:00
Scott Shawcroft
1ec3e023d7
Merge pull request #5744 from jepler/update-protomatter
...
Update protomatter & re-enable rgbmatrix on esp32s2
2021-12-20 12:34:02 -08:00
foamyguy
d08ba86fc4
Revert "code format"
...
This reverts commit 577358ae99
.
2021-12-20 12:09:14 -06:00
foamyguy
8b71519317
code format
2021-12-20 10:48:08 -06:00
Jeff Epler
4125a10d69
pin specific versions of cascadetoml & tomlkit, temporarily
2021-12-20 09:57:26 -06:00
foamyguy
577358ae99
code format
2021-12-20 07:38:16 -06:00
foamyguy
2ce9dc7680
Merge branch 'adafruit_main' into tilegrid_size_props
2021-12-20 07:31:08 -06:00
Jeff Epler
4eb780732b
Merge pull request #5748 from dhalbert/pixelbuf-packed-int-error-7.1.x
...
Explicitly cast float to mp_int_t - 7.1.x
2021-12-18 18:02:58 -07:00
Jeff Epler
7f189b3e30
Merge pull request #5747 from adafruit/7.1.x
...
Merge 7.1.x fixes and updates into main
2021-12-17 20:44:43 -07:00
George Waters
0ce5265624
Explicitly cast float to mp_int_t
...
Not sure why this is necessary, but it prevents an off-by-one error in
some (rare?) circumstances.
2021-12-17 22:41:48 -05:00
Dan Halbert
0ec839a956
Merge pull request #5746 from dunkmann00/pixelbuf-packed-int-error
...
Explicitly cast float to mp_int_t
2021-12-17 22:40:01 -05:00
George Waters
c615daff30
Explicitly cast float to mp_int_t
...
Not sure why this is necessary, but it prevents an off-by-one error in
some (rare?) circumstances.
2021-12-17 16:23:58 -05:00
Dan Halbert
b2189d3590
Merge pull request #5741 from dhalbert/5738-backport-to-7.1.x
...
Backport #5738 and #5742 to 7.1.x
2021-12-17 16:04:44 -05:00
Jeff Epler
60c2018262
Update protomatter & re-enable rgbmatrix on esp32s2
...
.. not enabled on s3 & c3 as I did not test there.
2021-12-17 12:04:39 -06:00
Dan Halbert
9096833366
Merge pull request #5740 from jepler/update-ulab
...
Update ulab
2021-12-17 11:47:40 -05:00
lady ada
654414e57e
fix colororder
2021-12-17 10:41:06 -05:00
Dan Halbert
14b24f405f
Merge pull request #5742 from ladyada/main
...
fix colororder
2021-12-17 10:38:18 -05:00
Jeff Epler
bd282bb1be
do not backslash-escape forward slashes
2021-12-17 09:34:47 -06:00
Jeff Epler
da4f5bdaef
fix ci matrix when ulab is modified
...
When the submodule is modified, the modified 'filename' is simply the
submodule path `extmod/ulab`, not the specific file(s) in the submodule
that are modified.
2021-12-17 09:32:53 -06:00