summaryrefslogtreecommitdiffstatshomepage
path: root/ports/esp32
diff options
context:
space:
mode:
Diffstat (limited to 'ports/esp32')
-rw-r--r--ports/esp32/main.c2
-rw-r--r--ports/esp32/modsocket.c14
-rw-r--r--ports/esp32/moduos.c2
-rw-r--r--ports/esp32/mpconfigport.h46
-rw-r--r--ports/esp32/mphalport.c2
5 files changed, 33 insertions, 33 deletions
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;
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 12:05:19 +0000