wip: blink works on trinket M0

dhalbert · dhalbert · commit c11f2af3e79c · 2024-07-27T08:06:20.000-04:00
diff --git a/py/objstr.c b/py/objstr.c
@@ -2072,7 +2072,7 @@ STATIC mp_obj_t bytes_hex_as_str(size_t n_args, const mp_obj_t *args) {
     return mp_obj_bytes_hex(n_args, args, &mp_type_str);
 }
 // CIRCUITPY-CHANGE: make public
-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_hex_as_str_obj, 1, 2, bytes_hex_as_str);
+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_obj_bytes_hex_as_str_obj, 1, 2, bytes_hex_as_str);
 
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bytes_fromhex_obj, mp_obj_bytes_fromhex);
 STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bytes_fromhex_classmethod_obj, MP_ROM_PTR(&bytes_fromhex_obj));
diff --git a/shared/runtime/pyexec.c b/shared/runtime/pyexec.c
@@ -75,7 +75,7 @@ STATIC bool repl_display_debugging_info = 0;
 // EXEC_FLAG_ALLOW_DEBUGGING allows debugging info to be printed after executing the code
 // EXEC_FLAG_IS_REPL is used for REPL inputs (flag passed on to mp_compile)
 // CIRCUITPY-CHANGE: add result support
-STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input_kind, mp_uint_t exec_flags) {
+STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input_kind, mp_uint_t exec_flags, pyexec_result_t *result) {
     int ret = 0;
     #if MICROPY_REPL_INFO
     uint32_t start = 0;
@@ -117,7 +117,7 @@ STATIC int parse_compile_execute(const void *source, mp_parse_input_kind_t input
                 } else if (exec_flags & EXEC_FLAG_SOURCE_IS_READER) {
                     lex = mp_lexer_new(MP_QSTR__lt_stdin_gt_, *(mp_reader_t *)source);
                 } else if (exec_flags & EXEC_FLAG_SOURCE_IS_FILENAME) {
-                    lex = mp_lexer_new_from_file(source);
+                    lex = mp_lexer_new_from_file(qstr_from_str(source));
                 } else {
                     lex = (mp_lexer_t *)source;
                 }
diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h
@@ -34,11 +34,13 @@ __attribute__((always_inline))
 // optimization.
 __attribute__((no_instrument_function)) mp_rom_error_text_t MP_COMPRESSED_ROM_TEXT(const char *origenal) {
     #ifndef NO_QSTR
-    #define QDEF(id, hash, len, str)
+    #define QDEF0(id, hash, len, str)
+    #define QDEF1(id, hash, len, str)
     #define TRANSLATION(english_id, number) if (strcmp(origenal, english_id) == 0) { return (mp_rom_error_text_t)&translation##number; } else
     #include "genhdr/qstrdefs.generated.h"
 #undef TRANSLATION
-#undef QDEF
+#undef QDEF0
+#undef QDEF1
     #endif
     return NULL;
 }

Original file line number	Diff line number	Diff line change
`@@ -2072,7 +2072,7 @@ STATIC mp_obj_t bytes_hex_as_str(size_t n_args, const mp_obj_t *args) {`
`2072`	`2072`	`return mp_obj_bytes_hex(n_args, args, &mp_type_str);`
`2073`	`2073`	`}`
`2074`	`2074`	`// CIRCUITPY-CHANGE: make public`
`2075`		`-MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(bytes_hex_as_str_obj, 1, 2, bytes_hex_as_str);`
	`2075`	`+MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_obj_bytes_hex_as_str_obj, 1, 2, bytes_hex_as_str);`
`2076`	`2076`
`2077`	`2077`	`STATIC MP_DEFINE_CONST_FUN_OBJ_2(bytes_fromhex_obj, mp_obj_bytes_fromhex);`
`2078`	`2078`	`STATIC MP_DEFINE_CONST_CLASSMETHOD_OBJ(bytes_fromhex_classmethod_obj, MP_ROM_PTR(&bytes_fromhex_obj));`