micropython · xuancong84 · Sep 22, 2023 · Oct 1, 2023 · Oct 4, 2023 · Oct 5, 2023
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ user.props
 
 # MacOS desktop metadata files
 .DS_Store
+ports/esp8266/modules/*.py
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
@@ -536,6 +536,10 @@ static mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
     } else {
         mask |= ELLIPSE_MASK_ALL;
     }
+    if (args[2] == 0 && args[3] == 0) {
+        setpixel_checked(self, args[0], args[1], args[4], mask & ELLIPSE_MASK_ALL);
+        return mp_const_none;
+    }
     mp_int_t two_asquare = 2 * args[2] * args[2];
     mp_int_t two_bsquare = 2 * args[3] * args[3];
     mp_int_t x = args[2];

diff --git a/extmod/modlwip.c b/extmod/modlwip.c
@@ -1432,7 +1432,7 @@ static mp_obj_t lwip_socket_setsockopt(size_t n_args, const mp_obj_t *args) {
         case IP_DROP_MEMBERSHIP: {
             mp_buffer_info_t bufinfo;
             mp_get_buffer_raise(args[3], &bufinfo, MP_BUFFER_READ);
-            if (bufinfo.len != sizeof(ip_addr_t) * 2) {
+            if (bufinfo.len != sizeof(MP_IGMP_IP_ADDR_TYPE) * 2) {
                 mp_raise_ValueError(NULL);
             }
 

diff --git a/extmod/modmachine.c b/extmod/modmachine.c
@@ -124,16 +124,15 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_deepsleep_obj, 0, 1, machine_deepsle
 #endif
 
 #if MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ
-
 static mp_obj_t machine_disable_irq(void) {
     uint32_t state = MICROPY_BEGIN_ATOMIC_SECTION();
     return mp_obj_new_int(state);
 }
 static MP_DEFINE_CONST_FUN_OBJ_0(machine_disable_irq_obj, machine_disable_irq);
 
 static mp_obj_t machine_enable_irq(mp_obj_t state_in) {
-    uint32_t state = mp_obj_get_int(state_in);
-    MICROPY_END_ATOMIC_SECTION(state);
+    uint32_t irq_state = mp_obj_get_int(state_in);
+    MICROPY_END_ATOMIC_SECTION(irq_state);
     return mp_const_none;
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(machine_enable_irq_obj, machine_enable_irq);

diff --git a/extmod/network_cyw43.c b/extmod/network_cyw43.c
@@ -60,6 +60,10 @@ typedef struct _network_cyw43_obj_t {
 static const network_cyw43_obj_t network_cyw43_wl_sta = { { &mp_network_cyw43_type }, &cyw43_state, CYW43_ITF_STA };
 static const network_cyw43_obj_t network_cyw43_wl_ap = { { &mp_network_cyw43_type }, &cyw43_state, CYW43_ITF_AP };
 
+// Avoid race conditions with callbacks by tracking the last up or down request
+// we have made for each interface.
+static bool if_active[2];
+
 static void network_cyw43_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     struct netif *netif = &self->cyw->netif[self->itf];
@@ -122,6 +126,10 @@ static MP_DEFINE_CONST_FUN_OBJ_3(network_cyw43_ioctl_obj, network_cyw43_ioctl);
 /*******************************************************************************/
 // network API
 
+static uint32_t get_country_code(void) {
+    return CYW43_COUNTRY(mod_network_country_code[0], mod_network_country_code[1], 0);
+}
+
 static mp_obj_t network_cyw43_deinit(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
     cyw43_deinit(self->cyw);
@@ -132,10 +140,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_deinit_obj, network_cyw43_deinit)
 static mp_obj_t network_cyw43_active(size_t n_args, const mp_obj_t *args) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(args[0]);
     if (n_args == 1) {
-        return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf));
+        return mp_obj_new_bool(if_active[self->itf]);
     } else {
-        uint32_t country = CYW43_COUNTRY(mod_network_country_code[0], mod_network_country_code[1], 0);
-        cyw43_wifi_set_up(self->cyw, self->itf, mp_obj_is_true(args[1]), country);
+        bool value = mp_obj_is_true(args[1]);
+        cyw43_wifi_set_up(self->cyw, self->itf, value, get_country_code());
+        if_active[self->itf] = value;
         return mp_const_none;
     }
 }
