diff options
Diffstat (limited to 'ports')
83 files changed, 320 insertions, 320 deletions
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c index da756296fc..9b614c6d34 100644 --- a/ports/cc3200/mods/modusocket.c +++ b/ports/cc3200/mods/modusocket.c @@ -489,7 +489,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { mod_network_socket_obj_t *self = args[0]; - int32_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + int32_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; diff --git a/ports/cc3200/mpconfigport.h b/ports/cc3200/mpconfigport.h index 8026f7b757..af10c63531 100644 --- a/ports/cc3200/mpconfigport.h +++ b/ports/cc3200/mpconfigport.h @@ -104,29 +104,29 @@ #define MICROPY_PY_SYS_STDFILES (1) #define MICROPY_PY_CMATH (0) #define MICROPY_PY_IO (1) -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_UERRNO_ERRORCODE (0) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_ERRNO_ERRORCODE (0) #define MICROPY_PY_THREAD (1) #define MICROPY_PY_THREAD_GIL (1) -#define MICROPY_PY_UBINASCII (1) +#define MICROPY_PY_BINASCII (1) #define MICROPY_PY_UCTYPES (0) -#define MICROPY_PY_UZLIB (0) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UHASHLIB (0) -#define MICROPY_PY_USELECT (1) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/cc3200/mods/modutime.c" +#define MICROPY_PY_ZLIB (0) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_HASHLIB (0) +#define MICROPY_PY_SELECT (1) +#define MICROPY_PY_TIME (1) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/cc3200/mods/modtime.c" #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) #define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0) #define MICROPY_KBD_EXCEPTION (1) // We define our own list of errno constants to include in errno module -#define MICROPY_PY_UERRNO_LIST \ +#define MICROPY_PY_ERRNO_LIST \ X(EPERM) \ X(EIO) \ X(ENODEV) \ diff --git a/ports/esp32/main.c b/ports/esp32/main.c index b3d467a80e..3e7c9ee162 100644 --- a/ports/esp32/main.c +++ b/ports/esp32/main.c @@ -224,7 +224,7 @@ soft_reset_exit: // TODO: machine_rmt_deinit_all(); machine_pins_deinit(); machine_deinit(); - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS socket_events_deinit(); #endif diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c index 114629a9d7..0b2d40e333 100644 --- a/ports/esp32/modsocket.c +++ b/ports/esp32/modsocket.c @@ -73,7 +73,7 @@ typedef struct _socket_obj_t { uint8_t proto; uint8_t state; unsigned int retries; - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS mp_obj_t events_callback; struct _socket_obj_t *events_next; #endif @@ -81,7 +81,7 @@ typedef struct _socket_obj_t { void _socket_settimeout(socket_obj_t *sock, uint64_t timeout_ms); -#if MICROPY_PY_USOCKET_EVENTS +#if MICROPY_PY_SOCKET_EVENTS // Support for callbacks on asynchronous socket events (when socket becomes readable) // This divisor is used to reduce the load on the system, so it doesn't poll sockets too often @@ -144,7 +144,7 @@ void socket_events_handler(void) { } } -#endif // MICROPY_PY_USOCKET_EVENTS +#endif // MICROPY_PY_SOCKET_EVENTS static inline void check_for_exceptions(void) { mp_handle_pending(true); @@ -299,7 +299,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); - int backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + int backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; @@ -396,7 +396,7 @@ STATIC mp_obj_t socket_setsockopt(size_t n_args, const mp_obj_t *args) { break; } - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS // level: SOL_SOCKET // special "register callback" option case 20: { @@ -734,7 +734,7 @@ STATIC mp_uint_t socket_stream_ioctl(mp_obj_t self_in, mp_uint_t request, uintpt return ret; } else if (request == MP_STREAM_CLOSE) { if (socket->fd >= 0) { - #if MICROPY_PY_USOCKET_EVENTS + #if MICROPY_PY_SOCKET_EVENTS if (socket->events_callback != MP_OBJ_NULL) { socket_events_remove(socket); socket->events_callback = MP_OBJ_NULL; @@ -869,7 +869,7 @@ const mp_obj_module_t mp_module_socket = { .globals = (mp_obj_dict_t *)&mp_module_socket_globals, }; -// Note: This port doesn't define MICROPY_PY_USOCKET or MICROPY_PY_LWIP so +// Note: This port doesn't define MICROPY_PY_SOCKET or MICROPY_PY_LWIP so // this will not conflict with the common implementation provided by // extmod/mod{lwip,socket}.c. MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket); diff --git a/ports/esp32/moduos.c b/ports/esp32/moduos.c index 6a5a26c256..287f1d9900 100644 --- a/ports/esp32/moduos.c +++ b/ports/esp32/moduos.c @@ -49,7 +49,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom); -#if MICROPY_PY_UOS_DUPTERM_NOTIFY +#if MICROPY_PY_OS_DUPTERM_NOTIFY STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) { (void)obj_in; for (;;) { diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index d6aaa98787..d25a5c2734 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -62,9 +62,9 @@ #define MICROPY_PY_ALL_INPLACE_SPECIAL_METHODS (1) #define MICROPY_PY_BUILTINS_HELP_TEXT esp32_help_text #define MICROPY_PY_IO_BUFFEREDWRITER (1) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/esp32/modutime.c" +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp32/modtime.c" #define MICROPY_PY_THREAD (1) #define MICROPY_PY_THREAD_GIL (1) #define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32) @@ -83,17 +83,17 @@ #define MICROPY_BLUETOOTH_NIMBLE (1) #define MICROPY_BLUETOOTH_NIMBLE_BINDINGS_ONLY (1) #endif -#define MICROPY_PY_UTIMEQ (1) -#define MICROPY_PY_UHASHLIB_SHA1 (1) -#define MICROPY_PY_UHASHLIB_SHA256 (1) -#define MICROPY_PY_UCRYPTOLIB (1) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (esp_random()) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/esp32/moduos.c" +#define MICROPY_PY_TIMEQ (1) +#define MICROPY_PY_HASHLIB_SHA1 (1) +#define MICROPY_PY_HASHLIB_SHA256 (1) +#define MICROPY_PY_CRYPTOLIB (1) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (esp_random()) +#define MICROPY_PY_OS_INCLUDEFILE "ports/esp32/moduos.c" #define MICROPY_PY_OS_DUPTERM (1) -#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_BITSTREAM (1) @@ -136,14 +136,14 @@ #endif #define MICROPY_HW_SOFTSPI_MIN_DELAY (0) #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (ets_get_cpu_frequency() * 1000000 / 200) // roughly -#define MICROPY_PY_USSL (1) +#define MICROPY_PY_SSL (1) #define MICROPY_SSL_MBEDTLS (1) -#define MICROPY_PY_USSL_FINALISER (1) -#define MICROPY_PY_UWEBSOCKET (1) +#define MICROPY_PY_SSL_FINALISER (1) +#define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_UPLATFORM (1) -#define MICROPY_PY_USOCKET_EVENTS (MICROPY_PY_WEBREPL) +#define MICROPY_PY_PLATFORM (1) +#define MICROPY_PY_SOCKET_EVENTS (MICROPY_PY_WEBREPL) #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR (1) #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32") @@ -169,10 +169,10 @@ void *esp_native_code_commit(void *, size_t, void *); #define MICROPY_BEGIN_ATOMIC_SECTION() portENTER_CRITICAL_NESTED() #define MICROPY_END_ATOMIC_SECTION(state) portEXIT_CRITICAL_NESTED(state) -#if MICROPY_PY_USOCKET_EVENTS -#define MICROPY_PY_USOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler(); +#if MICROPY_PY_SOCKET_EVENTS +#define MICROPY_PY_SOCKET_EVENTS_HANDLER extern void socket_events_handler(void); socket_events_handler(); #else -#define MICROPY_PY_USOCKET_EVENTS_HANDLER +#define MICROPY_PY_SOCKET_EVENTS_HANDLER #endif #if MICROPY_PY_THREAD @@ -180,7 +180,7 @@ void *esp_native_code_commit(void *, size_t, void *); do { \ extern void mp_handle_pending(bool); \ mp_handle_pending(true); \ - MICROPY_PY_USOCKET_EVENTS_HANDLER \ + MICROPY_PY_SOCKET_EVENTS_HANDLER \ MP_THREAD_GIL_EXIT(); \ ulTaskNotifyTake(pdFALSE, 1); \ MP_THREAD_GIL_ENTER(); \ @@ -190,7 +190,7 @@ void *esp_native_code_commit(void *, size_t, void *); do { \ extern void mp_handle_pending(bool); \ mp_handle_pending(true); \ - MICROPY_PY_USOCKET_EVENTS_HANDLER \ + MICROPY_PY_SOCKET_EVENTS_HANDLER \ asm ("waiti 0"); \ } while (0); #endif diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c index 61e9fd563e..4c8fa012f4 100644 --- a/ports/esp32/mphalport.c +++ b/ports/esp32/mphalport.c @@ -138,7 +138,7 @@ void mp_hal_delay_ms(uint32_t ms) { uint64_t t0 = esp_timer_get_time(); for (;;) { mp_handle_pending(true); - MICROPY_PY_USOCKET_EVENTS_HANDLER + MICROPY_PY_SOCKET_EVENTS_HANDLER MP_THREAD_GIL_EXIT(); uint64_t t1 = esp_timer_get_time(); dt = t1 - t0; diff --git a/ports/esp8266/Makefile b/ports/esp8266/Makefile index e3727dfeda..e4db811f24 100644 --- a/ports/esp8266/Makefile +++ b/ports/esp8266/Makefile @@ -27,7 +27,7 @@ QSTR_GLOBAL_DEPENDENCIES = $(BOARD_DIR)/mpconfigboard.h # MicroPython feature configurations MICROPY_ROM_TEXT_COMPRESSION ?= 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_AXTLS = 1 AXTLS_DEFS_EXTRA = -Dabort=abort_ -DRT_MAX_PLAIN_LENGTH=1024 -DRT_EXTRA=4096 BTREE_DEFS_EXTRA = -DDEFPSIZE=1024 -DMINCACHE=3 diff --git a/ports/esp8266/boards/GENERIC/mpconfigboard.h b/ports/esp8266/boards/GENERIC/mpconfigboard.h index 1d9b8e6f70..52c93f83a3 100644 --- a/ports/esp8266/boards/GENERIC/mpconfigboard.h +++ b/ports/esp8266/boards/GENERIC/mpconfigboard.h @@ -11,4 +11,4 @@ #define MICROPY_READER_VFS (MICROPY_VFS) #define MICROPY_VFS (1) -#define MICROPY_PY_UCRYPTOLIB (1) +#define MICROPY_PY_CRYPTOLIB (1) diff --git a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h index cf5127686c..f811f70592 100644 --- a/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h +++ b/ports/esp8266/boards/GENERIC_1M/mpconfigboard.h @@ -14,4 +14,4 @@ #define MICROPY_PY_FSTRINGS (0) #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0) #define MICROPY_PY_UASYNCIO (0) -#define MICROPY_PY_UCRYPTOLIB (1) +#define MICROPY_PY_CRYPTOLIB (1) diff --git a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h index b0adb7081c..fc933cd3eb 100644 --- a/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h +++ b/ports/esp8266/boards/GENERIC_512K/mpconfigboard.h @@ -9,5 +9,5 @@ #define MICROPY_PY_REVERSE_SPECIAL_METHODS (0) #define MICROPY_PY_SYS_STDIO_BUFFER (0) #define MICROPY_PY_UASYNCIO (0) -#define MICROPY_PY_URE_SUB (0) +#define MICROPY_PY_RE_SUB (0) #define MICROPY_PY_FRAMEBUF (0) diff --git a/ports/esp8266/mpconfigport.h b/ports/esp8266/mpconfigport.h index 0cfb83f73e..9985d59dd3 100644 --- a/ports/esp8266/mpconfigport.h +++ b/ports/esp8266/mpconfigport.h @@ -36,8 +36,8 @@ #define MICROPY_PY_MATH_FACTORIAL (0) #define MICROPY_PY_MATH_ISCLOSE (0) #define MICROPY_PY_SYS_PS1_PS2 (0) -#define MICROPY_PY_UBINASCII_CRC32 (0) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (0) +#define MICROPY_PY_BINASCII_CRC32 (0) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (0) // Configure other options. #define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_C) @@ -54,11 +54,11 @@ #define MICROPY_REPL_EVENT_DRIVEN (0) #define MICROPY_USE_INTERNAL_ERRNO (1) #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text -#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL && MICROPY_SSL_AXTLS) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (*WDEV_HWRNG) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/esp8266/modutime.c" +#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL && MICROPY_SSL_AXTLS) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (*WDEV_HWRNG) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/esp8266/modutime.c" #define MICROPY_PY_LWIP (1) #define MICROPY_PY_LWIP_SOCK_RAW (1) #define MICROPY_PY_MACHINE (1) @@ -78,19 +78,19 @@ #endif #define MICROPY_PY_NETWORK_INCLUDEFILE "ports/esp8266/modnetwork.h" #define MICROPY_PY_NETWORK_MODULE_GLOBALS_INCLUDEFILE "ports/esp8266/modnetwork_globals.h" -#define MICROPY_PY_UWEBSOCKET (1) +#define MICROPY_PY_WEBSOCKET (1) #define MICROPY_PY_ONEWIRE (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_WEBREPL_DELAY (20) #define MICROPY_PY_WEBREPL_STATIC_FILEBUF (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/esp8266/moduos.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/esp8266/modos.c" #define MICROPY_PY_OS_DUPTERM (2) -#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1) -#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_UNAME_RELEASE_DYNAMIC (1) -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) +#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_UNAME_RELEASE_DYNAMIC (1) +#define MICROPY_PY_OS_URANDOM (1) #define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ) #define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_FLOAT) #define MICROPY_WARNINGS (1) diff --git a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk index 8617261d54..236db27c87 100644 --- a/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk +++ b/ports/mimxrt/boards/ADAFRUIT_METRO_M7/mpconfigboard.mk @@ -7,5 +7,5 @@ MICROPY_HW_FLASH_TYPE ?= qspi_nor_flash MICROPY_HW_FLASH_SIZE ?= 0x800000 # 8MB MICROPY_PY_NETWORK_NINAW10 ?= 1 -MICROPY_PY_USSL ?= 1 +MICROPY_PY_SSL ?= 1 MICROPY_SSL_MBEDTLS ?= 1 diff --git a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk index 85bc1f71b6..547b88d57d 100644 --- a/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1020_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk index 8e4213569a..0cf2a34804 100644 --- a/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1050_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk index 22cd5356d9..c2556a2724 100644 --- a/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1060_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk index b0bd7ec6ac..d3ba752419 100644 --- a/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1064_EVK/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk index dc44b93bd0..25747a52c6 100644 --- a/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk +++ b/ports/mimxrt/boards/MIMXRT1170_EVK/mpconfigboard.mk @@ -12,7 +12,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x4000000 # 64MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h index d63c0dc403..3d080ff25f 100644 --- a/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h +++ b/ports/mimxrt/boards/OLIMEX_RT1010/mpconfigboard.h @@ -3,7 +3,7 @@ #define MICROPY_HW_USB_MANUFACTURER_STRING "Olimex Ltd." #define MICROPY_HW_USB_VID 0x15ba #define MICROPY_HW_USB_PID 0x0046 -#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (0) +#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (0) // Olimex RT1010-Py has 1 board LED #define MICROPY_HW_LED1_PIN (pin_GPIO_11) diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk index 8e530ac558..ca27dff55f 100644 --- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk +++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk @@ -10,7 +10,7 @@ MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk index ca7e10b5e4..cf07144668 100755 --- a/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk +++ b/ports/mimxrt/boards/TEENSY41/mpconfigboard.mk @@ -8,7 +8,7 @@ MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB MICROPY_HW_FLASH_RESERVED ?= 0x1000 # 4KB MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py diff --git a/ports/mimxrt/moduos.c b/ports/mimxrt/moduos.c index 8ae8019aae..ecfc3712d7 100644 --- a/ports/mimxrt/moduos.c +++ b/ports/mimxrt/moduos.c @@ -95,7 +95,7 @@ uint32_t trng_random_u32(void) { return rngval; } -#if MICROPY_PY_UOS_URANDOM +#if MICROPY_PY_OS_URANDOM STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { mp_int_t n = mp_obj_get_int(num); vstr_t vstr; @@ -109,7 +109,7 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom); #endif -#if MICROPY_PY_UOS_DUPTERM_NOTIFY +#if MICROPY_PY_OS_DUPTERM_NOTIFY STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) { (void)obj_in; for (;;) { diff --git a/ports/mimxrt/mpconfigport.h b/ports/mimxrt/mpconfigport.h index 52301cf94b..be086cb552 100644 --- a/ports/mimxrt/mpconfigport.h +++ b/ports/mimxrt/mpconfigport.h @@ -69,17 +69,17 @@ uint32_t trng_random_u32(void); // Extended modules #define MICROPY_EPOCH_IS_1970 (1) -#define MICROPY_PY_USSL_FINALISER (MICROPY_PY_USSL) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/mimxrt/modutime.c" -#define MICROPY_PY_UOS_INCLUDEFILE "ports/mimxrt/moduos.c" +#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/mimxrt/modutime.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/mimxrt/moduos.c" #define MICROPY_PY_OS_DUPTERM (3) -#define MICROPY_PY_UOS_DUPTERM_NOTIFY (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32()) +#define MICROPY_PY_OS_DUPTERM_NOTIFY (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32()) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_BITSTREAM (1) @@ -96,7 +96,7 @@ uint32_t trng_random_u32(void); #define MICROPY_PY_MACHINE_TIMER (1) #define MICROPY_SOFT_TIMER_TICKS_MS systick_ms #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_UPLATFORM (1) +#define MICROPY_PY_PLATFORM (1) // fatfs configuration used in ffconf.h #define MICROPY_FATFS_ENABLE_LFN (1) @@ -107,16 +107,16 @@ uint32_t trng_random_u32(void); #ifndef MICROPY_PY_NETWORK #define MICROPY_PY_NETWORK (1) #endif -#ifndef MICROPY_PY_USOCKET -#define MICROPY_PY_USOCKET (1) +#ifndef MICROPY_PY_SOCKET +#define MICROPY_PY_SOCKET (1) #endif -#define MICROPY_PY_UWEBSOCKET (MICROPY_PY_LWIP) +#define MICROPY_PY_WEBSOCKET (MICROPY_PY_LWIP) #define MICROPY_PY_WEBREPL (MICROPY_PY_LWIP) #define MICROPY_PY_LWIP_SOCK_RAW (MICROPY_PY_LWIP) -#define MICROPY_PY_USSL_FINALISER (MICROPY_PY_USSL) -// #define MICROPY_PY_UHASHLIB_MD5 (MICROPY_PY_USSL) -#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL) -// #define MICROPY_PY_UCRYPTOLIB (MICROPY_PY_USSL) +#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL) +// #define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL) +#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL) +// #define MICROPY_PY_CRYPTOLIB (MICROPY_PY_SSL) // Prevent the "LWIP task" from running. #define MICROPY_PY_LWIP_ENTER MICROPY_PY_PENDSV_ENTER diff --git a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h index eab232848b..d4ce93a0ac 100644 --- a/ports/nrf/boards/evk_nina_b3/mpconfigboard.h +++ b/ports/nrf/boards/evk_nina_b3/mpconfigboard.h @@ -41,8 +41,8 @@ #define MICROPY_EMIT_INLINE_THUMB (1) // Enable optional modules -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_UHASHLIB (1) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_HASHLIB (1) // Peripherals Config #define MICROPY_PY_MACHINE_UART (1) diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h index 0799000b90..3a311fe5d9 100644 --- a/ports/nrf/mpconfigport.h +++ b/ports/nrf/mpconfigport.h @@ -80,8 +80,8 @@ #define MICROPY_PY_SYS_STDFILES (CORE_FEAT) #endif -#ifndef MICROPY_PY_UBINASCII -#define MICROPY_PY_UBINASCII (CORE_FEAT) +#ifndef MICROPY_PY_BINASCII +#define MICROPY_PY_BINASCII (CORE_FEAT) #endif #ifndef MICROPY_PY_NRF @@ -134,7 +134,7 @@ #endif // Use port specific os module rather than extmod variant. -#define MICROPY_PY_UOS (0) +#define MICROPY_PY_OS (0) #define MICROPY_STREAMS_NON_BLOCK (1) #define MICROPY_CAN_OVERRIDE_BUILTINS (1) @@ -155,9 +155,9 @@ #define MICROPY_MODULE_BUILTIN_INIT (1) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_PY_SYS_MAXSIZE (1) -#define MICROPY_PY_URANDOM (1) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) -#define MICROPY_PY_UTIME (1) +#define MICROPY_PY_RANDOM (1) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1) +#define MICROPY_PY_TIME (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (0) #define MICROPY_PY_MACHINE_SOFTI2C (MICROPY_PY_MACHINE_I2C) @@ -286,7 +286,7 @@ typedef unsigned int mp_uint_t; // must be pointer size typedef long mp_off_t; #if MICROPY_HW_ENABLE_RNG -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_generate_random_word()) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_generate_random_word()) long unsigned int rng_generate_random_word(void); #endif diff --git a/ports/qemu-arm/mpconfigport.h b/ports/qemu-arm/mpconfigport.h index 972dce61b4..0eada5a529 100644 --- a/ports/qemu-arm/mpconfigport.h +++ b/ports/qemu-arm/mpconfigport.h @@ -36,16 +36,16 @@ #define MICROPY_PY_SYS_EXIT (1) #define MICROPY_PY_SYS_MAXSIZE (1) #define MICROPY_PY_SYS_PLATFORM "qemu-arm" -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_URANDOM (1) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_BINASCII (1) +#define MICROPY_PY_RANDOM (1) #define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UZLIB (1) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UHASHLIB (1) +#define MICROPY_PY_ZLIB (1) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_OS (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_HASHLIB (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_USE_INTERNAL_PRINTF (1) diff --git a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h index cd699e51bd..4845c0c09e 100644 --- a/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (0) #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_THREAD (0) // peripheral config diff --git a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h index 5fd2d1c6a3..d8d22ad72f 100644 --- a/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (1) #define MICROPY_PY_GENERATOR_PEND_THROW (1) #define MICROPY_PY_MATH (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_THREAD (0) // disable ARM_THUMB_FP using vldr due to RA has single float only // peripheral config diff --git a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h index b6f76a062e..d746dbdfc2 100644 --- a/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (1) #define MICROPY_PY_GENERATOR_PEND_THROW (1) #define MICROPY_PY_MATH (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_THREAD (0) // disable ARM_THUMB_FP using vldr due to RA has single float only // peripheral config diff --git a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h index 9e3c462eec..b6ecfe6d49 100644 --- a/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h +++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (1) #define MICROPY_PY_GENERATOR_PEND_THROW (1) #define MICROPY_PY_MATH (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) #define MICROPY_PY_THREAD (0) // disable ARM_THUMB_FP using vldr due to RA has single float only // peripheral config diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h index 7b8ccb1445..3934dd264b 100644 --- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h +++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h @@ -10,8 +10,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (0) #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_THREAD (0) // peripheral config diff --git a/ports/renesas-ra/mpconfigport.h b/ports/renesas-ra/mpconfigport.h index 42834c1fbc..1886d31541 100644 --- a/ports/renesas-ra/mpconfigport.h +++ b/ports/renesas-ra/mpconfigport.h @@ -91,19 +91,19 @@ #endif // extended modules -#define MICROPY_PY_UOS_INCLUDEFILE "ports/renesas-ra/moduos.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/renesas-ra/moduos.c" #define MICROPY_PY_OS_DUPTERM (3) -#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1) -#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (MICROPY_HW_ENABLE_RNG) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/renesas-ra/modutime.c" -#ifndef MICROPY_PY_UTIMEQ -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1) +#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (MICROPY_HW_ENABLE_RNG) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/renesas-ra/modtime.c" +#ifndef MICROPY_PY_TIMEQ +#define MICROPY_PY_TIMEQ (1) #endif #ifndef MICROPY_PY_MACHINE #define MICROPY_PY_MACHINE (1) @@ -126,8 +126,8 @@ #ifndef MICROPY_PY_ONEWIRE #define MICROPY_PY_ONEWIRE (1) #endif -#ifndef MICROPY_PY_UPLATFORM -#define MICROPY_PY_UPLATFORM (1) +#ifndef MICROPY_PY_PLATFORM +#define MICROPY_PY_PLATFORM (1) #endif // fatfs configuration used in ffconf.h diff --git a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h index a4fb8b7c8c..98b9c0f6fa 100644 --- a/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h +++ b/ports/rp2/boards/ARDUINO_NANO_RP2040_CONNECT/mpconfigboard.h @@ -8,7 +8,7 @@ #define MICROPY_PY_NETWORK (1) // Enable MD5 hash. -#define MICROPY_PY_UHASHLIB_MD5 (1) +#define MICROPY_PY_HASHLIB_MD5 (1) // Disable internal error numbers. #define MICROPY_USE_INTERNAL_ERRNO (0) diff --git a/ports/rp2/mpconfigport.h b/ports/rp2/mpconfigport.h index 720e858f19..de05a281bd 100644 --- a/ports/rp2/mpconfigport.h +++ b/ports/rp2/mpconfigport.h @@ -95,21 +95,21 @@ // Extended modules #define MICROPY_EPOCH_IS_1970 (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/rp2/moduos.c" +#define MICROPY_PY_OS_INCLUDEFILE "ports/rp2/moduos.c" #ifndef MICROPY_PY_OS_DUPTERM #define MICROPY_PY_OS_DUPTERM (1) #endif -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_URE_MATCH_GROUPS (1) -#define MICROPY_PY_URE_MATCH_SPAN_START_END (1) -#define MICROPY_PY_UHASHLIB_SHA1 (1) -#define MICROPY_PY_UCRYPTOLIB (1) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/rp2/modutime.c" -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rosc_random_u32()) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_RE_MATCH_GROUPS (1) +#define MICROPY_PY_RE_MATCH_SPAN_START_END (1) +#define MICROPY_PY_HASHLIB_SHA1 (1) +#define MICROPY_PY_CRYPTOLIB (1) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/rp2/modutime.c" +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rosc_random_u32()) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PIN_MAKE_NEW mp_pin_make_new #define MICROPY_PY_MACHINE_BITSTREAM (1) @@ -151,14 +151,14 @@ #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-rp2" #endif -#ifndef MICROPY_PY_USOCKET -#define MICROPY_PY_USOCKET (1) +#ifndef MICROPY_PY_SOCKET +#define MICROPY_PY_SOCKET (1) #endif -#ifndef MICROPY_PY_USSL -#define MICROPY_PY_USSL (1) +#ifndef MICROPY_PY_SSL +#define MICROPY_PY_SSL (1) #endif -#ifndef MICROPY_PY_UWEBSOCKET -#define MICROPY_PY_UWEBSOCKET (1) +#ifndef MICROPY_PY_WEBSOCKET +#define MICROPY_PY_WEBSOCKET (1) #endif #ifndef MICROPY_PY_WEBREPL #define MICROPY_PY_WEBREPL (1) @@ -181,8 +181,8 @@ extern const struct _mp_obj_type_t mp_network_cyw43_type; #if MICROPY_PY_NETWORK_NINAW10 // This Network interface requires the extended socket state. -#ifndef MICROPY_PY_USOCKET_EXTENDED_STATE -#define MICROPY_PY_USOCKET_EXTENDED_STATE (1) +#ifndef MICROPY_PY_SOCKET_EXTENDED_STATE +#define MICROPY_PY_SOCKET_EXTENDED_STATE (1) #endif extern const struct _mp_obj_type_t mod_network_nic_type_nina; #define MICROPY_HW_NIC_NINAW10 { MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&mod_network_nic_type_nina) }, diff --git a/ports/samd/mcu/samd21/mpconfigmcu.h b/ports/samd/mcu/samd21/mpconfigmcu.h index df94b9682d..f70981acd5 100644 --- a/ports/samd/mcu/samd21/mpconfigmcu.h +++ b/ports/samd/mcu/samd21/mpconfigmcu.h @@ -14,8 +14,8 @@ #define MICROPY_PY_BUILTINS_COMPLEX (0) #endif -#ifndef MICROPY_PY_UTIME -#define MICROPY_PY_UTIME (1) +#ifndef MICROPY_PY_TIME +#define MICROPY_PY_TIME (1) #endif #ifndef MICROPY_PY_MATH @@ -26,7 +26,7 @@ #define MICROPY_PY_CMATH (0) #endif -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32(300)) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32(300)) unsigned long trng_random_u32(int delay); #define VFS_BLOCK_SIZE_BYTES (1536) // 24x 64B flash pages; @@ -35,7 +35,7 @@ unsigned long trng_random_u32(int delay); #define MICROPY_HW_UART_TXBUF (1) #endif -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_URANDOM (1) #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU #define MICROPY_PY_MACHINE_PIN_BOARD_CPU (1) diff --git a/ports/samd/mcu/samd51/mpconfigmcu.h b/ports/samd/mcu/samd51/mpconfigmcu.h index 0c2d2370ff..1569e5624d 100644 --- a/ports/samd/mcu/samd51/mpconfigmcu.h +++ b/ports/samd/mcu/samd51/mpconfigmcu.h @@ -27,9 +27,9 @@ #define MICROPY_PY_MACHINE_DHT_READINTO (1) #define MICROPY_PY_ONEWIRE (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (trng_random_u32()) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32()) unsigned long trng_random_u32(void); #ifndef MICROPY_PY_MACHINE_PIN_BOARD_CPU diff --git a/ports/samd/moduos.c b/ports/samd/moduos.c index 4438bf3c7b..f9df0cd996 100644 --- a/ports/samd/moduos.c +++ b/ports/samd/moduos.c @@ -69,7 +69,7 @@ uint32_t trng_random_u32(int delay) { #define TRNG_RANDOM_U32 trng_random_u32(10) #endif -#if MICROPY_PY_UOS_URANDOM +#if MICROPY_PY_OS_URANDOM STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { mp_int_t n = mp_obj_get_int(num); vstr_t vstr; @@ -88,16 +88,16 @@ STATIC mp_obj_t mp_os_urandom(mp_obj_t num) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mp_os_urandom_obj, mp_os_urandom); -#endif // MICROPY_PY_UOS_URANDOM +#endif // MICROPY_PY_OS_URANDOM -#if MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM +#if MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM bool mp_os_dupterm_is_builtin_stream(mp_const_obj_t stream) { const mp_obj_type_t *type = mp_obj_get_type(stream); return type == &machine_uart_type; } #endif -#if MICROPY_PY_UOS_DUPTERM_NOTIFY +#if MICROPY_PY_OS_DUPTERM_NOTIFY STATIC mp_obj_t mp_os_dupterm_notify(mp_obj_t obj_in) { (void)obj_in; for (;;) { diff --git a/ports/samd/mpconfigport.h b/ports/samd/mpconfigport.h index a0a58a2fd7..8a9947468e 100644 --- a/ports/samd/mpconfigport.h +++ b/ports/samd/mpconfigport.h @@ -77,21 +77,21 @@ #define MICROPY_PY_IO_IOBASE (1) // Extended modules -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/samd/modutime.c" +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/samd/modtime.c" #define MICROPY_PY_MACHINE (1) -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/samd/moduos.c" +#define MICROPY_PY_OS (1) +#define MICROPY_PY_OS_INCLUDEFILE "ports/samd/modos.c" #define MICROPY_READER_VFS (1) #define MICROPY_VFS (1) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UBINASCII (1) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_BINASCII (1) #define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_URANDOM (1) -#define MICROPY_PY_UZLIB (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_RANDOM (1) +#define MICROPY_PY_ZLIB (1) #define MICROPY_PY_UASYNCIO (1) #define MICROPY_PY_MACHINE_RTC (1) #ifndef MICROPY_PY_MACHINE_ADC diff --git a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk index 135b12b8c8..b927388c55 100644 --- a/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk +++ b/ports/stm32/boards/ARDUINO_GIGA/mpconfigboard.mk @@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_BLUETOOTH_BTSTACK = 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk index ebe9775e80..2c48c17f38 100644 --- a/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk +++ b/ports/stm32/boards/ARDUINO_NICLA_VISION/mpconfigboard.mk @@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_BLUETOOTH_BTSTACK = 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk index 3bfd40dc92..cf4d40e5fe 100644 --- a/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk +++ b/ports/stm32/boards/ARDUINO_PORTENTA_H7/mpconfigboard.mk @@ -21,7 +21,7 @@ MICROPY_BLUETOOTH_NIMBLE = 1 MICROPY_BLUETOOTH_BTSTACK = 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h index dfcca72afb..165284f31a 100644 --- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h +++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.h @@ -12,13 +12,13 @@ #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h index ed8178d7d4..cfc46491e0 100644 --- a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h +++ b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.h @@ -4,7 +4,7 @@ #define MICROPY_EMIT_THUMB (0) #define MICROPY_EMIT_INLINE_THUMB (0) #define MICROPY_PY_BUILTINS_COMPLEX (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_HW_HAS_SWITCH (1) diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h index d44bfb0bb6..39d0082d7b 100644 --- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.h @@ -5,12 +5,12 @@ #define MICROPY_EMIT_INLINE_THUMB (0) #define MICROPY_OPT_COMPUTED_GOTO (0) #define MICROPY_PY_BUILTINS_COMPLEX (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_FRAMEBUF (0) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk index 9e82be1dc7..e5fc89ab47 100644 --- a/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F429ZI/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk index 69b0f80a2d..b8666755b0 100644 --- a/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F439ZI/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk index 9506b67595..20acc63f16 100644 --- a/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F746ZG/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk index 90fc242f9a..ab3eada5b0 100644 --- a/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F756ZG/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk index 6ef9d42f9d..22c4098159 100644 --- a/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_F767ZI/mpconfigboard.mk @@ -8,7 +8,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h index 31157dd2c4..336d95c42c 100644 --- a/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_G474RE/mpconfigboard.h @@ -10,13 +10,13 @@ #define MICROPY_HW_HAS_FLASH (0) // QSPI extflash not mounted #define MICROPY_PY_UASYNCIO (0) -#define MICROPY_PY_UZLIB (0) -#define MICROPY_PY_UBINASCII (0) -#define MICROPY_PY_UHASHLIB (0) -#define MICROPY_PY_UJSON (0) -#define MICROPY_PY_URE (0) +#define MICROPY_PY_ZLIB (0) +#define MICROPY_PY_BINASCII (0) +#define MICROPY_PY_HASHLIB (0) +#define MICROPY_PY_JSON (0) +#define MICROPY_PY_RE (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) // The board has an 24MHz HSE, the following gives 170MHz CPU speed diff --git a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk index 287b51f6d8..6d512ec0ed 100644 --- a/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_H723ZG/mpconfigboard.mk @@ -18,7 +18,7 @@ endif # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk index ea95fd0074..cbdf48c52a 100644 --- a/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk +++ b/ports/stm32/boards/NUCLEO_H743ZI/mpconfigboard.mk @@ -18,7 +18,7 @@ endif # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h index c8c809eb48..1d6b303260 100644 --- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.h @@ -12,13 +12,13 @@ #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_PY_MACHINE_BITSTREAM (0) diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h index 5e05053cdd..ba843c8a61 100644 --- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.h @@ -6,13 +6,13 @@ #define MICROPY_OPT_COMPUTED_GOTO (0) #define MICROPY_PY_BUILTINS_COMPLEX (0) #define MICROPY_PY_GENERATOR_PEND_THROW (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_HW_ENABLE_RTC (1) #define MICROPY_HW_ENABLE_ADC (1) diff --git a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h index 1b5827d5ae..b0fab45956 100644 --- a/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_L452RE/mpconfigboard.h @@ -1,7 +1,7 @@ #define MICROPY_HW_BOARD_NAME "NUCLEO-L452RE" #define MICROPY_HW_MCU_NAME "STM32L452RE" -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h index baf1f023be..2bb368adcc 100644 --- a/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h +++ b/ports/stm32/boards/NUCLEO_WL55/mpconfigboard.h @@ -11,13 +11,13 @@ #define MICROPY_PY_GENERATOR_PEND_THROW (0) #define MICROPY_PY_MATH (0) #define MICROPY_PY_FRAMEBUF (0) -#define MICROPY_PY_USOCKET (0) +#define MICROPY_PY_SOCKET (0) #define MICROPY_PY_NETWORK (0) #define MICROPY_PY_ONEWIRE (0) #define MICROPY_PY_STM (0) #define MICROPY_PY_PYB_LEGACY (0) -#define MICROPY_PY_UHEAPQ (0) -#define MICROPY_PY_UTIMEQ (0) +#define MICROPY_PY_HEAPQ (0) +#define MICROPY_PY_TIMEQ (0) #define MICROPY_HW_HAS_FLASH (1) #define MICROPY_HW_ENABLE_RTC (1) diff --git a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk index 0d3eee83be..aa11fd5492 100644 --- a/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk +++ b/ports/stm32/boards/OLIMEX_E407/mpconfigboard.mk @@ -7,5 +7,5 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 diff --git a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk index 6615a44a53..ee481e344f 100644 --- a/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF2/mpconfigboard.mk @@ -15,7 +15,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1 MICROPY_BLUETOOTH_BTSTACK ?= 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk index 550094b743..cb8c44361c 100644 --- a/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF3/mpconfigboard.mk @@ -15,7 +15,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1 MICROPY_BLUETOOTH_BTSTACK ?= 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk index 9db2210559..943ddf60d3 100644 --- a/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk +++ b/ports/stm32/boards/PYBD_SF6/mpconfigboard.mk @@ -12,7 +12,7 @@ MICROPY_BLUETOOTH_NIMBLE ?= 1 MICROPY_BLUETOOTH_BTSTACK ?= 0 MICROPY_PY_LWIP = 1 MICROPY_PY_NETWORK_CYW43 = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 MICROPY_VFS_LFS2 = 1 diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk index 6457fc6046..712906747c 100644 --- a/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk +++ b/ports/stm32/boards/STM32F769DISC/mpconfigboard.mk @@ -42,7 +42,7 @@ endif # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk index 9506b67595..20acc63f16 100644 --- a/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk +++ b/ports/stm32/boards/STM32F7DISC/mpconfigboard.mk @@ -7,7 +7,7 @@ TEXT1_ADDR = 0x08020000 # MicroPython settings MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk index a30a6137d3..2d3e4cec4f 100644 --- a/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk +++ b/ports/stm32/boards/VCC_GND_F407ZG/mpconfigboard.mk @@ -6,7 +6,7 @@ TEXT0_ADDR = 0x08000000 TEXT1_ADDR = 0x08020000 MICROPY_PY_LWIP = 1 -MICROPY_PY_USSL = 1 +MICROPY_PY_SSL = 1 MICROPY_SSL_MBEDTLS = 1 FROZEN_MANIFEST = $(BOARD_DIR)/manifest.py diff --git a/ports/stm32/moduos.c b/ports/stm32/moduos.c index bfbb868e2f..43543aa55e 100644 --- a/ports/stm32/moduos.c +++ b/ports/stm32/moduos.c @@ -29,7 +29,7 @@ #include "usb.h" #include "uart.h" -#if MICROPY_PY_UOS_URANDOM +#if MICROPY_PY_OS_URANDOM // urandom(n) // Return a bytes object with n random bytes, generated by the hardware // random number generator. diff --git a/ports/stm32/mpconfigport.h b/ports/stm32/mpconfigport.h index 62784dccf1..49a8a03405 100644 --- a/ports/stm32/mpconfigport.h +++ b/ports/stm32/mpconfigport.h @@ -92,24 +92,24 @@ #endif // extended modules -#define MICROPY_PY_USSL_FINALISER (MICROPY_PY_USSL) -#define MICROPY_PY_UHASHLIB_MD5 (MICROPY_PY_USSL) -#define MICROPY_PY_UHASHLIB_SHA1 (MICROPY_PY_USSL) -#define MICROPY_PY_UCRYPTOLIB (MICROPY_PY_USSL) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/stm32/moduos.c" +#define MICROPY_PY_SSL_FINALISER (MICROPY_PY_SSL) +#define MICROPY_PY_HASHLIB_MD5 (MICROPY_PY_SSL) +#define MICROPY_PY_HASHLIB_SHA1 (MICROPY_PY_SSL) +#define MICROPY_PY_CRYPTOLIB (MICROPY_PY_SSL) +#define MICROPY_PY_OS_INCLUDEFILE "ports/stm32/moduos.c" #define MICROPY_PY_OS_DUPTERM (3) -#define MICROPY_PY_UOS_DUPTERM_BUILTIN_STREAM (1) -#define MICROPY_PY_UOS_DUPTERM_STREAM_DETACHED_ATTACHED (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_SYNC (1) -#define MICROPY_PY_UOS_UNAME (1) -#define MICROPY_PY_UOS_URANDOM (MICROPY_HW_ENABLE_RNG) -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (rng_get()) -#define MICROPY_PY_UTIME_GMTIME_LOCALTIME_MKTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/stm32/modutime.c" -#ifndef MICROPY_PY_UTIMEQ -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_OS_DUPTERM_BUILTIN_STREAM (1) +#define MICROPY_PY_OS_DUPTERM_STREAM_DETACHED_ATTACHED (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_SYNC (1) +#define MICROPY_PY_OS_UNAME (1) +#define MICROPY_PY_OS_URANDOM (MICROPY_HW_ENABLE_RNG) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rng_get()) +#define MICROPY_PY_TIME_GMTIME_LOCALTIME_MKTIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/stm32/modutime.c" +#ifndef MICROPY_PY_TIMEQ +#define MICROPY_PY_TIMEQ (1) #endif #define MICROPY_PY_LWIP_SOCK_RAW (MICROPY_PY_LWIP) #ifndef MICROPY_PY_MACHINE @@ -130,10 +130,10 @@ #endif #define MICROPY_HW_SOFTSPI_MIN_DELAY (0) #define MICROPY_HW_SOFTSPI_MAX_BAUDRATE (HAL_RCC_GetSysClockFreq() / 48) -#define MICROPY_PY_UWEBSOCKET (MICROPY_PY_LWIP) +#define MICROPY_PY_WEBSOCKET (MICROPY_PY_LWIP) #define MICROPY_PY_WEBREPL (MICROPY_PY_LWIP) -#ifndef MICROPY_PY_USOCKET -#define MICROPY_PY_USOCKET (1) +#ifndef MICROPY_PY_SOCKET +#define MICROPY_PY_SOCKET (1) #endif #ifndef MICROPY_PY_NETWORK #define MICROPY_PY_NETWORK (1) @@ -141,8 +141,8 @@ #ifndef MICROPY_PY_ONEWIRE #define MICROPY_PY_ONEWIRE (1) #endif -#ifndef MICROPY_PY_UPLATFORM -#define MICROPY_PY_UPLATFORM (1) +#ifndef MICROPY_PY_PLATFORM +#define MICROPY_PY_PLATFORM (1) #endif // fatfs configuration used in ffconf.h @@ -324,5 +324,5 @@ static inline mp_uint_t disable_irq(void) { // We need to provide a declaration/definition of alloca() #include <alloca.h> -// Needed for MICROPY_PY_URANDOM_SEED_INIT_FUNC. +// Needed for MICROPY_PY_RANDOM_SEED_INIT_FUNC. uint32_t rng_get(void); diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 0ff2e4b6e8..9ff19aab98 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -138,7 +138,7 @@ CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0 LDFLAGS += $(LIBPTHREAD) endif -ifeq ($(MICROPY_PY_USSL),1) +ifeq ($(MICROPY_PY_SSL),1) ifeq ($(MICROPY_SSL_AXTLS),1) endif diff --git a/ports/unix/README.md b/ports/unix/README.md index a3a0dba75a..a3159a3262 100644 --- a/ports/unix/README.md +++ b/ports/unix/README.md @@ -70,5 +70,5 @@ or not). If you intend to build MicroPython with additional options (like cross-compiling), the same set of options should be passed to `make deplibs`. To actually enable/disable use of dependencies, edit the `ports/unix/mpconfigport.mk` file, which has inline descriptions of the -options. For example, to build the SSL module, `MICROPY_PY_USSL` should be +options. For example, to build the SSL module, `MICROPY_PY_SSL` should be set to 1. diff --git a/ports/unix/mbedtls/mbedtls_config.h b/ports/unix/mbedtls/mbedtls_config.h index c8ffab0832..629064abcf 100644 --- a/ports/unix/mbedtls/mbedtls_config.h +++ b/ports/unix/mbedtls/mbedtls_config.h @@ -27,7 +27,7 @@ #define MICROPY_INCLUDED_MBEDTLS_CONFIG_H // Set mbedtls configuration -#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_UCRYPTOLIB_CTR +#define MBEDTLS_CIPHER_MODE_CTR // needed for MICROPY_PY_CRYPTOLIB_CTR // Enable mbedtls modules #define MBEDTLS_HAVEGE_C diff --git a/ports/unix/moduselect.c b/ports/unix/moduselect.c index 9f7f452a12..97c3602e4b 100644 --- a/ports/unix/moduselect.c +++ b/ports/unix/moduselect.c @@ -27,10 +27,10 @@ #include "py/mpconfig.h" -#if MICROPY_PY_USELECT_POSIX +#if MICROPY_PY_SELECT_POSIX -#if MICROPY_PY_USELECT -#error "Can't have both MICROPY_PY_USELECT and MICROPY_PY_USELECT_POSIX." +#if MICROPY_PY_SELECT +#error "Can't have both MICROPY_PY_SELECT and MICROPY_PY_SELECT_POSIX." #endif #include <stdio.h> @@ -353,4 +353,4 @@ const mp_obj_module_t mp_module_select = { MP_REGISTER_MODULE(MP_QSTR_select, mp_module_select); -#endif // MICROPY_PY_USELECT_POSIX +#endif // MICROPY_PY_SELECT_POSIX diff --git a/ports/unix/modusocket.c b/ports/unix/modusocket.c index d8a615b469..9854f3cbce 100644 --- a/ports/unix/modusocket.c +++ b/ports/unix/modusocket.c @@ -146,7 +146,7 @@ STATIC mp_uint_t socket_ioctl(mp_obj_t o_in, mp_uint_t request, uintptr_t arg, i case MP_STREAM_GET_FILENO: return self->fd; - #if MICROPY_PY_USELECT + #if MICROPY_PY_SELECT case MP_STREAM_POLL: { mp_uint_t ret = 0; uint8_t pollevents = 0; @@ -227,7 +227,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_bind_obj, socket_bind); STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { mp_obj_socket_t *self = MP_OBJ_TO_PTR(args[0]); - int backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + int backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = (int)mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; diff --git a/ports/unix/modutime.c b/ports/unix/modutime.c index 26c2fbdb90..b6fbae0d1c 100644 --- a/ports/unix/modutime.c +++ b/ports/unix/modutime.c @@ -200,7 +200,7 @@ STATIC mp_obj_t mod_time_mktime(mp_obj_t tuple) { } MP_DEFINE_CONST_FUN_OBJ_1(mod_time_mktime_obj, mod_time_mktime); -#define MICROPY_PY_UTIME_EXTRA_GLOBALS \ +#define MICROPY_PY_TIME_EXTRA_GLOBALS \ { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&mod_time_clock_obj) }, \ { MP_ROM_QSTR(MP_QSTR_gmtime), MP_ROM_PTR(&mod_time_gmtime_obj) }, \ { MP_ROM_QSTR(MP_QSTR_localtime), MP_ROM_PTR(&mod_time_localtime_obj) }, \ diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h index 0588e100d6..58aba9700b 100644 --- a/ports/unix/mpconfigport.h +++ b/ports/unix/mpconfigport.h @@ -160,7 +160,7 @@ typedef long mp_off_t; // Enable sys.executable. #define MICROPY_PY_SYS_EXECUTABLE (1) -#define MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128) +#define MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT (SOMAXCONN < 128 ? SOMAXCONN : 128) // Bare-metal ports don't have stderr. Printing debug to stderr may give tests // which check stdout a chance to pass, etc. @@ -181,7 +181,7 @@ void mp_unix_mark_exec(void); #endif // If enabled, configure how to seed random on init. -#ifdef MICROPY_PY_URANDOM_SEED_INIT_FUNC +#ifdef MICROPY_PY_RANDOM_SEED_INIT_FUNC #include <stddef.h> void mp_hal_get_random(size_t n, void *buf); static inline unsigned long mp_random_seed_init(void) { diff --git a/ports/unix/mpconfigport.mk b/ports/unix/mpconfigport.mk index ce6183c133..c8ade0b7e2 100644 --- a/ports/unix/mpconfigport.mk +++ b/ports/unix/mpconfigport.mk @@ -23,8 +23,8 @@ MICROPY_PY_SOCKET = 1 # ffi module requires libffi (libffi-dev Debian package) MICROPY_PY_FFI = 1 -# ussl module requires one of the TLS libraries below -MICROPY_PY_USSL = 1 +# ssl module requires one of the TLS libraries below +MICROPY_PY_SSL = 1 # axTLS has minimal size but implements only a subset of modern TLS # functionality, so may have problems with some servers. MICROPY_SSL_AXTLS = 0 diff --git a/ports/unix/variants/coverage/mpconfigvariant.h b/ports/unix/variants/coverage/mpconfigvariant.h index 2a48e57e7f..e24e0f1b14 100644 --- a/ports/unix/variants/coverage/mpconfigvariant.h +++ b/ports/unix/variants/coverage/mpconfigvariant.h @@ -41,4 +41,4 @@ #define MICROPY_DEBUG_PARSE_RULE_NAME (1) #define MICROPY_TRACKED_ALLOC (1) #define MICROPY_WARNINGS_CATEGORY (1) -#define MICROPY_PY_UCRYPTOLIB_CTR (1) +#define MICROPY_PY_CRYPTOLIB_CTR (1) diff --git a/ports/unix/variants/minimal/mpconfigvariant.h b/ports/unix/variants/minimal/mpconfigvariant.h index 6b107e7790..0dbfbb3d1c 100644 --- a/ports/unix/variants/minimal/mpconfigvariant.h +++ b/ports/unix/variants/minimal/mpconfigvariant.h @@ -63,7 +63,7 @@ // Enable just the sys and os built-in modules. #define MICROPY_PY_SYS (1) -#define MICROPY_PY_UOS (1) +#define MICROPY_PY_OS (1) // The minimum sets this to 1 to save flash. #define MICROPY_QSTR_BYTES_IN_HASH (2) diff --git a/ports/unix/variants/minimal/mpconfigvariant.mk b/ports/unix/variants/minimal/mpconfigvariant.mk index d5c2a52e9a..19b3460ed5 100644 --- a/ports/unix/variants/minimal/mpconfigvariant.mk +++ b/ports/unix/variants/minimal/mpconfigvariant.mk @@ -7,7 +7,7 @@ MICROPY_PY_FFI = 0 MICROPY_PY_SOCKET = 0 MICROPY_PY_THREAD = 0 MICROPY_PY_TERMIOS = 0 -MICROPY_PY_USSL = 0 +MICROPY_PY_SSL = 0 MICROPY_USE_READLINE = 0 MICROPY_VFS_FAT = 0 diff --git a/ports/unix/variants/mpconfigvariant_common.h b/ports/unix/variants/mpconfigvariant_common.h index 9a8a524a22..cc50d426ce 100644 --- a/ports/unix/variants/mpconfigvariant_common.h +++ b/ports/unix/variants/mpconfigvariant_common.h @@ -58,7 +58,7 @@ #endif // Seed random on import. -#define MICROPY_PY_URANDOM_SEED_INIT_FUNC (mp_random_seed_init()) +#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (mp_random_seed_init()) // Allow exception details in low-memory conditions. #define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1) @@ -87,39 +87,39 @@ #define MICROPY_PY_SYS_EXC_INFO (1) // Configure the "os" module with extra unix features. -#define MICROPY_PY_UOS_INCLUDEFILE "ports/unix/moduos.c" -#define MICROPY_PY_UOS_ERRNO (1) -#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_SYSTEM (1) -#define MICROPY_PY_UOS_URANDOM (1) +#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c" +#define MICROPY_PY_OS_ERRNO (1) +#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_SYSTEM (1) +#define MICROPY_PY_OS_URANDOM (1) // Enable the unix-specific "time" module. -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_CUSTOM_SLEEP (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/unix/modutime.c" +#define MICROPY_PY_TIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_CUSTOM_SLEEP (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c" // Enable the utimeq module used by the previous (v2) version of uasyncio. -#define MICROPY_PY_UTIMEQ (1) +#define MICROPY_PY_TIMEQ (1) -#if MICROPY_PY_USSL -#define MICROPY_PY_UHASHLIB_MD5 (1) -#define MICROPY_PY_UHASHLIB_SHA1 (1) -#define MICROPY_PY_UCRYPTOLIB (1) +#if MICROPY_PY_SSL +#define MICROPY_PY_HASHLIB_MD5 (1) +#define MICROPY_PY_HASHLIB_SHA1 (1) +#define MICROPY_PY_CRYPTOLIB (1) #endif // Use the posix implementation of the "select" module (unless the variant // specifically asks for the MicroPython version). -#ifndef MICROPY_PY_USELECT -#define MICROPY_PY_USELECT (0) +#ifndef MICROPY_PY_SELECT +#define MICROPY_PY_SELECT (0) #endif -#ifndef MICROPY_PY_USELECT_POSIX -#define MICROPY_PY_USELECT_POSIX (!MICROPY_PY_USELECT) +#ifndef MICROPY_PY_SELECT_POSIX +#define MICROPY_PY_SELECT_POSIX (!MICROPY_PY_SELECT) #endif // Enable the "websocket" module. -#define MICROPY_PY_UWEBSOCKET (1) +#define MICROPY_PY_WEBSOCKET (1) // Enable the "machine" module, mostly for machine.mem*. #define MICROPY_PY_MACHINE (1) diff --git a/ports/windows/mpconfigport.h b/ports/windows/mpconfigport.h index 5e56923d93..87e12562b1 100644 --- a/ports/windows/mpconfigport.h +++ b/ports/windows/mpconfigport.h @@ -130,29 +130,29 @@ #define MICROPY_STACKLESS_STRICT (0) #endif -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_UOS_INCLUDEFILE "ports/unix/moduos.c" -#define MICROPY_PY_UOS_ERRNO (1) -#define MICROPY_PY_UOS_GETENV_PUTENV_UNSETENV (1) -#define MICROPY_PY_UOS_SEP (1) -#define MICROPY_PY_UOS_STATVFS (0) -#define MICROPY_PY_UOS_SYSTEM (1) -#define MICROPY_PY_UOS_URANDOM (1) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_CUSTOM_SLEEP (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/unix/modutime.c" -#define MICROPY_PY_UERRNO (1) +#define MICROPY_PY_OS (1) +#define MICROPY_PY_OS_INCLUDEFILE "ports/unix/moduos.c" +#define MICROPY_PY_OS_ERRNO (1) +#define MICROPY_PY_OS_GETENV_PUTENV_UNSETENV (1) +#define MICROPY_PY_OS_SEP (1) +#define MICROPY_PY_OS_STATVFS (0) +#define MICROPY_PY_OS_SYSTEM (1) +#define MICROPY_PY_OS_URANDOM (1) +#define MICROPY_PY_TIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_CUSTOM_SLEEP (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/unix/modutime.c" +#define MICROPY_PY_ERRNO (1) #define MICROPY_PY_UCTYPES (1) -#define MICROPY_PY_UZLIB (1) -#define MICROPY_PY_UJSON (1) -#define MICROPY_PY_URE (1) -#define MICROPY_PY_UHEAPQ (1) -#define MICROPY_PY_UTIMEQ (1) -#define MICROPY_PY_UHASHLIB (1) -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_UBINASCII_CRC32 (1) -#define MICROPY_PY_URANDOM (1) +#define MICROPY_PY_ZLIB (1) +#define MICROPY_PY_JSON (1) +#define MICROPY_PY_RE (1) +#define MICROPY_PY_HEAPQ (1) +#define MICROPY_PY_TIMEQ (1) +#define MICROPY_PY_HASHLIB (1) +#define MICROPY_PY_BINASCII (1) +#define MICROPY_PY_BINASCII_CRC32 (1) +#define MICROPY_PY_RANDOM (1) #define MICROPY_PY_MACHINE (1) #define MICROPY_PY_MACHINE_PULSE (1) #define MICROPY_MACHINE_MEM_GET_READ_ADDR mod_machine_mem_get_addr diff --git a/ports/windows/variants/dev/mpconfigvariant.h b/ports/windows/variants/dev/mpconfigvariant.h index abf43a0da9..d6ce7bf36f 100644 --- a/ports/windows/variants/dev/mpconfigvariant.h +++ b/ports/windows/variants/dev/mpconfigvariant.h @@ -34,9 +34,9 @@ #define MICROPY_PY_SYS_SETTRACE (1) #define MICROPY_PERSISTENT_CODE_SAVE (1) #define MICROPY_COMP_CONST (0) -#define MICROPY_PY_URANDOM_EXTRA_FUNCS (1) +#define MICROPY_PY_RANDOM_EXTRA_FUNCS (1) #define MICROPY_PY_BUILTINS_SLICE_INDICES (1) -#define MICROPY_PY_USELECT (1) +#define MICROPY_PY_SELECT (1) #ifndef MICROPY_PY_UASYNCIO #define MICROPY_PY_UASYNCIO (1) diff --git a/ports/zephyr/modusocket.c b/ports/zephyr/modusocket.c index c3356189ab..8d4197410c 100644 --- a/ports/zephyr/modusocket.c +++ b/ports/zephyr/modusocket.c @@ -25,7 +25,7 @@ */ #include "py/mpconfig.h" -#ifdef MICROPY_PY_USOCKET +#ifdef MICROPY_PY_SOCKET #include "py/runtime.h" #include "py/stream.h" @@ -190,7 +190,7 @@ STATIC mp_obj_t socket_listen(size_t n_args, const mp_obj_t *args) { socket_obj_t *socket = args[0]; socket_check_closed(socket); - mp_int_t backlog = MICROPY_PY_USOCKET_LISTEN_BACKLOG_DEFAULT; + mp_int_t backlog = MICROPY_PY_SOCKET_LISTEN_BACKLOG_DEFAULT; if (n_args > 1) { backlog = mp_obj_get_int(args[1]); backlog = (backlog < 0) ? 0 : backlog; @@ -475,4 +475,4 @@ const mp_obj_module_t mp_module_socket = { MP_REGISTER_MODULE(MP_QSTR_socket, mp_module_socket); -#endif // MICROPY_PY_USOCKET +#endif // MICROPY_PY_SOCKET diff --git a/ports/zephyr/modzsensor.c b/ports/zephyr/modzsensor.c index e35a1716f4..5b55f0ebba 100644 --- a/ports/zephyr/modzsensor.c +++ b/ports/zephyr/modzsensor.c @@ -145,4 +145,4 @@ const mp_obj_module_t mp_module_zsensor = { MP_REGISTER_MODULE(MP_QSTR_zsensor, mp_module_zsensor); -#endif // MICROPY_PY_UHASHLIB +#endif // MICROPY_PY_HASHLIB diff --git a/ports/zephyr/mpconfigport.h b/ports/zephyr/mpconfigport.h index 30ccccb627..ec759bda77 100644 --- a/ports/zephyr/mpconfigport.h +++ b/ports/zephyr/mpconfigport.h @@ -72,8 +72,8 @@ #define MICROPY_PY_STRUCT (0) #ifdef CONFIG_NETWORKING // If we have networking, we likely want errno comfort -#define MICROPY_PY_UERRNO (1) -#define MICROPY_PY_USOCKET (1) +#define MICROPY_PY_ERRNO (1) +#define MICROPY_PY_SOCKET (1) #endif #ifdef CONFIG_BT #define MICROPY_PY_BLUETOOTH (1) @@ -82,12 +82,12 @@ #endif #define MICROPY_PY_BLUETOOTH_ENABLE_GATT_CLIENT (0) #endif -#define MICROPY_PY_UBINASCII (1) -#define MICROPY_PY_UHASHLIB (1) -#define MICROPY_PY_UOS (1) -#define MICROPY_PY_UTIME (1) -#define MICROPY_PY_UTIME_TIME_TIME_NS (1) -#define MICROPY_PY_UTIME_INCLUDEFILE "ports/zephyr/modutime.c" +#define MICROPY_PY_BINASCII (1) +#define MICROPY_PY_HASHLIB (1) +#define MICROPY_PY_OS (1) +#define MICROPY_PY_TIME (1) +#define MICROPY_PY_TIME_TIME_TIME_NS (1) +#define MICROPY_PY_TIME_INCLUDEFILE "ports/zephyr/modutime.c" #define MICROPY_PY_ZEPHYR (1) #define MICROPY_PY_ZSENSOR (1) #define MICROPY_PY_SYS_MODULES (0) diff --git a/ports/zephyr/prj.conf b/ports/zephyr/prj.conf index 90211e3657..6046690197 100644 --- a/ports/zephyr/prj.conf +++ b/ports/zephyr/prj.conf @@ -57,7 +57,7 @@ CONFIG_THREAD_ANALYZER=y CONFIG_THREAD_ANALYZER_USE_PRINTK=y CONFIG_THREAD_NAME=y -# Required for usocket.pkt_get_info() +# Required for socket.pkt_get_info() CONFIG_NET_BUF_POOL_USAGE=y # Required for zephyr.shell_exec() |