Oliver Fabel пре 1 година
родитељ
комит
d313266284
5 измењених фајлова са 62 додато и 4 уклоњено
  1. 15 0
      genhdr/moduledefs.h
  2. 40 0
      genhdr/qstrdefs.generated.h
  3. 1 0
      mp_flipper_config_fap.h
  4. 5 4
      mp_flipper_config_firmware.h
  5. 1 0
      mpconfigport.h

+ 15 - 0
genhdr/moduledefs.h

@@ -4,6 +4,14 @@ extern const struct _mp_obj_module_t mp_module_array;
 #undef MODULE_DEF_ARRAY
 #define MODULE_DEF_ARRAY { MP_ROM_QSTR(MP_QSTR_array), MP_ROM_PTR(&mp_module_array) },
 
+extern const struct _mp_obj_module_t mp_module_io;
+#undef MODULE_DEF_IO
+#define MODULE_DEF_IO { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) },
+
+extern const struct _mp_obj_module_t mp_module_json;
+#undef MODULE_DEF_JSON
+#define MODULE_DEF_JSON { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_json) },
+
 extern const struct _mp_obj_module_t mp_module_random;
 #undef MODULE_DEF_RANDOM
 #define MODULE_DEF_RANDOM { MP_ROM_QSTR(MP_QSTR_random), MP_ROM_PTR(&mp_module_random) },
@@ -28,6 +36,10 @@ extern const struct _mp_obj_module_t mp_module_gc;
 #undef MODULE_DEF_GC
 #define MODULE_DEF_GC { MP_ROM_QSTR(MP_QSTR_gc), MP_ROM_PTR(&mp_module_gc) },
 
+extern const struct _mp_obj_module_t mp_module_math;
+#undef MODULE_DEF_MATH
+#define MODULE_DEF_MATH { MP_ROM_QSTR(MP_QSTR_math), MP_ROM_PTR(&mp_module_math) },
+
 extern const struct _mp_obj_module_t mp_module_micropython;
 #undef MODULE_DEF_MICROPYTHON
 #define MODULE_DEF_MICROPYTHON { MP_ROM_QSTR(MP_QSTR_micropython), MP_ROM_PTR(&mp_module_micropython) },
@@ -37,12 +49,15 @@ extern const struct _mp_obj_module_t mp_module_micropython;
     MODULE_DEF_BUILTINS \
     MODULE_DEF_FLIPPERZERO \
     MODULE_DEF_GC \
+    MODULE_DEF_MATH \
     MODULE_DEF_MICROPYTHON \
     MODULE_DEF___MAIN__ \
 // MICROPY_REGISTERED_MODULES
 
 #define MICROPY_REGISTERED_EXTENSIBLE_MODULES \
     MODULE_DEF_ARRAY \
+    MODULE_DEF_IO \
+    MODULE_DEF_JSON \
     MODULE_DEF_RANDOM \
     MODULE_DEF_TIME \
 // MICROPY_REGISTERED_EXTENSIBLE_MODULES

+ 40 - 0
genhdr/qstrdefs.generated.h

@@ -175,6 +175,7 @@ QDEF0(MP_QSTR__lt_listcomp_gt_, 212, 10, "<listcomp>")
 QDEF0(MP_QSTR__lt_setcomp_gt_, 84, 9, "<setcomp>")
 QDEF1(MP_QSTR__lt_stdin_gt_, 227, 7, "<stdin>")
 QDEF1(MP_QSTR__lt_string_gt_, 82, 8, "<string>")
+QDEF1(MP_QSTR_BytesIO, 26, 7, "BytesIO")
 QDEF1(MP_QSTR_CANVAS_ALIGN_BEGIN, 167, 18, "CANVAS_ALIGN_BEGIN")
 QDEF1(MP_QSTR_CANVAS_ALIGN_CENTER, 235, 19, "CANVAS_ALIGN_CENTER")
 QDEF1(MP_QSTR_CANVAS_ALIGN_END, 239, 16, "CANVAS_ALIGN_END")
