Changed BW behaviour
Short press: toggle mono/stereo Long press: BW up Long press BW + rotary: tune BW
This commit is contained in:
+39
-12
@@ -54,6 +54,7 @@ bool batterydetect = true;
|
|||||||
bool beepresetstart;
|
bool beepresetstart;
|
||||||
bool beepresetstop;
|
bool beepresetstop;
|
||||||
bool BWreset;
|
bool BWreset;
|
||||||
|
bool BWtune;
|
||||||
bool change;
|
bool change;
|
||||||
bool compressedold;
|
bool compressedold;
|
||||||
bool direction;
|
bool direction;
|
||||||
@@ -886,13 +887,14 @@ void loop() {
|
|||||||
rotary = 0;
|
rotary = 0;
|
||||||
WakeToSleep(REVERSE);
|
WakeToSleep(REVERSE);
|
||||||
} else {
|
} else {
|
||||||
KeyUp();
|
if (BWtune) doBWtuneUp(); else KeyUp();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
KeyUp();
|
if (BWtune) doBWtuneUp(); else KeyUp();
|
||||||
if (screensaverset && !menu && !screensavertriggered) ScreensaverTimerRestart();
|
if (screensaverset && !menu && !screensavertriggered) ScreensaverTimerRestart();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (rotary == 1) {
|
if (rotary == 1) {
|
||||||
tottimer = millis();
|
tottimer = millis();
|
||||||
if (screensavertriggered) {
|
if (screensavertriggered) {
|
||||||
@@ -900,10 +902,10 @@ void loop() {
|
|||||||
rotary = 0;
|
rotary = 0;
|
||||||
WakeToSleep(REVERSE);
|
WakeToSleep(REVERSE);
|
||||||
} else {
|
} else {
|
||||||
KeyDown();
|
if (BWtune) doBWtuneDown(); else KeyDown();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
KeyDown();
|
if (BWtune) doBWtuneDown(); else KeyDown();
|
||||||
if (screensaverset && !menu && !screensavertriggered) ScreensaverTimerRestart();
|
if (screensaverset && !menu && !screensavertriggered) ScreensaverTimerRestart();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -920,7 +922,9 @@ void loop() {
|
|||||||
if (!screenmute) ModeButtonPress();
|
if (!screenmute) ModeButtonPress();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (digitalRead(BWBUTTON) == LOW) {
|
if (digitalRead(BWBUTTON) == HIGH && BWtune) BWtune = false;
|
||||||
|
|
||||||
|
if (digitalRead(BWBUTTON) == LOW && !BWtune) {
|
||||||
tottimer = millis();
|
tottimer = millis();
|
||||||
if (screensavertriggered && !touchrotating) WakeToSleep(REVERSE);
|
if (screensavertriggered && !touchrotating) WakeToSleep(REVERSE);
|
||||||
if (!screenmute && !afscreen) BWButtonPress();
|
if (!screenmute && !afscreen) BWButtonPress();
|
||||||
@@ -1693,18 +1697,17 @@ void BWButtonPress() {
|
|||||||
while (digitalRead(BWBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
|
while (digitalRead(BWBUTTON) == LOW && counter - counterold <= 1000) counter = millis();
|
||||||
|
|
||||||
if (counter - counterold < 1000) {
|
if (counter - counterold < 1000) {
|
||||||
|
doStereoToggle();
|
||||||
|
} else {
|
||||||
BWset++;
|
BWset++;
|
||||||
doBW();
|
doBW();
|
||||||
} else {
|
BWtune = true;
|
||||||
doStereoToggle();
|
|
||||||
}
|
}
|
||||||
if (screensaverset) {
|
if (screensaverset) {
|
||||||
ScreensaverTimerRestart();
|
ScreensaverTimerRestart();
|
||||||
}
|
}
|
||||||
|
delay(100);
|
||||||
}
|
}
|
||||||
|
|
||||||
while (digitalRead(BWBUTTON) == LOW) delay(50);
|
|
||||||
delay(100);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void doStereoToggle() {
|
void doStereoToggle() {
|
||||||
@@ -2528,10 +2531,10 @@ void ShowOffset() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ShowBW() {
|
void ShowBW() {
|
||||||
if (millis() >= bwupdatetimer + TIMER_BW_TIMER) {
|
if (!BWtune && millis() >= bwupdatetimer + TIMER_BW_TIMER) {
|
||||||
bwupdatetimer = millis();
|
bwupdatetimer = millis();
|
||||||
} else {
|
} else {
|
||||||
return;
|
if (!BWtune) return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (BW != BWOld || BWreset) {
|
if (BW != BWOld || BWreset) {
|
||||||
@@ -2803,6 +2806,30 @@ void doBW() {
|
|||||||
EEPROM.commit();
|
EEPROM.commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void doBWtuneDown() {
|
||||||
|
rotary = 0;
|
||||||
|
BWset--;
|
||||||
|
if (band < BAND_GAP) {
|
||||||
|
if (BWset > 16) BWset = 16;
|
||||||
|
} else {
|
||||||
|
if (BWset > 4) BWset = 4;
|
||||||
|
}
|
||||||
|
doBW();
|
||||||
|
ShowBW();
|
||||||
|
}
|
||||||
|
|
||||||
|
void doBWtuneUp() {
|
||||||
|
rotary = 0;
|
||||||
|
BWset++;
|
||||||
|
if (band < BAND_GAP) {
|
||||||
|
if (BWset > 16) BWset = 0;
|
||||||
|
} else {
|
||||||
|
if (BWset > 4) BWset = 1;
|
||||||
|
}
|
||||||
|
doBW();
|
||||||
|
ShowBW();
|
||||||
|
}
|
||||||
|
|
||||||
void doTuneMode() {
|
void doTuneMode() {
|
||||||
switch (tunemode) {
|
switch (tunemode) {
|
||||||
case TUNE_MAN:
|
case TUNE_MAN:
|
||||||
|
|||||||
Reference in New Issue
Block a user