diff options
| author | Bernhard Boser <boser@berkeley.edu> | 2021-01-05 11:02:00 -0800 |
|---|---|---|
| committer | Bernhard Boser <boser@berkeley.edu> | 2021-01-05 11:02:00 -0800 |
| commit | 79e3c3d2fd41b762679d6aa17522fb675f197773 (patch) | |
| tree | 31ccc4c0d83f2299568519633f77a9389c38024b /shared-bindings/microcontroller | |
| parent | c875d7c22d447b9a29bcef62af7b46c902684d72 (diff) | |
| parent | 344d3c59cba516aac28f6c7db4189d80b2bfb49d (diff) | |
Merge branch 'msgpack' of github.com:iot49/iotpython into msgpack
Diffstat (limited to 'shared-bindings/microcontroller')
| -rw-r--r-- | shared-bindings/microcontroller/ResetReason.c | 4 | ||||
| -rw-r--r-- | shared-bindings/microcontroller/__init__.c | 1 | ||||
| -rw-r--r-- | shared-bindings/microcontroller/__init__.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/shared-bindings/microcontroller/ResetReason.c b/shared-bindings/microcontroller/ResetReason.c index 61891934a..1750e5520 100644 --- a/shared-bindings/microcontroller/ResetReason.c +++ b/shared-bindings/microcontroller/ResetReason.c @@ -72,6 +72,6 @@ MAKE_ENUM_MAP(mcu_reset_reason) { }; STATIC MP_DEFINE_CONST_DICT(mcu_reset_reason_locals_dict, mcu_reset_reason_locals_table); -MAKE_PRINTER(alarm, mcu_reset_reason); +MAKE_PRINTER(microcontroller, mcu_reset_reason); -MAKE_ENUM_TYPE(alarm, ResetReason, mcu_reset_reason); +MAKE_ENUM_TYPE(microcontroller, ResetReason, mcu_reset_reason); diff --git a/shared-bindings/microcontroller/__init__.c b/shared-bindings/microcontroller/__init__.c index 8a77d1df5..035587c30 100644 --- a/shared-bindings/microcontroller/__init__.c +++ b/shared-bindings/microcontroller/__init__.c @@ -170,6 +170,7 @@ STATIC const mp_rom_map_elem_t mcu_module_globals_table[] = { #else { MP_ROM_QSTR(MP_QSTR_watchdog), MP_ROM_PTR(&mp_const_none_obj) }, #endif + { MP_ROM_QSTR(MP_QSTR_ResetReason), MP_ROM_PTR(&mcu_reset_reason_type) }, { MP_ROM_QSTR(MP_QSTR_RunMode), MP_ROM_PTR(&mcu_runmode_type) }, { MP_ROM_QSTR(MP_QSTR_Pin), MP_ROM_PTR(&mcu_pin_type) }, { MP_ROM_QSTR(MP_QSTR_pin), MP_ROM_PTR(&mcu_pin_module) }, diff --git a/shared-bindings/microcontroller/__init__.h b/shared-bindings/microcontroller/__init__.h index ac71de424..0dafc74c7 100644 --- a/shared-bindings/microcontroller/__init__.h +++ b/shared-bindings/microcontroller/__init__.h @@ -1,4 +1,3 @@ - /* * This file is part of the MicroPython project, http://micropython.org/ * |