summaryrefslogtreecommitdiff
path: root/py/obj.h
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2020-12-02 13:10:39 -0800
committerScott Shawcroft <scott@tannewt.org>2020-12-02 13:10:39 -0800
commit608c98501bb90e02a480b2d84032a46f9a4d0737 (patch)
treeadea018a0c0e714ef33b79a306b69885568b6ad0 /py/obj.h
parent34bbcc4910014c3b4646d8005baf8244bac51f03 (diff)
parentd7ba641ff646b48e5ad38ff72a2dcfe17bb54624 (diff)
Merge remote-tracking branch 'adafruit/main' into msgpack
Diffstat (limited to 'py/obj.h')
-rw-r--r--py/obj.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/py/obj.h b/py/obj.h
index 805b26e48..066562cc4 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -640,6 +640,10 @@ extern const mp_obj_type_t mp_type_UnicodeError;
extern const mp_obj_type_t mp_type_ValueError;
extern const mp_obj_type_t mp_type_ViperTypeError;
extern const mp_obj_type_t mp_type_ZeroDivisionError;
+#if CIRCUITPY_ALARM
+extern const mp_obj_type_t mp_type_DeepSleepRequest;
+#endif
+
// Constant objects, globally accessible
// The macros are for convenience only
@@ -679,6 +683,7 @@ mp_obj_t mp_obj_new_bytearray_by_ref(size_t n, void *items);
#if MICROPY_PY_BUILTINS_FLOAT
mp_obj_t mp_obj_new_int_from_float(mp_float_t val);
mp_obj_t mp_obj_new_complex(mp_float_t real, mp_float_t imag);
+extern mp_float_t uint64_to_float(uint64_t ui64);
#endif
mp_obj_t mp_obj_new_exception(const mp_obj_type_t *exc_type);
mp_obj_t mp_obj_new_exception_arg1(const mp_obj_type_t *exc_type, mp_obj_t arg);