Mercurial > public > ostc4
diff Discovery/Src/t3.c @ 980:7149f372b0ba Evo_2_23
Fix a couple of bugs in the scrubber timer:
- double speed scrubber countdown in simulator mode
- unwanted updating of last scrubber use date in simulator mode
- invalid remaining scrubber display in surface mode
(mikeller)
author | heinrichsweikamp |
---|---|
date | Tue, 04 Feb 2025 13:49:43 +0100 (2 months ago) |
parents | 4e4fbd73e329 |
children |
line wrap: on
line diff
--- a/Discovery/Src/t3.c Tue Feb 04 13:48:53 2025 +0100 +++ b/Discovery/Src/t3.c Tue Feb 04 13:49:43 2025 +0100 @@ -1341,7 +1341,7 @@ textpointer = 0; text[textpointer++] = '\002'; - textpointer += printScrubberText(&text[textpointer], 10, pSettings); + textpointer += printScrubberText(&text[textpointer], 10, stateUsed->scrubberDataDive, pSettings); GFX_write_string(&FontT105,tXc1,text,1); } } @@ -1996,9 +1996,9 @@ return t3_selection_customview; } -int printScrubberText(char *text, size_t size, SSettings *settings) +int printScrubberText(char *text, size_t size, const SScrubberData *scrubberData, SSettings *settings) { - int16_t currentTimerMinutes = stateUsed->scrubberDataDive[settings->scubberActiveId].TimerCur; + int16_t currentTimerMinutes = scrubberData[settings->scubberActiveId].TimerCur; char colour = '\020'; if (currentTimerMinutes <= 0) { colour = '\025';