diff --git a/amy.py b/amy.py index e722b2b..7eea5c0 100644 --- a/amy.py +++ b/amy.py @@ -5,7 +5,7 @@ AMY_NCHANS = 2 AMY_OSCS = 120 MAX_QUEUE = 400 -[SINE, PULSE, SAW_DOWN, SAW_UP, TRIANGLE, NOISE, KS, PCM, ALGO, PARTIAL, PARTIALS, OFF] = range(12) +[SINE, PULSE, SAW_DOWN, SAW_UP, TRIANGLE, NOISE, KS, PCM, ALGO, PARTIAL, PARTIALS, CUSTOM, OFF] = range(13) TARGET_AMP, TARGET_DUTY, TARGET_FREQ, TARGET_FILTER_FREQ, TARGET_RESONANCE, TARGET_FEEDBACK, TARGET_LINEAR, TARGET_TRUE_EXPONENTIAL, TARGET_DX7_EXPONENTIAL, TARGET_PAN = (1, 2, 4, 8, 16, 32, 64, 128, 256, 512) FILTER_NONE, FILTER_LPF, FILTER_BPF, FILTER_HPF, FILTER_LPF24 = range(5) AMY_LATENCY_MS = 0 diff --git a/src/amy.h b/src/amy.h index d96647a..549c8be 100644 --- a/src/amy.h +++ b/src/amy.h @@ -100,6 +100,7 @@ enum coefs{ #define PARTIALS 10 #define CUSTOM 11 #define WAVE_OFF 12 + // synth[].status values #define EMPTY 0 #define SCHEDULED 1 diff --git a/src/amy_config.h b/src/amy_config.h index 08c7215..e74896b 100644 --- a/src/amy_config.h +++ b/src/amy_config.h @@ -24,11 +24,10 @@ extern const uint16_t pcm_samples; #define AMY_MAX_DRIFT_MS 20000 // ms of time you can schedule ahead before synth recomputes time base #define AMY_KS_OSCS 1 // How many karplus-strong oscillators to keep track of (0 disables KS) #define AMY_HAS_PARTIALS 1 // 1 = Make partials available -#define AMY_HAS_CUSTOM 0 // 1 = Make custom oscillators available +#define AMY_HAS_CUSTOM 1 // 1 = Make custom oscillators available #define PCM_AMY_SAMPLE_RATE 22050 #define AMY_EVENT_FIFO_LEN 2000 - //If using an ESP, tell us how to allocate ram here. Not used on other platforms. #ifdef ESP_PLATFORM #include