Skip to content

Commit 28c9aff

Browse files
dhalbertdhalbert
authored
Merge pull request #7150 from Neradoc/cleanup-boot-button-message
Change boot button message to an independent sentence
2 parents 99081ea + 8f82db5 commit 28c9aff

File tree

21 files changed

+51
-96
lines changed

21 files changed

+51
-96
lines changed

‎locale/circuitpython.pot

Lines changed: 33 additions & 47 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 ""
@@ -3815,48 +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/espressif/boards/m5stack_atom_lite/mpconfigboard.h
3848-
msgid "pressing central button at start up.\n"
3849-
msgstr ""
3850-
3851-
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3852-
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3853-
msgid "pressing button A at start up.\n"
3854-
msgstr ""
3855-
3856-
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
3857-
msgid "pressing the left button at start up\n"
3858-
msgstr ""
3859-
38603846
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
38613847
msgid "pull masks conflict with direction masks"
38623848
msgstr ""

‎ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define CALIBRATE_CRYSTALLESS 1
2424

2525
// Explanation of how a user got into safe mode.
26-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
26+
#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
2727

2828
// Increase stack size slightly due to CPX library import nesting
2929
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) // divisible by 8

‎ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define CALIBRATE_CRYSTALLESS 1
2424

2525
// Explanation of how a user got into safe mode.
26-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
26+
#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
2727

2828
// Increase stack size slightly due to CPX library import nesting
2929
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) // divisible by 8

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define CALIBRATE_CRYSTALLESS 1
2424

2525
// Explanation of how a user got into safe mode.
26-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
26+
#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
2727

2828
// Increase stack size slightly due to CPX library import nesting.
2929
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) // divisible by 8

‎ports/atmel-samd/boards/escornabot_makech/mpconfigboard.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
#define CALIBRATE_CRYSTALLESS 1
77

8-
// Explanation of how a user got into safe mode.
9-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
10-
118
#define DEFAULT_I2C_BUS_SCL (&pin_PA08)
129
#define DEFAULT_I2C_BUS_SDA (&pin_PA09)
1310

‎ports/atmel-samd/boards/meowmeow/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#define CALIBRATE_CRYSTALLESS 1
77

88
// Explanation of how a user got into safe mode.
9-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
9+
#define BOARD_USER_SAFE_MODE_ACTION translate("Both buttons were pressed at start up.\n")
1010

1111
#define DEFAULT_I2C_BUS_SCL (&pin_PA01)
1212
#define DEFAULT_I2C_BUS_SDA (&pin_PA00)

‎ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO38)
4848

4949
// Explanation of how a user got into safe mode
50-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing SW38 button at start up.\n")
50+
#define BOARD_USER_SAFE_MODE_ACTION translate("The SW38 button was pressed at start up.\n")
5151

5252
// UART pins attached to the USB-serial converter chip
5353
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)

‎ports/espressif/boards/adafruit_qtpy_esp32_pico/mpconfigboard.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141

4242
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
4343

44-
// Explanation of how a user got into safe mode
45-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing BOOT button at start up.\n")
46-
4744
// UART pins attached to the USB-serial converter chip
4845
#define CIRCUITPY_CONSOLE_UART_TX (&pin_GPIO1)
4946
#define CIRCUITPY_CONSOLE_UART_RX (&pin_GPIO3)

‎ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,4 @@
4444
// For entering safe mode
4545
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9)
4646

47-
// Explanation of how a user got into safe mode
48-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
49-
5047
#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)

‎ports/espressif/boards/beetle-esp32-c3/mpconfigboard.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,4 @@
4141
#define CIRCUITPY_BOARD_UART (1)
4242
#define CIRCUITPY_BOARD_UART_PIN {{.tx = &pin_GPIO21, .rx = &pin_GPIO20}}
4343

44-
// Explanation of how a user got into safe mode
45-
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
46-
4744
#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1)

0 commit comments

Comments
 (0)