diff options
| author | Jeff Epler <jeff@adafruit.com> | 2020-10-27 11:47:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-27 11:47:44 -0500 |
| commit | 5110fec312f0d91642daa65210a814d27a9e2119 (patch) | |
| tree | 2e1be7afabac709f1b3ca79324b0b8a631569008 | |
| parent | caca0609bdbc8f5b1b406fad19878505bb5492a5 (diff) | |
| parent | fa35c3fa7caf24b3b1cc5822f542f5d30476cbe4 (diff) | |
Merge pull request #3608 from adafruit/6.0.x
Update main with latest 6.0.x
| m--------- | extmod/ulab | 0 | ||||
| -rw-r--r-- | locale/circuitpython.pot | 12 | ||||
| -rw-r--r-- | ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/extmod/ulab b/extmod/ulab -Subproject 11a7ecff6d76a02644ff23a734b792afaa615e4 +Subproject 8242b84753355433b61230ab6631c06e5ac77f3 diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 7ed2d1ba1..aa0f52c96 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2871,6 +2871,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" @@ -3303,6 +3311,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 "" diff --git a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h b/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h index 17b044b14..ef34465dc 100644 --- a/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h +++ b/ports/nrf/boards/circuitplayground_bluefruit/mpconfigboard.h @@ -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) |