Skip to content

Commit ec20b2a

Browse files
durapensadurapensa
committed
Merge branch 'main' of github.com:adafruit/circuitpython into s2mini
2 parents 762c155 + d88361c commit ec20b2a

File tree

71 files changed

+972
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+972
-408
lines changed

‎.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,7 @@ jobs:
512512
- "atmegazero_esp32s2"
513513
- "crumpspace_crumps2"
514514
- "electroniccats_bastwifi"
515+
- "espressif_hmi_devkit_1"
515516
- "espressif_kaluga_1"
516517
- "espressif_kaluga_1.3"
517518
- "espressif_saola_1_wroom"
@@ -532,6 +533,7 @@ jobs:
532533
- "targett_module_clip_wroom"
533534
- "targett_module_clip_wrover"
534535
- "unexpectedmaker_feathers2"
536+
- "unexpectedmaker_feathers2_neo"
535537
- "unexpectedmaker_feathers2_prerelease"
536538
- "unexpectedmaker_tinys2"
537539

‎frozen/Adafruit_CircuitPython_NeoPixel

‎lib/tinyusb

Submodule tinyusb updated 150 files

‎locale/ID.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3982,6 +3982,7 @@ msgstr ""
39823982
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
39833983
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39843984
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
3985+
#: ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h
39853986
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39863987
#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h
39873988
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

‎locale/cs.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3942,6 +3942,7 @@ msgstr ""
39423942
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
39433943
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39443944
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
3945+
#: ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h
39453946
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39463947
#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h
39473948
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

‎locale/de_DE.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4011,6 +4011,7 @@ msgstr "pow() mit 3 Argumenten erfordert Integer"
40114011
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
40124012
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
40134013
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
4014+
#: ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h
40144015
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
40154016
#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h
40164017
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

‎locale/el.po

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3939,6 +3939,7 @@ msgstr ""
39393939
#: ports/esp32s2/boards/gravitech_cucumber_r/mpconfigboard.h
39403940
#: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h
39413941
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
3942+
#: ports/esp32s2/boards/lolin_s2_mini/mpconfigboard.h
39423943
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
39433944
#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h
39443945
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

0 commit comments

Comments
 (0)