brian/xevi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use enum naming convention

Browse source 
The same naming convention for enum as was used in menu should also apply to new enum.
Fixed some compiler warnings in menu.
Moved enum and struct in globals.h away from the middle of #define block.
This commit is contained in:
Mikael Degerfält 2021-07-29 20:30:09 +02:00
parent b5b6d890c0
commit 6ddd2aa111
4 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

48
NuEVI/NuEVI.ino
View file

@ -98,7 +98,7 @@ unsigned short harmSetting; // 0-7
unsigned short harmSelect; // 0-5 unsigned short harmSelect; // 0-5
unsigned short brHarmSetting; // 0-7 unsigned short brHarmSetting; // 0-7
unsigned short brHarmSelect; // 0-3 unsigned short brHarmSelect; // 0-3
EPolySelect polySelect; // OFF, MGR, MGD, MND, MNH, FWC, RTA, RTB or RTC PolySelect polySelect; // OFF, MGR, MGD, MND, MNH, FWC, RTA, RTB or RTC
unsigned short fwcType; // 6, m6, 7, m7 unsigned short fwcType; // 6, m6, 7, m7
unsigned short fwcLockH; // OFF:ON unsigned short fwcLockH; // OFF:ON
unsigned short fwcDrop2; // OFF:ON unsigned short fwcDrop2; // OFF:ON
@ -947,7 +947,7 @@ void loop() {
#else #else
specialKey = (touchRead(specialKeyPin) > touch_Thr); //S2 on pcb specialKey = (touchRead(specialKeyPin) > touch_Thr); //S2 on pcb
#endif #endif
if (polySelect != HarmonizerOff) { if (polySelect != EHarmonizerOff) {
if (lastSpecialKey != specialKey) { if (lastSpecialKey != specialKey) {
if (specialKey) { if (specialKey) {
// special key just pressed, check other keys // special key just pressed, check other keys
@ -1330,13 +1330,13 @@ static void stopRotatorNotes(byte note, const Rotator *rotator) {
static void stopHarmonizerNotes(byte note) static void stopHarmonizerNotes(byte note)
{ {
switch(polySelect) { switch(polySelect) {
case TriadMajorGospelRoot: sendHarmonizerData(note, majGosRootHmz, false); break; case ETriadMajorGospelRoot: sendHarmonizerData(note, majGosRootHmz, false); break;
case TriadMajorGospelDominant: sendHarmonizerData(note, majGosDomHmz, false); break; case ETriadMajorGospelDominant: sendHarmonizerData(note, majGosDomHmz, false); break;
case MajorAddNine: sendHarmonizerData(note, majAdd9Hmz, false); break; case EMajorAddNine: sendHarmonizerData(note, majAdd9Hmz, false); break;
case MinorDorian: sendHarmonizerData(note, minDorHmz, false); break; case EMinorDorian: sendHarmonizerData(note, minDorHmz, false); break;
case MinorAeolian: sendHarmonizerData(note, minAeoHmz, false); break; case EMinorAeolian: sendHarmonizerData(note, minAeoHmz, false); break;
case MinorFourVoiceHip: sendHarmonizerData(note, minHipHmz, false); break; case EMinorFourVoiceHip: sendHarmonizerData(note, minHipHmz, false); break;
case FourWayCloseHarmonizer: case EFourWayCloseHarmonizer:
{ {
if (!fwcDrop2 || (hmzLimit>(3+fwcLockH))) midiSendNoteOff(noteValueCheck(note+blockFWC[fwcType][(note-hmzKey)%12][0]-12*fwcDrop2)); if (!fwcDrop2 || (hmzLimit>(3+fwcLockH))) midiSendNoteOff(noteValueCheck(note+blockFWC[fwcType][(note-hmzKey)%12][0]-12*fwcDrop2));
if ((hmzLimit+fwcDrop2)>2) midiSendNoteOff(noteValueCheck(note+blockFWC[fwcType][(note-hmzKey)%12][1])); if ((hmzLimit+fwcDrop2)>2) midiSendNoteOff(noteValueCheck(note+blockFWC[fwcType][(note-hmzKey)%12][1]));
@ -1345,9 +1345,9 @@ static void stopHarmonizerNotes(byte note)
} }
break; break;
case RotatorA: stopRotatorNotes(note, &rotations_a); break; case ERotatorA: stopRotatorNotes(note, &rotations_a); break;
case RotatorB: stopRotatorNotes(note, &rotations_b); break; case ERotatorB: stopRotatorNotes(note, &rotations_b); break;
case RotatorC: stopRotatorNotes(note, &rotations_c); break; case ERotatorC: stopRotatorNotes(note, &rotations_c); break;
default: break; default: break;
} }
@ -1356,13 +1356,13 @@ static void stopHarmonizerNotes(byte note)
static void startHarmonizerNotes(byte note) static void startHarmonizerNotes(byte note)
{ {
switch(polySelect) { switch(polySelect) {
case TriadMajorGospelRoot: sendHarmonizerData(note, majGosRootHmz, true); break; case ETriadMajorGospelRoot: sendHarmonizerData(note, majGosRootHmz, true); break;
case TriadMajorGospelDominant: sendHarmonizerData(note, majGosDomHmz, true); break; case ETriadMajorGospelDominant: sendHarmonizerData(note, majGosDomHmz, true); break;
case MajorAddNine: sendHarmonizerData(note, majAdd9Hmz, true); break; case EMajorAddNine: sendHarmonizerData(note, majAdd9Hmz, true); break;
case MinorDorian: sendHarmonizerData(note, minDorHmz, true); break; case EMinorDorian: sendHarmonizerData(note, minDorHmz, true); break;
case MinorAeolian: sendHarmonizerData(note, minAeoHmz, true); break; case EMinorAeolian: sendHarmonizerData(note, minAeoHmz, true); break;
case MinorFourVoiceHip: sendHarmonizerData(note, minHipHmz, true); break; case EMinorFourVoiceHip: sendHarmonizerData(note, minHipHmz, true); break;
case FourWayCloseHarmonizer: case EFourWayCloseHarmonizer:
{ {
int limit = (hmzLimit+fwcDrop2); int limit = (hmzLimit+fwcDrop2);
if (!fwcDrop2 || (hmzLimit>(3+fwcLockH))) midiSendNoteOn(noteValueCheck(note+blockFWC[fwcType][(note-hmzKey)%12][0]-12*fwcDrop2), velocitySend); if (!fwcDrop2 || (hmzLimit>(3+fwcLockH))) midiSendNoteOn(noteValueCheck(note+blockFWC[fwcType][(note-hmzKey)%12][0]-12*fwcDrop2), velocitySend);
@ -1372,9 +1372,9 @@ static void startHarmonizerNotes(byte note)
} }
break; break;
case RotatorA: updateRotator(note, &rotations_a); break; case ERotatorA: updateRotator(note, &rotations_a); break;
case RotatorB: updateRotator(note, &rotations_b); break; case ERotatorB: updateRotator(note, &rotations_b); break;
case RotatorC: updateRotator(note, &rotations_c); break; case ERotatorC: updateRotator(note, &rotations_c); break;
default: break; default: break;
} }
@ -2016,7 +2016,7 @@ void readSwitches() {
else if (touchValueRollers[rPin1] < ctouchThrVal) octaveR = 1; //R1 else if (touchValueRollers[rPin1] < ctouchThrVal) octaveR = 1; //R1
else if (lastOctaveR > 1) { else if (lastOctaveR > 1) {
octaveR = lastOctaveR; octaveR = lastOctaveR;
if (otfKey && polySelect && (polySelect<EPolySelect::RotatorA) && rotatorOn && (mainState == NOTE_OFF)) hmzKey = fingeredNote%12; if (otfKey && polySelect && (polySelect<PolySelect::ERotatorA) && rotatorOn && (mainState == NOTE_OFF)) hmzKey = fingeredNote%12;
if (mainState == NOTE_OFF) currentRotation = 3; //rotator reset by releasing rollers if (mainState == NOTE_OFF) currentRotation = 3; //rotator reset by releasing rollers
} }
//if rollers are released and we are not coming down from roller 1, stay at the higher octave //if rollers are released and we are not coming down from roller 1, stay at the higher octave
@ -2158,7 +2158,7 @@ void readSwitches() {
else if (R1) octaveR = 1; //R1 else if (R1) octaveR = 1; //R1
else if (lastOctaveR > 1) { else if (lastOctaveR > 1) {
octaveR = lastOctaveR; octaveR = lastOctaveR;
if (otfKey && polySelect && (polySelect<EPolySelect::RotatorA) && rotatorOn && (mainState == NOTE_OFF)) hmzKey = fingeredNote%12; if (otfKey && polySelect && (polySelect<PolySelect::ERotatorA) && rotatorOn && (mainState == NOTE_OFF)) hmzKey = fingeredNote%12;
if (mainState == NOTE_OFF) currentRotation = 3; //rotator reset by releasing rollers if (mainState == NOTE_OFF) currentRotation = 3; //rotator reset by releasing rollers
} }
//if rollers are released and we are not coming down from roller 1, stay at the higher octave //if rollers are released and we are not coming down from roller 1, stay at the higher octave

43
NuEVI/globals.h
View file

@ -28,6 +28,26 @@
#define ECH 30 #define ECH 30
#define QTN 31 #define QTN 31
#define MOD 13
//Vibrato direction
#define UPWD 1
#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 struct Rotator
{ {
@ -35,27 +55,6 @@ struct Rotator
uint16_t rotations[4]; uint16_t rotations[4];
}; };
enum EPolySelect : unsigned short {
HarmonizerOff = 0,
TriadMajorGospelRoot = 1, // MGR
TriadMajorGospelDominant = 2, // MGD
MajorAddNine = 3,
MinorDorian = 4,
MinorAeolian = 5,
MinorFourVoiceHip = 6,
FourWayCloseHarmonizer = 7,
RotatorA = 8,
RotatorB = 9,
RotatorC = 10,
} ;
#define MOD 13
//Vibrato direction
#define UPWD 1
#define DNWD 0
extern const unsigned short* const curves[]; extern const unsigned short* const curves[];
extern const unsigned short curveIn[]; extern const unsigned short curveIn[];
@ -116,7 +115,7 @@ extern unsigned short harmSetting; // 0-7
extern unsigned short harmSelect; // 0-5 extern unsigned short harmSelect; // 0-5
extern unsigned short brHarmSetting; // 0-7 extern unsigned short brHarmSetting; // 0-7
extern unsigned short brHarmSelect; // 0-3 extern unsigned short brHarmSelect; // 0-3
extern EPolySelect 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 fwcType; // 6, m6, 7, m7
extern unsigned short fwcLockH; // OFF:ON extern unsigned short fwcLockH; // OFF:ON
extern unsigned short fwcDrop2; // OFF:ON extern unsigned short fwcDrop2; // OFF:ON

10
NuEVI/menu.cpp
View file

@ -1416,7 +1416,7 @@ const MenuEntrySub portLimitMenu = {
[](SubMenuRef __unused, char* out, const char** __unused unit) { [](SubMenuRef __unused, char* out, const char** __unused unit) {
numToString(portLimit, out); numToString(portLimit, out);
}, },
[](const SubMenuRef & __unused sub) { writeSetting(PORTLIMIT_ADDR,portLimit); } [](SubMenuRef __unused sub) { writeSetting(PORTLIMIT_ADDR,portLimit); }
, nullptr , nullptr
}; };
@ -1451,7 +1451,7 @@ const MenuEntrySub extraCC2Menu = {
if(extraCT2) numToString(extraCT2, out); if(extraCT2) numToString(extraCT2, out);
else strncpy(out, "OFF", 4); else strncpy(out, "OFF", 4);
}, },
[](const MenuEntrySub & __unused sub) { writeSetting(EXTRA2_ADDR,extraCT2); } [](const MenuEntrySub & __unused sub) { writeSetting(EXTRA2_ADDR,extraCT2); }
, nullptr , nullptr
}; };
@ -1461,7 +1461,7 @@ const MenuEntrySub harmonicsMenu = {
if(harmSetting) numToString(harmSetting, out); if(harmSetting) numToString(harmSetting, out);
else strncpy(out, "OFF", 4); else strncpy(out, "OFF", 4);
}, },
[](const MenuEntrySub & __unused sub) { writeSetting(HARMSET_ADDR,harmSetting); } [](const MenuEntrySub & __unused sub) { writeSetting(HARMSET_ADDR,harmSetting); }
, nullptr , nullptr
}; };
@ -1532,7 +1532,7 @@ const MenuEntrySub lvlCtrlCCMenu = {
if(levelCC) numToString(levelCC, out); if(levelCC) numToString(levelCC, out);
else strncpy(out, "AT", 4); else strncpy(out, "AT", 4);
}, },
[](const MenuEntrySub & __unused sub) { writeSetting(LEVEL_CC_ADDR,levelCC); } [](const MenuEntrySub & __unused sub) { writeSetting(LEVEL_CC_ADDR,levelCC); }
, nullptr , nullptr
}; };
@ -1544,6 +1544,7 @@ const MenuEntrySub fingeringMenu = {
strncpy(out, labs[fingering], 4); strncpy(out, labs[fingering], 4);
}, },
[](SubMenuRef __unused sub) { writeSetting(FINGER_ADDR,fingering); } [](SubMenuRef __unused sub) { writeSetting(FINGER_ADDR,fingering); }
, nullptr
}; };
#else #else
const MenuEntrySub fingeringMenu = { const MenuEntrySub fingeringMenu = {
@ -1553,6 +1554,7 @@ const MenuEntrySub fingeringMenu = {
strncpy(out, labs[fingering], 4); strncpy(out, labs[fingering], 4);
}, },
[](SubMenuRef __unused sub) { writeSetting(FINGER_ADDR,fingering); } [](SubMenuRef __unused sub) { writeSetting(FINGER_ADDR,fingering); }
, nullptr
}; };
#endif #endif

