Mercurial > public > ostc4

comparison Discovery/Src/t3.c @ 656:3ccf13af4651

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added visualization of scrubber time: The remaining scrubber timer may be displayed in minutes or percentage of maximum time (both countdown). The value is displayed in the lower left corner, the overview custom view in T7 display as well as in the O2 Monitor view of the T3 display.
author Ideenmodellierer
date Sun, 25 Apr 2021 20:47:01 +0200
parents c737cf5d9067
children 1b995079c045
comparison
equal deleted inserted replaced
655:980b4aa60a0e 656:3ccf13af4651
1275 if(stateUsed->warnings.sensorOutOfBounds[i]) 1275 if(stateUsed->warnings.sensorOutOfBounds[i])
1276 text[textpointer++] = '\025'; 1276 text[textpointer++] = '\025';
1277 textpointer += snprintf(&text[textpointer],TEXTSIZE,"%.2f",stateUsed->lifeData.ppO2Sensor_bar[i]); 1277 textpointer += snprintf(&text[textpointer],TEXTSIZE,"%.2f",stateUsed->lifeData.ppO2Sensor_bar[i]);
1278 } 1278 }
1279 GFX_write_string(&FontT105,tXc1,text,0); 1279 GFX_write_string(&FontT105,tXc1,text,0);
1280
1281
1282 if((pSettings->scrubTimerMode != SCRUB_TIMER_OFF) && (pSettings->dive_mode == DIVEMODE_CCR))
1283 {
1284 snprintf(text,TEXTSIZE,"\032\002\f%c",TXT_ScrubTime);
1285 GFX_write_string(&FontT42,tXc1,text,0);
1286
1287 textpointer = 0;
1288 if(settingsGetPointer()->scrubTimerMode == SCRUB_TIMER_MINUTES)
1289 {
1290 textpointer += snprintf(&text[textpointer],10,"\020\002%3u'", pSettings->scrubTimerCur);
1291 }
1292 else
1293 {
1294 textpointer += snprintf(&text[textpointer],20,"\020\002%u\016\016%%\017", (uint16_t)(pSettings->scrubTimerCur * 100 / pSettings->scrubTimerMax));
1295 }
1296 GFX_write_string(&FontT105,tXc1,text,1);
1297 }
1280 } 1298 }
1281 break; 1299 break;
1282 1300
1283 case CVIEW_T3_MaxDepth: 1301 case CVIEW_T3_MaxDepth:
1284 snprintf(text,TEXTSIZE,"\032\f%c",TXT_MaxDepth); 1302 snprintf(text,TEXTSIZE,"\032\f%c",TXT_MaxDepth);