From 3be02ea3d92694a28259c0478b9faa3dc1e983cf Mon Sep 17 00:00:00 2001 From: Neale Pickett Date: Sun, 25 Oct 2020 19:41:38 -0600 Subject: [PATCH] Detune drones slightly --- uilleann.ino | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/uilleann.ino b/uilleann.ino index b3557f3..cdc4bd9 100644 --- a/uilleann.ino +++ b/uilleann.ino @@ -9,7 +9,7 @@ #include "notes.h" #include "fingering.h" -#define DEBUG +//#define DEBUG #define KNEE_OFFSET 0 #define KEY_OFFSET 2 @@ -24,15 +24,14 @@ AudioMixer4 mixL; AudioMixer4 mixR; AudioOutputAnalogStereo dacs1; -#ifdef DEBUG AudioSynthNoiseWhite debug; -#endif AudioConnection FMVoicePatchCords[] = { -#ifdef DEBUG + {debug, 0, mixR, 3}, // Don't know why, but the first one is ignored {debug, 0, mixL, 3}, - {debug, 0, mixR, 3}, -#endif + + {mixL, 0, dacs1, 0}, + {mixR, 0, dacs1, 1}, {Chanter.outputMixer, 0, biquad1, 0}, {biquad1, 0, mixL, 0}, @@ -50,9 +49,6 @@ AudioConnection FMVoicePatchCords[] = { {mixRegulators, 0, mixL, 2}, {mixRegulators, 0, mixR, 2}, - {mixL, 0, dacs1, 0}, - {mixR, 0, dacs1, 1}, - FMVoiceWiring(Chanter), FMVoiceWiring(Drones[0]), FMVoiceWiring(Drones[1]), @@ -114,8 +110,9 @@ void setup() { // Turn on drones for (int i=0; i<3; i++) { + float detune = (1-i) * 0.002; FMVoiceLoadPatch(&Drones[i], &Bank[0]); - FMVoiceNoteOn(&Drones[i], JustPitches[NOTE_D4 - 12*i] + i); + FMVoiceNoteOn(&Drones[i], JustPitches[NOTE_D4 - 12*i] * (1 + detune)); } // Turn on all mixer channels @@ -124,11 +121,9 @@ void setup() { mixR.gain(i, 0.6); } -#ifdef DEBUG debug.amplitude(0.1); - mixL.gain(3, 0.1); - mixR.gain(3, 0.1); -#endif + mixL.gain(3, 0); + mixR.gain(3, 0); } #define BUTTON_UP 0