Skip to content

Commit 9b11818

Browse files
droneczdronecz
authored
Merge branch 'adafruit:main' into main
2 parents 468709a + 952812c commit 9b11818

File tree

122 files changed

+2104
-1090
lines changed

Some content is hidden

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

122 files changed

+2104
-1090
lines changed

‎extmod/moduasyncio.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,18 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
7373
#define _TICKS_PERIOD (1lu << 29)
7474
#define _TICKS_MAX (_TICKS_PERIOD - 1)
7575
#define _TICKS_HALFPERIOD (_TICKS_PERIOD >> 1)
76-
76+
#if !CIRCUITPY || (defined(__unix__) || defined(__APPLE__))
7777
STATIC mp_obj_t ticks(void) {
7878
return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & _TICKS_MAX);
7979
}
80+
#else
81+
// We don't share the implementation above because our supervisor_ticks_ms
82+
// starts the epoch about 65 seconds before the first overflow (see
83+
// shared-bindings/supervisor/__init__.c). We assume/require that
84+
// supervisor.ticks_ms is picked as the ticks implementation under
85+
// CircuitPython for the Python-coded bits of asyncio.
86+
#define ticks() MP_OBJ_NEW_SMALL_INT(supervisor_ticks_ms())
87+
#endif
8088

8189
STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
8290
mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);

‎locale/ID.po

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,13 @@ msgstr ""
591591
msgid "Both RX and TX required for flow control"
592592
msgstr ""
593593

594+
#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
595+
#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
596+
#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
597+
#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
598+
msgid "Both buttons were pressed at start up.\n"
599+
msgstr ""
600+
594601
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
595602
msgid "Both pins must support hardware interrupts"
596603
msgstr "Kedua pin harus mendukung hardware interrut"
@@ -656,6 +663,11 @@ msgstr ""
656663
msgid "Bus pin %d is already in use"
657664
msgstr "Pin bus %d sudah digunakan"
658665

666+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
667+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
668+
msgid "Button A was pressed at start up.\n"
669+
msgstr ""
670+
659671
#: shared-bindings/_bleio/UUID.c
660672
msgid "Byte buffer must be 16 bytes."
661673
msgstr "Byte buffer harus 16 byte."
@@ -2004,18 +2016,38 @@ msgstr ""
20042016
msgid "Temperature read timed out"
20052017
msgstr "Waktu baca suhu habis"
20062018

2019+
#: supervisor/shared/safe_mode.c
2020+
msgid "The BOOT button was pressed at start up.\n"
2021+
msgstr ""
2022+
20072023
#: supervisor/shared/safe_mode.c
20082024
msgid ""
20092025
"The CircuitPython heap was corrupted because the stack was too small.\n"
20102026
"Increase the stack size if you know how. If not:"
20112027
msgstr ""
20122028

2029+
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
2030+
msgid "The SW38 button was pressed at start up.\n"
2031+
msgstr ""
2032+
2033+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
2034+
msgid "The VOLUME button was pressed at start up.\n"
2035+
msgstr ""
2036+
20132037
#: supervisor/shared/safe_mode.c
20142038
msgid ""
20152039
"The `microcontroller` module was used to boot into safe mode. Press reset to "
20162040
"exit safe mode."
20172041
msgstr ""
20182042

2043+
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
2044+
msgid "The central button was pressed at start up.\n"
2045+
msgstr ""
2046+
2047+
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
2048+
msgid "The left button was pressed at start up.\n"
2049+
msgstr ""
2050+
20192051
#: shared-bindings/rgbmatrix/RGBMatrix.c
20202052
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
20212053
msgstr ""
@@ -2076,8 +2108,8 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
20762108
msgstr ""
20772109

20782110
#: supervisor/shared/safe_mode.c
2079-
msgid "To exit, please reset the board without "
2080-
msgstr "Untuk keluar, silahkan reset board tanpa "
2111+
msgid "To exit, please reset the board without requesting safe mode."
2112+
msgstr ""
20812113

20822114
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
20832115
msgid "Too many channels in sample"
@@ -2376,10 +2408,6 @@ msgid ""
23762408
"You pressed the reset button during boot. Press again to exit safe mode."
23772409
msgstr ""
23782410

2379-
#: supervisor/shared/safe_mode.c
2380-
msgid "You requested starting safe mode by "
2381-
msgstr "Anda mengajukan untuk memulai mode aman pada (safe mode) pada "
2382-
23832411
#: py/objtype.c
23842412
msgid "__init__() should return None"
23852413
msgstr "__init __() harus mengembalikan None"
@@ -2673,7 +2701,7 @@ msgstr ""
26732701
msgid "can't set 512 block size"
26742702
msgstr ""
26752703

2676-
#: py/objnamedtuple.c
2704+
#: py/objexcept.c py/objnamedtuple.c
26772705
msgid "can't set attribute"
26782706
msgstr ""
26792707

@@ -3847,39 +3875,6 @@ msgstr ""
38473875
msgid "pow() with 3 arguments requires integers"
38483876
msgstr ""
38493877

3850-
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3851-
msgid "pressing BOOT button at start up.\n"
3852-
msgstr ""
3853-
3854-
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
3855-
msgid "pressing SW38 button at start up.\n"
3856-
msgstr ""
3857-
3858-
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3859-
msgid "pressing VOLUME button at start up.\n"
3860-
msgstr ""
3861-
3862-
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3863-
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
3864-
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
3865-
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
3866-
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
3867-
#: supervisor/shared/safe_mode.c
3868-
msgid "pressing boot button at start up.\n"
3869-
msgstr ""
3870-
3871-
#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
3872-
#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
3873-
#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
3874-
#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
3875-
#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
3876-
msgid "pressing both buttons at start up.\n"
3877-
msgstr ""
3878-
3879-
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
3880-
msgid "pressing the left button at start up\n"
3881-
msgstr ""
3882-
38833878
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
38843879
msgid "pull masks conflict with direction masks"
38853880
msgstr ""
@@ -4400,6 +4395,12 @@ msgstr "zi harus berjenis float"
44004395
msgid "zi must be of shape (n_section, 2)"
44014396
msgstr "Zi harus berbentuk (n_section, 2)"
44024397

