Merge pull request #3608 from adafruit/6.0.x

jepler · web-flow · commit 5110fec312f0 · 2020-10-27T11:47:44.000-05:00
Update main with latest 6.0.x
diff --git a/extmod/ulab b/extmod/ulab
@@ -1 +1 @@
-Subproject commit 11a7ecff6d76a02644ff23a734b792afaa615e44
+Subproject commit 8242b84753355433b61230ab6631c06e5ac77f35
diff --git 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
@@ -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)
