Skip to content

Commit 36da920

Browse files
committed
Update safe mode reason
1 parent 5deac8d commit 36da920

File tree

7 files changed

+8
-15
lines changed

7 files changed

+8
-15
lines changed

locale/circuitpython.pot

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-09-12 18:06+0530\n"
11+
"POT-Creation-Date: 2020-09-13 22:53+0530\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -576,12 +576,6 @@ msgid ""
576576
"boot. Press again to exit safe mode.\n"
577577
msgstr ""
578578

579-
#: supervisor/shared/safe_mode.c
580-
msgid ""
581-
"CircuitPython is in safe mode with status being USER_SAFE_MODE but no "
582-
"specific reason was provided.\n"
583-
msgstr ""
584-
585579
#: supervisor/shared/safe_mode.c
586580
msgid "CircuitPython was unable to allocate the heap.\n"
587581
msgstr ""

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define CALIBRATE_CRYSTALLESS 1
2626

2727
// Explanation of how a user got into safe mode.
28-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up\n"
28+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
2929

3030
// Increase stack size slightly due to CPX library import nesting
3131
#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
@@ -27,7 +27,7 @@
2727
#define USER_NEOPIXELS_PIN (&pin_PB23)
2828

2929
// Explanation of how a user got into safe mode.
30-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up\n"
30+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
3131

3232
// Increase stack size slightly due to CPX library import nesting
3333
#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
@@ -25,7 +25,7 @@
2525
#define CALIBRATE_CRYSTALLESS 1
2626

2727
// Explanation of how a user got into safe mode.
28-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up\n"
28+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
2929

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define CALIBRATE_CRYSTALLESS 1
1212

1313
// Explanation of how a user got into safe mode.
14-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up\n"
14+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
1515

1616
#define DEFAULT_I2C_BUS_SCL (&pin_PA08)
1717
#define DEFAULT_I2C_BUS_SDA (&pin_PA09)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define CALIBRATE_CRYSTALLESS 1
1212

1313
// Explanation of how a user got into safe mode.
14-
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up\n"
14+
#define BOARD_USER_SAFE_MODE_ACTION "pressing both buttons at start up.\n"
1515

1616
#define DEFAULT_I2C_BUS_SCL (&pin_PA01)
1717
#define DEFAULT_I2C_BUS_SDA (&pin_PA00)

supervisor/shared/safe_mode.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,7 @@ void print_safe_mode_message(safe_mode_t reason) {
123123
serial_write_compressed(translate("To exit, please reset the board without "));
124124
serial_write_compressed(translate(BOARD_USER_SAFE_MODE_ACTION));
125125
#else
126-
// fallthrough
127-
serial_write_compressed(translate("CircuitPython is in safe mode with status being USER_SAFE_MODE but no specific reason was provided.\n"));
126+
break;
128127
#endif
129128
return;
130129
case MANUAL_SAFE_MODE:
@@ -189,4 +188,4 @@ void print_safe_mode_message(safe_mode_t reason) {
189188
break;
190189
}
191190
serial_write_compressed(FILE_AN_ISSUE);
192-
}
191+
}

0 commit comments

Comments
 (0)