Skip to content

Commit 73ad78e

Browse files
jeplerjepler
authored
Merge pull request adafruit#3395 from microDev1/safeMode
Add esp32s2 safe mode support & fix user_safe_mode output
2 parents a81a2cf + 506bb09 commit 73ad78e

13 files changed

Lines changed: 116 additions & 82 deletions

File tree

‎locale/circuitpython.pot‎

Lines changed: 5 additions & 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-09 14:33-0700\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 <LL@li.org>\n"
@@ -30,12 +30,6 @@ msgid ""
3030
"https://github.com/adafruit/circuitpython/issues\n"
3131
msgstr ""
3232

33-
#: supervisor/shared/safe_mode.c
34-
msgid ""
35-
"\n"
36-
"To exit, please reset the board without "
37-
msgstr ""
38-
3933
#: py/obj.c
4034
msgid " File \"%q\""
4135
msgstr ""
@@ -1605,6 +1599,10 @@ msgid ""
16051599
"Timer was reserved for internal use - declare PWM pins earlier in the program"
16061600
msgstr ""
16071601

1602+
#: supervisor/shared/safe_mode.c
1603+
msgid "To exit, please reset the board without "
1604+
msgstr ""
1605+
16081606
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
16091607
msgid "Too many channels in sample."
16101608
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"
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"
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"
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"
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"
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)

‎ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@
2929
#define MICROPY_HW_BOARD_NAME "BastWiFi"
3030
#define MICROPY_HW_MCU_NAME "ESP32S2"
3131

32+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
33+
34+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
35+
3236
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO45)
3333

34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
37+
3438
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
3333

34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
37+
3438
#define AUTORESET_DELAY_MS 500

‎ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,8 @@
3131

3232
#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
3333

34+
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
35+
36+
#define BOARD_USER_SAFE_MODE_ACTION "pressing boot button at start up.\n"
37+
3438
#define AUTORESET_DELAY_MS 500

0 commit comments

Comments
 (0)