Skip to content

Commit 341728f

Browse files
authored
Merge pull request #768 from shorepine/a440
A440
2 parents 55ce9e1 + 29fbbd7 commit 341728f

4 files changed

Lines changed: 141 additions & 139 deletions

File tree

amy

Submodule amy updated 70 files

tulip/amyboardweb/static/amy_api.generated.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,9 @@ var AMY = {
302302
MAX_VOICES_PER_INSTRUMENT: 32,
303303
FILT_NUM_DELAYS: 4,
304304
ZERO_HZ_LOG_VAL: -99.0,
305-
ZERO_LOGFREQ_IN_HZ: 261.63,
306-
ZERO_MIDI_NOTE: 60,
305+
ZERO_LOGFREQ_IN_HZ: 440.0,
306+
ZERO_MIDI_NOTE: 69,
307+
MIN_FILTER_LOGFREQ: -2.75,
307308
NUM_COMBO_COEFS: 9,
308309
MAX_MESSAGE_LEN: 1024,
309310
MAX_PARAM_LEN: 256,

tulip/amyboardweb/static/amy_parameters.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ window.addEventListener("DOMContentLoaded", function() {
3232
display_name: "freq",
3333
change_code: "i%iv" + OSCA_OSC + "f%v",
3434
knob_type: "log",
35-
default_value: 261.63,
36-
amy_default: 261.63, // logfreq_coefs[CONST]=0; display as middle C
35+
default_value: 440.0,
36+
amy_default: 440.0, // logfreq_coefs[CONST]=0; display as middle C
3737
min_value: 50,
3838
max_value: 2000,
3939
},
@@ -150,8 +150,8 @@ window.addEventListener("DOMContentLoaded", function() {
150150
display_name: "freq",
151151
change_code: "i%iv" + OSCB_OSC + "f%v",
152152
knob_type: "log",
153-
default_value: 261.63,
154-
amy_default: 261.63,
153+
default_value: 440.0,
154+
amy_default: 440.0,
155155
min_value: 50,
156156
max_value: 2000,
157157
},
@@ -730,7 +730,7 @@ function set_knobs_from_synth(synth) {
730730
let lfoOsc = 0; // logfreq_coefs[MOD] = 0
731731
let lfoPwm = 0; // duty_coefs[MOD] = 0
732732
// Track coefficients for the 2 non-lfo oscs. Because LFO is now osc 1, we need index [2]
733-
let osc_freq = [261.63, 261.63, 261.63]; // display default (logfreq_coefs[CONST]=0)
733+
let osc_freq = [440.0, 440.0, 440.0, 440.0]; // display default (logfreq_coefs[CONST]=0)
734734
let osc_wave = [0, 0, 0]; // wave = SINE = 0
735735
let osc_preset = [null, null, null];
736736
let osc_duty = [0.5, 0.5, 0.5]; // duty_coefs[CONST] = 0.5

0 commit comments

Comments
 (0)