Oliver Fabel 1 год назад
Родитель
Сommit
ec5ea89285

+ 1 - 1
lib/micropython

@@ -1 +1 @@
-Subproject commit b6ee63fe1f5bbb7f008061e67583da1047bce646
+Subproject commit b8dd933830ff4128111e375f6d9f09cde02708a9

+ 0 - 1
lib/micropython-port/mp_flipper_context.h

@@ -46,5 +46,4 @@ typedef struct {
     mp_flipper_gpio_pin_t* gpio_pins;
     mp_flipper_infrared_rx_t* infrared_rx;
     mp_flipper_infrared_tx_t* infrared_tx;
-    uint8_t log_level;
 } mp_flipper_context_t;

+ 21 - 18
lib/micropython-port/mp_flipper_logging.c

@@ -9,38 +9,41 @@ static inline FuriLogLevel decode_log_level(uint8_t level) {
     switch(level) {
     case MP_FLIPPER_LOG_LEVEL_TRACE:
         return FuriLogLevelTrace;
-        break;
     case MP_FLIPPER_LOG_LEVEL_DEBUG:
         return FuriLogLevelDebug;
-        break;
     case MP_FLIPPER_LOG_LEVEL_INFO:
         return FuriLogLevelInfo;
-        break;
     case MP_FLIPPER_LOG_LEVEL_WARN:
         return FuriLogLevelWarn;
-        break;
     case MP_FLIPPER_LOG_LEVEL_ERROR:
         return FuriLogLevelError;
-        break;
+    case MP_FLIPPER_LOG_LEVEL_NONE:
+        return FuriLogLevelNone;
     default:
-        return FuriLogLevelDefault;
-        break;
+        return FuriLogLevelNone;
     }
 }
 
-uint8_t mp_flipper_log_get_level() {
-    mp_flipper_context_t* ctx = mp_flipper_context;
-
-    return ctx->log_level;
-}
-
-void mp_flipper_log_set_level(uint8_t level) {
-    mp_flipper_context_t* ctx = mp_flipper_context;
-
-    ctx->log_level = level;
+inline uint8_t mp_flipper_log_get_effective_level() {
+    switch(furi_log_get_level()) {
+    case FuriLogLevelTrace:
+        return MP_FLIPPER_LOG_LEVEL_TRACE;
+    case FuriLogLevelDebug:
+        return MP_FLIPPER_LOG_LEVEL_DEBUG;
+    case FuriLogLevelInfo:
+        return MP_FLIPPER_LOG_LEVEL_INFO;
+    case FuriLogLevelWarn:
+        return MP_FLIPPER_LOG_LEVEL_WARN;
+    case FuriLogLevelError:
+        return MP_FLIPPER_LOG_LEVEL_ERROR;
+    case FuriLogLevelNone:
+        return MP_FLIPPER_LOG_LEVEL_NONE;
+    default:
+        return MP_FLIPPER_LOG_LEVEL_NONE;
+    }
 }
 
-void mp_flipper_log(uint8_t raw_level, const char* message) {
+inline void mp_flipper_log(uint8_t raw_level, const char* message) {
     FuriLogLevel level = decode_log_level(raw_level);
 
     furi_log_print_format(level, "uPython", message);

+ 0 - 4
lib/micropython-port/mp_flipper_runtime.c

@@ -3,7 +3,6 @@
 
 #include <mp_flipper_runtime.h>
 #include <mp_flipper_modflipperzero.h>
-#include <mp_flipper_logging.h>
 
 #include "mp_flipper_context.h"
 
@@ -113,9 +112,6 @@ void* mp_flipper_context_alloc() {
     ctx->infrared_tx->size = 0;
     ctx->infrared_tx->level = false;
 
-    // log level
-    ctx->log_level = MP_FLIPPER_LOG_LEVEL_INFO;
-
     return ctx;
 }