@@ -197,6 +198,7 @@ QDEF1(MP_QSTR_LIGHT_BACKLIGHT, 17, 15, "LIGHT_BACKLIGHT")
 QDEF1(MP_QSTR_LIGHT_BLUE, 90, 10, "LIGHT_BLUE")
 QDEF1(MP_QSTR_LIGHT_GREEN, 95, 11, "LIGHT_GREEN")
 QDEF1(MP_QSTR_LIGHT_RED, 215, 9, "LIGHT_RED")
+QDEF1(MP_QSTR_StringIO, 118, 8, "StringIO")
 QDEF0(MP_QSTR___add__, 196, 7, "__add__")
 QDEF1(MP_QSTR___bases__, 3, 9, "__bases__")
 QDEF0(MP_QSTR___bool__, 43, 8, "__bool__")
@@ -221,8 +223,12 @@ QDEF1(MP_QSTR___reversed__, 97, 12, "__reversed__")
 QDEF0(MP_QSTR___sub__, 33, 7, "__sub__")
 QDEF1(MP_QSTR___traceback__, 79, 13, "__traceback__")
 QDEF1(MP_QSTR__input_trigger_handler, 108, 22, "_input_trigger_handler")
+QDEF1(MP_QSTR_acos, 27, 4, "acos")
 QDEF1(MP_QSTR_add, 68, 3, "add")
 QDEF1(MP_QSTR_array, 124, 5, "array")
+QDEF1(MP_QSTR_asin, 80, 4, "asin")
+QDEF1(MP_QSTR_atan, 31, 4, "atan")
+QDEF1(MP_QSTR_atan2, 205, 5, "atan2")
 QDEF1(MP_QSTR_bin, 224, 3, "bin")
 QDEF1(MP_QSTR_bound_method, 151, 12, "bound_method")
 QDEF1(MP_QSTR_canvas_clear, 107, 12, "canvas_clear")
@@ -241,11 +247,15 @@ QDEF1(MP_QSTR_canvas_text_height, 239, 18, "canvas_text_height")
 QDEF1(MP_QSTR_canvas_text_width, 86, 17, "canvas_text_width")
 QDEF1(MP_QSTR_canvas_update, 131, 13, "canvas_update")
 QDEF1(MP_QSTR_canvas_width, 180, 12, "canvas_width")
+QDEF1(MP_QSTR_ceil, 6, 4, "ceil")
 QDEF1(MP_QSTR_choice, 46, 6, "choice")
 QDEF1(MP_QSTR_closure, 116, 7, "closure")
 QDEF1(MP_QSTR_collect, 155, 7, "collect")
+QDEF1(MP_QSTR_copysign, 51, 8, "copysign")
+QDEF1(MP_QSTR_cos, 122, 3, "cos")
 QDEF1(MP_QSTR_decode, 169, 6, "decode")
 QDEF1(MP_QSTR_default, 206, 7, "default")
+QDEF1(MP_QSTR_degrees, 2, 7, "degrees")
 QDEF1(MP_QSTR_delattr, 219, 7, "delattr")
 QDEF1(MP_QSTR_deleter, 110, 7, "deleter")
 QDEF1(MP_QSTR_dict_view, 45, 9, "dict_view")
@@ -254,44 +264,67 @@ QDEF1(MP_QSTR_difference_update, 156, 17, "difference_update")
 QDEF1(MP_QSTR_disable, 145, 7, "disable")
 QDEF1(MP_QSTR_discard, 15, 7, "discard")
 QDEF1(MP_QSTR_doc, 45, 3, "doc")
+QDEF1(MP_QSTR_dump, 233, 4, "dump")
+QDEF1(MP_QSTR_dumps, 122, 5, "dumps")
+QDEF1(MP_QSTR_e, 192, 1, "e")
 QDEF1(MP_QSTR_enable, 4, 6, "enable")
 QDEF1(MP_QSTR_encode, 67, 6, "encode")
 QDEF1(MP_QSTR_enumerate, 113, 9, "enumerate")
 QDEF1(MP_QSTR_errno, 193, 5, "errno")
+QDEF1(MP_QSTR_exp, 200, 3, "exp")
+QDEF1(MP_QSTR_fabs, 147, 4, "fabs")
 QDEF1(MP_QSTR_filter, 37, 6, "filter")
 QDEF1(MP_QSTR_flipperzero, 179, 11, "flipperzero")
 QDEF1(MP_QSTR_float, 53, 5, "float")
