Skip to content

working new AMY on web, desktop and CC #595

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 5 commits into from
Jun 12, 2025
Merged

working new AMY on web, desktop and CC #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3f9c9f2
upping amy
bwhitman Jun 12, 2025
02485b9
fixed bleep on tulip CC
bwhitman Jun 12, 2025
6a672cb
upping amy
bwhitman Jun 12, 2025
820f2fb
fixing web
bwhitman Jun 12, 2025
98cba83
deploying Tulip Web
bwhitman Jun 12, 2025
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
2 changes: 1 addition & 1 deletion amy
Open in desktop
Submodule amy updated 7 files
+1 −1 Makefile
+1 −1 docs/amy.js
+ − docs/amy.wasm
+6 −2 src/amy.c
+0 −1 src/amy.h
+4 −5 src/api.c
+0 −93 src/dsps_biquad_f32_ae32.S
1 change: 0 additions & 1 deletion tulip/amyboard/esp32_common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ list(APPEND MICROPY_SOURCE_EXTMOD
${TULIP_SHARED_DIR}/help.c
${TULIP_SHARED_DIR}/tsequencer.c
${TULIP_SHARED_DIR}/amy_connector.c
${AMY_DIR}/src/dsps_biquad_f32_ae32.S
${AMY_DIR}/src/algorithms.c
${AMY_DIR}/src/custom.c
${AMY_DIR}/src/patches.c
Expand Down
1 change: 0 additions & 1 deletion tulip/esp32s3/esp32_common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ list(APPEND MICROPY_SOURCE_EXTMOD
${TULIP_SHARED_DIR}/u8fontdata.c
${TULIP_SHARED_DIR}/u8g2_fonts.c
${TULIP_SHARED_DIR}/amy_connector.c
${AMY_DIR}/src/dsps_biquad_f32_ae32.S
${AMY_DIR}/src/algorithms.c
${AMY_DIR}/src/custom.c
${AMY_DIR}/src/patches.c
Expand Down
2 changes: 2 additions & 0 deletions tulip/shared/amy_connector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ void run_amy() {
amy_config.i2s_mclk = CONFIG_I2S_MCLK;
amy_config.midi_out = MIDI_OUT_PIN;
amy_config.midi_in = MIDI_IN_PIN;
amy_config.features.startup_bleep = 1;
amy_start(amy_config);
external_map = malloc_caps(amy_config.max_oscs, MALLOC_CAP_INTERNAL);
for(uint16_t i=0;i<amy_config.max_oscs;i++) external_map[i] = 0;
Expand All @@ -180,6 +181,7 @@ void run_amy(uint8_t capture_device_id, uint8_t playback_device_id) {
amy_config.capture_device_id = capture_device_id;
amy_config.playback_device_id = playback_device_id;
amy_config.features.audio_in = 1;
amy_config.features.startup_bleep = 1;
amy_start(amy_config);
amy_live_start();
}
Expand Down
17 changes: 8 additions & 9 deletions tulip/web/static/spss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
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;
Expand Down Expand Up @@ -31,8 +32,11 @@ amyModule().then(async function(am) {
amy_live_stop = am.cwrap(
'amy_live_stop', null, null, {async: true}
);
amy_start_web = am.cwrap(
'amy_start_web', null, null
amy_bleep = am.cwrap(
'amy_bleep', null, ['number']
);
amy_start_web_no_synths = am.cwrap(
'amy_start_web_no_synths', null, null
);
amy_add_message = am.cwrap(
'amy_add_message', null, ['string']
Expand All @@ -46,16 +50,11 @@ 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_web();
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
Expand Down
27 changes: 0 additions & 27 deletions www/run/amy-20250529104651.js
View file
Open in desktop

This file was deleted.

0 www/run/amy-20250529104651.aw.js → www/run/amy-20250612103609.aw.js
View file
Open in desktop
File renamed without changes.
27 changes: 27 additions & 0 deletions www/run/amy-20250612103609.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file renamed www/run/amy-20250529104651.wasm → www/run/amy-20250612103609.wasm
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions www/run/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>

<!-- These filenames are replaced by the build system -->
<script src="tulipcc-20250529104651.mjs" type="module"></script>
<script type="text/javascript" id="amy_js_include" src="amy-20250529104651.js"></script>
<script src="tulipcc-20250612103609.mjs" type="module"></script>
<script type="text/javascript" id="amy_js_include" src="amy-20250612103609.js"></script>
<script type="text/javascript" src="examples.js"></script>
<script type="text/javascript" src="spss.js"></script>
</head>
Expand Down
17 changes: 8 additions & 9 deletions www/run/spss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
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;
Expand Down Expand Up @@ -31,8 +32,11 @@ amyModule().then(async function(am) {
amy_live_stop = am.cwrap(
'amy_live_stop', null, null, {async: true}
);
amy_start_web = am.cwrap(
'amy_start_web', null, null
amy_bleep = am.cwrap(
'amy_bleep', null, ['number']
);
amy_start_web_no_synths = am.cwrap(
'amy_start_web_no_synths', null, null
);
amy_add_message = am.cwrap(
'amy_add_message', null, ['string']
Expand All @@ -46,16 +50,11 @@ 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_web();
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
Expand Down
0 www/run/tulipcc-20250529104651.data → www/run/tulipcc-20250612103609.data
View file
Open in desktop
File renamed without changes.
Loading