Skip to content

fixing up amyboard-web to work with new amy changes #609

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
bwhitman merged 1 commit into from
Sep 1, 2025
Merged

fixing up amyboard-web to work with new amy changes #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions tulip/amyboardweb/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ EXPORTED_FUNCTIONS_EXTRA += ,\
_proxy_c_to_js_resume,\
_proxy_c_to_js_store_attr,\
_proxy_convert_mp_to_js_obj_cside,\
_tulip_tick
_tulip_tick,\
_tulip_midi_input_hook

EXPORTED_RUNTIME_METHODS_EXTRA += ,\
PATH,\
Expand All @@ -107,7 +108,6 @@ JSFLAGS += \
_mp_js_repl_process_char,\
_mp_hal_get_interrupt_char,\
_mp_handle_pending,\
_amy_process_single_midi_byte,\
_mp_sched_keyboard_interrupt$(EXPORTED_FUNCTIONS_EXTRA)"
JSFLAGS += -s EXPORTED_RUNTIME_METHODS="\
ccall,\
Expand Down Expand Up @@ -148,6 +148,7 @@ EXTMOD_SRC_C += $(addprefix $(TULIP_EXTMOD_DIR)/, \
help.c \
tulip_helpers.c \
tsequencer.c \
amy_connector.c \
)

