diff --git a/.gitmodules b/.gitmodules index 55fce0eebbed9..b1c0a72a9e08e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -87,9 +87,9 @@ [submodule "tools/bitmap_font"] path = tools/bitmap_font url = https://github.com/adafruit/Adafruit_CircuitPython_BitmapFont.git -[submodule "tools/Tecate-bitmap-fonts"] - path = tools/Tecate-bitmap-fonts - url = https://github.com/Tecate/bitmap-fonts.git +#[submodule "tools/Tecate-bitmap-fonts"] +# path = tools/Tecate-bitmap-fonts +# url = https://github.com/Tecate/bitmap-fonts.git [submodule "frozen/pew-pewpew-standalone-10.x"] path = frozen/pew-pewpew-standalone-10.x url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git @@ -152,7 +152,26 @@ url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git [submodule "ports/esp32s2/esp-idf"] path = ports/esp32s2/esp-idf - url = https://github.com/adafruit/esp-idf.git + url = https://github.com/tannewt/esp-idf.git +[submodule "frozen/Adafruit_CircuitPython_IL0398"] + path = frozen/Adafruit_CircuitPython_IL0398 + url = https://github.com/adafruit/Adafruit_CircuitPython_IL0398 +[submodule "frozen/Adafruit_CircuitPython_Display_Shapes"] + path = frozen/Adafruit_CircuitPython_Display_Shapes + url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Shapes +[submodule "frozen/Adafruit_CircuitPython_Bitmap_Font"] + path = frozen/Adafruit_CircuitPython_Bitmap_Font + url = https://github.com/adafruit/Adafruit_CircuitPython_Bitmap_Font +[submodule "frozen/Adafruit_CircuitPython_Debouncer"] + path = frozen/Adafruit_CircuitPython_Debouncer + url = https://github.com/adafruit/Adafruit_CircuitPython_Debouncer +[submodule "frozen/Adafruit_CircuitPython_Display_Text"] + path = frozen/Adafruit_CircuitPython_Display_Text + url = https://github.com/adafruit/Adafruit_CircuitPython_Display_Text +[submodule "frozen/Adafruit_CircuitPython_ImageLoad"] + path = frozen/Adafruit_CircuitPython_ImageLoad + url = https://github.com/adafruit/Adafruit_CircuitPython_ImageLoad + url = https://github.com/jepler/esp-idf.git [submodule "ports/esp32s2/certificates/nina-fw"] path = ports/esp32s2/certificates/nina-fw url = https://github.com/adafruit/nina-fw.git diff --git a/data/nvm.toml b/data/nvm.toml deleted file mode 160000 index e5b149599d14a..0000000000000 --- a/data/nvm.toml +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e5b149599d14a8841167fe552846ca36925b87a0 diff --git a/extmod/ulab b/extmod/ulab index e3bf07cabb728..0394801933f6e 160000 --- a/extmod/ulab +++ b/extmod/ulab @@ -1 +1 @@ -Subproject commit e3bf07cabb728ecfa2b78ea5e468179f94dbf933 +Subproject commit 0394801933f6e68a5bc7cdb0da76c7884e8cf70a diff --git a/frozen/Adafruit_CircuitPython_BLE b/frozen/Adafruit_CircuitPython_BLE index df40a24184191..5d584576ef79c 160000 --- a/frozen/Adafruit_CircuitPython_BLE +++ b/frozen/Adafruit_CircuitPython_BLE @@ -1 +1 @@ -Subproject commit df40a241841918d6c0a984d427e61ca831b7b431 +Subproject commit 5d584576ef79ca36506e6c7470e7ac5204cf0a8d diff --git a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center index a8f3cbc1a94b8..3ffb3f02d2046 160000 --- a/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center +++ b/frozen/Adafruit_CircuitPython_BLE_Apple_Notification_Center @@ -1 +1 @@ -Subproject commit a8f3cbc1a94b8a5d25f80101f519025a162dbb80 +Subproject commit 3ffb3f02d2046910e09d1f5a74721bd1a4cdf8cf diff --git a/frozen/Adafruit_CircuitPython_Bitmap_Font b/frozen/Adafruit_CircuitPython_Bitmap_Font new file mode 160000 index 0000000000000..33439e7479fcf --- /dev/null +++ b/frozen/Adafruit_CircuitPython_Bitmap_Font @@ -0,0 +1 @@ +Subproject commit 33439e7479fcfb34976a284a31f5adb956e81f75 diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice index 5aceeae814eff..e9411c4244984 160000 --- a/frozen/Adafruit_CircuitPython_BusDevice +++ b/frozen/Adafruit_CircuitPython_BusDevice @@ -1 +1 @@ -Subproject commit 5aceeae814effae4eb950f1078c194b11401faa7 +Subproject commit e9411c4244984b69ec6928370ede40cec014c10b diff --git a/frozen/Adafruit_CircuitPython_CircuitPlayground b/frozen/Adafruit_CircuitPython_CircuitPlayground index d2bdacf878a4b..e9f15d61502f3 160000 --- a/frozen/Adafruit_CircuitPython_CircuitPlayground +++ b/frozen/Adafruit_CircuitPython_CircuitPlayground @@ -1 +1 @@ -Subproject commit d2bdacf878a4bde3009370705b9b49eb1441428b +Subproject commit e9f15d61502f34173912ba271aaaf9446dae8da1 diff --git a/frozen/Adafruit_CircuitPython_Crickit b/frozen/Adafruit_CircuitPython_Crickit index 66adc454f5c9c..0e1230676a54d 160000 --- a/frozen/Adafruit_CircuitPython_Crickit +++ b/frozen/Adafruit_CircuitPython_Crickit @@ -1 +1 @@ -Subproject commit 66adc454f5c9cc66b9e38777a61c58bc82a04090 +Subproject commit 0e1230676a54da17a309d1dfffdd7fa90240191c diff --git a/frozen/Adafruit_CircuitPython_DRV2605 b/frozen/Adafruit_CircuitPython_DRV2605 index c8483fe4909fb..7914a63903186 160000 --- a/frozen/Adafruit_CircuitPython_DRV2605 +++ b/frozen/Adafruit_CircuitPython_DRV2605 @@ -1 +1 @@ -Subproject commit c8483fe4909fba9b4ecfce7092918a038cc087a0 +Subproject commit 7914a6390318687bb8e2e9c4119aa932fea01531 diff --git a/frozen/Adafruit_CircuitPython_DS3231 b/frozen/Adafruit_CircuitPython_DS3231 index 5b017df35b6a4..0d49a1fcd96c1 160000 --- a/frozen/Adafruit_CircuitPython_DS3231 +++ b/frozen/Adafruit_CircuitPython_DS3231 @@ -1 +1 @@ -Subproject commit 5b017df35b6a4cb4b7a30d0ac5d4595583ea461d +Subproject commit 0d49a1fcd96c13a94e8bdf26f92abe79b8517906 diff --git a/frozen/Adafruit_CircuitPython_Debouncer b/frozen/Adafruit_CircuitPython_Debouncer new file mode 160000 index 0000000000000..3ae9f4a74404c --- /dev/null +++ b/frozen/Adafruit_CircuitPython_Debouncer @@ -0,0 +1 @@ +Subproject commit 3ae9f4a74404c6d14993625ee39ada4e0b58537e diff --git a/frozen/Adafruit_CircuitPython_Display_Shapes b/frozen/Adafruit_CircuitPython_Display_Shapes index d68bb9e0e7a28..6b64c9f37ba5f 160000 --- a/frozen/Adafruit_CircuitPython_Display_Shapes +++ b/frozen/Adafruit_CircuitPython_Display_Shapes @@ -1 +1 @@ -Subproject commit d68bb9e0e7a28d38d9f36627c35b6949595b2f7e +Subproject commit 6b64c9f37ba5f785468848e5e480d355943d4704 diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index 11bf02c3a850d..1dcecb9979dce 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit 11bf02c3a850d390802f944a693ff4e0d531727f +Subproject commit 1dcecb9979dced10f3d4bf1fa7c4dc8e7c699f71 diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar index f376fcca8c829..f4f66fa039904 160000 --- a/frozen/Adafruit_CircuitPython_DotStar +++ b/frozen/Adafruit_CircuitPython_DotStar @@ -1 +1 @@ -Subproject commit f376fcca8c829b1e68236edbef6b71cb57f7e42f +Subproject commit f4f66fa03990428c239eac68d37f79a7245b4cd3 diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI index 61e38631b557a..94b03517c1f4f 160000 --- a/frozen/Adafruit_CircuitPython_ESP32SPI +++ b/frozen/Adafruit_CircuitPython_ESP32SPI @@ -1 +1 @@ -Subproject commit 61e38631b557a51376edbd02501ca51311631597 +Subproject commit 94b03517c1f4ff68cc2bb09b0963f7e7e3ce3d04 diff --git a/frozen/Adafruit_CircuitPython_FocalTouch b/frozen/Adafruit_CircuitPython_FocalTouch index 27b6d39384249..72968d3546f9d 160000 --- a/frozen/Adafruit_CircuitPython_FocalTouch +++ b/frozen/Adafruit_CircuitPython_FocalTouch @@ -1 +1 @@ -Subproject commit 27b6d39384249cc9050d5d87982e88f1323e3098 +Subproject commit 72968d3546f9d6c5af138d4c179343007cb9662c diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID index 78b0fbbb00c04..65fb213b8c554 160000 --- a/frozen/Adafruit_CircuitPython_HID +++ b/frozen/Adafruit_CircuitPython_HID @@ -1 +1 @@ -Subproject commit 78b0fbbb00c0431042b460fe20a76bbc440c4793 +Subproject commit 65fb213b8c554181d54b77f75335e16e2f4c0987 diff --git a/frozen/Adafruit_CircuitPython_IL0398 b/frozen/Adafruit_CircuitPython_IL0398 new file mode 160000 index 0000000000000..eafdf60b1f761 --- /dev/null +++ b/frozen/Adafruit_CircuitPython_IL0398 @@ -0,0 +1 @@ +Subproject commit eafdf60b1f761dd0b09020eefe323a393285bd62 diff --git a/frozen/Adafruit_CircuitPython_IRRemote b/frozen/Adafruit_CircuitPython_IRRemote index d8260f2fe2a8b..d435fc9a9d90c 160000 --- a/frozen/Adafruit_CircuitPython_IRRemote +++ b/frozen/Adafruit_CircuitPython_IRRemote @@ -1 +1 @@ -Subproject commit d8260f2fe2a8b3e874320483060756dce4c2a9ec +Subproject commit d435fc9a9d90cb063608ae037bf5284b33bc5e84 diff --git a/frozen/Adafruit_CircuitPython_ImageLoad b/frozen/Adafruit_CircuitPython_ImageLoad new file mode 160000 index 0000000000000..1967a6affbf31 --- /dev/null +++ b/frozen/Adafruit_CircuitPython_ImageLoad @@ -0,0 +1 @@ +Subproject commit 1967a6affbf31eb9b6d3038ecfec7a7c52363207 diff --git a/frozen/Adafruit_CircuitPython_LC709203F b/frozen/Adafruit_CircuitPython_LC709203F deleted file mode 160000 index 06ec55ec5acc5..0000000000000 --- a/frozen/Adafruit_CircuitPython_LC709203F +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 06ec55ec5acc56ff98db8b4b203be3092cf44c94 diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH index cf564ad0defb0..457aba6dd59ad 160000 --- a/frozen/Adafruit_CircuitPython_LIS3DH +++ b/frozen/Adafruit_CircuitPython_LIS3DH @@ -1 +1 @@ -Subproject commit cf564ad0defb0bc98a41f195c5b20d1aa88641ed +Subproject commit 457aba6dd59ad00502b80c9031655d3d26ecc82b diff --git a/frozen/Adafruit_CircuitPython_LSM6DS b/frozen/Adafruit_CircuitPython_LSM6DS index fa2cb2c7770f6..ee8f2187d4795 160000 --- a/frozen/Adafruit_CircuitPython_LSM6DS +++ b/frozen/Adafruit_CircuitPython_LSM6DS @@ -1 +1 @@ -Subproject commit fa2cb2c7770f67fa16053fe5375b1a9ad3a3d0a5 +Subproject commit ee8f2187d4795b08ae4aa60558f564d26c997be9 diff --git a/frozen/Adafruit_CircuitPython_MIDI b/frozen/Adafruit_CircuitPython_MIDI deleted file mode 160000 index 54cc3311b979d..0000000000000 --- a/frozen/Adafruit_CircuitPython_MIDI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 54cc3311b979dcd52bb870456d612f39e8bfd226 diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index a9ef35bae580b..5fd72fb963c4a 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit a9ef35bae580b6a0d99a425856fcc863ad58a54d +Subproject commit 5fd72fb963c4a0318d29282ca2cc988f19787fda diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index a8e9975b3f06d..59add970cc66f 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit a8e9975b3f06d454f8951254d96f99755b11d962 +Subproject commit 59add970cc66f9b0f2d45082e86b25650843a159 diff --git a/frozen/Adafruit_CircuitPython_ProgressBar b/frozen/Adafruit_CircuitPython_ProgressBar deleted file mode 160000 index 7193260344306..0000000000000 --- a/frozen/Adafruit_CircuitPython_ProgressBar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7193260344306337050a165bdee4f9d0de7bb8e9 diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69 deleted file mode 160000 index 161b39148ebd7..0000000000000 --- a/frozen/Adafruit_CircuitPython_RFM69 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 161b39148ebd79f051630737e34e0cbd6d838a59 diff --git a/frozen/Adafruit_CircuitPython_RFM9x b/frozen/Adafruit_CircuitPython_RFM9x deleted file mode 160000 index 378616f160bbc..0000000000000 --- a/frozen/Adafruit_CircuitPython_RFM9x +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 378616f160bbcbc85f0acd960b4eb181b9c2fd0b diff --git a/frozen/Adafruit_CircuitPython_Register b/frozen/Adafruit_CircuitPython_Register index a0892d1822937..56358b4494da8 160000 --- a/frozen/Adafruit_CircuitPython_Register +++ b/frozen/Adafruit_CircuitPython_Register @@ -1 +1 @@ -Subproject commit a0892d1822937fe89146dec68604b3e924d5c51e +Subproject commit 56358b4494da825cd99a56a854119f926abca670 diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests index c55425e17842c..41de8b3c05dd7 160000 --- a/frozen/Adafruit_CircuitPython_Requests +++ b/frozen/Adafruit_CircuitPython_Requests @@ -1 +1 @@ -Subproject commit c55425e17842cce3ec0b34489133436c3e1a3898 +Subproject commit 41de8b3c05dd78d7be8893a0f6cb47a7e9b421a2 diff --git a/frozen/Adafruit_CircuitPython_SD b/frozen/Adafruit_CircuitPython_SD index 63f795518c798..96ee9954a3099 160000 --- a/frozen/Adafruit_CircuitPython_SD +++ b/frozen/Adafruit_CircuitPython_SD @@ -1 +1 @@ -Subproject commit 63f795518c79821fa1f60c4978b59c8bbd16ad1c +Subproject commit 96ee9954a3099ee9c9d7d7b7747f30ab3c6a45bf diff --git a/frozen/Adafruit_CircuitPython_ST7789 b/frozen/Adafruit_CircuitPython_ST7789 deleted file mode 160000 index f1841618d2690..0000000000000 --- a/frozen/Adafruit_CircuitPython_ST7789 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f1841618d2690bb54dabd98fd8650af30bc2c9bf diff --git a/frozen/Adafruit_CircuitPython_SimpleIO b/frozen/Adafruit_CircuitPython_SimpleIO deleted file mode 160000 index 9b53bebc520d7..0000000000000 --- a/frozen/Adafruit_CircuitPython_SimpleIO +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9b53bebc520d70f89d44fc989fc493d5036df925 diff --git a/frozen/Adafruit_CircuitPython_SimpleMath b/frozen/Adafruit_CircuitPython_SimpleMath deleted file mode 160000 index 5f382650e62e0..0000000000000 --- a/frozen/Adafruit_CircuitPython_SimpleMath +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f382650e62e05cc72a67dbedce13d706d699621 diff --git a/frozen/Adafruit_CircuitPython_Thermistor b/frozen/Adafruit_CircuitPython_Thermistor index da67fd3046c85..b5bbdbd56ca20 160000 --- a/frozen/Adafruit_CircuitPython_Thermistor +++ b/frozen/Adafruit_CircuitPython_Thermistor @@ -1 +1 @@ -Subproject commit da67fd3046c85eae0a3e417074bc681befa39218 +Subproject commit b5bbdbd56ca205c581ba2c84d927ef99befce88e diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 3c47a7323f81e..76c0dd13294ce 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 3c47a7323f81e961b06853814964d04db5b3817b +Subproject commit 76c0dd13294ce8ae0518cb9882dcad5d3668977e diff --git a/frozen/circuitpython-stage b/frozen/circuitpython-stage index 40d8a03b4569d..0d2c083a2fb57 160000 --- a/frozen/circuitpython-stage +++ b/frozen/circuitpython-stage @@ -1 +1 @@ -Subproject commit 40d8a03b4569d566faa62fcb0f798178118f2954 +Subproject commit 0d2c083a2fb57a1562d4806775f45273abbfbfae diff --git a/frozen/pew-pewpew-standalone-10.x b/frozen/pew-pewpew-standalone-10.x index a14da2e1ced10..87755e088150c 160000 --- a/frozen/pew-pewpew-standalone-10.x +++ b/frozen/pew-pewpew-standalone-10.x @@ -1 +1 @@ -Subproject commit a14da2e1ced1010a0da65f758199ff08eedd0bd5 +Subproject commit 87755e088150cc9bce42f4104cbd74d91b923c6f diff --git a/lib/mp3 b/lib/mp3 index 7a5de1ad777e9..c3c664bf4db6a 160000 --- a/lib/mp3 +++ b/lib/mp3 @@ -1 +1 @@ -Subproject commit 7a5de1ad777e95b0f4fab7bbd35678c7d319b1b5 +Subproject commit c3c664bf4db6a36d11808dfcbb5dbf7cff1715b8 diff --git a/lib/protomatter b/lib/protomatter index 7fe6406affb13..9f71088d2c322 160000 --- a/lib/protomatter +++ b/lib/protomatter @@ -1 +1 @@ -Subproject commit 7fe6406affb1376193102cf76ded06e61316d7e6 +Subproject commit 9f71088d2c32206c6f0495704ae0c040426d5764 diff --git a/lib/tinyusb b/lib/tinyusb index ab4d30fd6bca0..dc5445e2f45cb 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit ab4d30fd6bca02c73eb9b4ff82db0b2b0f403344 +Subproject commit dc5445e2f45cb348a44fe24fc1be4bc8b5ba5bab diff --git a/lib/uzlib b/lib/uzlib index 27e4f4c15ba30..f966da0fab121 160000 --- a/lib/uzlib +++ b/lib/uzlib @@ -1 +1 @@ -Subproject commit 27e4f4c15ba30c2cfc89575159e8efb50f95037e +Subproject commit f966da0fab121e910ea74f037f074538a2e6dbbb diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index fbb64020516cf..db72c57061bb7 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -950,14 +950,10 @@ msgstr "" msgid "Extended advertisements with scan response not supported." msgstr "" -#: extmod/ulab/code/numpy/fft/fft_tools.c +#: extmod/ulab/code/fft.c msgid "FFT is defined for ndarrays only" msgstr "" -#: extmod/ulab/code/numpy/fft/fft_tools.c -msgid "FFT is implemented for linear arrays only" -msgstr "" - #: ports/esp32s2/common-hal/ssl/SSLSocket.c msgid "Failed SSL handshake" msgstr "" @@ -2446,6 +2442,10 @@ msgstr "" msgid "annotation must be an identifier" msgstr "" +#: extmod/ulab/code/vectorise.c +msgid "arctan2 is implemented for scalars and ndarrays only" +msgstr "" + #: py/modbuiltins.c msgid "arg is an empty sequence" msgstr "" @@ -2454,14 +2454,10 @@ msgstr "" msgid "arg must be user-type" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "argsort argument must be an ndarray" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "argsort is not implemented for flattened arrays" -msgstr "" - #: py/runtime.c msgid "argument has wrong type" msgstr "" @@ -2479,25 +2475,16 @@ msgstr "" msgid "argument should be a '%q' not a '%q'" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -#: extmod/ulab/code/numpy/transform/transform.c +#: extmod/ulab/code/linalg.c msgid "arguments must be ndarrays" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "array and index length must be equal" -msgstr "" - #: py/objarray.c shared-bindings/alarm/SleepMemory.c #: shared-bindings/nvm/ByteArray.c msgid "array/bytes required on right side" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "attempt to get (arg)min/(arg)max of empty sequence" -msgstr "" - -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "attempt to get argmin/argmax of an empty sequence" msgstr "" @@ -2505,16 +2492,16 @@ msgstr "" msgid "attributes not supported yet" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "axis is out of bounds" +#: extmod/ulab/code/numerical.c +msgid "axis must be -1, 0, None, or 1" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c extmod/ulab/code/ulab_tools.c -msgid "axis must be None, or an integer" +#: extmod/ulab/code/numerical.c +msgid "axis must be -1, 0, or 1" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "axis too long" +#: extmod/ulab/code/numerical.c +msgid "axis must be None, 0, or 1" msgstr "" #: py/builtinevex.c @@ -2549,14 +2536,6 @@ msgstr "" msgid "branch not in range" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c -msgid "buffer is smaller than requested size" -msgstr "" - -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c -msgid "buffer size must be a multiple of element size" -msgstr "" - #: shared-module/struct/__init__.c msgid "buffer size must match format" msgstr "" @@ -2731,10 +2710,6 @@ msgid "" "can't switch from manual field specification to automatic field numbering" msgstr "" -#: extmod/ulab/code/ndarray_operators.c -msgid "cannot cast output with casting rule" -msgstr "" - #: py/objtype.c msgid "cannot create '%q' instances" msgstr "" @@ -2751,6 +2726,10 @@ msgstr "" msgid "cannot perform relative import" msgstr "" +#: extmod/ulab/code/ndarray.c +msgid "cannot reshape array (incompatible input/output shape)" +msgstr "" + #: extmod/moductypes.c msgid "cannot unambiguously get sizeof scalar" msgstr "" @@ -2827,19 +2806,23 @@ msgstr "" msgid "conversion to object" msgstr "" -#: extmod/ulab/code/numpy/filter/filter.c +#: extmod/ulab/code/filter.c msgid "convolve arguments must be linear arrays" msgstr "" -#: extmod/ulab/code/numpy/filter/filter.c +#: extmod/ulab/code/filter.c msgid "convolve arguments must be ndarrays" msgstr "" -#: extmod/ulab/code/numpy/filter/filter.c +#: extmod/ulab/code/filter.c msgid "convolve arguments must not be empty" msgstr "" -#: extmod/ulab/code/numpy/poly/poly.c +#: extmod/ulab/code/ndarray.c +msgid "could not broadast input array from shape" +msgstr "" + +#: extmod/ulab/code/poly.c msgid "could not invert Vandermonde matrix" msgstr "" @@ -2847,15 +2830,11 @@ msgstr "" msgid "couldn't determine SD card version" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "cross is defined for 1D arrays of length 3" -msgstr "" - -#: extmod/ulab/code/scipy/optimize/optimize.c +#: extmod/ulab/code/approx.c msgid "data must be iterable" msgstr "" -#: extmod/ulab/code/scipy/optimize/optimize.c +#: extmod/ulab/code/approx.c msgid "data must be of equal length" msgstr "" @@ -2864,8 +2843,8 @@ msgstr "" msgid "data pin #%d in use" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "data type not understood" +#: extmod/ulab/code/numerical.c +msgid "ddof must be smaller than length of data set" msgstr "" #: py/parsenum.c @@ -2897,18 +2876,10 @@ msgstr "" msgid "dict update sequence has wrong length" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "diff argument must be an ndarray" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "differentiation order out of range" -msgstr "" - -#: extmod/ulab/code/numpy/transform/transform.c -msgid "dimensions do not match" -msgstr "" - #: py/emitnative.c msgid "div/mod not implemented for uint" msgstr "" @@ -3032,19 +3003,19 @@ msgstr "" msgid "filesystem must provide mount method" msgstr "" -#: extmod/ulab/code/numpy/vector/vector.c +#: extmod/ulab/code/vectorise.c msgid "first argument must be a callable" msgstr "" -#: extmod/ulab/code/scipy/optimize/optimize.c +#: extmod/ulab/code/approx.c msgid "first argument must be a function" msgstr "" -#: extmod/ulab/code/ulab_create.c -msgid "first argument must be a tuple of ndarrays" +#: extmod/ulab/code/ndarray.c +msgid "first argument must be an iterable" msgstr "" -#: extmod/ulab/code/numpy/vector/vector.c +#: extmod/ulab/code/vectorise.c msgid "first argument must be an ndarray" msgstr "" @@ -3056,7 +3027,7 @@ msgstr "" msgid "flattening order must be either 'C', or 'F'" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "flip argument must be an ndarray" msgstr "" @@ -3093,12 +3064,12 @@ msgstr "" msgid "function got multiple values for argument '%q'" msgstr "" -#: extmod/ulab/code/scipy/optimize/optimize.c +#: extmod/ulab/code/approx.c msgid "function has the same sign at the ends of interval" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "function is defined for ndarrays only" +#: extmod/ulab/code/compare.c +msgid "function is implemented for scalars and ndarrays only" msgstr "" #: py/argcheck.c @@ -3180,7 +3151,6 @@ msgstr "" msgid "index is out of bounds" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c extmod/ulab/code/ulab_tools.c #: ports/esp32s2/common-hal/pulseio/PulseIn.c py/obj.c #: shared-bindings/bitmaptools/__init__.c msgid "index out of range" @@ -3194,7 +3164,7 @@ msgstr "" msgid "indices must be integers, slices, or Boolean lists" msgstr "" -#: extmod/ulab/code/scipy/optimize/optimize.c +#: extmod/ulab/code/approx.c msgid "initial values must be iterable" msgstr "" @@ -3206,66 +3176,38 @@ msgstr "" msgid "inline assembler must be a function" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "input and output shapes are not compatible" +#: extmod/ulab/code/create.c +msgid "input argument must be an integer or a 2-tuple" msgstr "" -#: extmod/ulab/code/ulab_create.c -msgid "input argument must be an integer, a tuple, or a list" -msgstr "" - -#: extmod/ulab/code/numpy/fft/fft_tools.c +#: extmod/ulab/code/fft.c msgid "input array length must be power of 2" msgstr "" -#: extmod/ulab/code/ulab_create.c -msgid "input arrays are not compatible" -msgstr "" - -#: extmod/ulab/code/numpy/poly/poly.c +#: extmod/ulab/code/poly.c msgid "input data must be an iterable" msgstr "" -#: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/linalg.c msgid "input matrix is asymmetric" msgstr "" -#: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/linalg.c msgid "input matrix is singular" msgstr "" -#: extmod/ulab/code/user/user.c -msgid "input must be a dense ndarray" -msgstr "" - -#: extmod/ulab/code/ulab_create.c -msgid "input must be a tensor of rank 2" -msgstr "" - -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/user/user.c -msgid "input must be an ndarray" -msgstr "" - -#: extmod/ulab/code/scipy/signal/signal.c -msgid "input must be one-dimensional" -msgstr "" - -#: extmod/ulab/code/ulab_tools.c +#: extmod/ulab/code/linalg.c msgid "input must be square matrix" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "input must be tuple, list, range, or ndarray" msgstr "" -#: extmod/ulab/code/numpy/poly/poly.c +#: extmod/ulab/code/poly.c msgid "input vectors must be of equal length" msgstr "" -#: extmod/ulab/code/numpy/poly/poly.c -msgid "inputs are not iterable" -msgstr "" - #: py/parsenum.c msgid "int() arg 2 must be >= 2 and <= 36" msgstr "" @@ -3274,7 +3216,7 @@ msgstr "" msgid "integer required" msgstr "" -#: extmod/ulab/code/numpy/approx/approx.c +#: extmod/ulab/code/approx.c msgid "interp is defined for 1D arrays of equal length" msgstr "" @@ -3351,7 +3293,11 @@ msgstr "" msgid "issubclass() arg 2 must be a class or a tuple of classes" msgstr "" -#: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/ndarray.c +msgid "iterables are not of the same length" +msgstr "" + +#: extmod/ulab/code/linalg.c msgid "iterations did not converge" msgstr "" @@ -3419,7 +3365,11 @@ msgstr "" msgid "math domain error" msgstr "" -#: extmod/ulab/code/numpy/linalg/linalg.c +#: extmod/ulab/code/linalg.c +msgid "matrix dimensions do not match" +msgstr "" + +#: extmod/ulab/code/linalg.c msgid "matrix is not positive definite" msgstr "" @@ -3433,26 +3383,10 @@ msgstr "" msgid "max_length must be >= 0" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "maximum number of dimensions is 4" -msgstr "" - #: py/runtime.c msgid "maximum recursion depth exceeded" msgstr "" -#: extmod/ulab/code/scipy/optimize/optimize.c -msgid "maxiter must be > 0" -msgstr "" - -#: extmod/ulab/code/scipy/optimize/optimize.c -msgid "maxiter should be > 0" -msgstr "" - -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "median argument must be an ndarray" -msgstr "" - #: py/runtime.c #, c-format msgid "memory allocation failed, allocating %u bytes" @@ -3470,7 +3404,7 @@ msgstr "" msgid "module not found" msgstr "" -#: extmod/ulab/code/numpy/poly/poly.c +#: extmod/ulab/code/poly.c msgid "more degrees of freedom than data points" msgstr "" @@ -3494,6 +3428,10 @@ msgstr "" msgid "must use keyword argument for key function" msgstr "" +#: extmod/ulab/code/numerical.c +msgid "n must be between 0, and 9" +msgstr "" + #: py/runtime.c msgid "name '%q' is not defined" msgstr "" @@ -3612,7 +3550,11 @@ msgstr "" msgid "not enough arguments for format string" msgstr "" -#: extmod/ulab/code/ulab_create.c +#: extmod/ulab/code/poly.c +msgid "number of arguments must be 2, or 3" +msgstr "" + +#: extmod/ulab/code/create.c msgid "number of points must be at least 2" msgstr "" @@ -3670,18 +3612,10 @@ msgstr "" msgid "odd-length string" msgstr "" -#: extmod/ulab/code/ulab_create.c extmod/ulab/code/utils/utils.c -msgid "offset is too large" -msgstr "" - #: shared-bindings/dualbank/__init__.c msgid "offset must be >= 0" msgstr "" -#: extmod/ulab/code/ulab_create.c -msgid "offset must be non-negative and no greater than buffer length" -msgstr "" - #: py/objstr.c py/objstrunicode.c msgid "offset out of bounds" msgstr "" @@ -3703,16 +3637,12 @@ msgstr "" msgid "opcode" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/numpy/compare/compare.c -#: extmod/ulab/code/numpy/vector/vector.c +#: extmod/ulab/code/compare.c extmod/ulab/code/ndarray.c +#: extmod/ulab/code/vectorise.c msgid "operands could not be broadcast together" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "operation is implemented for 1D Boolean arrays only" -msgstr "" - -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "operation is not implemented on ndarrays" msgstr "" @@ -3729,14 +3659,6 @@ msgstr "" msgid "ord() expected a character, but string of length %d found" msgstr "" -#: extmod/ulab/code/utils/utils.c -msgid "out array is too small" -msgstr "" - -#: extmod/ulab/code/utils/utils.c -msgid "out must be a float dense array" -msgstr "" - #: shared-bindings/displayio/Bitmap.c msgid "out of range of source" msgstr "" @@ -3819,6 +3741,7 @@ msgstr "" #: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h #: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h +#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h #: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h #: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h @@ -3826,7 +3749,8 @@ msgstr "" #: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h -#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h +#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h #: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h @@ -3867,7 +3791,7 @@ msgstr "" msgid "raw f-strings are not implemented" msgstr "" -#: extmod/ulab/code/numpy/fft/fft_tools.c +#: extmod/ulab/code/fft.c msgid "real and imaginary parts must be of equal length" msgstr "" @@ -3880,10 +3804,6 @@ msgstr "" msgid "requested length %d but object has length %d" msgstr "" -#: extmod/ulab/code/ndarray_operators.c -msgid "results cannot be cast to specified type" -msgstr "" - #: py/compile.c msgid "return annotation must be an identifier" msgstr "" @@ -3902,8 +3822,8 @@ msgstr "" msgid "rgb_pins[%d] is not on the same port as clock" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "roll argument must be an ndarray" +#: extmod/ulab/code/ndarray.c +msgid "right hand side must be an ndarray, or a scalar" msgstr "" #: py/objstr.c @@ -3934,7 +3854,7 @@ msgid "set unsupported" msgstr "" #: extmod/ulab/code/ndarray.c -msgid "shape must be a tuple" +msgid "shape must be a 2-tuple" msgstr "" #: shared-module/msgpack/__init__.c @@ -3953,7 +3873,7 @@ msgstr "" msgid "single '}' encountered in format string" msgstr "" -#: extmod/ulab/code/ulab_tools.c +#: extmod/ulab/code/linalg.c msgid "size is defined for ndarrays only" msgstr "" @@ -3961,10 +3881,6 @@ msgstr "" msgid "sleep length must be non-negative" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "slice step can't be zero" -msgstr "" - #: py/objslice.c msgid "slice step cannot be zero" msgstr "" @@ -3981,22 +3897,10 @@ msgstr "" msgid "soft reboot\n" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c +#: extmod/ulab/code/numerical.c msgid "sort argument must be an ndarray" msgstr "" -#: extmod/ulab/code/scipy/signal/signal.c -msgid "sos array must be of shape (n_section, 6)" -msgstr "" - -#: extmod/ulab/code/scipy/signal/signal.c -msgid "sos[:, 3] should be all ones" -msgstr "" - -#: extmod/ulab/code/scipy/signal/signal.c -msgid "sosfilt requires iterable arguments" -msgstr "" - #: shared-bindings/bitmaptools/__init__.c shared-bindings/displayio/Bitmap.c msgid "source palette too large" msgstr "" @@ -4103,18 +4007,10 @@ msgstr "" msgid "timestamp out of range for platform time_t" msgstr "" -#: extmod/ulab/code/ndarray.c -msgid "tobytes can be invoked for dense arrays only" -msgstr "" - #: shared-module/struct/__init__.c msgid "too many arguments provided with the given format" msgstr "" -#: extmod/ulab/code/ndarray.c extmod/ulab/code/ulab_create.c -msgid "too many dimensions" -msgstr "" - #: extmod/ulab/code/ndarray.c msgid "too many indices" msgstr "" @@ -4128,12 +4024,8 @@ msgstr "" msgid "too many values to unpack (expected %d)" msgstr "" -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays" -msgstr "" - -#: extmod/ulab/code/numpy/approx/approx.c -msgid "trapz is defined for 1D arrays of equal length" +#: extmod/ulab/code/linalg.c +msgid "tuple index out of range" msgstr "" #: py/obj.c @@ -4295,20 +4187,19 @@ msgstr "" msgid "window must be <= interval" msgstr "" -#: extmod/ulab/code/numpy/numerical/numerical.c -msgid "wrong axis index" +#: extmod/ulab/code/linalg.c +msgid "wrong argument type" msgstr "" -#: extmod/ulab/code/ulab_create.c -msgid "wrong axis specified" +#: extmod/ulab/code/ndarray.c +msgid "wrong index type" msgstr "" -#: extmod/ulab/code/numpy/compare/compare.c -#: extmod/ulab/code/numpy/vector/vector.c +#: extmod/ulab/code/vectorise.c msgid "wrong input type" msgstr "" -#: extmod/ulab/code/ulab_create.c py/objstr.c +#: py/objstr.c msgid "wrong number of arguments" msgstr "" @@ -4320,7 +4211,7 @@ msgstr "" msgid "wrong operand type" msgstr "" -#: extmod/ulab/code/numpy/vector/vector.c +#: extmod/ulab/code/vectorise.c msgid "wrong output type" msgstr "" @@ -4343,15 +4234,3 @@ msgstr "" #: py/objrange.c msgid "zero step" msgstr "" - -#: extmod/ulab/code/scipy/signal/signal.c -msgid "zi must be an ndarray" -msgstr "" - -#: extmod/ulab/code/scipy/signal/signal.c -msgid "zi must be of float type" -msgstr "" - -#: extmod/ulab/code/scipy/signal/signal.c -msgid "zi must be of shape (n_section, 2)" -msgstr "" diff --git a/ports/atmel-samd/asf4 b/ports/atmel-samd/asf4 index 84f56af13292d..c0eef7b75124f 160000 --- a/ports/atmel-samd/asf4 +++ b/ports/atmel-samd/asf4 @@ -1 +1 @@ -Subproject commit 84f56af13292d8f32c40acbd949bde698ddd4507 +Subproject commit c0eef7b75124fc946af5f75e12d82d6d01315ab1 diff --git a/ports/atmel-samd/peripherals b/ports/atmel-samd/peripherals index a7e39c4d01aa5..e4161d7d6d98d 160000 --- a/ports/atmel-samd/peripherals +++ b/ports/atmel-samd/peripherals @@ -1 +1 @@ -Subproject commit a7e39c4d01aa5916015beecb021777617e77b0ad +Subproject commit e4161d7d6d98d78eddcccb82128856af4baf7e50 diff --git a/ports/cxd56/spresense-exported-sdk b/ports/cxd56/spresense-exported-sdk index 2ec2a15383626..7f6568c7f4898 160000 --- a/ports/cxd56/spresense-exported-sdk +++ b/ports/cxd56/spresense-exported-sdk @@ -1 +1 @@ -Subproject commit 2ec2a1538362696118dc3fdf56f33dacaf8f4067 +Subproject commit 7f6568c7f4898cdb24a2f06040784a836050686e diff --git a/ports/esp32s2/certificates/nina-fw b/ports/esp32s2/certificates/nina-fw deleted file mode 160000 index f2a0e601b2321..0000000000000 --- a/ports/esp32s2/certificates/nina-fw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f2a0e601b23212dda4fe305eab30af49a7c7fb41 diff --git a/ports/esp32s2/esp-idf b/ports/esp32s2/esp-idf index f30a865fd1a44..7aae7f034bab6 160000 --- a/ports/esp32s2/esp-idf +++ b/ports/esp32s2/esp-idf @@ -1 +1 @@ -Subproject commit f30a865fd1a44d880b909b84112f74741412c2ce +Subproject commit 7aae7f034bab68d2dd6aaa763924c91eb697d87e diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile index 290d99386a010..828623c30b611 100755 --- a/ports/nrf/Makefile +++ b/ports/nrf/Makefile @@ -102,7 +102,7 @@ endif # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk CFLAGS += $(OPTIMIZATION_FLAGS) -CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) +CFLAGS += $(INC) -Wall -Wno-error=implicit-function-declaration -std=gnu11 -nostdlib -fshort-enums $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT) # Undo some warnings. # nrfx does casts that increase alignment requirements. diff --git a/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk b/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk index 57b39b512b40e..a6c78ecda83ba 100644 --- a/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk +++ b/ports/nrf/boards/itsybitsy_nrf52840_express/mpconfigboard.mk @@ -10,3 +10,11 @@ CIRCUITPY_BITBANG_APA102 = 1 QSPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "GD25Q16C" + +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_IL0398 +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BLE +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes +#FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Bitmap_Font +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Debouncer +FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ImageLoad diff --git a/ports/raspberrypi/sdk b/ports/raspberrypi/sdk deleted file mode 160000 index 49c0c1613dca3..0000000000000 --- a/ports/raspberrypi/sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 49c0c1613dca37eea85f168290e858cca4411d81 diff --git a/ports/stm/st_driver b/ports/stm/st_driver index 1900834751fd6..3fc2e0f3db155 160000 --- a/ports/stm/st_driver +++ b/ports/stm/st_driver @@ -1 +1 @@ -Subproject commit 1900834751fd6754457874b8c971690bab33e0a7 +Subproject commit 3fc2e0f3db155b33177bb0705e0dd65cadb58412 diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy1.py b/ports/unix/variants/coverage/frzmpy/frzmpy1.py deleted file mode 100644 index 83231c81a5f53..0000000000000 --- a/ports/unix/variants/coverage/frzmpy/frzmpy1.py +++ /dev/null @@ -1 +0,0 @@ -print("frzmpy1") diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy2.py b/ports/unix/variants/coverage/frzmpy/frzmpy2.py deleted file mode 100644 index 1ad930db2b6a8..0000000000000 --- a/ports/unix/variants/coverage/frzmpy/frzmpy2.py +++ /dev/null @@ -1 +0,0 @@ -raise ZeroDivisionError diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py deleted file mode 100644 index a0f0a6e540eb0..0000000000000 --- a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg1/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# test frozen package with __init__.py -print("frzmpy_pkg1.__init__") -x = 1 diff --git a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py b/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py deleted file mode 100644 index bd5419a0a7696..0000000000000 --- a/ports/unix/variants/coverage/frzmpy/frzmpy_pkg2/mod.py +++ /dev/null @@ -1,6 +0,0 @@ -# test frozen package without __init__.py -print("frzmpy_pkg2.mod") - - -class Foo: - x = 1 diff --git a/ports/unix/variants/coverage/frzmpy/frzqstr.py b/ports/unix/variants/coverage/frzmpy/frzqstr.py deleted file mode 100644 index 051f2a9c1676a..0000000000000 --- a/ports/unix/variants/coverage/frzmpy/frzqstr.py +++ /dev/null @@ -1,3 +0,0 @@ -# Checks for regression on MP_QSTR_NULL -def returns_NULL(): - return "NULL" diff --git a/ports/unix/variants/coverage/frzstr/frzstr1.py b/ports/unix/variants/coverage/frzstr/frzstr1.py deleted file mode 100644 index cf4b98d338d11..0000000000000 --- a/ports/unix/variants/coverage/frzstr/frzstr1.py +++ /dev/null @@ -1 +0,0 @@ -print("frzstr1") diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py deleted file mode 100644 index 748abb6ce90eb..0000000000000 --- a/ports/unix/variants/coverage/frzstr/frzstr_pkg1/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -# test frozen package with __init__.py -print("frzstr_pkg1.__init__") -x = 1 diff --git a/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py b/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py deleted file mode 100644 index 9e256d9ea796e..0000000000000 --- a/ports/unix/variants/coverage/frzstr/frzstr_pkg2/mod.py +++ /dev/null @@ -1,6 +0,0 @@ -# test frozen package without __init__.py -print("frzstr_pkg2.mod") - - -class Foo: - x = 1 diff --git a/ports/unix/variants/coverage/manifest.py b/ports/unix/variants/coverage/manifest.py deleted file mode 100644 index 6111050884222..0000000000000 --- a/ports/unix/variants/coverage/manifest.py +++ /dev/null @@ -1,2 +0,0 @@ -freeze_as_str("frzstr") -freeze_as_mpy("frzmpy") diff --git a/ports/unix/variants/dev/manifest.py b/ports/unix/variants/dev/manifest.py deleted file mode 100644 index 92a681116a687..0000000000000 --- a/ports/unix/variants/dev/manifest.py +++ /dev/null @@ -1,3 +0,0 @@ -include("$(PORT_DIR)/variants/manifest.py") - -include("$(MPY_DIR)/extmod/uasyncio/manifest.py") diff --git a/ports/unix/variants/manifest.py b/ports/unix/variants/manifest.py deleted file mode 100644 index 7708e598dbcfb..0000000000000 --- a/ports/unix/variants/manifest.py +++ /dev/null @@ -1,2 +0,0 @@ -freeze_as_mpy("$(MPY_DIR)/tools", "upip.py") -freeze_as_mpy("$(MPY_DIR)/tools", "upip_utarfile.py", opt=3) diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 41f8d71abdc3f..499997ef88c7e 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -34,7 +34,6 @@ BASE_CFLAGS = \ -Wimplicit-fallthrough=2 \ -Wno-endif-labels \ -Wstrict-prototypes \ - -Werror-implicit-function-declaration \ -Wfloat-equal \ -Wundef \ -Wshadow \ diff --git a/tools/gen_display_resources.py b/tools/gen_display_resources.py index 04ebc86579f1c..4667a56d3124f 100644 --- a/tools/gen_display_resources.py +++ b/tools/gen_display_resources.py @@ -59,7 +59,10 @@ def _load_row(self, y, row): filtered_characters = all_characters # Try to pre-load all of the glyphs. Misses will still be slow later. -f.load_glyphs(set(ord(c) for c in all_characters)) +try: + f.load_glyphs(set(ord(c) for c in all_characters)) +except: + pass missing = 0 # Get each glyph. diff --git a/tools/usb_descriptor b/tools/usb_descriptor index 2eaa6114b209f..701cafc50e2e5 160000 --- a/tools/usb_descriptor +++ b/tools/usb_descriptor @@ -1 +1 @@ -Subproject commit 2eaa6114b209fe7f0a795eda8d6a7b3b93d76d2e +Subproject commit 701cafc50e2e574dccaf7a340eedbd64a0b41a42