diff --git a/NuEVI/NuEVI.ino b/NuEVI/NuEVI.ino index ad918e6..2f280c8 100644 --- a/NuEVI/NuEVI.ino +++ b/NuEVI/NuEVI.ino @@ -36,31 +36,6 @@ PROGRAMME FUNCTION: EVI Wind Controller using the Freescale MP3V5004GP breath - -// The three states of our main state machine - -// No note is sounding -#define NOTE_OFF 1 - -// We've observed a transition from below to above the -// threshold value. We wait a while to see how fast the -// breath velocity is increasing -#define RISE_WAIT 2 - -// A note is sounding -#define NOTE_ON 3 - - -//Magic value where pinky button means "pitch bend" -#define PBD 12 - -//Vibrato direction -#define UPWD 1 -#define DNWD 0 - - - - //_______________________________________________________________________________________________ DECLARATIONS //variables setup diff --git a/NuEVI/globals.h b/NuEVI/globals.h index 98776a3..6ec0e44 100644 --- a/NuEVI/globals.h +++ b/NuEVI/globals.h @@ -3,6 +3,29 @@ #include "Wiring.h" + +// The three states of our main state machine + +// No note is sounding +#define NOTE_OFF 1 + +// We've observed a transition from below to above the +// threshold value. We wait a while to see how fast the +// breath velocity is increasing +#define RISE_WAIT 2 + +// A note is sounding +#define NOTE_ON 3 + + +//Magic value where pinky button means "pitch bend" +#define PBD 12 + +//Vibrato direction +#define UPWD 1 +#define DNWD 0 + + extern unsigned short breathThrVal; extern unsigned short breathMaxVal; extern unsigned short portamThrVal;