Explorar o código

library update

Oliver Fabel hai 1 ano
pai
achega
1e8fda1e9f
Modificáronse 3 ficheiros con 18 adicións e 18 borrados
  1. 1 1
      genhdr/mpversion.h
  2. 2 2
      genhdr/qstrdefs.generated.h
  3. 15 15
      mp_flipper_fileio.c

+ 1 - 1
genhdr/mpversion.h

@@ -1,4 +1,4 @@
 // This file was generated by py/makeversionhdr.py
 // This file was generated by py/makeversionhdr.py
 #define MICROPY_GIT_TAG "v1.23.0"
 #define MICROPY_GIT_TAG "v1.23.0"
 #define MICROPY_GIT_HASH "a61c446c0"
 #define MICROPY_GIT_HASH "a61c446c0"
-#define MICROPY_BUILD_DATE "2024-10-01"
+#define MICROPY_BUILD_DATE "2024-10-02"

+ 2 - 2
genhdr/qstrdefs.generated.h

@@ -176,11 +176,11 @@ QDEF1(MP_QSTR__lt_string_gt_, 82, 8, "<string>")
 QDEF1(MP_QSTR_ALIGN_BEGIN, 240, 11, "ALIGN_BEGIN")
 QDEF1(MP_QSTR_ALIGN_BEGIN, 240, 11, "ALIGN_BEGIN")
 QDEF1(MP_QSTR_ALIGN_CENTER, 28, 12, "ALIGN_CENTER")
 QDEF1(MP_QSTR_ALIGN_CENTER, 28, 12, "ALIGN_CENTER")
 QDEF1(MP_QSTR_ALIGN_END, 248, 9, "ALIGN_END")
 QDEF1(MP_QSTR_ALIGN_END, 248, 9, "ALIGN_END")
+QDEF1(MP_QSTR_BinaryFileIO, 106, 12, "BinaryFileIO")
 QDEF1(MP_QSTR_CANVAS_BLACK, 213, 12, "CANVAS_BLACK")
 QDEF1(MP_QSTR_CANVAS_BLACK, 213, 12, "CANVAS_BLACK")
 QDEF1(MP_QSTR_CANVAS_WHITE, 53, 12, "CANVAS_WHITE")
 QDEF1(MP_QSTR_CANVAS_WHITE, 53, 12, "CANVAS_WHITE")
 QDEF1(MP_QSTR_FONT_PRIMARY, 133, 12, "FONT_PRIMARY")
 QDEF1(MP_QSTR_FONT_PRIMARY, 133, 12, "FONT_PRIMARY")
 QDEF1(MP_QSTR_FONT_SECONDARY, 51, 14, "FONT_SECONDARY")
 QDEF1(MP_QSTR_FONT_SECONDARY, 51, 14, "FONT_SECONDARY")
-QDEF1(MP_QSTR_FileIO, 197, 6, "FileIO")
 QDEF1(MP_QSTR_GPIO_MODE_ANALOG, 29, 16, "GPIO_MODE_ANALOG")
 QDEF1(MP_QSTR_GPIO_MODE_ANALOG, 29, 16, "GPIO_MODE_ANALOG")
 QDEF1(MP_QSTR_GPIO_MODE_INPUT, 97, 15, "GPIO_MODE_INPUT")
 QDEF1(MP_QSTR_GPIO_MODE_INPUT, 97, 15, "GPIO_MODE_INPUT")
 QDEF1(MP_QSTR_GPIO_MODE_INTERRUPT_FALL, 40, 24, "GPIO_MODE_INTERRUPT_FALL")
 QDEF1(MP_QSTR_GPIO_MODE_INTERRUPT_FALL, 40, 24, "GPIO_MODE_INTERRUPT_FALL")
@@ -327,7 +327,7 @@ QDEF1(MP_QSTR_SPEAKER_NOTE_GS7, 13, 16, "SPEAKER_NOTE_GS7")
 QDEF1(MP_QSTR_SPEAKER_NOTE_GS8, 2, 16, "SPEAKER_NOTE_GS8")
 QDEF1(MP_QSTR_SPEAKER_NOTE_GS8, 2, 16, "SPEAKER_NOTE_GS8")
 QDEF1(MP_QSTR_SPEAKER_VOLUME_MAX, 66, 18, "SPEAKER_VOLUME_MAX")
 QDEF1(MP_QSTR_SPEAKER_VOLUME_MAX, 66, 18, "SPEAKER_VOLUME_MAX")
 QDEF1(MP_QSTR_SPEAKER_VOLUME_MIN, 92, 18, "SPEAKER_VOLUME_MIN")
 QDEF1(MP_QSTR_SPEAKER_VOLUME_MIN, 92, 18, "SPEAKER_VOLUME_MIN")
-QDEF1(MP_QSTR_TextIO, 30, 6, "TextIO")
+QDEF1(MP_QSTR_TextFileIO, 56, 10, "TextFileIO")
 QDEF0(MP_QSTR___add__, 196, 7, "__add__")
 QDEF0(MP_QSTR___add__, 196, 7, "__add__")
 QDEF1(MP_QSTR___bases__, 3, 9, "__bases__")
 QDEF1(MP_QSTR___bases__, 3, 9, "__bases__")
 QDEF0(MP_QSTR___bool__, 43, 8, "__bool__")
 QDEF0(MP_QSTR___bool__, 43, 8, "__bool__")

+ 15 - 15
mp_flipper_fileio.c

@@ -10,8 +10,8 @@
 
 
 #include "mp_flipper_fileio.h"
 #include "mp_flipper_fileio.h"
 
 
