Merge pull request #10945 from dhalbert/merge-from-10.1.x

tannewt · web-flow · commit a223267b5240 · 2026-04-15T15:25:51.000-07:00
Merge from 10.1.x and update frozen libs
diff --git a/frozen/Adafruit_CircuitPython_AHTx0 b/frozen/Adafruit_CircuitPython_AHTx0
@@ -1 +1 @@
-Subproject commit 8c61ed111fc83e4e1703cf5e014e645f4dbbef32
+Subproject commit 043c7163c1d66a9d3ef2150e6140f92af973c9b1
diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960
@@ -1 +1 @@
-Subproject commit f05a7239131dc05df949e49c1bb5732529a864bf
+Subproject commit 0134a126af8430126c9a569a29958802716262fc
diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE
@@ -1 +1 @@
-Subproject commit 0058a10ba53e2d7bd6bcc84c7bf10dd30ee998dd
+Subproject commit 63c9af9a343c68ebbd013054b799d2e35a513343
diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
@@ -1 +1 @@
-Subproject commit e162713efa578b9967f7ec921b129362036571b3
+Subproject commit a636fc984dced58f5f0815c5c531a03ee092f7ad
diff --git a/frozen/Adafruit_CircuitPython_Bitmap_Font b/frozen/Adafruit_CircuitPython_Bitmap_Font
@@ -1 +1 @@
-Subproject commit 47999fac242f673812315f42d1886ea54a2c5177
+Subproject commit 2b320bb26492b84d3ddabb2cd712d8db41a8b983
diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice
@@ -1 +1 @@
-Subproject commit 69ebda79d40d0e74c01e4f1aa293f219b8c7e086
+Subproject commit d4b283c85b7b2043eb0d095638a47305a1f4ef61
diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground
@@ -1 +1 @@
-Subproject commit 65be0763beda780d3a1a8c4c49b033628bc54d28
+Subproject commit 2ee9b7ddd9d8574f1a154c67b5c849d2e44e3435
diff --git a/frozen/Adafruit_CircuitPython_ConnectionManager b/frozen/Adafruit_CircuitPython_ConnectionManager
@@ -1 +1 @@
-Subproject commit 2c85f3b98d08102d2494195074ad836fc3020610
+Subproject commit 89e59ec81bdfa7349b08ba3adf0d3cefc57af4d2
diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit
@@ -1 +1 @@
-Subproject commit 722f7937bfb0c02340dcf737ebf37cc4ecf86b83
+Subproject commit e3c372fecf7209320826009de88818d91809cff6
diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605
@@ -1 +1 @@
-Subproject commit 616d61c7495e5dadc6b77ea9fce07a3861580534
+Subproject commit 18b7397ec21235fc398625a52f995a3be31eb59a
diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231
@@ -1 +1 @@
-Subproject commit 62cc4dc49b587fad935368ed60b9ba1433250fdc
+Subproject commit 552104c8aed472c7437413e94b8954e63b4a4d4d
diff --git a/frozen/Adafruit_CircuitPython_DisplayIO_SSD1306 b/frozen/Adafruit_CircuitPython_DisplayIO_SSD1306
@@ -1 +1 @@
-Subproject commit 89463c9bd81aaf43a14fd4f3c7bdbb75d4e48b40
+Subproject commit 8c7acd451ad53f7dc3b33a704c885032a03c1064
diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes
@@ -1 +1 @@
-Subproject commit e8867231041837735ef2769a6dc793887d1979ca
+Subproject commit bf6c2addf2465625de747d2f4ea1613fcded7840
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit 3b606a735a01f0cb577447fba59e0190ba79b10e
+Subproject commit 6450c7a3dc4c16c4af4b75eda549537dffb5a73c
diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar
@@ -1 +1 @@
-Subproject commit 8d19e1b23cbe6c1d17a29f321d06b16d21909b92
+Subproject commit a12e2ce2046afc1791ca6aa2bdeb33cb97f7def0
diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI
@@ -1 +1 @@
-Subproject commit 0b24c52f472f870fcd417301521a6f7895416a4e
+Subproject commit ec1d2e66ace176c13d7128a839287601a97a6bda
diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests
@@ -1 +1 @@
-Subproject commit ff942eaae835144f7269d8206adf506c99f699f4
+Subproject commit f9f9d061a66453e0d3164ffd4e046ed3b6007669
diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch
@@ -1 +1 @@
-Subproject commit f20c13bdffa9b586c648f331851f427368a995ae
+Subproject commit e18ecd678ec3ac4fef884db18ddb2aab56bf44f9
diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID
@@ -1 +1 @@
-Subproject commit 788e46ca2cb2febddac83e0c660972598d6a8a27
+Subproject commit a147d3b5b976371601b460622209d327f51eb681
diff --git a/frozen/Adafruit_CircuitPython_HTTPServer b/frozen/Adafruit_CircuitPython_HTTPServer
@@ -1 +1 @@
-Subproject commit 1419fc5c071b7c631d9285c4efef4c4df23a079c
+Subproject commit d55c6f54aba54df9b0e0b9d83ddf7fca46eea5e4
diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote
@@ -1 +1 @@
-Subproject commit 98bd8fad8cd65f481b8808e5de8cdbf62d0dd300
+Subproject commit 646cc051881a07d8bd5c442320479c6e5e553567
diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731
@@ -1 +1 @@
-Subproject commit 1babff02ea87f5c4863aed20be0da553d76e9600
+Subproject commit c011e8e0d021a6c5870242eb721f012922002fc8
diff --git a/frozen/Adafruit_CircuitPython_ImageLoad b/frozen/Adafruit_CircuitPython_ImageLoad
@@ -1 +1 @@
-Subproject commit 67532099f7a574f08955b31efb7c1ca5cc3f143c
+Subproject commit 458bc46b63ea2bfc51529b05b62b4df3c5902e17
diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F
@@ -1 +1 @@
-Subproject commit 7fe15ca666bd3730a17e13bb29ff884092345b5f
+Subproject commit e32e39a18d23ae58fe97b3472253b6cbcbc8ebd0
diff --git a/frozen/Adafruit_CircuitPython_LED_Animation b/frozen/Adafruit_CircuitPython_LED_Animation
@@ -1 +1 @@
-Subproject commit 515553f0b6cb1290b92965f8e4e8beab9e83bcf1
+Subproject commit 7cc736df1628f767c4fc6f23287cedbf6e80f4ce
diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH
@@ -1 +1 @@
-Subproject commit 83333f8f6a5501f9cbee215ebc791cd2fb67bd7d
+Subproject commit ca871b8bc59b23acbfd779bf59d420599e8bcbb5
diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS
@@ -1 +1 @@
-Subproject commit 36247d1d9d769a23f40ca2c4371a5cd64e2a7204
+Subproject commit 9d94dc6a3350cb8766baa4a1247e36576b00f68a
diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI
@@ -1 +1 @@
-Subproject commit 2bc555485772743b70f620fe939048020924a605
+Subproject commit 5feb31fbd31f2475862e0cb55c89359cb688ad34
diff --git a/frozen/Adafruit_CircuitPython_MPU6050 b/frozen/Adafruit_CircuitPython_MPU6050
@@ -1 +1 @@
-Subproject commit bb5100733f339dcad24df7d32eeeb492023b5059
+Subproject commit d3761591ccf7629b39675dd1db45184b96a3b779
diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor
@@ -1 +1 @@
-Subproject commit 610c42f1187045fb962807ac8d895e66e2612298
+Subproject commit f55b2910b01094904461d769581221c20418a267
diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel
@@ -1 +1 @@
-Subproject commit 5b8fe0e70646d55bfa75a14cbc5136b9328be850
+Subproject commit d3eaf5c45dde45588f9a2eb2ffbe0b9025251bee
diff --git a/frozen/Adafruit_CircuitPython_OPT4048 b/frozen/Adafruit_CircuitPython_OPT4048
@@ -1 +1 @@
-Subproject commit b6a02e289e922b328fd395908b6b89f12ee137ea
+Subproject commit ddfe6b13acef7076333ee8e0ecd27bc4186512b9
diff --git a/frozen/Adafruit_CircuitPython_PCF8563 b/frozen/Adafruit_CircuitPython_PCF8563
@@ -1 +1 @@
-Subproject commit 3f40c877acbbda0ef82336c18f3620ce1b9013f5
+Subproject commit 16e3112885b0b6149b4dfa1749181424dd5da122
diff --git a/frozen/Adafruit_CircuitPython_Pixel_Framebuf b/frozen/Adafruit_CircuitPython_Pixel_Framebuf
@@ -1 +1 @@
-Subproject commit d355df47c0d5c1f80da01c86d585223988f30a33
+Subproject commit 555b30acf78ba65cec48f64b3350e19fddada4ce
diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase
@@ -1 +1 @@
-Subproject commit 067b1b80dfd42fe1b62416eef2790b7d99d46206
+Subproject commit b67904c7bca12d7ee443e16bc40d64fd67c7cb48
diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar
@@ -1 +1 @@
-Subproject commit 9fa23112cea1a8db2b9b87cf2156cc4b039440a7
+Subproject commit fab168ab38f61f654735140c67c7defdad512de8
diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69
@@ -1 +1 @@
-Subproject commit 763992bb084343ee1a7cfce72585e028ced0d890
+Subproject commit 1837cb10b353a6349c33d87c0f045c80c08003e3
diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x
@@ -1 +1 @@
-Subproject commit ad05a38fc96edcae5d0ac9d107c268dd76e4a186
+Subproject commit ad3a28df5e0cab2a24b9a6acf0667fe7c5a26563
diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register
@@ -1 +1 @@
-Subproject commit 98faa16a0dd6c63a2726b291a53fde760a0fcabb
+Subproject commit 2a7039c548456ddf7573814967ce494f61adbc46
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
@@ -1 +1 @@
-Subproject commit 1479169b59d069b15384da64645f1e2d711a4679
+Subproject commit 44186adfc6a982f26007cba2b103dd65cbb68c65
diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD
@@ -1 +1 @@
-Subproject commit dfbb9fd6ae297d6246554ea44e6c318970de98af
+Subproject commit c700b45d484a7e5054cf1856b871f3f25edb5ebb
diff --git a/frozen/Adafruit_CircuitPython_SHT4x b/frozen/Adafruit_CircuitPython_SHT4x
@@ -1 +1 @@
-Subproject commit 9da248ca944264cbc4278c1732f901f3e1229231
+Subproject commit 2b5317830e66233017e68f8b459261bc4240307d
diff --git a/frozen/Adafruit_CircuitPython_SSD1306 b/frozen/Adafruit_CircuitPython_SSD1306
@@ -1 +1 @@
-Subproject commit 2d7fd1fd8f7bb1b83d60926a28ab01ffaf67fa3b
+Subproject commit 04d8d531e8ed2df45c061c8b3c6d91abda001f13
diff --git a/frozen/Adafruit_CircuitPython_SSD1680 b/frozen/Adafruit_CircuitPython_SSD1680
@@ -1 +1 @@
-Subproject commit c22e6d097b44c6e9612ff6b866ebec569796e6f5
+Subproject commit c98b43e11eca52c9885c48e866325595f5614eb8
diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789
@@ -1 +1 @@
-Subproject commit 1060cf1753df0024a95070132045357ddd9ce559
+Subproject commit 8fb8cbf7c4cf404c1334df67a7512ccf99a00c52
diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO
@@ -1 +1 @@
-Subproject commit 054d2643744fe78fed3c4c8b371ced26c8ab2ebe
+Subproject commit b024e7276cf3796dddcced3cbe438195d310661b
diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath
@@ -1 +1 @@
-Subproject commit da27f05235713bc8e79cf3a005d11bab920e13bb
+Subproject commit 9ebbdae834ca3225bf411ba54c9e3148d8c26b6c
diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor
@@ -1 +1 @@
-Subproject commit f109e9d847b7f8ba8545a2b6be8d0c3dd6a8a280
+Subproject commit bdfeb28d741a0233c4d8789b610d116831c9c0dd
diff --git a/frozen/Adafruit_CircuitPython_Ticks b/frozen/Adafruit_CircuitPython_Ticks
@@ -1 +1 @@
-Subproject commit 83695404ab734eb60d32c9e96784b9bd90c58a1a
+Subproject commit 415f35dceaf43f6e2bbc879f7049fed5e52f3c4a
diff --git a/frozen/Adafruit_CircuitPython_UC8151D b/frozen/Adafruit_CircuitPython_UC8151D
@@ -1 +1 @@
-Subproject commit b9bd61a0bbef1f4705abb831739d4888f1dcec95
+Subproject commit ec3fd72eb4219520c2ad5dd33e2e865a7e4b9d6a
diff --git a/frozen/Adafruit_CircuitPython_Wave b/frozen/Adafruit_CircuitPython_Wave
@@ -1 +1 @@
-Subproject commit d302cd78d29ef821faa1c18482a0b20fdca1d4ee
+Subproject commit 10f7ed33cbf75b0f42ffe9aae721f57583a33ce6
diff --git a/frozen/Adafruit_CircuitPython_Wiznet5k b/frozen/Adafruit_CircuitPython_Wiznet5k
@@ -1 +1 @@
-Subproject commit fa2e95d61fb5a90b8bd59234b56d1acbfe9fd995
+Subproject commit 1e786b93a5a1dede2fa6f44634336f666d153f6a
diff --git a/frozen/Adafruit_CircuitPython_asyncio b/frozen/Adafruit_CircuitPython_asyncio
@@ -1 +1 @@
-Subproject commit 1f9fee3c5d99d60b069c4a366678b391c198d955
+Subproject commit d0d63f113c7da0852bdc5aa303cd738e45d40fbc
diff --git a/frozen/Adafruit_CircuitPython_framebuf b/frozen/Adafruit_CircuitPython_framebuf
@@ -1 +1 @@
-Subproject commit 8a94ddb7257bebfb856fe476d9b851dfa63ce443
+Subproject commit 3d2036d2926f7d04a00908845dd14cb18e3d8b90
diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw
@@ -1 +1 @@
-Subproject commit 50628104824849fbdac093c8f18367623edff1c4
+Subproject commit daab794981f177041fe1a4a9266a9688c45480e9
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32s3_4mbflash_2mbpsram/mpconfigboard.h
@@ -25,3 +25,6 @@
 #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO5, .rx = &pin_GPIO16}}
 
 #define DOUBLE_TAP_PIN (&pin_GPIO10)
