Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 980:7149f372b0ba Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 (8 months ago)
parents e7cd7ffd1879
children 41136649b90d
comparison
equal deleted inserted replaced
979:e7cd7ffd1879 980:7149f372b0ba
1960 heading[headingIndex++] = TXT2BYTE_Scrubber; 1960 heading[headingIndex++] = TXT2BYTE_Scrubber;
1961 1961
1962 data[dataIndex++] = '\n'; 1962 data[dataIndex++] = '\n';
1963 data[dataIndex++] = '\r'; 1963 data[dataIndex++] = '\r';
1964 data[dataIndex++] = '\t'; 1964 data[dataIndex++] = '\t';
1965 dataIndex += printScrubberText(&data[dataIndex], 10, settings); 1965 dataIndex += printScrubberText(&data[dataIndex], 10, settings->scrubberData, settings);
1966 } 1966 }
1967 1967
1968 heading[headingIndex++] = '\017'; 1968 heading[headingIndex++] = '\017';
1969 heading[headingIndex++] = 0; 1969 heading[headingIndex++] = 0;
1970 1970
3394 3394
3395 case LLC_ScrubberTime: 3395 case LLC_ScrubberTime:
3396 tinyHeaderFont = 1; 3396 tinyHeaderFont = 1;
3397 headerText[2] = TXT_ScrubTime; 3397 headerText[2] = TXT_ScrubTime;
3398 3398
3399 printScrubberText(text, TEXTSIZE, pSettings); 3399 printScrubberText(text, TEXTSIZE, stateUsed->scrubberDataDive, pSettings);
3400 3400
3401 break; 3401 break;
3402 #ifdef ENABLE_PSCR_MODE 3402 #ifdef ENABLE_PSCR_MODE
3403 case LCC_SimPpo2: 3403 case LCC_SimPpo2:
3404 headerText[2] = TXT_SimPpo2; 3404 headerText[2] = TXT_SimPpo2;
4245 { 4245 {
4246 text[textpointer++] = '\n'; 4246 text[textpointer++] = '\n';
4247 text[textpointer++] = '\r'; 4247 text[textpointer++] = '\r';
4248 text[textpointer++] = '\t'; 4248 text[textpointer++] = '\t';
4249 4249
4250 textpointer += printScrubberText(&text[textpointer], 10, pSettings); 4250 textpointer += printScrubberText(&text[textpointer], 10, stateUsed->scrubberDataDive, pSettings);
4251 } 4251 }
4252 text[textpointer++] = 0; 4252 text[textpointer++] = 0;
4253 Gfx_colorsscheme_mod(text, 0); 4253 Gfx_colorsscheme_mod(text, 0);
4254 GFX_write_string(&FontT42, &t7cY0free, text, 1); 4254 GFX_write_string(&FontT42, &t7cY0free, text, 1);
4255 } 4255 }