-extern const mp_obj_type_t mp_flipper_fileio_type;
-extern const mp_obj_type_t mp_flipper_textio_type;
+extern const mp_obj_type_t mp_flipper_binary_fileio_type;
+extern const mp_obj_type_t mp_flipper_text_fileio_type;
 
 
 typedef struct _mp_flipper_fileio_file_descriptor_t {
 typedef struct _mp_flipper_fileio_file_descriptor_t {
     mp_obj_base_t base;
     mp_obj_base_t base;
@@ -23,7 +23,7 @@ typedef struct _mp_flipper_fileio_file_descriptor_t {
 
 
 void* mp_flipper_file_new_file_descriptor(void* handle, const char* name, uint8_t access_mode, uint8_t open_mode, bool is_text) {
 void* mp_flipper_file_new_file_descriptor(void* handle, const char* name, uint8_t access_mode, uint8_t open_mode, bool is_text) {
     mp_flipper_fileio_file_descriptor_t* fd = mp_obj_malloc_with_finaliser(
     mp_flipper_fileio_file_descriptor_t* fd = mp_obj_malloc_with_finaliser(
-        mp_flipper_fileio_file_descriptor_t, is_text ? &mp_flipper_textio_type : &mp_flipper_fileio_type);
+        mp_flipper_fileio_file_descriptor_t, is_text ? &mp_flipper_text_fileio_type : &mp_flipper_binary_fileio_type);
 
 
     fd->handle = handle;
     fd->handle = handle;
     fd->name = mp_obj_new_str(name, strlen(name));
     fd->name = mp_obj_new_str(name, strlen(name));
@@ -145,7 +145,7 @@ static const mp_map_elem_t mp_flipper_file_locals_dict_table[] = {
 };
 };
 static MP_DEFINE_CONST_DICT(mp_flipper_file_locals_dict, mp_flipper_file_locals_dict_table);
 static MP_DEFINE_CONST_DICT(mp_flipper_file_locals_dict, mp_flipper_file_locals_dict_table);
 
 
-static const mp_stream_p_t mp_flipper_fileio_stream_p = {
+static const mp_stream_p_t mp_flipper_binary_fileio_stream_p = {
     .read = mp_flipper_fileio_read,
     .read = mp_flipper_fileio_read,
     .write = mp_flipper_fileio_write,
     .write = mp_flipper_fileio_write,
     .ioctl = mp_flipper_fileio_ioctl,
     .ioctl = mp_flipper_fileio_ioctl,
@@ -153,15 +153,15 @@ static const mp_stream_p_t mp_flipper_fileio_stream_p = {
 };
 };
 
 
 MP_DEFINE_CONST_OBJ_TYPE(
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_flipper_fileio_type,
-    MP_QSTR_FileIO,
-    MP_TYPE_FLAG_NONE,
+    mp_flipper_binary_fileio_type,
+    MP_QSTR_BinaryFileIO,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     protocol,
     protocol,
-    &mp_flipper_fileio_stream_p,
+    &mp_flipper_binary_fileio_stream_p,
     locals_dict,
     locals_dict,
     &mp_flipper_file_locals_dict);
     &mp_flipper_file_locals_dict);
 
 
-static const mp_stream_p_t mp_flipper_textio_stream_p = {
+static const mp_stream_p_t mp_flipper_text_fileio_stream_p = {
     .read = mp_flipper_fileio_read,
     .read = mp_flipper_fileio_read,
     .write = mp_flipper_fileio_write,
     .write = mp_flipper_fileio_write,
     .ioctl = mp_flipper_fileio_ioctl,
     .ioctl = mp_flipper_fileio_ioctl,
@@ -169,11 +169,11 @@ static const mp_stream_p_t mp_flipper_textio_stream_p = {
 };
 };
 
 
 MP_DEFINE_CONST_OBJ_TYPE(
 MP_DEFINE_CONST_OBJ_TYPE(
-    mp_flipper_textio_type,
-    MP_QSTR_TextIO,
-    MP_TYPE_FLAG_NONE,
+    mp_flipper_text_fileio_type,
+    MP_QSTR_TextFileIO,
+    MP_TYPE_FLAG_ITER_IS_STREAM,
     protocol,
     protocol,
-    &mp_flipper_textio_stream_p,
+    &mp_flipper_text_fileio_stream_p,
     locals_dict,
     locals_dict,
     &mp_flipper_file_locals_dict);
     &mp_flipper_file_locals_dict);
 
 
@@ -237,8 +237,8 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_flipper_builtin_open_obj, 1, mp_flipper_builtin_op
 static const mp_rom_map_elem_t mp_module_io_globals_table[] = {
 static const mp_rom_map_elem_t mp_module_io_globals_table[] = {
     {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io)},
     {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_io)},
     {MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_flipper_builtin_open_obj)},
     {MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_flipper_builtin_open_obj)},
-    {MP_ROM_QSTR(MP_QSTR_FileIO), MP_ROM_PTR(&mp_flipper_fileio_type)},
-    {MP_ROM_QSTR(MP_QSTR_TextIO), MP_ROM_PTR(&mp_flipper_textio_type)},
+    {MP_ROM_QSTR(MP_QSTR_BinaryFileIO), MP_ROM_PTR(&mp_flipper_binary_fileio_type)},
+    {MP_ROM_QSTR(MP_QSTR_TextFileIO), MP_ROM_PTR(&mp_flipper_text_fileio_type)},
 };
 };
 
 
 static MP_DEFINE_CONST_DICT(mp_module_io_globals, mp_module_io_globals_table);
 static MP_DEFINE_CONST_DICT(mp_module_io_globals, mp_module_io_globals_table);