library update

genhdr/qstrdefs.generated.h

@@ -406,7 +406,6 @@ QDEF1(MP_QSTR_float, 53, 5, "float")
 QDEF1(MP_QSTR_flush, 97, 5, "flush")
 QDEF1(MP_QSTR_function, 39, 8, "function")
 QDEF1(MP_QSTR_generator, 150, 9, "generator")
-QDEF1(MP_QSTR_getLevel, 197, 8, "getLevel")
 QDEF1(MP_QSTR_getrandbits, 102, 11, "getrandbits")
 QDEF1(MP_QSTR_gpio_deinit_pin, 120, 15, "gpio_deinit_pin")
 QDEF1(MP_QSTR_gpio_get_pin, 85, 12, "gpio_get_pin")
@@ -424,6 +423,7 @@ QDEF1(MP_QSTR_isdisjoint, 247, 10, "isdisjoint")
 QDEF1(MP_QSTR_issubset, 185, 8, "issubset")
 QDEF1(MP_QSTR_issuperset, 252, 10, "issuperset")
 QDEF1(MP_QSTR_iterator, 71, 8, "iterator")
+QDEF1(MP_QSTR_level, 211, 5, "level")
 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")

mp_flipper_logging.c

@@ -7,7 +7,7 @@
 #include "mp_flipper_logging.h"
 
 static mp_obj_t mp_flipper_logging_log_internal(uint8_t level, size_t n_args, const mp_obj_t* args) {
-    if(n_args < 1 || level > mp_flipper_log_get_level()) {
+    if(n_args < 1 || level > mp_flipper_log_level) {
         return mp_const_none;
     }
 
@@ -19,13 +19,12 @@ static mp_obj_t mp_flipper_logging_log_internal(uint8_t level, size_t n_args, co
     return mp_const_none;
 }
 
-static mp_obj_t mp_flipper_logging_get_level() {
-    return mp_obj_new_int_from_uint(mp_flipper_log_get_level());
-}
-static MP_DEFINE_CONST_FUN_OBJ_0(mp_flipper_logging_get_level_obj, mp_flipper_logging_get_level);
+static mp_obj_t mp_flipper_logging_set_level(mp_obj_t raw_level) {
+    uint8_t level = mp_obj_get_int(raw_level);
 
-static mp_obj_t mp_flipper_logging_set_level(mp_obj_t level) {
-    mp_flipper_log_set_level(mp_obj_get_int(level));
+    if(mp_flipper_log_set_level(level)) {
+        mp_flipper_log_level = level;
+    }
 
     return mp_const_none;
 }
@@ -69,7 +68,7 @@ static MP_DEFINE_CONST_FUN_OBJ_VAR(mp_flipper_logging_error_obj, 1, mp_flipper_l
 
 static const mp_rom_map_elem_t mp_module_logging_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_logging)},
-    {MP_ROM_QSTR(MP_QSTR_getLevel), MP_ROM_PTR(&mp_flipper_logging_get_level_obj)},
+    {MP_ROM_QSTR(MP_QSTR_level), MP_ROM_INT(mp_flipper_log_level)},
     {MP_ROM_QSTR(MP_QSTR_setLevel), MP_ROM_PTR(&mp_flipper_logging_set_level_obj)},
     {MP_ROM_QSTR(MP_QSTR_trace), MP_ROM_PTR(&mp_flipper_logging_trace_obj)},
     {MP_ROM_QSTR(MP_QSTR_debug), MP_ROM_PTR(&mp_flipper_logging_debug_obj)},

mp_flipper_logging.h

@@ -2,6 +2,8 @@
 
 #include <stdint.h>
 
+extern uint8_t mp_flipper_log_level;
+
 extern uint8_t MP_FLIPPER_LOG_LEVEL_TRACE;
 extern uint8_t MP_FLIPPER_LOG_LEVEL_DEBUG;
 extern uint8_t MP_FLIPPER_LOG_LEVEL_INFO;
@@ -9,6 +11,5 @@ extern uint8_t MP_FLIPPER_LOG_LEVEL_WARN;
 extern uint8_t MP_FLIPPER_LOG_LEVEL_ERROR;
 extern uint8_t MP_FLIPPER_LOG_LEVEL_NONE;
 
-uint8_t mp_flipper_log_get_level();
-void mp_flipper_log_set_level(uint8_t level);
+bool mp_flipper_log_set_level(uint8_t level);
 void mp_flipper_log(uint8_t raw_level, const char* message);