Mercurial > public > ostc4
diff Discovery/Src/t7.c @ 115:3834b6272ee5 FlipDisplay
Merge with 68181cd61f2069d061621c2cd2a6afddb7486f5e
| author | Ideenmodellierer |
|---|---|
| date | Thu, 03 Jan 2019 19:59:36 +0100 |
| parents | cc8e24374b83 f5d2f02dc73f |
| children | cc9c18075e00 |
line wrap: on
line diff
--- a/Discovery/Src/t7.c Thu Jan 03 18:35:11 2019 +0100 +++ b/Discovery/Src/t7.c Thu Jan 03 19:59:36 2019 +0100 @@ -970,7 +970,7 @@ /* surface pressure and temperature */ if(stateUsed->sensorErrorsRTE == 0) { - snprintf(text,30,"%01.0f\022\016\016 mbar", stateUsed->lifeData.pressure_surface_bar * 1000.0f); + snprintf(text,30,"%01.0f\022\016\016 %s", stateUsed->lifeData.pressure_surface_bar * 1000.0f,TEXT_PRESSURE_UNIT); GFX_write_string(&FontT48,&t7surfaceL,text,3); if(settingsGetPointer()->nonMetricalSystem) @@ -981,7 +981,7 @@ } else { - snprintf(text,30,"ERR\022\016\016 mbar"); + snprintf(text,30,"ERR\022\016\016 %s",TEXT_PRESSURE_UNIT); GFX_write_string(&FontT48,&t7surfaceL,text,3); if(settingsGetPointer()->nonMetricalSystem) @@ -1295,7 +1295,7 @@ Gfx_write_label_var(&t7screen, 0,400,255,&FontT48,CLUT_Font020,TextL1); return; } - snprintf(TextL1,TEXTSIZE,"%01.0f mbar",stateUsed->lifeData.pressure_ambient_bar * 1000.0f); + snprintf(TextL1,TEXTSIZE,"%01.0f %s",stateUsed->lifeData.pressure_ambient_bar * 1000.0f,TEXT_PRESSURE_UNIT); Gfx_write_label_var(&t7screen, 0,400, 0,&FontT42,CLUT_DiveMainLabel,"Ambient Pressure"); Gfx_write_label_var(&t7screen, 0,400, 45,&FontT48,CLUT_Font020,TextL1); @@ -1307,7 +1307,7 @@ Gfx_write_label_var(&t7screen, 0,400,200,&FontT42,CLUT_DiveMainLabel,"Heading Roll Pitch"); Gfx_write_label_var(&t7screen, 0,400,255,&FontT48,CLUT_Font020,TextL1); - snprintf(TextL1,TEXTSIZE,"%01.0f mbar",stateUsed->lifeData.pressure_surface_bar * 1000.0f); + snprintf(TextL1,TEXTSIZE,"%01.0f %s",stateUsed->lifeData.pressure_surface_bar * 1000.0f,TEXT_PRESSURE_UNIT); Gfx_write_label_var(&t7screen, 0,400,310,&FontT42,CLUT_DiveMainLabel,"Surface Pressure"); Gfx_write_label_var(&t7screen, 0,400,355,&FontT48,CLUT_Font020,TextL1);