Merge pull request #9100 from dhalbert/9.0.x-to-main-2024-03-27

Merge 9.0.x changes to main

Author: dhalbert

ports/espressif/boards/adafruit_itsybitsy_esp32/pins.c

@@ -31,8 +31,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_GPIO13) },
     { MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
 
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO17) },
-    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO16) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_GPIO0) },
+    { MP_ROM_QSTR(MP_QSTR_NEOPIXEL_POWER), MP_ROM_PTR(&pin_GPIO2) },
     { MP_ROM_QSTR(MP_QSTR_BUTTON), MP_ROM_PTR(&pin_GPIO35) },
 
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },

ports/raspberrypi/common-hal/socketpool/Socket.c

@@ -1184,15 +1184,35 @@ void common_hal_socketpool_socket_settimeout(socketpool_socket_obj_t *self, uint
 }
 
 int common_hal_socketpool_socket_setsockopt(socketpool_socket_obj_t *self, int level, int optname, const void *value, size_t optlen) {
-    if (level == SOCKETPOOL_IPPROTO_TCP && optname == SOCKETPOOL_TCP_NODELAY) {
-        int one = 1;
-        bool enable = optlen == sizeof(&one) && memcmp(value, &one, optlen);
-        if (enable) {
-            tcp_set_flags(self->pcb.tcp, TF_NODELAY);
-        } else {
-            tcp_clear_flags(self->pcb.tcp, TF_NODELAY);
-        }
-        return 0;
+    int zero = 0;
+    bool enable = optlen == sizeof(&zero) && memcmp(value, &zero, optlen);
+
+    switch (level) {
+        case SOCKETPOOL_IPPROTO_TCP:
+            switch (optname) {
+                case SOCKETPOOL_TCP_NODELAY:
+                    if (enable) {
+                        tcp_set_flags(self->pcb.tcp, TF_NODELAY);
+                    } else {
+                        tcp_clear_flags(self->pcb.tcp, TF_NODELAY);
+                    }
+                    return 0;
+                    break;
+            }
+            break;
+
+        case SOCKETPOOL_SOL_SOCKET:
+            switch (optname) {
+                case SOCKETPOOL_SO_REUSEADDR:
+                    if (enable) {
+                        ip_set_option(self->pcb.ip, SOF_REUSEADDR);
+                    } else {
+                        ip_reset_option(self->pcb.ip, SOF_REUSEADDR);
+                    }
+                    return 0;
+                    break;
+            }
+            break;
     }
     return -MP_EOPNOTSUPP;
 }

py/circuitpy_mpconfig.h

@@ -38,6 +38,12 @@
 // Always 1: defined in circuitpy_mpconfig.mk
 // #define CIRCUITPY (1)
 
+// Can be removed once CircuitPython 10 is released.
+// Print warnings or not about deprecated names. See objmodule.c.
+#ifndef CIRCUITPY_8_9_WARNINGS
+#define CIRCUITPY_8_9_WARNINGS (0)
+#endif
+
 // REPR_C encodes qstrs, 31-bit ints, and 30-bit floats in a single 32-bit word.
 #ifndef MICROPY_OBJ_REPR
 #define MICROPY_OBJ_REPR            (MICROPY_OBJ_REPR_C)

py/objmodule.c

@@ -66,7 +66,7 @@ STATIC void module_attr_try_delegation(mp_obj_t self_in, qstr attr, mp_obj_t *de
 STATIC void module_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
     mp_obj_module_t *self = MP_OBJ_TO_PTR(self_in);
     if (dest[0] == MP_OBJ_NULL) {
-        #if CIRCUITPY_DISPLAYIO && CIRCUITPY_WARNINGS
+        #if CIRCUITPY_8_9_WARNINGS && CIRCUITPY_DISPLAYIO && CIRCUITPY_WARNINGS
         if (self == &displayio_module) {
             #if CIRCUITPY_BUSDISPLAY
             if (attr == MP_QSTR_Display) {

shared-bindings/busdisplay/BusDisplay.c

@@ -104,7 +104,7 @@
 //|                            b"\x11\x80\x78"# Exit Sleep then delay 0x78 (120ms)
 //|                            b"\x29\x81\xaa\x78"# Display on then delay 0x78 (120ms)
 //|                           )
-//|            display = displayio.Display(display_bus, init_sequence, width=320, height=240)
+//|            display = busdisplay.BusDisplay(display_bus, init_sequence, width=320, height=240)
 //|
 //|         The first command is 0xe1 with 15 (0xf) parameters following. The second is 0x11 with 0
 //|         parameters and a 120ms (0x78) delay. The third command is 0x29 with one parameter 0xaa and a