adafruit · dhalbert · May 23, 2023 · May 15, 2023 · May 16, 2023 · May 16, 2023
diff --git a/extmod/ulab b/extmod/ulab
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -211,7 +211,7 @@ msgstr ""
 msgid "%q must be of type %q or %q, not %q"
 msgstr ""
 
-#: py/argcheck.c py/obj.c py/objstrunicode.c
+#: py/argcheck.c py/obj.c py/objstrunicode.c shared-module/synthio/__init__.c
 msgid "%q must be of type %q, not %q"
 msgstr ""
 
@@ -2470,6 +2470,10 @@ msgstr ""
 msgid "annotation must be an identifier"
 msgstr ""
 
+#: extmod/ulab/code/numpy/create.c
+msgid "arange: cannot compute length"
+msgstr ""
+
 #: py/modbuiltins.c
 msgid "arg is an empty sequence"
 msgstr ""
@@ -2642,6 +2646,10 @@ msgstr ""
 msgid "can only have up to 4 parameters to Xtensa assembly"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "can only specify one unknown dimension"
+msgstr ""
+
 #: py/objtype.c
 msgid "can't add special method to already-subclassed class"
 msgstr ""
@@ -2793,6 +2801,10 @@ msgstr ""
 msgid "cannot import name %q"
 msgstr ""
 
+#: extmod/ulab/code/ndarray.c
+msgid "cannot reshape array"
+msgstr ""
+
 #: extmod/moductypes.c
 msgid "cannot unambiguously get sizeof scalar"
 msgstr ""
@@ -3242,10 +3254,6 @@ msgstr ""
 msgid "inline assembler must be a function"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
-msgid "input and output shapes are not compatible"
-msgstr ""
-
 #: extmod/ulab/code/numpy/create.c
 msgid "input argument must be an integer, a tuple, or a list"
 msgstr ""
@@ -3959,7 +3967,7 @@ msgid "set unsupported"
 msgstr ""
 
 #: extmod/ulab/code/ndarray.c
-msgid "shape must be a tuple"
+msgid "shape must be integer or tuple of integers"
 msgstr ""
 
 #: shared-module/msgpack/__init__.c

diff --git a/ports/atmel-samd/boards/aloriumtech_evo_m51/mpconfigboard.mk b/ports/atmel-samd/boards/aloriumtech_evo_m51/mpconfigboard.mk
@@ -13,3 +13,4 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_PS2IO = 1
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_deluxe_m4/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, S25FL064L"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_PS2IO = 1
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk b/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JVxQ, W25Q16JVxM"
 LONGINT_IMPL = MPZ
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m4_express/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
 LONGINT_IMPL = MPZ
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk b/ports/atmel-samd/boards/monster_m4sk/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "GD25Q64C,W25Q64JVxQ"
 LONGINT_IMPL = MPZ
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk b/ports/atmel-samd/boards/openbook_m4/mpconfigboard.mk
@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_KEYPAD = 1
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk b/ports/atmel-samd/boards/seeeduino_wio_terminal/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk b/ports/atmel-samd/boards/silicognition-m4-shim/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/atmel-samd/boards/uartlogger2/mpconfigboard.mk b/ports/atmel-samd/boards/uartlogger2/mpconfigboard.mk
@@ -9,3 +9,4 @@ CHIP_FAMILY = samd51
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32JVxQ"
 LONGINT_IMPL = MPZ
+CIRCUITPY_SYNTHIO = 0
diff --git a/ports/stm/boards/thunderpack_v12/mpconfigboard.mk b/ports/stm/boards/thunderpack_v12/mpconfigboard.mk
@@ -11,9 +11,10 @@ LONGINT_IMPL = NONE
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 
-CIRCUITPY_NVM = 1
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_BLEIO_HCI = 0
+CIRCUITPY_NVM = 1
+CIRCUITPY_SYNTHIO = 0
 CIRCUITPY_ZLIB = 0
 
 MCU_SERIES = F4

diff --git a/ports/unix/variants/coverage/mpconfigvariant.mk b/ports/unix/variants/coverage/mpconfigvariant.mk
@@ -41,7 +41,9 @@ SRC_BITMAP := \
 	shared-bindings/rainbowio/__init__.c \
 	shared-bindings/struct/__init__.c \
 	shared-bindings/synthio/__init__.c \
+	shared-bindings/synthio/Math.c \
 	shared-bindings/synthio/MidiTrack.c \
+	shared-bindings/synthio/LFO.c \
 	shared-bindings/synthio/Note.c \
 	shared-bindings/synthio/Synthesizer.c \
 	shared-bindings/traceback/__init__.c \
@@ -64,7 +66,9 @@ SRC_BITMAP := \
 	shared-module/rainbowio/__init__.c \
 	shared-module/struct/__init__.c \
 	shared-module/synthio/__init__.c \
+	shared-module/synthio/Math.c \
 	shared-module/synthio/MidiTrack.c \
+	shared-module/synthio/LFO.c \
 	shared-module/synthio/Note.c \
 	shared-module/synthio/Synthesizer.c \
 	shared-module/traceback/__init__.c \

diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk
@@ -650,6 +650,8 @@ SRC_SHARED_MODULE_ALL = \
 	struct/__init__.c \
 	supervisor/__init__.c \
 	supervisor/StatusBar.c \
+	synthio/LFO.c \
+	synthio/Math.c \
 	synthio/MidiTrack.c \
 	synthio/Note.c \
 	synthio/Synthesizer.c \

diff --git a/py/enum.h b/py/enum.h
@@ -50,12 +50,13 @@ typedef struct {
         cp_enum_obj_print_helper(MP_QSTR_##module, print, self_in, kind); \
     }
 
-#define MAKE_ENUM_TYPE(module, type, typename) \
+#define MAKE_ENUM_TYPE(module, type, typename, ...) \
     const mp_obj_type_t typename##_type = { \
         { &mp_type_type }, \
         .name = MP_QSTR_##type, \
         .print = typename##_print, \
         .locals_dict = (mp_obj_dict_t *)&typename##_locals_dict, \
+        ##__VA_ARGS__ \
     }
+1 −1		README.md
+25 −0		build/rp2w.sh
+52 −9		code/ndarray.c
+18 −2		code/ndarray.h
+98 −2		code/ndarray_operators.c
+262 −1		code/ndarray_operators.h
+17 −0		code/ndarray_properties.h
+2 −0		code/numpy/compare.c
+6 −4		code/numpy/create.c
+2 −0		code/numpy/numerical.c
+3 −0		code/numpy/numpy.c
+21 −0		code/numpy/vector.c
+1 −0		code/numpy/vector.h
+1 −1		code/ulab.c
+8 −0		code/ulab.h
+18 −0		docs/ulab-change-log.md
+1 −2		requirements_cp_dev.txt
+9 −1		tests/2d/numpy/arange.py
+6 −0		tests/2d/numpy/arange.py.exp
+12 −0		tests/2d/numpy/operators.py
+11 −0		tests/2d/numpy/operators.py.exp
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,4 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C
		LONGINT_IMPL = MPZ

		CIRCUITPY_PS2IO = 1
		CIRCUITPY_SYNTHIO = 0
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,3 +11,4 @@ EXTERNAL_FLASH_DEVICES = "W25Q64JVxQ, S25FL064L"
		LONGINT_IMPL = MPZ

		CIRCUITPY_PS2IO = 1
		CIRCUITPY_SYNTHIO = 0