Parcourir la source

library update

Oliver Fabel il y a 1 an
Parent
commit
7177586329
4 fichiers modifiés avec 7 ajouts et 6 suppressions
  1. 2 2
      genhdr/qstrdefs.generated.h
  2. 3 2
      mp_flipper_logging.c
  3. 1 1
      mp_flipper_logging.h
  4. 1 1
      mpconfigport.h

+ 2 - 2
genhdr/qstrdefs.generated.h

@@ -166,6 +166,8 @@ QDEF0(MP_QSTR_value, 78, 5, "value")
 QDEF0(MP_QSTR_values, 125, 6, "values")
 QDEF0(MP_QSTR_values, 125, 6, "values")
 QDEF0(MP_QSTR_write, 152, 5, "write")
 QDEF0(MP_QSTR_write, 152, 5, "write")
 QDEF0(MP_QSTR_zip, 230, 3, "zip")
 QDEF0(MP_QSTR_zip, 230, 3, "zip")
+QDEF1(MP_QSTR__percent__hash_o, 108, 3, "%#o")
+QDEF1(MP_QSTR__percent__hash_x, 123, 3, "%#x")
 QDEF0(MP_QSTR__lt_dictcomp_gt_, 204, 10, "<dictcomp>")
 QDEF0(MP_QSTR__lt_dictcomp_gt_, 204, 10, "<dictcomp>")
 QDEF0(MP_QSTR__lt_genexpr_gt_, 52, 9, "<genexpr>")
 QDEF0(MP_QSTR__lt_genexpr_gt_, 52, 9, "<genexpr>")
 QDEF0(MP_QSTR__lt_lambda_gt_, 128, 8, "<lambda>")
 QDEF0(MP_QSTR__lt_lambda_gt_, 128, 8, "<lambda>")
@@ -458,5 +460,3 @@ QDEF1(MP_QSTR_union, 246, 5, "union")
 QDEF1(MP_QSTR_vibro_set, 216, 9, "vibro_set")
 QDEF1(MP_QSTR_vibro_set, 216, 9, "vibro_set")
 QDEF1(MP_QSTR_writable, 247, 8, "writable")
 QDEF1(MP_QSTR_writable, 247, 8, "writable")
 QDEF1(MP_QSTR__brace_open__colon__hash_b_brace_close_, 88, 5, "{:#b}")
 QDEF1(MP_QSTR__brace_open__colon__hash_b_brace_close_, 88, 5, "{:#b}")
-QDEF1(MP_QSTR__brace_open__colon__hash_o_brace_close_, 245, 5, "{:#o}")
-QDEF1(MP_QSTR__brace_open__colon__hash_x_brace_close_, 2, 5, "{:#x}")

+ 3 - 2
mp_flipper_logging.c

@@ -18,9 +18,10 @@ static mp_obj_t mp_flipper_logger_debug(size_t n_args, const mp_obj_t* args) {
 
 
     mp_flipper_logger_t* logger = MP_OBJ_TO_PTR(args[0]);
     mp_flipper_logger_t* logger = MP_OBJ_TO_PTR(args[0]);
 
 
-    const char* message = mp_obj_str_get_str(args[1]);
+    mp_obj_t values = mp_obj_new_tuple(n_args - 2, &args[2]);
+    mp_obj_t message = mp_obj_str_binary_op(MP_BINARY_OP_MODULO, args[1], values);
 
 
-    mp_flipper_log_debug(logger->name, message, &args[2], n_args - 2);
+    mp_flipper_log_debug(logger->name, mp_obj_str_get_str(message));
 
 
     return mp_const_none;
     return mp_const_none;
 }
 }

+ 1 - 1
mp_flipper_logging.h

@@ -2,4 +2,4 @@
 
 
 #include <stdio.h>
 #include <stdio.h>
 
 
-void mp_flipper_log_debug(const char* name, const char* message, void* args, size_t len);
+void mp_flipper_log_debug(const char* name, const char* message);

+ 1 - 1
mpconfigport.h

@@ -98,7 +98,7 @@ typedef long mp_off_t;
 #define MICROPY_PY_BUILTINS_STR_UNICODE (0)
 #define MICROPY_PY_BUILTINS_STR_UNICODE (0)
 #define MICROPY_PY_BUILTINS_STR_CENTER (0)
 #define MICROPY_PY_BUILTINS_STR_CENTER (0)
 #define MICROPY_PY_BUILTINS_STR_COUNT (0)
 #define MICROPY_PY_BUILTINS_STR_COUNT (0)
-#define MICROPY_PY_BUILTINS_STR_OP_MODULO (0)
+#define MICROPY_PY_BUILTINS_STR_OP_MODULO (1)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (0)
 #define MICROPY_PY_BUILTINS_STR_PARTITION (0)
 #define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
 #define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)
 #define MICROPY_PY_BUILTINS_BYTEARRAY (0)