+QDEF1(MP_QSTR_floor, 125, 5, "floor")
+QDEF1(MP_QSTR_flush, 97, 5, "flush")
+QDEF1(MP_QSTR_fmod, 229, 4, "fmod")
+QDEF1(MP_QSTR_frexp, 28, 5, "frexp")
 QDEF1(MP_QSTR_fromkeys, 55, 8, "fromkeys")
 QDEF1(MP_QSTR_function, 39, 8, "function")
 QDEF1(MP_QSTR_gc, 97, 2, "gc")
 QDEF1(MP_QSTR_generator, 150, 9, "generator")
 QDEF1(MP_QSTR_getrandbits, 102, 11, "getrandbits")
 QDEF1(MP_QSTR_getter, 144, 6, "getter")
+QDEF1(MP_QSTR_getvalue, 120, 8, "getvalue")
 QDEF1(MP_QSTR_heap_lock, 173, 9, "heap_lock")
 QDEF1(MP_QSTR_heap_unlock, 86, 11, "heap_unlock")
 QDEF1(MP_QSTR_hex, 112, 3, "hex")
 QDEF1(MP_QSTR_intersection, 40, 12, "intersection")
 QDEF1(MP_QSTR_intersection_update, 6, 19, "intersection_update")
+QDEF1(MP_QSTR_io, 35, 2, "io")
 QDEF1(MP_QSTR_isdisjoint, 247, 10, "isdisjoint")
 QDEF1(MP_QSTR_isenabled, 154, 9, "isenabled")
+QDEF1(MP_QSTR_isfinite, 166, 8, "isfinite")
+QDEF1(MP_QSTR_isinf, 62, 5, "isinf")
+QDEF1(MP_QSTR_isnan, 158, 5, "isnan")
 QDEF1(MP_QSTR_issubset, 185, 8, "issubset")
 QDEF1(MP_QSTR_issuperset, 252, 10, "issuperset")
 QDEF1(MP_QSTR_iterable, 37, 8, "iterable")
 QDEF1(MP_QSTR_iterator, 71, 8, "iterator")
+QDEF1(MP_QSTR_json, 253, 4, "json")
+QDEF1(MP_QSTR_ldexp, 64, 5, "ldexp")
 QDEF1(MP_QSTR_light_blink_set_color, 217, 21, "light_blink_set_color")
 QDEF1(MP_QSTR_light_blink_start, 121, 17, "light_blink_start")
 QDEF1(MP_QSTR_light_blink_stop, 33, 16, "light_blink_stop")
 QDEF1(MP_QSTR_light_set, 134, 9, "light_set")
+QDEF1(MP_QSTR_load, 99, 4, "load")
+QDEF1(MP_QSTR_loads, 176, 5, "loads")
+QDEF1(MP_QSTR_log, 33, 3, "log")
+QDEF1(MP_QSTR_math, 53, 4, "math")
 QDEF1(MP_QSTR_max, 177, 3, "max")
 QDEF1(MP_QSTR_maximum_space_recursion_space_depth_space_exceeded, 115, 32, "maximum recursion depth exceeded")
 QDEF1(MP_QSTR_mem_alloc, 82, 9, "mem_alloc")
 QDEF1(MP_QSTR_mem_free, 203, 8, "mem_free")
 QDEF1(MP_QSTR_min, 175, 3, "min")
+QDEF1(MP_QSTR_modf, 37, 4, "modf")
 QDEF1(MP_QSTR_module, 191, 6, "module")
 QDEF1(MP_QSTR_oct, 253, 3, "oct")
 QDEF1(MP_QSTR_on_input, 141, 8, "on_input")
 QDEF1(MP_QSTR_opt_level, 135, 9, "opt_level")
+QDEF1(MP_QSTR_pi, 28, 2, "pi")
 QDEF1(MP_QSTR_property, 194, 8, "property")
