Skip to content

Update main with latest 6.0.x #3608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 27, 2020
Merged

Update main with latest 6.0.x #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff69ab6
fix CPB SPI pin definitions
jerryneedell Oct 21, 2020
a899433
Merge pull request #3590 from jerryneedell/jerryn_cpb_spi
tannewt Oct 22, 2020
4cad547
ulab: Incorporate bugfixes (update to tag 0.54.5)
jepler Oct 24, 2020
543316a
ulab: Update again
jepler Oct 25, 2020
85aa851
make translate
jepler Oct 25, 2020
1e0f12d
Merge pull request #3602 from jepler/update-ulab-2
tannewt Oct 26, 2020
81ab6a0
Use old translation date to avoid merge conflict
tannewt Oct 26, 2020
fa35c3f
Merge pull request #3609 from tannewt/6.0.x
gamblor21 Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion extmod/ulab
Open in desktop
Submodule ulab updated 19 files
+30 −3 .github/workflows/build.yml
+6 −3 README.md
+20 −0 build-cp.sh
+50 −8 code/approx/approx.c
+29 −25 code/compare/compare.c
+9 −9 code/fft/fft.c
+24 −16 code/filter/filter.c
+83 −48 code/linalg/linalg.c
+1 −0 code/linalg/linalg.h
+83 −23 code/ndarray.c
+52 −47 code/numerical/numerical.c
+24 −19 code/poly/poly.c
+1 −1 code/ulab.c
+50 −41 code/ulab_create.c
+34 −27 code/vector/vectorise.c
+1 −1 docs/manual/source/conf.py
+11 −13 docs/manual/source/ulab.rst
+30 −1 docs/ulab-change-log.md
+17 −18 docs/ulab-manual.ipynb
12 changes: 12 additions & 0 deletions locale/circuitpython.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2863,6 +2863,14 @@ msgstr ""
msgid "maximum recursion depth exceeded"
msgstr ""

#: extmod/ulab/code/approx/approx.c
msgid "maxiter must be > 0"
msgstr ""

#: extmod/ulab/code/approx/approx.c
msgid "maxiter should be > 0"
msgstr ""

#: py/runtime.c
#, c-format
msgid "memory allocation failed, allocating %u bytes"
Expand Down Expand Up @@ -3295,6 +3303,10 @@ msgstr ""
msgid "sort argument must be an ndarray"
msgstr ""

#: extmod/ulab/code/numerical/numerical.c
msgid "sorted axis can't be longer than 65535"
msgstr ""

#: extmod/ulab/code/filter/filter.c
msgid "sos array must be of shape (n_section, 6)"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
#define DEFAULT_I2C_BUS_SCL (&pin_P0_04)
#define DEFAULT_I2C_BUS_SDA (&pin_P0_05)

#define DEFAULT_SPI_BUS_SCK (&pin_P0_05)
#define DEFAULT_SPI_BUS_MOSI (&pin_P1_03)
#define DEFAULT_SPI_BUS_SCK (&pin_P0_02)
#define DEFAULT_SPI_BUS_MOSI (&pin_P0_03)
#define DEFAULT_SPI_BUS_MISO (&pin_P0_29)

#define DEFAULT_UART_BUS_RX (&pin_P0_30)
Expand Down