4398+
#~ msgid "To exit, please reset the board without "
4399+
#~ msgstr "Untuk keluar, silahkan reset board tanpa "
4400+
4401+
#~ msgid "You requested starting safe mode by "
4402+
#~ msgstr "Anda mengajukan untuk memulai mode aman pada (safe mode) pada "
4403+
44034404
#~ msgid "Stream missing readinto() or write() method."
44044405
#~ msgstr "Aliran tidak menemukan metode readinto() atau write()."
44054406

‎locale/circuitpython.pot

100644100755
Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,13 @@ msgstr ""
583583
msgid "Both RX and TX required for flow control"
584584
msgstr ""
585585

586+
#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
587+
#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
588+
#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
589+
#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
590+
msgid "Both buttons were pressed at start up.\n"
591+
msgstr ""
592+
586593
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
587594
msgid "Both pins must support hardware interrupts"
588595
msgstr ""
@@ -648,6 +655,11 @@ msgstr ""
648655
msgid "Bus pin %d is already in use"
649656
msgstr ""
650657

658+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
659+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
660+
msgid "Button A was pressed at start up.\n"
661+
msgstr ""
662+
651663
#: shared-bindings/_bleio/UUID.c
652664
msgid "Byte buffer must be 16 bytes."
653665
msgstr ""
@@ -1975,18 +1987,38 @@ msgstr ""
19751987
msgid "Temperature read timed out"
19761988
msgstr ""
19771989

1990+
#: supervisor/shared/safe_mode.c
1991+
msgid "The BOOT button was pressed at start up.\n"
1992+
msgstr ""
1993+
19781994
#: supervisor/shared/safe_mode.c
19791995
msgid ""
19801996
"The CircuitPython heap was corrupted because the stack was too small.\n"
19811997
"Increase the stack size if you know how. If not:"
19821998
msgstr ""
19831999

2000+
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
2001+
msgid "The SW38 button was pressed at start up.\n"
2002+
msgstr ""
2003+
2004+
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
2005+
msgid "The VOLUME button was pressed at start up.\n"
2006+
msgstr ""
2007+
19842008
#: supervisor/shared/safe_mode.c
19852009
msgid ""
19862010
"The `microcontroller` module was used to boot into safe mode. Press reset to "
19872011
"exit safe mode."
19882012
msgstr ""
19892013

2014+
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
2015+
msgid "The central button was pressed at start up.\n"
2016+
msgstr ""
2017+
2018+
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
2019+
msgid "The left button was pressed at start up.\n"
2020+
msgstr ""
2021+
19902022
#: shared-bindings/rgbmatrix/RGBMatrix.c
19912023
msgid "The length of rgb_pins must be 6, 12, 18, 24, or 30"
19922024
msgstr ""
@@ -2047,7 +2079,7 @@ msgid "Timeout is too long: Maximum timeout length is %d seconds"
20472079
msgstr ""
20482080

20492081
#: supervisor/shared/safe_mode.c
2050-
msgid "To exit, please reset the board without "
2082+
msgid "To exit, please reset the board without requesting safe mode."
20512083
msgstr ""
20522084

20532085
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
@@ -2345,10 +2377,6 @@ msgid ""
23452377
"You pressed the reset button during boot. Press again to exit safe mode."
23462378
msgstr ""
23472379

2348-
#: supervisor/shared/safe_mode.c
2349-
msgid "You requested starting safe mode by "
2350-
msgstr ""
2351-
23522380
#: py/objtype.c
23532381
msgid "__init__() should return None"
23542382
msgstr ""
@@ -2642,7 +2670,7 @@ msgstr ""
26422670
msgid "can't set 512 block size"
26432671
msgstr ""
26442672

2645-
#: py/objnamedtuple.c
2673+
#: py/objexcept.c py/objnamedtuple.c
26462674
msgid "can't set attribute"
26472675
msgstr ""
26482676

@@ -3815,39 +3843,6 @@ msgstr ""
38153843
msgid "pow() with 3 arguments requires integers"
38163844
msgstr ""
38173845

3818-
#: ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h
3819-
msgid "pressing BOOT button at start up.\n"
3820-
msgstr ""
3821-
3822-
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
3823-
msgid "pressing SW38 button at start up.\n"
3824-
msgstr ""
3825-
3826-
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
3827-
msgid "pressing VOLUME button at start up.\n"
3828-
msgstr ""
3829-
3830-
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3831-
#: ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h
3832-
#: ports/espressif/boards/espressif_esp32s2_devkitc_1_n8r2/mpconfigboard.h
3833-
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
3834-
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
3835-
#: supervisor/shared/safe_mode.c
3836-
msgid "pressing boot button at start up.\n"
3837-
msgstr ""
3838-
3839-
#: ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
3840-
#: ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
3841-
#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
3842-
#: ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h
3843-
#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
3844-
msgid "pressing both buttons at start up.\n"
3845-
msgstr ""
3846-
3847-
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
3848-
msgid "pressing the left button at start up\n"
3849-
msgstr ""
3850-
38513846
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
38523847
msgid "pull masks conflict with direction masks"
38533848
msgstr ""

0 commit comments

Comments
 (0)