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

Two unrelated changes

Browse source 
* Move text print of submenu into function
 * No need to check if value changed since writeSettings uses EEPROM.update.
This commit is contained in:
Mikael Degerfält 2019-06-15 19:16:13 +02:00
parent e362546e3c
commit 2f5c546b2c
1 changed files with 91 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

220
NuEVI/menu.cpp
View file

@ -372,12 +372,16 @@ static void clearSub(){
display.fillRect(63,11,64,52,BLACK); display.fillRect(63,11,64,52,BLACK);
} }
static void drawSubBox() static void drawSubBox(const char* label)
{ {
display.fillRect(63,11,64,52,BLACK); display.fillRect(63,11,64,52,BLACK);
display.drawRect(63,11,64,52,WHITE); display.drawRect(63,11,64,52,WHITE);
display.setTextColor(WHITE); display.setTextColor(WHITE);
display.setTextSize(1); display.setTextSize(1);
int len = strlen(label);
display.setCursor(95-len*3,15);
display.println(label);
} }
static void plotTranspose(int color){ static void plotTranspose(int color){
@ -396,9 +400,7 @@ static void plotTranspose(int color){
} }
static void drawSubTranspose(){ static void drawSubTranspose(){
drawSubBox(); drawSubBox("TRANSPOSE");
display.setCursor(68,15);
display.println("TRANSPOSE");
plotTranspose(WHITE); plotTranspose(WHITE);
display.display(); display.display();
} }
@ -420,9 +422,7 @@ static void plotRotator(int color,int value){
} }
static void drawSubRotator(){ static void drawSubRotator(){
drawSubBox(); drawSubBox("SEMITONES");
display.setCursor(68,15);
display.println("SEMITONES");
//plotRotator(WHITE,value); //plotRotator(WHITE,value);
forceRedraw = 1; forceRedraw = 1;
display.display(); display.display();
@ -440,9 +440,7 @@ static void plotPriority(int color){
} }
static void drawSubPriority(){ static void drawSubPriority(){
drawSubBox(); drawSubBox("MONO PRIO");
display.setCursor(68,15);
display.println("MONO PRIO");
plotPriority(WHITE); plotPriority(WHITE);
display.display(); display.display();
} }
@ -464,9 +462,7 @@ static void plotOctave(int color){
} }
static void drawSubOctave(){ static void drawSubOctave(){
drawSubBox(); drawSubBox("OCTAVE");
display.setCursor(77,15);
display.println("OCTAVE");
plotOctave(WHITE); plotOctave(WHITE);
display.display(); display.display();
} }
@ -487,9 +483,7 @@ static void plotMIDI(int color){
} }
static void drawSubMIDI(){ static void drawSubMIDI(){
drawSubBox(); drawSubBox("MIDI CHNL");
display.setCursor(68,15);
display.println("MIDI CHNL");
plotMIDI(WHITE); plotMIDI(WHITE);
display.display(); display.display();
} }
@ -512,9 +506,7 @@ static void plotBreathCC(int color){
} }
static void drawSubBreathCC(){ static void drawSubBreathCC(){
drawSubBox(); drawSubBox("BREATH CC");
display.setCursor(68,15);
display.println("BREATH CC");
plotBreathCC(WHITE); plotBreathCC(WHITE);
display.display(); display.display();
} }
@ -528,9 +520,7 @@ static void plotBreathAT(int color){
} }
static void drawSubBreathAT(){ static void drawSubBreathAT(){
drawSubBox(); drawSubBox("BREATH AT");
display.setCursor(68,15);
display.println("BREATH AT");
plotBreathAT(WHITE); plotBreathAT(WHITE);
display.display(); display.display();
} }
@ -548,9 +538,7 @@ static void plotVelocity(int color){
} }
static void drawSubVelocity(){ static void drawSubVelocity(){
drawSubBox(); drawSubBox("VELOCITY");
display.setCursor(71,15);
display.println("VELOCITY");
plotVelocity(WHITE); plotVelocity(WHITE);
display.display(); display.display();
} }
@ -565,9 +553,7 @@ static void plotCurve(int color){
} }
static void drawSubCurve(){ static void drawSubCurve(){
drawSubBox(); drawSubBox("CURVE");
display.setCursor(80,15);
display.println("CURVE");
plotCurve(WHITE); plotCurve(WHITE);
display.display(); display.display();
} }
@ -583,9 +569,7 @@ static void plotPort(int color){
} }
static void drawSubPort(){ static void drawSubPort(){
drawSubBox(); drawSubBox("PORT/GLD");
display.setCursor(71,15);
display.println("PORT/GLD");
plotPort(WHITE); plotPort(WHITE);
display.display(); display.display();
} }
@ -605,9 +589,7 @@ static void plotPB(int color){
} }
static void drawSubPB(){ static void drawSubPB(){
drawSubBox(); drawSubBox("PITCHBEND");
display.setCursor(68,15);
display.println("PITCHBEND");
plotPB(WHITE); plotPB(WHITE);
display.display(); display.display();
} }
@ -619,9 +601,7 @@ static void plotExtra(int color){
} }
static void drawSubExtra(){ static void drawSubExtra(){
drawSubBox(); drawSubBox("EXTRA CTR");
display.setCursor(68,15);
display.println("EXTRA CTR");
plotExtra(WHITE); plotExtra(WHITE);
display.display(); display.display();
} }
@ -640,9 +620,7 @@ static void plotVibrato(int color){
} }
static void drawSubVibrato(){ static void drawSubVibrato(){
drawSubBox(); drawSubBox("LEVEL");
display.setCursor(81,15);
display.println("LEVEL");
plotVibrato(WHITE); plotVibrato(WHITE);
display.display(); display.display();
} }
@ -655,9 +633,7 @@ static void plotVibSens(int color){
} }
static void drawSubVibSens(){ static void drawSubVibSens(){
drawSubBox(); drawSubBox("LEVEL");
display.setCursor(81,15);
display.println("LEVEL");
plotVibSens(WHITE); plotVibSens(WHITE);
display.display(); display.display();
} }
@ -670,9 +646,7 @@ static void plotVibRetn(int color){
} }
static void drawSubVibRetn(){ static void drawSubVibRetn(){
drawSubBox(); drawSubBox("LEVEL");
display.setCursor(81,15);
display.println("LEVEL");
plotVibRetn(WHITE); plotVibRetn(WHITE);
display.display(); display.display();
} }
@ -686,9 +660,7 @@ static void plotVibSquelch(int color){
} }
static void drawSubVibSquelch(){ static void drawSubVibSquelch(){
drawSubBox(); drawSubBox("LEVEL");
display.setCursor(81,15);
display.println("LEVEL");
plotVibSquelch(WHITE); plotVibSquelch(WHITE);
display.display(); display.display();
} }
@ -705,9 +677,7 @@ static void plotVibDirection(int color){
} }
static void drawSubVibDirection(){ static void drawSubVibDirection(){
drawSubBox(); drawSubBox("DIRECTION");
display.setCursor(68,15);
display.println("DIRECTION");
plotVibDirection(WHITE); plotVibDirection(WHITE);
display.display(); display.display();
} }
@ -727,9 +697,7 @@ static void plotDeglitch(int color){
} }
static void drawSubDeglitch(){ static void drawSubDeglitch(){
drawSubBox(); drawSubBox("DEGLITCH");
display.setCursor(71,15);
display.println("DEGLITCH");
plotDeglitch(WHITE); plotDeglitch(WHITE);
display.display(); display.display();
} }
@ -750,9 +718,7 @@ static void plotPinkyKey(int color){
} }
static void drawSubPinkyKey(){ static void drawSubPinkyKey(){
drawSubBox(); drawSubBox("PINKY KEY");
display.setCursor(68,15);
display.println("PINKY KEY");
plotPinkyKey(WHITE); plotPinkyKey(WHITE);
display.display(); display.display();
} }
@ -772,9 +738,7 @@ static void plotVelSmpDl(int color){
} }
static void drawSubVelSmpDl(){ static void drawSubVelSmpDl(){
drawSubBox(); drawSubBox("VEL DELAY");
display.setCursor(69,15);
display.println("VEL DELAY");
plotVelSmpDl(WHITE); plotVelSmpDl(WHITE);
display.display(); display.display();
} }
@ -793,9 +757,7 @@ static void plotVelBias(int color){
} }
static void drawSubVelBias(){ static void drawSubVelBias(){
drawSubBox(); drawSubBox("VEL BIAS");
display.setCursor(72,15);
display.println("VEL BIAS");
plotVelBias(WHITE); plotVelBias(WHITE);
display.display(); display.display();
} }
@ -1284,7 +1246,7 @@ void menu() {
stateFirstRun = 1; stateFirstRun = 1;
doPatchUpdate = 1; doPatchUpdate = 1;
FPD = 0; FPD = 0;
if (readSetting(PATCH_ADDR) != patch) writeSetting(PATCH_ADDR,patch); writeSetting(PATCH_ADDR,patch);
} }
if (buttonPressedAndNotUsed){ if (buttonPressedAndNotUsed){
buttonPressedAndNotUsed = 0; buttonPressedAndNotUsed = 0;
@ -1297,7 +1259,7 @@ void menu() {
activePatch = 0; activePatch = 0;
doPatchUpdate = 1; doPatchUpdate = 1;
FPD = 1; FPD = 1;
if (readSetting(PATCH_ADDR) != patch) writeSetting(PATCH_ADDR,patch); writeSetting(PATCH_ADDR,patch);
} else if (!trills){ } else if (!trills){
if (patch > 1){ if (patch > 1){
patch--; patch--;
@ -1327,7 +1289,7 @@ void menu() {
activePatch = 0; activePatch = 0;
doPatchUpdate = 1; doPatchUpdate = 1;
FPD = 1; FPD = 1;
if (readSetting(PATCH_ADDR) != patch) writeSetting(PATCH_ADDR,patch); writeSetting(PATCH_ADDR,patch);
} else if (!trills){ } else if (!trills){
if (patch < 128){ if (patch < 128){
patch++; patch++;
@ -1346,7 +1308,7 @@ void menu() {
stateFirstRun = 1; stateFirstRun = 1;
doPatchUpdate = 1; doPatchUpdate = 1;
} }
if (readSetting(PATCH_ADDR) != patch) writeSetting(PATCH_ADDR,patch); writeSetting(PATCH_ADDR,patch);
FPD = 0; FPD = 0;
break; break;
case 10: case 10:
@ -1398,7 +1360,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subTranspose = 0; subTranspose = 0;
if (readSetting(TRANSP_ADDR) != transpose) writeSetting(TRANSP_ADDR,transpose); writeSetting(TRANSP_ADDR,transpose);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -1417,7 +1379,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subTranspose = 0; subTranspose = 0;
if (readSetting(TRANSP_ADDR) != transpose) writeSetting(TRANSP_ADDR,transpose); writeSetting(TRANSP_ADDR,transpose);
break; break;
} }
} }
@ -1447,7 +1409,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subOctave = 0; subOctave = 0;
if (readSetting(OCTAVE_ADDR) != octave) writeSetting(OCTAVE_ADDR,octave); writeSetting(OCTAVE_ADDR,octave);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -1466,7 +1428,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subOctave = 0; subOctave = 0;
if (readSetting(OCTAVE_ADDR) != octave) writeSetting(OCTAVE_ADDR,octave); writeSetting(OCTAVE_ADDR,octave);
break; break;
} }
} }
@ -1505,7 +1467,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subMIDI = 0; subMIDI = 0;
if (readSetting(MIDI_ADDR) != MIDIchannel) writeSetting(MIDI_ADDR,MIDIchannel); writeSetting(MIDI_ADDR,MIDIchannel);
} }
break; break;
case BTN_UP: case BTN_UP:
@ -1525,7 +1487,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subMIDI = 0; subMIDI = 0;
if (readSetting(MIDI_ADDR) != MIDIchannel) writeSetting(MIDI_ADDR,MIDIchannel); writeSetting(MIDI_ADDR,MIDIchannel);
break; break;
} }
} }
@ -1629,7 +1591,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subParallel = 0; subParallel = 0;
if (readSetting(PARAL_ADDR) != (parallel + 24)) writeSetting(PARAL_ADDR,(parallel + 24)); writeSetting(PARAL_ADDR,(parallel + 24));
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -1648,7 +1610,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subParallel = 0; subParallel = 0;
if (readSetting(PARAL_ADDR) != (parallel + 24)) writeSetting(PARAL_ADDR,(parallel + 24)); writeSetting(PARAL_ADDR,(parallel + 24));
break; break;
} }
} }
@ -1681,7 +1643,7 @@ void menu() {
plotRotator(WHITE,rotations[subRotator-1]); plotRotator(WHITE,rotations[subRotator-1]);
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
if (readSetting(ROTN1_ADDR+2*(subRotator-1)) != rotations[subRotator-1]) writeSetting(ROTN1_ADDR+2*(subRotator-1),(rotations[subRotator-1]+24)); writeSetting(ROTN1_ADDR+2*(subRotator-1),(rotations[subRotator-1]+24));
subRotator = 0; subRotator = 0;
break; break;
case BTN_UP: case BTN_UP:
@ -1700,7 +1662,7 @@ void menu() {
plotRotator(WHITE,rotations[subRotator-1]); plotRotator(WHITE,rotations[subRotator-1]);
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
if (readSetting(ROTN1_ADDR+2*(subRotator-1)) != (rotations[subRotator-1]+24)) writeSetting(ROTN1_ADDR+2*(subRotator-1),(rotations[subRotator-1]+24)); writeSetting(ROTN1_ADDR+2*(subRotator-1),(rotations[subRotator-1]+24));
subRotator = 0; subRotator = 0;
break; break;
} }
@ -1729,7 +1691,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPriority = 0; subPriority = 0;
if (readSetting(PRIO_ADDR) != priority) writeSetting(PRIO_ADDR,priority); writeSetting(PRIO_ADDR,priority);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -1746,7 +1708,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPriority = 0; subPriority = 0;
if (readSetting(PRIO_ADDR) != priority) writeSetting(PRIO_ADDR,priority); writeSetting(PRIO_ADDR,priority);
break; break;
} }
} }
@ -1907,8 +1869,8 @@ void menu() {
// down // down
state = PITCHB_ADJ_IDL; state = PITCHB_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(PORTAM_THR_ADDR) != portamThrVal) writeSetting(PORTAM_THR_ADDR,portamThrVal); writeSetting(PORTAM_THR_ADDR,portamThrVal);
if (readSetting(PORTAM_MAX_ADDR) != portamMaxVal) writeSetting(PORTAM_MAX_ADDR,portamMaxVal); writeSetting(PORTAM_MAX_ADDR,portamMaxVal);
break; break;
case BTN_ENTER: case BTN_ENTER:
// enter // enter
@ -1918,15 +1880,15 @@ void menu() {
// up // up
state = BREATH_ADJ_IDL; state = BREATH_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(PORTAM_THR_ADDR) != portamThrVal) writeSetting(PORTAM_THR_ADDR,portamThrVal); writeSetting(PORTAM_THR_ADDR,portamThrVal);
if (readSetting(PORTAM_MAX_ADDR) != portamMaxVal) writeSetting(PORTAM_MAX_ADDR,portamMaxVal); writeSetting(PORTAM_MAX_ADDR,portamMaxVal);
break; break;
case BTN_MENU: case BTN_MENU:
// menu // menu
state = MAIN_MENU; state = MAIN_MENU;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(PORTAM_THR_ADDR) != portamThrVal) writeSetting(PORTAM_THR_ADDR,portamThrVal); writeSetting(PORTAM_THR_ADDR,portamThrVal);
if (readSetting(PORTAM_MAX_ADDR) != portamMaxVal) writeSetting(PORTAM_MAX_ADDR,portamMaxVal); writeSetting(PORTAM_MAX_ADDR,portamMaxVal);
break; break;
} }
} }
@ -1985,8 +1947,8 @@ void menu() {
// down // down
state = EXTRAC_ADJ_IDL; state = EXTRAC_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(PITCHB_THR_ADDR) != pitchbThrVal) writeSetting(PITCHB_THR_ADDR,pitchbThrVal); writeSetting(PITCHB_THR_ADDR,pitchbThrVal);
if (readSetting(PITCHB_MAX_ADDR) != pitchbMaxVal) writeSetting(PITCHB_MAX_ADDR,pitchbMaxVal); writeSetting(PITCHB_MAX_ADDR,pitchbMaxVal);
break; break;
case BTN_ENTER: case BTN_ENTER:
// enter // enter
@ -1996,15 +1958,15 @@ void menu() {
// up // up
state = PORTAM_ADJ_IDL; state = PORTAM_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(PITCHB_THR_ADDR) != pitchbThrVal) writeSetting(PITCHB_THR_ADDR,pitchbThrVal); writeSetting(PITCHB_THR_ADDR,pitchbThrVal);
if (readSetting(PITCHB_MAX_ADDR) != pitchbMaxVal) writeSetting(PITCHB_MAX_ADDR,pitchbMaxVal); writeSetting(PITCHB_MAX_ADDR,pitchbMaxVal);
break; break;
case BTN_MENU: case BTN_MENU:
// menu // menu
state = MAIN_MENU; state = MAIN_MENU;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(PITCHB_THR_ADDR) != pitchbThrVal) writeSetting(PITCHB_THR_ADDR,pitchbThrVal); writeSetting(PITCHB_THR_ADDR,pitchbThrVal);
if (readSetting(PITCHB_MAX_ADDR) != pitchbMaxVal) writeSetting(PITCHB_MAX_ADDR,pitchbMaxVal); writeSetting(PITCHB_MAX_ADDR,pitchbMaxVal);
break; break;
} }
} }
@ -2061,8 +2023,8 @@ void menu() {
// down // down
state = CTOUCH_ADJ_IDL; state = CTOUCH_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(EXTRAC_THR_ADDR) != extracThrVal) writeSetting(EXTRAC_THR_ADDR,extracThrVal); writeSetting(EXTRAC_THR_ADDR,extracThrVal);
if (readSetting(EXTRAC_MAX_ADDR) != extracMaxVal) writeSetting(EXTRAC_MAX_ADDR,extracMaxVal); writeSetting(EXTRAC_MAX_ADDR,extracMaxVal);
break; break;
case BTN_ENTER: case BTN_ENTER:
// enter // enter
@ -2072,15 +2034,15 @@ void menu() {
// up // up
state = PITCHB_ADJ_IDL; state = PITCHB_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(EXTRAC_THR_ADDR) != extracThrVal) writeSetting(EXTRAC_THR_ADDR,extracThrVal); writeSetting(EXTRAC_THR_ADDR,extracThrVal);
if (readSetting(EXTRAC_MAX_ADDR) != extracMaxVal) writeSetting(EXTRAC_MAX_ADDR,extracMaxVal); writeSetting(EXTRAC_MAX_ADDR,extracMaxVal);
break; break;
case BTN_MENU: case BTN_MENU:
// menu // menu
state = MAIN_MENU; state = MAIN_MENU;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(EXTRAC_THR_ADDR) != extracThrVal) writeSetting(EXTRAC_THR_ADDR,extracThrVal); writeSetting(EXTRAC_THR_ADDR,extracThrVal);
if (readSetting(EXTRAC_MAX_ADDR) != extracMaxVal) writeSetting(EXTRAC_MAX_ADDR,extracMaxVal); writeSetting(EXTRAC_MAX_ADDR,extracMaxVal);
break; break;
} }
} }
@ -2136,7 +2098,7 @@ void menu() {
// down // down
state = BREATH_ADJ_IDL; state = BREATH_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(CTOUCH_THR_ADDR) != ctouchThrVal) writeSetting(CTOUCH_THR_ADDR,ctouchThrVal); writeSetting(CTOUCH_THR_ADDR,ctouchThrVal);
break; break;
case BTN_ENTER: case BTN_ENTER:
// enter // enter
@ -2146,13 +2108,13 @@ void menu() {
// up // up
state = EXTRAC_ADJ_IDL; state = EXTRAC_ADJ_IDL;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(CTOUCH_THR_ADDR) != ctouchThrVal) writeSetting(CTOUCH_THR_ADDR,ctouchThrVal); writeSetting(CTOUCH_THR_ADDR,ctouchThrVal);
break; break;
case BTN_MENU: case BTN_MENU:
// menu // menu
state = MAIN_MENU; state = MAIN_MENU;
stateFirstRun = 1; stateFirstRun = 1;
if (readSetting(CTOUCH_THR_ADDR) != ctouchThrVal) writeSetting(CTOUCH_THR_ADDR,ctouchThrVal); writeSetting(CTOUCH_THR_ADDR,ctouchThrVal);
break; break;
} }
} }
@ -2327,7 +2289,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVelocity = 0; subVelocity = 0;
if (readSetting(VELOCITY_ADDR) != velocity) writeSetting(VELOCITY_ADDR,velocity); writeSetting(VELOCITY_ADDR,velocity);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2346,7 +2308,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVelocity = 0; subVelocity = 0;
if (readSetting(VELOCITY_ADDR) != velocity) writeSetting(VELOCITY_ADDR,velocity); writeSetting(VELOCITY_ADDR,velocity);
break; break;
} }
} }
@ -2378,7 +2340,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subCurve = 0; subCurve = 0;
if (readSetting(BREATHCURVE_ADDR) != curve) writeSetting(BREATHCURVE_ADDR,curve); writeSetting(BREATHCURVE_ADDR,curve);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2397,7 +2359,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subCurve = 0; subCurve = 0;
if (readSetting(BREATHCURVE_ADDR) != curve) writeSetting(BREATHCURVE_ADDR,curve); writeSetting(BREATHCURVE_ADDR,curve);
break; break;
} }
} }
@ -2428,7 +2390,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVelSmpDl = 0; subVelSmpDl = 0;
if (readSetting(VEL_SMP_DL_ADDR) != velSmpDl) writeSetting(VEL_SMP_DL_ADDR,velSmpDl); writeSetting(VEL_SMP_DL_ADDR,velSmpDl);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2447,7 +2409,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVelSmpDl = 0; subVelSmpDl = 0;
if (readSetting(VEL_SMP_DL_ADDR) != velSmpDl) writeSetting(VEL_SMP_DL_ADDR,velSmpDl); writeSetting(VEL_SMP_DL_ADDR,velSmpDl);
break; break;
} }
} }
@ -2478,7 +2440,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVelBias = 0; subVelBias = 0;
if (readSetting(VEL_BIAS_ADDR) != velBias) writeSetting(VEL_BIAS_ADDR,velBias); writeSetting(VEL_BIAS_ADDR,velBias);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2497,7 +2459,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVelBias = 0; subVelBias = 0;
if (readSetting(VEL_BIAS_ADDR) != velBias) writeSetting(VEL_BIAS_ADDR,velBias); writeSetting(VEL_BIAS_ADDR,velBias);
break; break;
} }
} }
@ -2578,7 +2540,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPort = 0; subPort = 0;
if (readSetting(PORTAM_ADDR) != portamento) writeSetting(PORTAM_ADDR,portamento); writeSetting(PORTAM_ADDR,portamento);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2597,7 +2559,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPort = 0; subPort = 0;
if (readSetting(PORTAM_ADDR) != portamento) writeSetting(PORTAM_ADDR,portamento); writeSetting(PORTAM_ADDR,portamento);
break; break;
} }
} }
@ -2627,7 +2589,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPB = 0; subPB = 0;
if (readSetting(PB_ADDR) != PBdepth) writeSetting(PB_ADDR,PBdepth); writeSetting(PB_ADDR,PBdepth);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2646,7 +2608,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPB = 0; subPB = 0;
if (readSetting(PB_ADDR) != PBdepth) writeSetting(PB_ADDR,PBdepth); writeSetting(PB_ADDR,PBdepth);
break; break;
} }
} }
@ -2676,7 +2638,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subExtra = 0; subExtra = 0;
if (readSetting(EXTRA_ADDR) != extraCT) writeSetting(EXTRA_ADDR,extraCT); writeSetting(EXTRA_ADDR,extraCT);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2695,7 +2657,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subExtra = 0; subExtra = 0;
if (readSetting(EXTRA_ADDR) != extraCT) writeSetting(EXTRA_ADDR,extraCT); writeSetting(EXTRA_ADDR,extraCT);
break; break;
} }
} }
@ -2725,7 +2687,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subDeglitch = 0; subDeglitch = 0;
if (readSetting(DEGLITCH_ADDR) != deglitch) writeSetting(DEGLITCH_ADDR,deglitch); writeSetting(DEGLITCH_ADDR,deglitch);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2744,7 +2706,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subDeglitch = 0; subDeglitch = 0;
if (readSetting(DEGLITCH_ADDR) != deglitch) writeSetting(DEGLITCH_ADDR,deglitch); writeSetting(DEGLITCH_ADDR,deglitch);
break; break;
} }
} }
@ -2774,7 +2736,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPinky = 0; subPinky = 0;
if (readSetting(PINKY_KEY_ADDR) != pinkySetting) writeSetting(PINKY_KEY_ADDR,pinkySetting); writeSetting(PINKY_KEY_ADDR,pinkySetting);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2793,7 +2755,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subPinky = 0; subPinky = 0;
if (readSetting(PINKY_KEY_ADDR) != pinkySetting) writeSetting(PINKY_KEY_ADDR,pinkySetting); writeSetting(PINKY_KEY_ADDR,pinkySetting);
break; break;
} }
} }
@ -2876,7 +2838,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibrato = 0; subVibrato = 0;
if (readSetting(VIBRATO_ADDR) != vibrato) writeSetting(VIBRATO_ADDR,vibrato); writeSetting(VIBRATO_ADDR,vibrato);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2895,7 +2857,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibrato = 0; subVibrato = 0;
if (readSetting(VIBRATO_ADDR) != vibrato) writeSetting(VIBRATO_ADDR,vibrato); writeSetting(VIBRATO_ADDR,vibrato);
break; break;
} }
} }
@ -2925,7 +2887,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibSens = 0; subVibSens = 0;
if (readSetting(VIB_SENS_ADDR) != vibSens) writeSetting(VIB_SENS_ADDR,vibSens); writeSetting(VIB_SENS_ADDR,vibSens);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2944,7 +2906,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibSens = 0; subVibSens = 0;
if (readSetting(VIB_SENS_ADDR) != vibSens) writeSetting(VIB_SENS_ADDR,vibSens); writeSetting(VIB_SENS_ADDR,vibSens);
break; break;
} }
} }
@ -2974,7 +2936,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibRetn = 0; subVibRetn = 0;
if (readSetting(VIB_RETN_ADDR) != vibRetn) writeSetting(VIB_RETN_ADDR,vibRetn); writeSetting(VIB_RETN_ADDR,vibRetn);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -2993,7 +2955,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibRetn = 0; subVibRetn = 0;
if (readSetting(VIB_RETN_ADDR) != vibRetn) writeSetting(VIB_RETN_ADDR,vibRetn); writeSetting(VIB_RETN_ADDR,vibRetn);
break; break;
} }
} }
@ -3023,7 +2985,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibSquelch = 0; subVibSquelch = 0;
if (readSetting(VIB_SQUELCH_ADDR) != vibSquelch) writeSetting(VIB_SQUELCH_ADDR,vibSquelch); writeSetting(VIB_SQUELCH_ADDR,vibSquelch);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -3042,7 +3004,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibSquelch = 0; subVibSquelch = 0;
if (readSetting(VIB_SQUELCH_ADDR) != vibSquelch) writeSetting(VIB_SQUELCH_ADDR,vibSquelch); writeSetting(VIB_SQUELCH_ADDR,vibSquelch);
break; break;
} }
} }
@ -3070,7 +3032,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibDirection = 0; subVibDirection = 0;
if (readSetting(VIB_DIRECTION_ADDR) != vibDirection) writeSetting(VIB_DIRECTION_ADDR,vibDirection); writeSetting(VIB_DIRECTION_ADDR,vibDirection);
break; break;
case BTN_UP: case BTN_UP:
// up // up
@ -3087,7 +3049,7 @@ void menu() {
cursorNow = BLACK; cursorNow = BLACK;
display.display(); display.display();
subVibDirection = 0; subVibDirection = 0;
if (readSetting(VIB_DIRECTION_ADDR) != vibDirection) writeSetting(VIB_DIRECTION_ADDR,vibDirection); writeSetting(VIB_DIRECTION_ADDR,vibDirection);
break; break;
} }
} }