+
+// Reduce wifi.radio.tx_power due to the antenna design of this board
+#define CIRCUITPY_WIFI_DEFAULT_TX_POWER   (15)
diff --git a/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h b/ports/espressif/boards/adafruit_qtpy_esp32s3_nopsram/mpconfigboard.h
@@ -25,3 +25,6 @@
 #define CIRCUITPY_BOARD_UART_PIN    {{.tx = &pin_GPIO5, .rx = &pin_GPIO16}}
 
 #define DOUBLE_TAP_PIN (&pin_GPIO10)
+
+// Reduce wifi.radio.tx_power due to the antenna design of this board
+#define CIRCUITPY_WIFI_DEFAULT_TX_POWER   (15)
diff --git a/ports/stm/common-hal/busio/SPI.c b/ports/stm/common-hal/busio/SPI.c
@@ -136,12 +136,13 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
     const mcu_pin_obj_t *sck, const mcu_pin_obj_t *mosi,
     const mcu_pin_obj_t *miso, bool half_duplex) {
 
+    // Ensure the object starts in its deinit state before check_pins sets
+    // self->sck, self->mosi, and self->miso.
+    common_hal_busio_spi_mark_deinit(self);
+
     int periph_index = check_pins(self, sck, mosi, miso);
     SPI_TypeDef *SPIx = mcu_spi_banks[periph_index - 1];
 
-    // Ensure the object starts in its deinit state.
-    common_hal_busio_spi_mark_deinit(self);
-
     // Start GPIO for each pin
     GPIO_InitTypeDef GPIO_InitStruct = {0};
     GPIO_InitStruct.Pin = pin_mask(sck->number);
