From f0bf14094be3a66d0105147f3198ffacf7435da2 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 17 Jun 2022 10:59:59 -0400 Subject: [PATCH 01/10] Update samd-peripherals to fix SPI DMA problem --- ports/atmel-samd/peripherals | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index d3b20192cf..79bf4e87e9 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit d3b20192cf94fdea68a412596e082108ba5ebbf0 +Subproject commit 79bf4e87e98356c54f13799ccb8fb84dff987bd1 From cbcd37f95bec95f4eed6c92d2e5f85d7db9b401d Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Fri, 17 Jun 2022 12:45:52 -0400 Subject: [PATCH 02/10] update frozen libraries --- frozen/Adafruit_CircuitPython_APDS9960 | 2 +- frozen/Adafruit_CircuitPython_BLE | 2 +- frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center | 2 +- frozen/Adafruit_CircuitPython_BusDevice | 2 +- frozen/Adafruit_CircuitPython_CircuitPlayground | 2 +- frozen/Adafruit_CircuitPython_Crickit | 2 +- frozen/Adafruit_CircuitPython_DRV2605 | 2 +- frozen/Adafruit_CircuitPython_DS3231 | 2 +- frozen/Adafruit_CircuitPython_Display_Shapes | 2 +- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_DotStar | 2 +- frozen/Adafruit_CircuitPython_ESP32SPI | 2 +- frozen/Adafruit_CircuitPython_FakeRequests | 2 +- frozen/Adafruit_CircuitPython_FocalTouch | 2 +- frozen/Adafruit_CircuitPython_HID | 2 +- frozen/Adafruit_CircuitPython_IRRemote | 2 +- frozen/Adafruit_CircuitPython_LC709203F | 2 +- frozen/Adafruit_CircuitPython_LIS3DH | 2 +- frozen/Adafruit_CircuitPython_LSM6DS | 2 +- frozen/Adafruit_CircuitPython_MIDI | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_PortalBase | 2 +- frozen/Adafruit_CircuitPython_ProgressBar | 2 +- frozen/Adafruit_CircuitPython_RFM69 | 2 +- frozen/Adafruit_CircuitPython_RFM9x | 2 +- frozen/Adafruit_CircuitPython_Register | 2 +- frozen/Adafruit_CircuitPython_Requests | 2 +- frozen/Adafruit_CircuitPython_SD | 2 +- frozen/Adafruit_CircuitPython_ST7789 | 2 +- frozen/Adafruit_CircuitPython_SimpleIO | 2 +- frozen/Adafruit_CircuitPython_SimpleMath | 2 +- frozen/Adafruit_CircuitPython_Thermistor | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_APDS9960 b/frozen/Adafruit_CircuitPython_APDS9960 index 9bd4882092..13856be616 160000 --- a/frozen/Adafruit_CircuitPython_APDS9960 +++ b/frozen/Adafruit_CircuitPython_APDS9960 @@ -1 +1 @@ -Subproject commit 9bd48820928afad549832fe9b4ae497b224007f0 +Subproject commit 13856be616eee2eb84280b7c4914951c1ddbfd36 diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE index 13c529288e..7d9635ba1d 160000 --- a/frozen/Adafruit_CircuitPython_BLE +++ b/frozen/Adafruit_CircuitPython_BLE @@ -1 +1 @@ -Subproject commit 13c529288e9431541fe58cf7992d4f53f7ca3b76 +Subproject commit 7d9635ba1dda31ce45b84519c4da76ff86d0debe diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center index 258bb62c58..e5cf8206c0 160000 --- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center +++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center @@ -1 +1 @@ -Subproject commit 258bb62c58e545c38749b8a66f5872035b2384cb +Subproject commit e5cf8206c0173228252ae74367cab85b0531488e diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice index b96f0d2794..9addf6a26f 160000 --- a/frozen/Adafruit_CircuitPython_BusDevice +++ b/frozen/Adafruit_CircuitPython_BusDevice @@ -1 +1 @@ -Subproject commit b96f0d279481446017ca1cc1ff4abf1f5a10346f +Subproject commit 9addf6a26fef3a32c78d574c66452b6210eca5c5 diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground index f82d3ef195..843def7dae 160000 --- a/frozen/Adafruit_CircuitPython_CircuitPlayground +++ b/frozen/Adafruit_CircuitPython_CircuitPlayground @@ -1 +1 @@ -Subproject commit f82d3ef195256aa71d274a34ea25f760d7e651d1 +Subproject commit 843def7daee741c8fb04fe21c3c7b98f22862471 diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit index 938f6bb335..0a045871d3 160000 --- a/frozen/Adafruit_CircuitPython_Crickit +++ b/frozen/Adafruit_CircuitPython_Crickit @@ -1 +1 @@ -Subproject commit 938f6bb335ba5e4c56a8062c591ff9f3c18c4297 +Subproject commit 0a045871d3da681d1c9c9578f09174bfc6d84f1d diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605 index 8e7e111a9f..6a429bcd0e 160000 --- a/frozen/Adafruit_CircuitPython_DRV2605 +++ b/frozen/Adafruit_CircuitPython_DRV2605 @@ -1 +1 @@ -Subproject commit 8e7e111a9ff39d3f4311caa7babeb451422c759f +Subproject commit 6a429bcd0e6b22ee181197ce0477ae70f5adb80d diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231 index df24498154..22931594bc 160000 --- a/frozen/Adafruit_CircuitPython_DS3231 +++ b/frozen/Adafruit_CircuitPython_DS3231 @@ -1 +1 @@ -Subproject commit df2449815433e05ea0f89c19518ccde7a10a2faa +Subproject commit 22931594bc52ab259eaf313d26219a507703c315 diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes index 2fad6f2f98..d90f9e7b12 160000 --- a/frozen/Adafruit_CircuitPython_Display_Shapes +++ b/frozen/Adafruit_CircuitPython_Display_Shapes @@ -1 +1 @@ -Subproject commit 2fad6f2f98c0df135e2306d32af18bb2796b852c +Subproject commit d90f9e7b122aad072d59a01df524036995cf4a78 diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index de3276cc08..a5672998d9 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit de3276cc08ba13901d1f69060ff7501c1699bc4d +Subproject commit a5672998d9a555247ebd69b17f56813a03d8d40f diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar index a90579e1e1..f9469d26ed 160000 --- a/frozen/Adafruit_CircuitPython_DotStar +++ b/frozen/Adafruit_CircuitPython_DotStar @@ -1 +1 @@ -Subproject commit a90579e1e1e1c973e6ba8f6cf8e914d77fc8f0f2 +Subproject commit f9469d26ed9eb95d43982de88c035ac3862dd258 diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index ddd26eb4ab..a8c8f71727 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit ddd26eb4abcd3c10ae5dd33b1345d10d58707995 +Subproject commit a8c8f717271562fbfab295bdfd506c39f50de0fb diff --git a/frozen/Adafruit_CircuitPython_FakeRequests b/frozen/Adafruit_CircuitPython_FakeRequests index f6cdec74b6..2ea025b1b6 160000 --- a/frozen/Adafruit_CircuitPython_FakeRequests +++ b/frozen/Adafruit_CircuitPython_FakeRequests @@ -1 +1 @@ -Subproject commit f6cdec74b64112016c459abe4a5d31a3b34caeb3 +Subproject commit 2ea025b1b68b0be95a0514732d4bc623f313fd75 diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch index a77f0f9c2e..b637c47423 160000 --- a/frozen/Adafruit_CircuitPython_FocalTouch +++ b/frozen/Adafruit_CircuitPython_FocalTouch @@ -1 +1 @@ -Subproject commit a77f0f9c2e8f64568bbb68254d0134fbc7b5a8af +Subproject commit b637c47423eb85233ba614424aadadace37fcfb1 diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID index 2fddabcaf0..47cc914748 160000 --- a/frozen/Adafruit_CircuitPython_HID +++ b/frozen/Adafruit_CircuitPython_HID @@ -1 +1 @@ -Subproject commit 2fddabcaf0df1763111ed9dbf9e2d4cdb5b0434e +Subproject commit 47cc91474823677218239b5b37901590755cac4c diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote index 1e478b1530..a2491a806b 160000 --- a/frozen/Adafruit_CircuitPython_IRRemote +++ b/frozen/Adafruit_CircuitPython_IRRemote @@ -1 +1 @@ -Subproject commit 1e478b1530b3be81bd84f13620d0a23502d377f1 +Subproject commit a2491a806b636f66caf670527c49b864923f125c diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F index a9cf0cde77..72367f37cd 160000 --- a/frozen/Adafruit_CircuitPython_LC709203F +++ b/frozen/Adafruit_CircuitPython_LC709203F @@ -1 +1 @@ -Subproject commit a9cf0cde77c185c6bbc79a3b6d77dd024a9683d2 +Subproject commit 72367f37cd221c7af7822ba3a9cd21cd3cd70292 diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH index acc4bdd73f..a06c8a116e 160000 --- a/frozen/Adafruit_CircuitPython_LIS3DH +++ b/frozen/Adafruit_CircuitPython_LIS3DH @@ -1 +1 @@ -Subproject commit acc4bdd73fdceb74d75cd5a1f261ae157ee32613 +Subproject commit a06c8a116e5767a8481b9018239fe729e01760a6 diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS index 3d1aab0daf..5acf8a850d 160000 --- a/frozen/Adafruit_CircuitPython_LSM6DS +++ b/frozen/Adafruit_CircuitPython_LSM6DS @@ -1 +1 @@ -Subproject commit 3d1aab0daf63c3b4476f73cba39cf5da49e1e4aa +Subproject commit 5acf8a850d98789a79fe37836b2ac7b623d95913 diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI index 3d871907f0..d3f9adce6e 160000 --- a/frozen/Adafruit_CircuitPython_MIDI +++ b/frozen/Adafruit_CircuitPython_MIDI @@ -1 +1 @@ -Subproject commit 3d871907f0187c627277382f184209f5520703a6 +Subproject commit d3f9adce6e48d37222ef171a280cfa3122faf15b diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index 207953aac0..df61e7b0be 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit 207953aac033d40728b5f8dd7fd73d90facbca5c +Subproject commit df61e7b0be9dc0c6a1bbe60f526fbdc01b6c2819 diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index 36d4a31010..eb5bb54429 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit 36d4a31010461e47f265553ebd764c69d38a254c +Subproject commit eb5bb5442949e032ced5dd1cc143e5cdb689a24d diff --git a/frozen/Adafruit_CircuitPython_PortalBase b/frozen/Adafruit_CircuitPython_PortalBase index bcfaae874f..a5b3f74049 160000 --- a/frozen/Adafruit_CircuitPython_PortalBase +++ b/frozen/Adafruit_CircuitPython_PortalBase @@ -1 +1 @@ -Subproject commit bcfaae874fbae294ce04549d55b96d6b41603944 +Subproject commit a5b3f74049dfa0d39caf1c0520e46d773ba4d643 diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar index 011acd627f..1c39469bac 160000 --- a/frozen/Adafruit_CircuitPython_ProgressBar +++ b/frozen/Adafruit_CircuitPython_ProgressBar @@ -1 +1 @@ -Subproject commit 011acd627fc24342c397fc640b204a798f7b69dd +Subproject commit 1c39469bac98eea022af695ac42e5096dae6130c diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69 index c58defd709..74ea48f7a5 160000 --- a/frozen/Adafruit_CircuitPython_RFM69 +++ b/frozen/Adafruit_CircuitPython_RFM69 @@ -1 +1 @@ -Subproject commit c58defd70947531c5a9c37ddcb569f240567a78b +Subproject commit 74ea48f7a5d85591f5af804cacb57e9cfaab46c6 diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x index 2d8310f19d..cd1da8c938 160000 --- a/frozen/Adafruit_CircuitPython_RFM9x +++ b/frozen/Adafruit_CircuitPython_RFM9x @@ -1 +1 @@ -Subproject commit 2d8310f19d1bdce817df13e807b409b5b057fc21 +Subproject commit cd1da8c9384537b886ea697d5c38c7b34f8a178a diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register index 49ab415d6b..d1e8ac7ad9 160000 --- a/frozen/Adafruit_CircuitPython_Register +++ b/frozen/Adafruit_CircuitPython_Register @@ -1 +1 @@ -Subproject commit 49ab415d6b601c99979262f9e91c21dcb3a927a7 +Subproject commit d1e8ac7ad9dcd65ab83749db3e5c96ffee80ebb7 diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests index 2e6b3f9fee..6e03832b11 160000 --- a/frozen/Adafruit_CircuitPython_Requests +++ b/frozen/Adafruit_CircuitPython_Requests @@ -1 +1 @@ -Subproject commit 2e6b3f9feeacc678402454f7d3416b04a9a93e17 +Subproject commit 6e03832b1170d75d7a7e0b8a578160298905b726 diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD index da02c76d4c..332143d4ca 160000 --- a/frozen/Adafruit_CircuitPython_SD +++ b/frozen/Adafruit_CircuitPython_SD @@ -1 +1 @@ -Subproject commit da02c76d4c802cd5abac73a5f274243b05e8cb35 +Subproject commit 332143d4ca5762d2d351ceb170c0b4e37dd42793 diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789 index 850c3dc512..995959d5dc 160000 --- a/frozen/Adafruit_CircuitPython_ST7789 +++ b/frozen/Adafruit_CircuitPython_ST7789 @@ -1 +1 @@ -Subproject commit 850c3dc512f7feae1eaad20bdc1c5e4c63c92f08 +Subproject commit 995959d5dca23fbe49590700d1aa26a96dca1df7 diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO index 272d225365..d238fe99e2 160000 --- a/frozen/Adafruit_CircuitPython_SimpleIO +++ b/frozen/Adafruit_CircuitPython_SimpleIO @@ -1 +1 @@ -Subproject commit 272d225365eed46916390cf1f393dd08bc00b7d4 +Subproject commit d238fe99e24ea4cdb472f1d8a9c99dd189b0aeca diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath index fad0f89e76..632655b8f5 160000 --- a/frozen/Adafruit_CircuitPython_SimpleMath +++ b/frozen/Adafruit_CircuitPython_SimpleMath @@ -1 +1 @@ -Subproject commit fad0f89e760829a76f553ef8459f61001597a846 +Subproject commit 632655b8f5f6f62e3b4d0b6161213634e0ae74e9 diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor index e86f258e43..0c3a5ecaac 160000 --- a/frozen/Adafruit_CircuitPython_Thermistor +++ b/frozen/Adafruit_CircuitPython_Thermistor @@ -1 +1 @@ -Subproject commit e86f258e43591ce4a04661277e77e9fdf6fec27e +Subproject commit 0c3a5ecaac0891776822556b18f79722d72a8f04 diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 3aaf72165b..1230da9e11 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 3aaf72165bc6ba10bf5219716c8654651649f87b +Subproject commit 1230da9e11381767c7298d41c029ba63672ee1a6 From 094b3b3b614e7cbc39d8244c3223cdeea42653b3 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 16 Jun 2022 21:10:19 +0200 Subject: [PATCH 03/10] include python executable path in the idf key I noticed that the latest time we needed to switch the idf key was when the environment changed from python 3.10.4 to 3.10.5. I don't know if this is the only cause of needing to change the key, but it seems to be a good idea to make the key include it. I think this is what's going on because when I replaced a virtualenv's "python" with a dangling symlink (same as would occur when python's version gets bumped), I got a similar error. --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f260117ad..e2d58c1416 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -382,6 +382,7 @@ jobs: if: ${{ needs.test.outputs.boards-espressif != '[]' }} steps: - name: Set up Python 3 + id: py3 uses: actions/setup-python@v2 with: python-version: "3.x" @@ -400,7 +401,7 @@ jobs: id: idf-cache with: path: ${{ github.workspace }}/.idf_tools - key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-20220404 + key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/espressif/esp-idf/HEAD') }}-${{ steps.py3.outputs.python-path }}-20220404 - name: Clone IDF submodules run: | (cd $IDF_PATH && git submodule update --init) From 111a25f9339f12bd7d7f5915fa0bb7c3fc95ebfe Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Fri, 17 Jun 2022 16:21:27 +0200 Subject: [PATCH 04/10] use setup-python v4 for python-path support --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2d58c1416..4a9bd65d8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -383,7 +383,7 @@ jobs: steps: - name: Set up Python 3 id: py3 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: "3.x" - uses: actions/checkout@v2.2.0 From 7f968f18c0c7dbc01418481995a45a8882ab3c89 Mon Sep 17 00:00:00 2001 From: Neradoc Date: Wed, 4 May 2022 01:49:51 +0200 Subject: [PATCH 05/10] move frozen adafruit_circuitplayground to express subdirectory --- .../boards/circuitplayground_express/mpconfigboard.mk | 2 +- .../boards/circuitplayground_express_crickit/mpconfigboard.mk | 2 +- .../boards/circuitplayground_express_displayio/mpconfigboard.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk index 5311cdc1d4..b64fd2033d 100644 --- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk @@ -19,7 +19,7 @@ CIRCUITPY_COUNTIO = 1 CIRCUITPY_BUSDEVICE = 1 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk index 4d749d2134..975d892b9a 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk @@ -18,7 +18,7 @@ CIRCUITPY_KEYPAD = 0 CIRCUITPY_ONEWIREIO = 0 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk index 0ae0c58b42..4338fe3e1e 100644 --- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk +++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk @@ -24,7 +24,7 @@ CIRCUITPY_BITMAPTOOLS = 0 CIRCUITPY_PARALLELDISPLAY = 0 # Include these Python libraries in firmware. -FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_CircuitPlayground/frozen_cpx FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor From d3903bf2f4354c073f1b51b38af3d2542ac2aec8 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 12:14:05 -0500 Subject: [PATCH 06/10] Fix for Issue #6478 --- ports/nrf/boards/clue_nrf52840_express/board.c | 1 + ports/nrf/common-hal/alarm/__init__.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ports/nrf/boards/clue_nrf52840_express/board.c b/ports/nrf/boards/clue_nrf52840_express/board.c index f2e648f473..06ee622f93 100644 --- a/ports/nrf/boards/clue_nrf52840_express/board.c +++ b/ports/nrf/boards/clue_nrf52840_express/board.c @@ -102,4 +102,5 @@ void reset_board(void) { } void board_deinit(void) { + common_hal_displayio_release_displays(); } diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index 92dac1c789..c79158e8f1 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -48,6 +48,9 @@ #include "nrf_power.h" #include "nrfx.h" #include "nrfx_gpiote.h" +#ifdef NRF_DEBUG_PRINT +void print_wakeup_cause(nrf_sleep_source_t cause); +#endif // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { From 803c18c71f08df852ed6ae8b6cf1e69312b95d02 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 13:27:15 -0500 Subject: [PATCH 07/10] Uncommented call to print_wakeup_cause --- ports/nrf/common-hal/alarm/__init__.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index c79158e8f1..1acc0c0324 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -49,7 +49,7 @@ #include "nrfx.h" #include "nrfx_gpiote.h" #ifdef NRF_DEBUG_PRINT -void print_wakeup_cause(nrf_sleep_source_t cause); +static void print_wakeup_cause(nrf_sleep_source_t cause); #endif // Singleton instance of SleepMemory. @@ -111,7 +111,7 @@ bool common_hal_alarm_woken_from_sleep(void) { nrf_sleep_source_t cause = _get_wakeup_cause(); #ifdef NRF_DEBUG_PRINT if (cause != NRF_SLEEP_WAKEUP_UNDEFINED) { - // print_wakeup_cause(cause); + print_wakeup_cause(cause); } #endif return cause == NRF_SLEEP_WAKEUP_GPIO || cause == NRF_SLEEP_WAKEUP_TIMER From 1ad3daf75bda5b6961ba17939ebbbc2193c9c46d Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jun 2022 20:51:07 -0500 Subject: [PATCH 08/10] Fix declaration of print_wakeup_cause --- ports/nrf/common-hal/alarm/__init__.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ports/nrf/common-hal/alarm/__init__.c b/ports/nrf/common-hal/alarm/__init__.c index 1acc0c0324..043be0b319 100644 --- a/ports/nrf/common-hal/alarm/__init__.c +++ b/ports/nrf/common-hal/alarm/__init__.c @@ -48,9 +48,6 @@ #include "nrf_power.h" #include "nrfx.h" #include "nrfx_gpiote.h" -#ifdef NRF_DEBUG_PRINT -static void print_wakeup_cause(nrf_sleep_source_t cause); -#endif // Singleton instance of SleepMemory. const alarm_sleep_memory_obj_t alarm_sleep_memory_obj = { @@ -99,7 +96,7 @@ static const char *cause_str[] = { "VBUS", "RESETPIN", }; -void print_wakeup_cause(nrf_sleep_source_t cause) { +static void print_wakeup_cause(nrf_sleep_source_t cause) { if (cause >= 0 && cause < NRF_SLEEP_WAKEUP_ZZZ) { mp_printf(&mp_plat_print, "wakeup cause = NRF_SLEEP_WAKEUP_%s\r\n", cause_str[(int)cause]); From e8023f33a964e27d0d4dfed236d8d0a4d56efabf Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 Jun 2022 14:56:18 -0500 Subject: [PATCH 09/10] Test for a BLE disconnect while reading --- ports/nrf/common-hal/_bleio/__init__.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/nrf/common-hal/_bleio/__init__.c b/ports/nrf/common-hal/_bleio/__init__.c index 1d59983896..718b28c7fe 100644 --- a/ports/nrf/common-hal/_bleio/__init__.c +++ b/ports/nrf/common-hal/_bleio/__init__.c @@ -185,7 +185,12 @@ STATIC bool _on_gattc_read_rsp_evt(ble_evt_t *ble_evt, void *param) { } break; } - + case BLE_GAP_EVT_DISCONNECTED: { + read->conn_handle = BLE_CONN_HANDLE_INVALID; + read->done = true; + return false; + break; + } default: // For debugging. // mp_printf(&mp_plat_print, "Unhandled characteristic event: 0x%04x\n", ble_evt->header.evt_id); @@ -219,6 +224,8 @@ size_t common_hal_bleio_gattc_read(uint16_t handle, uint16_t conn_handle, uint8_ while (!read_info.done) { RUN_BACKGROUND_TASKS; } + // Test if we were disconnected while reading + common_hal_bleio_check_connected(read_info.conn_handle); ble_drv_remove_event_handler(_on_gattc_read_rsp_evt, &read_info); check_gatt_status(read_info.status); From 03023d2829e5ddee56a0e99a73cce0d40d5e7f5c Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 22 Jun 2022 09:13:41 -0400 Subject: [PATCH 10/10] update frozen libraries --- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_ESP32SPI | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index a5672998d9..bb9cb75e15 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit a5672998d9a555247ebd69b17f56813a03d8d40f +Subproject commit bb9cb75e15b4bfce3063a94b40dfad2375d5605e diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index a8c8f71727..f3d504be1d 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit a8c8f717271562fbfab295bdfd506c39f50de0fb +Subproject commit f3d504be1dc82cc4a8e4ea9b38bd5c2ce74d59ba diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index eb5bb54429..015eb1ccd5 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit eb5bb5442949e032ced5dd1cc143e5cdb689a24d +Subproject commit 015eb1ccd5eb5364d8e1cf20358e7dcda9f12efc diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 1230da9e11..148345d232 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 1230da9e11381767c7298d41c029ba63672ee1a6 +Subproject commit 148345d232c83133de3649fb70b471f11501b3d2