+QDEF1(MP_QSTR_radians, 135, 7, "radians")
 QDEF1(MP_QSTR_randint, 175, 7, "randint")
 QDEF1(MP_QSTR_random, 190, 6, "random")
 QDEF1(MP_QSTR_randrange, 163, 9, "randrange")
@@ -299,7 +332,10 @@ QDEF1(MP_QSTR_rb, 213, 2, "rb")
 QDEF1(MP_QSTR_reversed, 161, 8, "reversed")
 QDEF1(MP_QSTR_schedule, 224, 8, "schedule")
 QDEF1(MP_QSTR_seed, 146, 4, "seed")
+QDEF1(MP_QSTR_seek, 157, 4, "seek")
+QDEF1(MP_QSTR_separators, 235, 10, "separators")
 QDEF1(MP_QSTR_setter, 4, 6, "setter")
+QDEF1(MP_QSTR_sin, 177, 3, "sin")
 QDEF1(MP_QSTR_sleep, 234, 5, "sleep")
 QDEF1(MP_QSTR_sleep_ms, 11, 8, "sleep_ms")
 QDEF1(MP_QSTR_sleep_us, 19, 8, "sleep_us")
@@ -307,8 +343,11 @@ QDEF1(MP_QSTR_slice, 181, 5, "slice")
 QDEF1(MP_QSTR_speaker_set_volume, 116, 18, "speaker_set_volume")
 QDEF1(MP_QSTR_speaker_start, 1, 13, "speaker_start")
 QDEF1(MP_QSTR_speaker_stop, 153, 12, "speaker_stop")
+QDEF1(MP_QSTR_sqrt, 33, 4, "sqrt")
 QDEF1(MP_QSTR_symmetric_difference, 206, 20, "symmetric_difference")
 QDEF1(MP_QSTR_symmetric_difference_update, 96, 27, "symmetric_difference_update")
+QDEF1(MP_QSTR_tan, 254, 3, "tan")
+QDEF1(MP_QSTR_tell, 20, 4, "tell")
 QDEF1(MP_QSTR_threshold, 242, 9, "threshold")
 QDEF1(MP_QSTR_ticks_add, 157, 9, "ticks_add")
 QDEF1(MP_QSTR_ticks_cpu, 26, 9, "ticks_cpu")
@@ -317,6 +356,7 @@ QDEF1(MP_QSTR_ticks_ms, 66, 8, "ticks_ms")
 QDEF1(MP_QSTR_ticks_us, 90, 8, "ticks_us")
 QDEF1(MP_QSTR_time, 240, 4, "time")
 QDEF1(MP_QSTR_time_ns, 114, 7, "time_ns")
+QDEF1(MP_QSTR_trunc, 91, 5, "trunc")
 QDEF1(MP_QSTR_uniform, 1, 7, "uniform")
 QDEF1(MP_QSTR_union, 246, 5, "union")
 QDEF1(MP_QSTR_vibro_set, 216, 9, "vibro_set")

+ 1 - 0
mp_flipper_config_fap.h

@@ -1,4 +1,5 @@
 #define MP_FLIPPER_COMPILER
 #define MP_FLIPPER_RUNTIME
+#define MP_FLIPPER_SPLIT_HEAP
 
 #include "mp_flipper_config.h"

+ 5 - 4
mp_flipper_config_firmware.h

@@ -1,9 +1,10 @@
 #define MP_FLIPPER_COMPILER
 #define MP_FLIPPER_RUNTIME
-//#define MP_FLIPPER_MPY_SUPPORT
+#define MP_FLIPPER_MPY_SUPPORT
 #define MP_FLIPPER_FIRMWARE
-//#define MP_FLIPPER_MATH
-//#define MP_FLIPPER_JSON
-//#define MP_FLIPPER_IO
+#define MP_FLIPPER_SPLIT_HEAP
+#define MP_FLIPPER_MATH
+#define MP_FLIPPER_JSON
+#define MP_FLIPPER_IO
 
 #include "mp_flipper_config.h"

+ 1 - 0
mpconfigport.h

@@ -1,4 +1,5 @@
 #define MP_FLIPPER_COMPILER
 #define MP_FLIPPER_RUNTIME
+#define MP_FLIPPER_SPLIT_HEAP
 
 #include "mp_flipper_config.h"