amyrepl target works

shorepine · Jan 1, 2025 · ee202a2 · ee202a2
1 parent 2050fd8
commit ee202a2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/amy b/amy
diff --git a/tulip/amyrepl/Makefile b/tulip/amyrepl/Makefile
@@ -1,6 +1,12 @@
 ################################################################################
 # Initial setup of Makefile environment.
 
+TOP = ../../micropython
+
+# Set parallel flag to # of CPUs
+CPUS ?= $(shell sysctl -n hw.ncpu || echo 1)
+MAKEFLAGS += --jobs=$(CPUS)
+
 # Select the variant to build for:
 ifdef VARIANT_DIR
 # Custom variant path - remove trailing slash and get the final component of
@@ -17,9 +23,9 @@ $(error Invalid VARIANT specified: $(VARIANT_DIR))
 endif
 
 # If the build directory is not given, make it reflect the variant name.
-BUILD ?= build-$(VARIANT)
+BUILD ?= build-$(VARIANT)/tulip/obj
 
-include ../../py/mkenv.mk
+include $(TOP)/py/mkenv.mk
 include $(VARIANT_DIR)/mpconfigvariant.mk
 
 # Use the default frozen manifest, variants may override this.
@@ -44,10 +50,12 @@ INC += -I.
 INC += -I$(TOP)
 INC += -I$(BUILD)
 INC += -I$(VARIANT_DIR)
-INC += -I../../../tulip/shared/ulab/code/
+INC += -I../shared/
+INC += -I../shared/ulab/code/
+INC += -I../shared/desktop/
 
 
-ULAB_DIR = ../../../tulip/shared/ulab/code
+ULAB_DIR = ../shared/ulab/code
 EXTMOD_SRC_C += $(addprefix $(ULAB_DIR)/, \
 	scipy/integrate/integrate.c \
 	scipy/linalg/linalg.c \
@@ -86,7 +94,7 @@ EXTMOD_SRC_C += $(addprefix $(ULAB_DIR)/, \
 
 
 CFLAGS += -std=c99 -Wall -Werror -Wdouble-promotion -Wfloat-conversion
-CFLAGS += -Os -DNDEBUG  -DMODULE_ULAB_ENABLED=1
+CFLAGS += -Os -DNDEBUG  -DMODULE_ULAB_ENABLED=1 -DAMY_IS_EXTERNAL
 CFLAGS += $(INC)
 
 EXPORTED_FUNCTIONS_EXTRA += ,\

diff --git a/tulip/amyrepl/variants/manifest.py b/tulip/amyrepl/variants/manifest.py
@@ -3,6 +3,7 @@
 # runtime (with setTimeout an Promise's) to contrtol the scheduling.
 freeze("../../../../amy", "amy.py")
 freeze("../../../../amy/experiments", "tulip_piano.py")
+freeze("../../../../amy/experiments", "piano_params.py")
 freeze("../../../../amy", "juno.py")
 
 package(

diff --git a/tulip/web/Makefile b/tulip/web/Makefile
@@ -18,7 +18,6 @@ VARIANT ?= standard
 VARIANT_DIR ?= variants/$(VARIANT)
 endif
 
-
 ifeq ($(wildcard $(VARIANT_DIR)/.),)
 $(error Invalid VARIANT specified: $(VARIANT_DIR))
 endif
+4 −3		Makefile
+1 −1		docs/amy.js
+ −		docs/amy.wasm
+167 −0		docs/amyrepl.css
+122 −0		docs/amyrepl.js
+ −		docs/d4ff.png
+ −		docs/d4ffshift.png
+ −		docs/d4harm.png
+1 −0		docs/discord-mark-black.svg
+ −		docs/dx7.png
+ −		docs/env1.gif
+ −		docs/envelope.png
+ −		docs/favicon.ico
+ −		docs/fixed.png
+ −		docs/fundamental.png
+1 −0		docs/github-mark.svg
+ −		docs/interpolated.png
+ −		docs/juno.png
+6,645 −0		docs/micropython.mjs
+ −		docs/micropython.wasm
+249 −0		docs/piano.html
+161 −0		docs/piano.md
+ −		docs/realpiano.mp4
+ −		docs/spectralpeaks.png
+ −		docs/uiowa.png
+403 −0		experiments/make_piano_examples.ipynb
+76 −0		experiments/piano_examples.py
+41 −139		experiments/piano_heterodyne.ipynb
+2 −0		experiments/piano_params.py
+131 −94		experiments/tulip_piano.py
+ −		sounds/.DS_Store
+48 −8		src/amy.c
+5 −0		src/amy_config.h
+13 −2		src/libminiaudio-audio.c
+16 −13		src/partials.c
+2 −2		src/patches.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,6 @@ VARIANT ?= standard @@
     VARIANT_DIR ?= variants/$(VARIANT)
     endif
     ifeq ($(wildcard $(VARIANT_DIR)/.),)
     $(error Invalid VARIANT specified: $(VARIANT_DIR))
     endif
@@ Expand Down @@