btclock/btclock_v3
3
1
Fork 2
Code Issues Pull requests 1 Projects Releases 20 Packages Wiki Activity Actions

Screen handler bugfix for multi currency
All checks were successful
BTClock CI / build (push) Successful in 21m36s
Details
BTClock CI / merge (map[name:btclock_rev_b version:esp32s3], 213epd) (push) Successful in 34s
Details
BTClock CI / merge (map[name:btclock_v8 version:esp32s3], 213epd) (push) Successful in 33s
Details
BTClock CI / merge (map[name:lolin_s3_mini version:esp32s3], 213epd) (push) Successful in 32s
Details
BTClock CI / merge (map[name:lolin_s3_mini version:esp32s3], 29epd) (push) Successful in 32s
Details
BTClock CI / release (push) Successful in 12s
Details

Browse source
This commit is contained in:
Djuri Baars 2024-12-29 17:11:34 +01:00
parent 833d46fa5a
commit 73a20cf9a7
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 468e105adfaded0440ff8bba61a8241d54f28cd4
Subproject commit 48e585d4ec12bbc441499936d7cbf53d4307b9ec

29
src/lib/screen_handler.cpp
View file

@ -108,6 +108,7 @@ bool ScreenHandler::handleCurrencyRotation(bool forward) {
setCurrentScreen(getCurrentScreen());
return true;
}
// If we're at the last/first currency of current screen, let nextScreen/previousScreen handle it
return false;
}
return false;
@ -143,14 +144,38 @@ int ScreenHandler::findNextVisibleScreen(int currentScreen, bool forward) {
void ScreenHandler::nextScreen() {
if (handleCurrencyRotation(true)) return;
int currentIndex = findScreenIndexByValue(getCurrentScreen());
setCurrentScreen(findNextVisibleScreen(currentIndex, true));
int nextScreen = findNextVisibleScreen(currentIndex, true);
// If moving from a currency-specific screen to another currency-specific screen
// reset to first currency
if (isCurrencySpecific(getCurrentScreen()) && isCurrencySpecific(nextScreen)) {
std::vector<std::string> ac = getActiveCurrencies();
if (!ac.empty()) {
setCurrentCurrency(getCurrencyChar(ac.front()));
}
}
setCurrentScreen(nextScreen);
}
void ScreenHandler::previousScreen() {
if (handleCurrencyRotation(false)) return;
int currentIndex = findScreenIndexByValue(getCurrentScreen());
setCurrentScreen(findNextVisibleScreen(currentIndex, false));
int prevScreen = findNextVisibleScreen(currentIndex, false);
// If moving from a currency-specific screen to another currency-specific screen
// reset to last currency
if (isCurrencySpecific(getCurrentScreen()) && isCurrencySpecific(prevScreen)) {
std::vector<std::string> ac = getActiveCurrencies();
if (!ac.empty()) {
setCurrentCurrency(getCurrencyChar(ac.back()));
}
}
setCurrentScreen(prevScreen);
}
void ScreenHandler::showSystemStatusScreen() {