Преглед изворни кода

Merge pull request #31 from SummerGGift/201822

update for upip
朱天龙 (Armink) пре 8 година
родитељ
комит
7dbe2ee96f
2 измењених фајлова са 9 додато и 5 уклоњено
  1. 5 4
      port/genhdr/qstrdefs.generated.h
  2. 4 1
      port/mpconfigport.h

+ 5 - 4
port/genhdr/qstrdefs.generated.h

@@ -568,6 +568,11 @@ QDEF(MP_QSTR_cert, (const byte*)"\x25\x04" "cert")
 QDEF(MP_QSTR_server_side, (const byte*)"\x64\x0b" "server_side")
 QDEF(MP_QSTR_server_hostname, (const byte*)"\x58\x0f" "server_hostname")
 QDEF(MP_QSTR_readlines, (const byte*)"\x6a\x09" "readlines")
+QDEF(MP_QSTR_decode, (const byte*)"\xa9\x06" "decode")
+QDEF(MP_QSTR_delattr, (const byte*)"\xdb\x07" "delattr")
+QDEF(MP_QSTR_FileIO, (const byte*)"\xc5\x06" "FileIO")
+QDEF(MP_QSTR_TextIOWrapper, (const byte*)"\xad\x0d" "TextIOWrapper")
+QDEF(MP_QSTR_io, (const byte*)"\x23\x02" "io")
 
 
 // This file was automatically generated by makeqstrdata.py
@@ -1365,7 +1370,6 @@ QDEF(MP_QSTR_EVT_RISING_FALLING, (const byte*)"\xcd\x08\x12" "EVT_RISING_FALLING
 QDEF(MP_QSTR_ExtInt, (const byte*)"\x7f\x5c\x06" "ExtInt")
 QDEF(MP_QSTR_FALLING, (const byte*)"\x02\x69\x07" "FALLING")
 QDEF(MP_QSTR_False, (const byte*)"\x38\x6f\x05" "False")
-QDEF(MP_QSTR_FileIO, (const byte*)"\xc5\x15\x06" "FileIO")
 QDEF(MP_QSTR_Flash, (const byte*)"\x95\x91\x05" "Flash")
 QDEF(MP_QSTR_HID, (const byte*)"\x00\xec\x03" "HID")
 QDEF(MP_QSTR_HIGH, (const byte*)"\x2b\x6c\x04" "HIGH")
@@ -1408,7 +1412,6 @@ QDEF(MP_QSTR_SPI, (const byte*)"\xef\x11\x03" "SPI")
 QDEF(MP_QSTR_Servo, (const byte*)"\x98\xd9\x05" "Servo")
 QDEF(MP_QSTR_SoftSPI, (const byte*)"\x21\x58\x07" "SoftSPI")
 QDEF(MP_QSTR_StopAsyncIteration, (const byte*)"\xec\xf0\x12" "StopAsyncIteration")
-QDEF(MP_QSTR_TextIOWrapper, (const byte*)"\xad\x8d\x0d" "TextIOWrapper")
 QDEF(MP_QSTR_Timer, (const byte*)"\xa2\x1f\x05" "Timer")
 QDEF(MP_QSTR_TimerChannel, (const byte*)"\x41\x99\x0c" "TimerChannel")
 QDEF(MP_QSTR_True, (const byte*)"\x13\x17\x04" "True")
@@ -1450,7 +1453,6 @@ QDEF(MP_QSTR_crc8, (const byte*)"\xcf\xef\x04" "crc8")
 QDEF(MP_QSTR_data, (const byte*)"\x15\xdc\x04" "data")
 QDEF(MP_QSTR_datetime, (const byte*)"\xe4\x04\x08" "datetime")
 QDEF(MP_QSTR_deadtime, (const byte*)"\x54\xf8\x08" "deadtime")
-QDEF(MP_QSTR_decode, (const byte*)"\xa9\x59\x06" "decode")
 QDEF(MP_QSTR_encode, (const byte*)"\x43\xca\x06" "encode")
 QDEF(MP_QSTR_encoding, (const byte*)"\x06\x9c\x08" "encoding")
 QDEF(MP_QSTR_extframe, (const byte*)"\x11\x74\x08" "extframe")
@@ -1467,7 +1469,6 @@ QDEF(MP_QSTR_hid_keyboard, (const byte*)"\x92\xb1\x0c" "hid_keyboard")
 QDEF(MP_QSTR_hid_mouse, (const byte*)"\x3e\x1e\x09" "hid_mouse")
 QDEF(MP_QSTR_initfilterbanks, (const byte*)"\x2a\x2b\x0f" "initfilterbanks")
 QDEF(MP_QSTR_intensity, (const byte*)"\xca\x3d\x09" "intensity")
-QDEF(MP_QSTR_io, (const byte*)"\x23\x6f\x02" "io")
 QDEF(MP_QSTR_ioctl, (const byte*)"\x78\xc2\x05" "ioctl")
 QDEF(MP_QSTR_ipoll, (const byte*)"\x53\x5d\x05" "ipoll")
 QDEF(MP_QSTR_irq, (const byte*)"\x8f\x56\x03" "irq")

+ 4 - 1
port/mpconfigport.h

@@ -115,7 +115,7 @@
 #define MICROPY_PY_RTTHREAD         (1)
 #define MICROPY_PY_SYS              (1)
 #define MICROPY_MODULE_FROZEN_MPY   (1)
-#define MICROPY_CPYTHON_COMPAT      (0)
+#define MICROPY_CPYTHON_COMPAT      (1)
 #define MICROPY_LONGINT_IMPL        (MICROPY_LONGINT_IMPL_MPZ)
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_DOUBLE)
 #define MICROPY_READER_POSIX        (1)
@@ -239,6 +239,7 @@ extern const struct _mp_obj_module_t mp_module_machine;
 extern const struct _mp_obj_module_t mp_module_uos;
 extern const struct _mp_obj_module_t mp_module_uselect;
 extern const struct _mp_obj_module_t mp_module_usocket;
+extern const struct _mp_obj_module_t mp_module_io;
 
 #if MICROPY_PY_RTTHREAD
 #define MICROPY_PY_RTTHREAD_DEF { MP_ROM_QSTR(MP_QSTR_rtthread), MP_ROM_PTR(&mp_module_rtthread) },
@@ -273,6 +274,8 @@ extern const struct _mp_obj_module_t mp_module_usocket;
     { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \
     { MP_ROM_QSTR(MP_QSTR_heapq), MP_ROM_PTR(&mp_module_uheapq) }, \
     { MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, \
+    { MP_ROM_QSTR(MP_QSTR_io), MP_ROM_PTR(&mp_module_io) }, \
+
 
 #define MP_RTT_NOT_IMPL_PRINT rt_kprintf("Not implement on %s:%ld, Please add for your board!\n", __FILE__, __FUNCTION__)