@@ -311,7 +320,17 @@ static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_disconnect_obj, network_cyw43_dis
 
 static mp_obj_t network_cyw43_isconnected(mp_obj_t self_in) {
     network_cyw43_obj_t *self = MP_OBJ_TO_PTR(self_in);
-    return mp_obj_new_bool(cyw43_tcpip_link_status(self->cyw, self->itf) == 3);
+    bool result = (cyw43_tcpip_link_status(self->cyw, self->itf) == CYW43_LINK_UP);
+
+    if (result && self->itf == CYW43_ITF_AP) {
+        // For AP we need to not only know if the link is up, but also if any stations
+        // have associated.
+        uint8_t mac_buf[6];
+        int num_stas = 1;
+        cyw43_wifi_ap_get_stas(self->cyw, &num_stas, mac_buf);
+        result = num_stas > 0;
+    }
+    return mp_obj_new_bool(result);
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(network_cyw43_isconnected_obj, network_cyw43_isconnected);
 
@@ -351,13 +370,15 @@ static mp_obj_t network_cyw43_status(size_t n_args, const mp_obj_t *args) {
             if (self->itf != CYW43_ITF_AP) {
                 mp_raise_ValueError(MP_ERROR_TEXT("AP required"));
             }
-            int num_stas;
-            uint8_t macs[32 * 6];
+            static const unsigned mac_len = 6;
+            static const unsigned max_stas = 32;
+            int num_stas = max_stas;
+            uint8_t macs[max_stas * mac_len];
             cyw43_wifi_ap_get_stas(self->cyw, &num_stas, macs);
             mp_obj_t list = mp_obj_new_list(num_stas, NULL);
             for (int i = 0; i < num_stas; ++i) {
                 mp_obj_t tuple[1] = {
-                    mp_obj_new_bytes(&macs[i * 6], 6),
+                    mp_obj_new_bytes(&macs[i * mac_len], mac_len),
                 };
                 ((mp_obj_list_t *)MP_OBJ_TO_PTR(list))->items[i] = mp_obj_new_tuple(1, tuple);
             }
@@ -445,6 +466,10 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
             mp_raise_TypeError(MP_ERROR_TEXT("can't specify pos and kw args"));
         }
 
+        // A number of these options only update buffers in memory, and
+        // won't do anything until the interface is cycled down and back up
+        bool cycle_active = false;
+
         for (size_t i = 0; i < kwargs->alloc; ++i) {
             if (MP_MAP_SLOT_IS_FILLED(kwargs, i)) {
                 mp_map_elem_t *e = &kwargs->table[i];
@@ -457,13 +482,15 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                     }
                     case MP_QSTR_channel: {
                         cyw43_wifi_ap_set_channel(self->cyw, mp_obj_get_int(e->value));
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_ssid:
                     case MP_QSTR_essid: {
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);
                         cyw43_wifi_ap_set_ssid(self->cyw, len, (const uint8_t *)str);
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_monitor: {
@@ -483,13 +510,15 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
                     }
                     case MP_QSTR_security: {
                         cyw43_wifi_ap_set_auth(self->cyw, mp_obj_get_int(e->value));
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_key:
                     case MP_QSTR_password: {
                         size_t len;
                         const char *str = mp_obj_str_get_data(e->value, &len);
                         cyw43_wifi_ap_set_password(self->cyw, len, (const uint8_t *)str);
+                        cycle_active = true;
                         break;
                     }
                     case MP_QSTR_pm: {
@@ -519,6 +548,13 @@ static mp_obj_t network_cyw43_config(size_t n_args, const mp_obj_t *args, mp_map
             }
         }
 
+        // If the interface is already active, cycle it down and up
+        if (cycle_active && if_active[self->itf]) {
+            uint32_t country = get_country_code();
+            cyw43_wifi_set_up(self->cyw, self->itf, false, country);
+            cyw43_wifi_set_up(self->cyw, self->itf, true, country);
+        }
+
         return mp_const_none;
     }
 }

diff --git a/extmod/vfs_blockdev.c b/extmod/vfs_blockdev.c
@@ -58,6 +58,13 @@ static int mp_vfs_blockdev_call_rw(mp_obj_t *args, size_t block_num, size_t bloc
     if (ret == mp_const_none) {
         return 0;
     } else {
+        // Some block devices return a bool indicating success, so
+        // convert those to an errno integer code.
+        if (ret == mp_const_true) {
+            return 0;
+        } else if (ret == mp_const_false) {
+            return -MP_EIO;
+        }
         // Block device functions are expected to return 0 on success
         // and negative integer on errors. Check for positive integer
         // results as some callers (i.e. littlefs) will produce corrupt

diff --git a/extmod/vfs_reader.c b/extmod/vfs_reader.c
@@ -105,6 +105,7 @@ void mp_reader_new_file(mp_reader_t *reader, qstr filename) {
     reader->data = rf;
     reader->readbyte = mp_reader_vfs_readbyte;
     reader->close = mp_reader_vfs_close;
+    reader->readbytes = NULL;
 }
 
 #endif // MICROPY_READER_VFS
diff --git a/lib/arduino-lib b/lib/arduino-lib
diff --git a/lib/cyw43-driver b/lib/cyw43-driver
diff --git a/lib/libmetal b/lib/libmetal
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,4 @@ user.props

		# MacOS desktop metadata files
		.DS_Store
		ports/esp8266/modules/*.py
+2 −2		.github/workflows/python-linter.yml
+1 −1		lib/msgpackrpc/md5sum.py
+0 −91		lib/opta/example.py
+0 −6		lib/opta/manifest.py
+0 −444		lib/opta/opta.py
+0 −40		lib/se05x/examples/sign_verify.py
+0 −94		lib/se05x/examples/write_read_verify.py
+0 −6		lib/se05x/manifest.py
+0 −22		lib/se05x/se05x/__init__.py
+0 −389		lib/se05x/se05x/iso7816.py
+0 −253		lib/se05x/se05x/se05x.py
+3 −3		src/cyw43.h
+0 −5		src/cyw43_config.h
+1 −5		src/cyw43_ctrl.c
+83 −66		src/cyw43_ll.c
+5 −7		src/cyw43_lwip.c
+1 −1		tests/debug_print/Makefile
+2 −6		tests/debug_print/cyw43_configport.h
+4 −0		tests/debug_print/main.c
+2 −31		tests/debug_print/test.exp
+1 −56		tests/mock_sdio.c
+1 −4		tests/sdio/Makefile
+2 −6		tests/sdio/cyw43_configport.h
+4 −0		tests/sdio/main.c
+1 −26		tests/sdio/test.exp
+2 −2		.github/actions/build_ci/Dockerfile
+37 −27		.github/actions/build_ci/entrypoint.sh
+1 −1		README.md
+1 −1		VERSION
+1 −1		cmake/syscheck.cmake
+5 −1		lib/atomic.h
+1 −1		lib/compiler.h
+93 −0		lib/compiler/armcc/errno.h
+2 −0		lib/config.h
+6 −0		lib/cpu.h
+17 −21		lib/device.h
+1 −1		lib/errno.h
+18 −0		lib/list.h
+9 −9		lib/log.h
+13 −1		lib/processor/CMakeLists.txt
+0 −3		lib/processor/aarch64/CMakeLists.txt
+0 −15		lib/processor/aarch64/atomic.h
+0 −3		lib/processor/arm/CMakeLists.txt
+0 −15		lib/processor/arm/atomic.h
+0 −17		lib/processor/arm/cpu.h
+0 −2		lib/processor/ceva/CMakeLists.txt
+0 −2		lib/processor/csky/CMakeLists.txt
+0 −17		lib/processor/csky/cpu.h
+15 −0		lib/processor/generic/atomic.h
+17 −0		lib/processor/generic/cpu.h
+22 −0		lib/processor/hosted/cpu.h
+0 −3		lib/processor/microblaze/CMakeLists.txt
+0 −15		lib/processor/microblaze/atomic.h
+0 −20		lib/processor/microblaze/cpu.h
+0 −2		lib/processor/riscv/CMakeLists.txt
+0 −17		lib/processor/riscv/cpu.h
+0 −3		lib/processor/x86/CMakeLists.txt
+0 −16		lib/processor/x86/atomic.h
+0 −3		lib/processor/x86_64/CMakeLists.txt
+0 −16		lib/processor/x86_64/atomic.h
+0 −2		lib/processor/xtensa/CMakeLists.txt
+0 −15		lib/processor/xtensa/atomic.h
+3 −3		lib/shmem.h
+1 −2		lib/softirq.c
+4 −4		lib/sys.h
+2 −2		lib/system/freertos/cache.h
+54 −1		lib/system/freertos/xlnx/sys.c
+2 −2		lib/system/generic/cache.h
+5 −1		lib/system/generic/xlnx/CMakeLists.txt
+54 −1		lib/system/generic/xlnx/sys.c
+5 −0		lib/system/generic/xlnx/sys.h
+25 −0		lib/system/generic/xlnx/sys_devicetree.h
+17 −17		lib/system/linux/sys.h
+23 −2		lib/system/nuttx/io.c
+2 −2		lib/system/zephyr/alloc.c
+2 −2		lib/system/zephyr/alloc.h
+2 −2		lib/system/zephyr/sys.c
+6 −0		lib/system/zephyr/sys.h
+2 −2		lib/utilities.h
+4 −4		lib/version.h
+2 −1		test/metal-test.h