Skip to content
This repository was archived by the owner on Aug 23, 2024. It is now read-only.

Commit a09f392

Browse files
committed
Fixed bug preventing the 'rshell' and 'ampy' to run
1 parent 5babc3c commit a09f392

21 files changed

Lines changed: 10 additions & 4 deletions

File tree

MicroPython_BUILD/components/micropython/esp32/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,8 @@ void mp_task(void *pvParameter) {
256256
}
257257
// ================================================
258258

259-
prepareSleepReset(1, "ESP32: soft reboot\r\n");
259+
//ToDo: Remember the REPL mode !!
260+
prepareSleepReset(0, "ESP32: soft reboot\r\n");
260261
esp_restart();
261262

262263
goto soft_reset;

MicroPython_BUILD/components/micropython/esp32/mpversion.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
* THE SOFTWARE.
2525
*/
2626

27-
#define MICROPY_GIT_TAG "ESP32_LoBo_v3.2.2"
27+
#define MICROPY_GIT_TAG "ESP32_LoBo_v3.2.3"
2828
#define MICROPY_GIT_HASH "g139d4989"
2929
#define MICROPY_BUILD_DATE "2018-04-04"
3030
#define MICROPY_VERSION_MAJOR (3)
3131
#define MICROPY_VERSION_MINOR (2)
32-
#define MICROPY_VERSION_MICRO (2)
33-
#define MICROPY_VERSION_STRING "3.2.2"
32+
#define MICROPY_VERSION_MICRO (3)
33+
#define MICROPY_VERSION_STRING "3.2.3"
3434
#define MICROPY_CORE_VERSION "bcfff4f"
3535
#define MICROPY_CORE_DATE "2018-03-30"

MicroPython_BUILD/components/micropython/lib/utils/pyexec.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,11 @@ int pyexec_raw_repl(void) {
347347
vstr_reset(&line);
348348
} else if (c == CHAR_CTRL_D) {
349349
// input finished
350+
if (line.len == 0) {
351+
mp_hal_stdout_tx_str("soft reboot\r\n");
352+
vTaskDelay(1000);
353+
goto raw_repl_reset;
354+
}
350355
break;
351356
} else {
352357
// let through any other raw 8-bit value
46 Bytes
Binary file not shown.
14 Bytes
Binary file not shown.
-53 Bytes
Binary file not shown.
-41 Bytes
Binary file not shown.
-57 Bytes
Binary file not shown.
-23 Bytes
Binary file not shown.
48 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)