merge from upstream + wip

1 files changed, 0 insertions, 44 deletions

diff --git a/shared-bindings/supervisor/__init__.c b/shared-bindings/supervisor/__init__.c
index 9a7890a87..aaecdcbeb 100644
--- a/shared-bindings/supervisor/__init__.c
+++ b/shared-bindings/supervisor/__init__.c
@@ -47,48 +47,6 @@
 //| This object is the sole instance of `supervisor.Runtime`."""
 //|
 
-//| def allow_deep_sleep(*, when_connected: bool = False, on_error: bool = False) -> None:
-//|     """Configure when CircuitPython can go into deep sleep. Deep sleep can occur
-//|     after a program has finished running or when `supervisor.exit_and_deep_sleep()` is called.
-//|
-//|     :param bool when_connected: If ``True``, CircuitPython will go into deep sleep
-//|       when a program finishes, even if it is connected to a host computer over USB or other means.
-//|       It will disconnect from the host before sleeping.
-//|       If ``False``, deep sleep will not be entered if connected.
-//|     :param bool on_error: If ``True``, deep sleep will be entered if even a program
-//|       terminated due to an exception or fatal error. If ``False``, an error will cause
-//|       CircuitPython to stay awake, flashing error codes on the status RGB LED, if available.
-//|     """
-//|     ...
-//|
-STATIC mp_obj_t supervisor_allow_deep_sleep(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_when_connected, ARG_on_error };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_when_connected, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
-        { MP_QSTR_on_error, MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
-    };
-
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    supervisor_workflow_set_allow_deep_sleep_when_connected(args[ARG_when_connected].u_bool);
-    supervisor_workflow_set_allow_deep_sleep_on_error(args[ARG_on_error].u_bool);
-
-    return mp_const_none;
-}
-MP_DEFINE_CONST_FUN_OBJ_KW(supervisor_allow_deep_sleep_obj, 0, supervisor_allow_deep_sleep);
-
-//| def exit_and_deep_sleep() -> None:
-//|     """Go into deep sleep mode immediately, if not connected to a host computer.
-//|     But if connected and ``supervisor.allow_deep_sleep(when_connected=true)``
-//|     has not been called, simply restart."""
-//|     ...
-
-STATIC mp_obj_t supervisor_exit_and_deep_sleep(void) {
-    common_hal_mcu_deep_sleep();
-}
-MP_DEFINE_CONST_FUN_OBJ_0(supervisor_exit_and_deep_sleep_obj, supervisor_exit_and_deep_sleep);
-
 //| def enable_autoreload() -> None:
 //|     """Enable autoreload based on USB file write activity."""
 //|     ...
@@ -156,8 +114,6 @@ MP_DEFINE_CONST_FUN_OBJ_1(supervisor_set_next_stack_limit_obj, supervisor_set_ne
 
 STATIC const mp_rom_map_elem_t supervisor_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_supervisor) },
-    { MP_ROM_QSTR(MP_QSTR_allow_deep_sleep),  MP_ROM_PTR(&supervisor_allow_deep_sleep_obj) },
-    { MP_ROM_QSTR(MP_QSTR_exit_and_deep_sleep),  MP_ROM_PTR(&supervisor_exit_and_deep_sleep_obj) },
     { MP_ROM_QSTR(MP_QSTR_enable_autoreload),  MP_ROM_PTR(&supervisor_enable_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_disable_autoreload),  MP_ROM_PTR(&supervisor_disable_autoreload_obj) },
     { MP_ROM_QSTR(MP_QSTR_set_rgb_status_brightness),  MP_ROM_PTR(&supervisor_set_rgb_status_brightness_obj) },