library update

genhdr/qstrdefs.generated.h

@@ -406,6 +406,7 @@ 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_getEffectiveLevel, 40, 17, "getEffectiveLevel")
 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")

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_level) {
+    if(n_args < 1 || level > mp_flipper_log_get_effective_level()) {
         return mp_const_none;
     }
 
@@ -22,14 +22,19 @@ static mp_obj_t mp_flipper_logging_log_internal(uint8_t level, size_t n_args, co
 static mp_obj_t mp_flipper_logging_set_level(mp_obj_t raw_level) {
     uint8_t level = mp_obj_get_int(raw_level);
 
-    if(mp_flipper_log_set_level(level)) {
-        mp_flipper_log_level = level;
-    }
+    mp_flipper_log_set_level(level);
 
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(mp_flipper_logging_set_level_obj, mp_flipper_logging_set_level);
 
+static mp_obj_t mp_flipper_logging_get_effective_level() {
+    uint8_t level = mp_flipper_log_get_effective_level();
+
+    return mp_obj_new_int_from_uint(level);
+}
+static MP_DEFINE_CONST_FUN_OBJ_0(mp_flipper_logging_get_effective_level_obj, mp_flipper_logging_get_effective_level);
+
 static mp_obj_t mp_flipper_logging_log(size_t n_args, const mp_obj_t* args) {
     if(n_args < 2) {
         return mp_const_none;
@@ -68,8 +73,9 @@ 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_level), MP_ROM_INT(mp_flipper_log_level)},
+    {MP_ROM_QSTR(MP_QSTR_level), MP_ROM_PTR(mp_flipper_log_level)},
     {MP_ROM_QSTR(MP_QSTR_setLevel), MP_ROM_PTR(&mp_flipper_logging_set_level_obj)},
+    {MP_ROM_QSTR(MP_QSTR_getEffectiveLevel), MP_ROM_PTR(&mp_flipper_logging_get_effective_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_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&mp_flipper_logging_info_obj)},

mp_flipper_logging.h

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