EXTMOD_SRC_C += $(addprefix $(ULAB_DIR)/, \
Expand Down
9 changes: 6 additions & 3 deletions tulip/amyboardweb/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,13 @@ export async function loadMicroPython(options) {
"tulip_tick", "null", ["number"], [tick], {async:true}
);
},
midiByte(byte) {
return Module.ccall(
"amy_process_single_midi_byte", "null", ["number"], [byte], {async:true}
midiInHook(bytes, len, sysex) {
const midi_ptr_out = Module._malloc(len); // max midi message len
Module.HEAPU8.set(bytes, midi_ptr_out);
Module.ccall(
'tulip_midi_input_hook', null, ["number", "number", "number"], [midi_ptr_out, len, sysex]
);
Module._free(midi_ptr_out);
},
// Needed if the GC/asyncify is enabled.
async replProcessCharWithAsyncify(chr) {
Expand Down
6 changes: 0 additions & 6 deletions tulip/amyboardweb/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ timestamp=$(date +%Y%m%d%H%M%S)

cd ../../amy
make docs/amy.js
make docs/amy-audioin.js
cd ../tulip/amyboardweb
make

Expand All @@ -27,17 +26,12 @@ cp ../../amy/docs/amy.js stage/amy/amy-$timestamp.js
cp ../../amy/docs/amy.wasm stage/amy/amy-$timestamp.wasm
cp ../../amy/docs/amy.aw.js stage/amy/amy-$timestamp.aw.js

cp ../../amy/docs/amy-audioin.js stage/amy/amy-audioin-$timestamp.js
cp ../../amy/docs/amy-audioin.wasm stage/amy/amy-audioin-$timestamp.wasm
cp ../../amy/docs/amy-audioin.aw.js stage/amy/amy-audioin-$timestamp.aw.js

cp build-standard/tulip/obj/micropython.wasm stage/amy/amyboard-$timestamp.wasm
cp build-standard/tulip/obj/micropython.mjs stage/amy/amyboard-$timestamp.mjs
cp build-standard/tulip/obj/micropython.data stage/amy/amyboard-$timestamp.data

sed -i '' -e "s/AMYBOARDMJS/amyboard\-${timestamp}.mjs/g" -e "s/AMYJS/amy\-${timestamp}.js/g" stage/amy/index.html
sed -i '' -e "s/amy.aw.js/amy\-${timestamp}.aw.js/g" -e "s/amy.wasm/amy\-${timestamp}.wasm/g" stage/amy/amy-$timestamp.js
sed -i '' -e "s/amy\-audioin.aw.js/amy\-audioin\-${timestamp}.aw.js/g" -e "s/amy\-audioin.wasm/amy\-audioin\-${timestamp}.wasm/g" stage/amy/amy-audioin-$timestamp.js
sed -i '' -e "s/micropython./amyboard\-${timestamp}./g" stage/amy/amyboard-$timestamp.mjs

python3 server.py
2 changes: 1 addition & 1 deletion tulip/amyboardweb/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include "proxy_c.h"
#include "py/ringbuf.h"
#include "emscripten/html5.h"
#include "amy_midi.h"
#include "amy_connector.h"
#include "tsequencer.h"

extern void setup_lvgl();
Expand Down
76 changes: 43 additions & 33 deletions tulip/amyboardweb/static/spss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
var amy_play_message = null;
var amy_live_start = null;

var amy_add_message = null;
var amy_live_start_web = null;
var amy_bleep = null;
var amy_live_start_web_audioin = null;
var amy_process_single_midi_byte = null;
var audio_started = false;
var amy_sysclock = null;
var amy_get_input_buffer = null;
var amy_set_input_buffer = null;
var amyboard_started = false;

var mp = null;
var midiOutputDevice = null;
var midiInputDevice = null;
Expand All @@ -18,19 +21,26 @@ var cv_1_voltage = 0;
var cv_2_voltage = 0;
var amy_module = null;


// Once AMY module is loaded, register its functions and start AMY (not yet audio, you need to click for that)
amyModule().then(async function(am) {
amy_live_start = am.cwrap(
'amy_live_start', null, ['number'], {async: true}
amy_live_start_web = am.cwrap(
'amy_live_start_web', null, null, {async: true}
);
amy_live_start_web_audioin = am.cwrap(
'amy_live_start_web_audioin', null, null, {async: true}
);
amy_live_stop = am.cwrap(
'amy_live_stop', null, null, {async: true}
);
amy_start = am.cwrap(
'amy_start', null, ['number', 'number', 'number']
amy_bleep = am.cwrap(
'amy_bleep', null, ['number']
);
amy_play_message = am.cwrap(
'amy_play_message', null, ['string']
amy_start_web_no_synths = am.cwrap(
'amy_start_web_no_synths', null, null
);
amy_add_message = am.cwrap(
'amy_add_message', null, ['string']
);
amy_reset_sysclock = am.cwrap(
'amy_reset_sysclock', null, null
Expand All @@ -41,16 +51,16 @@ amyModule().then(async function(am) {
amy_sysclock = am.cwrap(
'amy_sysclock', 'number', [null]
);
amy_get_input_buffer = am.cwrap(
'amy_get_input_buffer', null, ['number']
);
amy_set_input_buffer = am.cwrap(
'amy_set_external_input_buffer', null, ['number']
amy_process_single_midi_byte = am.cwrap(
'amy_process_single_midi_byte', null, ['number, number']
);
amy_start(1,1,1,1);
amy_start_web_no_synths();
amy_bleep(0); // won't play until live audio starts
amy_module = am;
});
res_ptr_in = amy_module._malloc(2 * 256 * 2); // 2 channels, 256 frames, int16s
res_ptr_out = amy_module._malloc(2 * 256 * 2); // 2 channels, 256 frames, int16s

});

// Called from AMY to update AMYboard about what tick it is, for the sequencer
function amy_sequencer_js_hook(tick) {
Expand All @@ -64,6 +74,11 @@ async function clear_storage() {
}
}

async function amy_external_midi_input_js_hook(bytes, len, sysex) {
mp.midiInHook(bytes, len, sysex);
}


async function setup_midi_devices() {
var midi_in = document.amyboard_settings.midi_input;
var midi_out = document.amyboard_settings.midi_output;
Expand All @@ -72,7 +87,7 @@ async function setup_midi_devices() {
midiInputDevice = WebMidi.getInputById(WebMidi.inputs[midi_in.selectedIndex].id);
midiInputDevice.addListener("midimessage", e => {
for(byte in e.message.data) {
mp.midiByte(e.message.data[byte]);
amy_process_single_midi_byte(e.message.data[byte], 1);
}
});
}
Expand Down Expand Up @@ -439,10 +454,10 @@ async function toggle_audioin() {
await amy_live_stop();
if (document.getElementById('amy_audioin').checked) {
amy_audioin_toggle = true;
await amy_live_start(1);
await amy_live_start_web_audioin();
} else {
amy_audioin_toggle = false;
await amy_live_start(0);
await amy_live_start_web();
}
}

Expand Down Expand Up @@ -473,25 +488,20 @@ async function start_amyboard() {
await start_midi();

// Let micropython call an exported AMY function
await mp.registerJsModule('amy_js_message', amy_play_message);
await mp.registerJsModule('amy_js_message', amy_add_message);
await mp.registerJsModule('amy_sysclock', amy_sysclock);
await mp.registerJsModule('amyboard_world_upload_file', amyboard_world_upload_file);
await mp.registerJsModule('amy_get_input_buffer', get_audio_samples);
await mp.registerJsModule('amy_set_external_input_buffer', set_audio_samples);
// await mp.registerJsModule('amy_get_input_buffer', get_audio_samples);
// await mp.registerJsModule('amy_set_external_input_buffer', set_audio_samples);

// time.sleep on this would block the browser from executing anything, so we override it to a JS thing
mp.registerJsModule("jssleep", sleep_ms);

// Set up the micropython context for AMY.
await mp.runPythonAsync(`
import tulip, amy, amy_js_message, amy_sysclock, amy_get_input_buffer, amy_set_external_input_buffer
import tulip, amy, amy_js_message, amy_sysclock
amy.override_send = amy_js_message
tulip.amy_ticks_ms = amy_sysclock
def amy_block_done_callback(f=None):
amy.block_cb = f
# put the js exported AMY shims in the spot tulip expects
tulip.amy_set_external_input_buffer = amy_set_external_input_buffer
tulip.amy_get_input_buffer = amy_get_input_buffer
tulip.amy_block_done_callback = amy_block_done_callback
`);

// If you don't have these sleeps we get a MemoryError with a locked heap. Not sure why yet.
Expand All @@ -506,14 +516,14 @@ async function start_amyboard() {
async function start_audio() {
document.body.removeEventListener('click', start_audio, true);
document.body.removeEventListener('keydown', start_audio, true);

// Don't run this twice
if(audio_started) return;

// Start the audio worklet (miniaudio)
if(amy_audioin_toggle) {
await amy_live_start(1);
await amy_live_start_web_audioin();
} else {
await amy_live_start(0);
await amy_live_start_web();
}
audio_started = true;
}