2
NuEVI/settings.cpp
View file

@ -245,7 +245,7 @@ void readEEPROM(const bool factoryReset) {
batteryType = readSettingBounded(BATTYPE_ADDR, 0, 2, BATTYPE_FACTORY); batteryType = readSettingBounded(BATTYPE_ADDR, 0, 2, BATTYPE_FACTORY);
harmSetting = readSettingBounded(HARMSET_ADDR, 0, 6, HARMSET_FACTORY); harmSetting = readSettingBounded(HARMSET_ADDR, 0, 6, HARMSET_FACTORY);
harmSelect = readSettingBounded(HARMSEL_ADDR, 0, 7, HARMSEL_FACTORY); harmSelect = readSettingBounded(HARMSEL_ADDR, 0, 7, HARMSEL_FACTORY);
polySelect = (EPolySelect)readSettingBounded(POLYSEL_ADDR, 0, 10, POLYSEL_FACTORY); polySelect = (PolySelect)readSettingBounded(POLYSEL_ADDR, 0, 10, POLYSEL_FACTORY);
fwcType = readSettingBounded(FWCTYPE_ADDR, 0, 4, FWCTYPE_FACTORY); fwcType = readSettingBounded(FWCTYPE_ADDR, 0, 4, FWCTYPE_FACTORY);
fwcLockH = readSettingBounded(FWCLCH_ADDR, 0, 1, FWCLCH_FACTORY); fwcLockH = readSettingBounded(FWCLCH_ADDR, 0, 1, FWCLCH_FACTORY);
fwcDrop2 = readSettingBounded(FWCDP2_ADDR, 0, 1, FWCDP2_FACTORY); fwcDrop2 = readSettingBounded(FWCDP2_ADDR, 0, 1, FWCDP2_FACTORY);