Merge remote-tracking branch 'origin/main'

2022-02-18 02:19:40 +01:00 · 2022-02-18 02:19:40 +01:00 · 6e7eb78a10
parent 8ea0301b14 60ceb6e367
commit 6e7eb78a10
40 changed files with 82 additions and 32 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -277,3 +277,9 @@
 [submodule "ports/stm/st_driver/stm32f4xx_hal_driver"]
 	path = ports/stm/st_driver/stm32f4xx_hal_driver
 	url = https://github.com/adafruit/stm32f4xx_hal_driver.git
+[submodule "frozen/Adafruit_CircuitPython_PortalBase"]
+	path = frozen/Adafruit_CircuitPython_PortalBase
+	url = https://github.com/adafruit/Adafruit_CircuitPython_PortalBase.git
+[submodule "frozen/Adafruit_CircuitPython_FakeRequests"]
+	path = frozen/Adafruit_CircuitPython_FakeRequests
+	url = https://github.com/adafruit/Adafruit_CircuitPython_FakeRequests.git
--- a/frozen/Adafruit_CircuitPython_APDS9960
+++ b/frozen/Adafruit_CircuitPython_APDS9960
@ -1 +1 @@
-Subproject commit c55da0dee66302d2fa8ed31623d047c307f409b2
+Subproject commit baab505fd4dcc54d8e9d45e6463c68bdc6d100eb
--- a/frozen/Adafruit_CircuitPython_BLE
+++ b/frozen/Adafruit_CircuitPython_BLE
@ -1 +1 @@
-Subproject commit a695cde1b1cc957bcd10875b12ae82d1deeb0157
+Subproject commit beec03065712cd62f79e839d5cf8f7c9847fc3b1
--- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
+++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center
@ -1 +1 @@
-Subproject commit c24a5310bc259cd9d93b1f42468e07f41d4b0e56
+Subproject commit 859a7d403e4e79ec1c8915c81ba581dbaab8a4ac
--- a/frozen/Adafruit_CircuitPython_BusDevice
+++ b/frozen/Adafruit_CircuitPython_BusDevice
@ -1 +1 @@
-Subproject commit 169715b3444c614e55827ccf79b35b2b5e11f1d2
+Subproject commit 43b2b5261845839bb31cf2507755b1f1efa73a48
--- a/frozen/Adafruit_CircuitPython_CircuitPlayground
+++ b/frozen/Adafruit_CircuitPython_CircuitPlayground
@ -1 +1 @@
-Subproject commit 2017afdfb43d3d9c5a73f8e85e951a583b18206a
+Subproject commit b04042addd47c2645e139032b02a3b9ddeeb3425
--- a/frozen/Adafruit_CircuitPython_Crickit
+++ b/frozen/Adafruit_CircuitPython_Crickit
@ -1 +1 @@
-Subproject commit 8d09b29a1a92499dbbd10dd832f27db71057af5f
+Subproject commit 938f6bb335ba5e4c56a8062c591ff9f3c18c4297
--- a/frozen/Adafruit_CircuitPython_DRV2605
+++ b/frozen/Adafruit_CircuitPython_DRV2605
@ -1 +1 @@
-Subproject commit 8a6ab89b7d19f45a20b3f794cf900e23c9a8453b
+Subproject commit 8e7e111a9ff39d3f4311caa7babeb451422c759f
--- a/frozen/Adafruit_CircuitPython_DS3231
+++ b/frozen/Adafruit_CircuitPython_DS3231
@ -1 +1 @@
-Subproject commit 4fc5a32763c4a6eac3a9446e296a9e925cc29a5c
+Subproject commit df2449815433e05ea0f89c19518ccde7a10a2faa
--- a/frozen/Adafruit_CircuitPython_Display_Shapes
+++ b/frozen/Adafruit_CircuitPython_Display_Shapes
@ -1 +1 @@
-Subproject commit 993bd12e1747ec117e8d104a5e9f4659c8a347a3
+Subproject commit 708bb0c82c7b075bd6912c97231aea880b1a1cb8
--- a/frozen/Adafruit_CircuitPython_Display_Text
+++ b/frozen/Adafruit_CircuitPython_Display_Text
@ -1 +1 @@
-Subproject commit 0ec87891f9a28ee3c5ae3b020b60d361684f466d
+Subproject commit 0bd04a235556979bd13a373821a6602445fe132b
--- a/frozen/Adafruit_CircuitPython_DotStar
+++ b/frozen/Adafruit_CircuitPython_DotStar
@ -1 +1 @@
-Subproject commit e07090117766d4a9ea2de07cd6f5418990cc598b
+Subproject commit eb6124fdff59b98d7d49dd86072df99c0e97167b
--- a/frozen/Adafruit_CircuitPython_ESP32SPI
+++ b/frozen/Adafruit_CircuitPython_ESP32SPI
@ -1 +1 @@
-Subproject commit de4829a027a45882ae5477e50a75985e0e59f759
+Subproject commit 13775b058422085762874fde8e587f2e9f066855
--- a/frozen/Adafruit_CircuitPython_FakeRequests
+++ b/frozen/Adafruit_CircuitPython_FakeRequests
@ -0,0 +1 @@
+Subproject commit f6cdec74b64112016c459abe4a5d31a3b34caeb3
--- a/frozen/Adafruit_CircuitPython_FocalTouch
+++ b/frozen/Adafruit_CircuitPython_FocalTouch
@ -1 +1 @@
-Subproject commit 68744ede79c992a3df8322c21a1468c5ccaef2ee
+Subproject commit bccbe3da75f42b540b3faebb9d5a2d1ccf5e7147
--- a/frozen/Adafruit_CircuitPython_HID
+++ b/frozen/Adafruit_CircuitPython_HID
@ -1 +1 @@
-Subproject commit d79dd180cf6062e97d6a12cbc8dc7fdbedcc752b
+Subproject commit 2fddabcaf0df1763111ed9dbf9e2d4cdb5b0434e
--- a/frozen/Adafruit_CircuitPython_IRRemote
+++ b/frozen/Adafruit_CircuitPython_IRRemote
@ -1 +1 @@
-Subproject commit 2ca37f927b3ee3aad379c2991f36b3ef1be0203d
+Subproject commit 9d78269db987df8657baea554c725a6b6be3f62c
--- a/frozen/Adafruit_CircuitPython_LC709203F
+++ b/frozen/Adafruit_CircuitPython_LC709203F
@ -1 +1 @@
-Subproject commit 8fc5eaecb3e24e4109bcc788f41461f1c45c3719
+Subproject commit 29816fbe98c012ea0a1b5cae7f07aeae7ebf8b52
--- a/frozen/Adafruit_CircuitPython_LIS3DH
+++ b/frozen/Adafruit_CircuitPython_LIS3DH
@ -1 +1 @@
-Subproject commit ebbe69667d53ae76bc6d82e5296f87520ffbb5ae
+Subproject commit acc4bdd73fdceb74d75cd5a1f261ae157ee32613
--- a/frozen/Adafruit_CircuitPython_LSM6DS
+++ b/frozen/Adafruit_CircuitPython_LSM6DS
@ -1 +1 @@
-Subproject commit f94ef67425516f23c889d217ffe5a3a710c1d278
+Subproject commit 75e9ec62e4fe47a7212a69fb84aa1cfa7848e2b3
--- a/frozen/Adafruit_CircuitPython_MIDI
+++ b/frozen/Adafruit_CircuitPython_MIDI
@ -1 +1 @@
-Subproject commit 1127e3f7bcefa9fddb5b7f30533ecc6c58b420ea
+Subproject commit 6641509ef43b672a82addf41f02b6466d6c67f01
--- a/frozen/Adafruit_CircuitPython_Motor
+++ b/frozen/Adafruit_CircuitPython_Motor
@ -1 +1 @@
-Subproject commit 9995c45a5ed1d455a4a8b7bfb9eb134de7f2b9db
+Subproject commit fd478fda7adbd254282b8cad5000f06a96760c91
--- a/frozen/Adafruit_CircuitPython_NeoPixel
+++ b/frozen/Adafruit_CircuitPython_NeoPixel
@ -1 +1 @@
-Subproject commit 9ca3bf00c6a2dd1de2d315a3b952a381d720aa7d
+Subproject commit a115fc30df1c230c09c8a533ca77f3a4afd9f6c3
--- a/frozen/Adafruit_CircuitPython_PortalBase
+++ b/frozen/Adafruit_CircuitPython_PortalBase
@ -0,0 +1 @@
+Subproject commit 77ba8eedf89b96c85a6194e5da2061c9d5c20242
--- a/frozen/Adafruit_CircuitPython_ProgressBar
+++ b/frozen/Adafruit_CircuitPython_ProgressBar
@ -1 +1 @@
-Subproject commit 4ac43288938abb4c3db127eeb79ef0d4ea4c16ea
+Subproject commit 011acd627fc24342c397fc640b204a798f7b69dd
--- a/frozen/Adafruit_CircuitPython_RFM69
+++ b/frozen/Adafruit_CircuitPython_RFM69
@ -1 +1 @@
-Subproject commit 9ac490905834466319279a3390c914f1fd83733f
+Subproject commit c58defd70947531c5a9c37ddcb569f240567a78b
--- a/frozen/Adafruit_CircuitPython_RFM9x
+++ b/frozen/Adafruit_CircuitPython_RFM9x
@ -1 +1 @@
-Subproject commit 0df4521b4a04ca1236960ff889ede118ec4305b5
+Subproject commit 742ac7c8fb52bb85d9fd367b60a7f80475d7ed14
--- a/frozen/Adafruit_CircuitPython_Register
+++ b/frozen/Adafruit_CircuitPython_Register
@ -1 +1 @@
-Subproject commit 79678c6adb2252de8fed6273604bc6ac676132a5
+Subproject commit 49ab415d6b601c99979262f9e91c21dcb3a927a7
--- a/frozen/Adafruit_CircuitPython_Requests
+++ b/frozen/Adafruit_CircuitPython_Requests
@ -1 +1 @@
-Subproject commit 900b28cbae008e3253c4c40496e49faea9fb7034
+Subproject commit 270565665ada26fe8d7a99a3cb5941b452444471
--- a/frozen/Adafruit_CircuitPython_SD
+++ b/frozen/Adafruit_CircuitPython_SD
@ -1 +1 @@
-Subproject commit b7a76420d1dec119f8744aa7c0ea500e235561d1
+Subproject commit 9dd51fecfcbb15cb2a00eeadbd66b36ce0c09ee2
--- a/frozen/Adafruit_CircuitPython_ST7789
+++ b/frozen/Adafruit_CircuitPython_ST7789
@ -1 +1 @@
-Subproject commit c5b480434de8fa56d8ba978a57cd3919fdc9da2a
+Subproject commit 79c70a49285be8b6548de3f5ca20aa5ac1fafa22
--- a/frozen/Adafruit_CircuitPython_SimpleIO
+++ b/frozen/Adafruit_CircuitPython_SimpleIO
@ -1 +1 @@
-Subproject commit ca56187fe7af315130808191b004432fdfdc1b09
+Subproject commit 272d225365eed46916390cf1f393dd08bc00b7d4
--- a/frozen/Adafruit_CircuitPython_SimpleMath
+++ b/frozen/Adafruit_CircuitPython_SimpleMath
@ -1 +1 @@
-Subproject commit 755784b6acc8ba419a085bee2d2dc4374f0d0030
+Subproject commit fad0f89e760829a76f553ef8459f61001597a846
--- a/frozen/Adafruit_CircuitPython_Thermistor
+++ b/frozen/Adafruit_CircuitPython_Thermistor
@ -1 +1 @@
-Subproject commit d4ac6ce3eea2c87781fa2df4e431d9440c610fad
+Subproject commit e86f258e43591ce4a04661277e77e9fdf6fec27e
--- a/frozen/Adafruit_CircuitPython_seesaw
+++ b/frozen/Adafruit_CircuitPython_seesaw
@ -1 +1 @@
-Subproject commit f06ac21e96321724258e00f7596d874eff53f0b8
+Subproject commit c89c8689161e5b35bfe4fa8355615696e03f0648
--- a/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/matrixportal_m4/mpconfigboard.mk
@ -9,3 +9,14 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+
+CIRCUITPY_SHARPDISPLAY=0
+CIRCUITPY_SDCARDIO=0
+CIRCUITPY_BLEIO_HCI=0
+CIRCUITPY_BLEIO=0
--- a/ports/atmel-samd/boards/pyportal/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pyportal/mpconfigboard.mk
@ -9,3 +9,11 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C"
 LONGINT_IMPL = MPZ
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
--- a/ports/atmel-samd/boards/pyportal_titano/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pyportal_titano/mpconfigboard.mk
@ -9,3 +9,11 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, GD25Q64C"
 LONGINT_IMPL = MPZ
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
--- a/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_funhouse/mpconfigboard.mk
@ -17,3 +17,10 @@ CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB

 CIRCUITPY_MODULE=wrover
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
--- a/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
+++ b/ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.mk
@ -17,3 +17,11 @@ CIRCUITPY_ESP_FLASH_FREQ=40m
 CIRCUITPY_ESP_FLASH_SIZE=4MB

 CIRCUITPY_MODULE=wrover
+
+# Include these Python libraries in firmware.
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_PortalBase
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_FakeRequests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
				`@ -0,0 +1 @@`
				`Subproject commit f6cdec74b64112016c459abe4a5d31a3b34caeb3`
				`@ -0,0 +1 @@`
				`Subproject commit 77ba8eedf89b96c85a6194e5da2061c9d5c20242`