Merge branch 'master' into johans-senaste
This commit is contained in:
commit
ba6182d1e6
4 changed files with 196 additions and 297 deletions
|
@ -28,18 +28,6 @@
|
|||
#define ECH 30
|
||||
#define QTN 31
|
||||
|
||||
#define HOF 0
|
||||
#define MGR 1
|
||||
#define MGD 2
|
||||
#define MA9 3
|
||||
#define MND 4
|
||||
#define MNA 5
|
||||
#define MNH 6
|
||||
#define FWC 7
|
||||
#define RT1 8
|
||||
#define RT2 9
|
||||
#define RT3 10
|
||||
|
||||
#define MOD 13
|
||||
|
||||
//Vibrato direction
|
||||
|
@ -47,6 +35,27 @@
|
|||
#define DNWD 0
|
||||
|
||||
|
||||
enum PolySelect : unsigned short {
|
||||
EHarmonizerOff = 0,
|
||||
ETriadMajorGospelRoot = 1, // MGR
|
||||
ETriadMajorGospelDominant = 2, // MGD
|
||||
EMajorAddNine = 3,
|
||||
EMinorDorian = 4,
|
||||
EMinorAeolian = 5,
|
||||
EMinorFourVoiceHip = 6,
|
||||
EFourWayCloseHarmonizer = 7,
|
||||
ERotatorA = 8,
|
||||
ERotatorB = 9,
|
||||
ERotatorC = 10,
|
||||
};
|
||||
|
||||
struct Rotator
|
||||
{
|
||||
uint16_t parallel; // Semitones
|
||||
uint16_t rotations[4];
|
||||
};
|
||||
|
||||
|
||||
extern const unsigned short* const curves[];
|
||||
extern const unsigned short curveIn[];
|
||||
|
||||
|
@ -107,7 +116,7 @@ extern unsigned short harmSetting; // 0-7
|
|||
extern unsigned short harmSelect; // 0-5
|
||||
extern unsigned short brHarmSetting; // 0-7
|
||||
extern unsigned short brHarmSelect; // 0-3
|
||||
extern unsigned short polySelect; // OFF, MGR, MGD, MND, MNH, FWC, RTA, RTB or RTC
|
||||
extern PolySelect polySelect; // OFF, MGR, MGD, MND, MNH, FWC, RTA, RTB or RTC
|
||||
extern unsigned short fwcType; // 6, m6, 7, m7
|
||||
extern unsigned short fwcLockH; // OFF:ON
|
||||
extern unsigned short fwcDrop2; // OFF:ON
|
||||
|
@ -126,12 +135,10 @@ extern uint16_t gateOpenEnable;
|
|||
extern uint16_t specialKeyEnable;
|
||||
extern byte rotatorOn;
|
||||
extern byte currentRotation;
|
||||
extern uint16_t rotations[4];
|
||||
extern uint16_t parallel; // semitones
|
||||
extern uint16_t rotationsb[4];
|
||||
extern uint16_t parallelb; // semitones
|
||||
extern uint16_t rotationsc[4];
|
||||
extern uint16_t parallelc; // semitones
|
||||
|
||||
extern Rotator rotations_a;
|
||||
extern Rotator rotations_b;
|
||||
extern Rotator rotations_c;
|
||||
|
||||
extern uint16_t bcasMode; //Legacy CASSIDY compile flag
|
||||
extern uint16_t trill3_interval;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue