From 8d34344dceb367844b651deccadff2b55f20c55c Mon Sep 17 00:00:00 2001 From: Damien George Date: Fri, 20 Mar 2020 13:40:01 +1100 Subject: [PATCH] esp8266/modmachine: Implement machine.soft_reset(). Fixes issue #5764. --- ports/esp8266/modmachine.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ports/esp8266/modmachine.c b/ports/esp8266/modmachine.c index e6be0c1af7..bb7a780a35 100644 --- a/ports/esp8266/modmachine.c +++ b/ports/esp8266/modmachine.c @@ -30,6 +30,7 @@ #include "py/obj.h" #include "py/runtime.h" +#include "lib/utils/pyexec.h" // This needs to be set before we include the RTOS headers #define USE_US_TIMER 1 @@ -77,6 +78,12 @@ STATIC mp_obj_t machine_reset(void) { } STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_obj, machine_reset); +STATIC mp_obj_t machine_soft_reset(void) { + pyexec_system_exit = PYEXEC_FORCED_EXIT; + mp_raise_type(&mp_type_SystemExit); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_soft_reset_obj, machine_soft_reset); + STATIC mp_obj_t machine_reset_cause(void) { return MP_OBJ_NEW_SMALL_INT(system_get_rst_info()->reason); } @@ -392,6 +399,7 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_freq_obj) }, { MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) }, + { MP_ROM_QSTR(MP_QSTR_soft_reset), MP_ROM_PTR(&machine_soft_reset_obj) }, { MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) }, { MP_ROM_QSTR(MP_QSTR_unique_id), MP_ROM_PTR(&machine_unique_id_obj) }, { MP_ROM_QSTR(MP_QSTR_idle), MP_ROM_PTR(&machine_idle_obj) },