Mercurial > public > ostc4
changeset 102:4276d56eb37c kittz
hPa instead of mbar, enabled Spanish language
author | heinrichsweikamp |
---|---|
date | Tue, 27 Nov 2018 18:31:21 +0100 |
parents | 83feba2ad1c3 |
children | f5d2f02dc73f |
files | Discovery/Src/settings.c Discovery/Src/show_logbook.c Discovery/Src/t7.c Discovery/Src/tMenuEditSystem.c ostc4pack/OSTC4_Firmware.bin ostc4pack/OSTC4_RTE.bin ostc4pack/OSTC4_RTE_upload.bin ostc4pack/OSTC4_firmware_upload.bin |
diffstat | 8 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Src/settings.c Tue Nov 27 13:18:59 2018 +0300 +++ b/Discovery/Src/settings.c Tue Nov 27 18:31:21 2018 +0100 @@ -56,7 +56,7 @@ .versionFirst = 1, .versionSecond = 4, .versionThird = 5, - .versionBeta = 2, + .versionBeta = 1, /* 4 bytes with trailing 0 */ .signature = "mh",
--- a/Discovery/Src/show_logbook.c Tue Nov 27 13:18:59 2018 +0300 +++ b/Discovery/Src/show_logbook.c Tue Nov 27 18:31:21 2018 +0100 @@ -626,7 +626,7 @@ // snprintf(text,20,"\001%i\016\016 mbar",logbookHeader.surfacePressure_mbar); // Gfx_write_label_var(hgfx,300,500,750, &FontT42,CLUT_GasSensor1,text); // snprintf(text,40,"%i\016\016 mbar\017 (%i\016\016 m\017)",logbookHeader.surfacePressure_mbar, unit_SeaLevelRelation_integer(logbookHeader.surfacePressure_mbar)); - snprintf(text,40,"%i\016\016 mbar\017",logbookHeader.surfacePressure_mbar); + snprintf(text,40,"%i\016\016 hPa\017",logbookHeader.surfacePressure_mbar); Gfx_write_label_var(hgfx,320,600,750, &FontT42,CLUT_GasSensor1,text);
--- a/Discovery/Src/t7.c Tue Nov 27 13:18:59 2018 +0300 +++ b/Discovery/Src/t7.c Tue Nov 27 18:31:21 2018 +0100 @@ -775,7 +775,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 hPa", stateUsed->lifeData.pressure_surface_bar * 1000.0f); GFX_write_string(&FontT48,&t7surfaceL,text,3); if(settingsGetPointer()->nonMetricalSystem) @@ -786,7 +786,7 @@ } else { - snprintf(text,30,"ERR\022\016\016 mbar"); + snprintf(text,30,"ERR\022\016\016 hPa"); GFX_write_string(&FontT48,&t7surfaceL,text,3); if(settingsGetPointer()->nonMetricalSystem) @@ -1090,7 +1090,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 hPa",stateUsed->lifeData.pressure_ambient_bar * 1000.0f); 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); @@ -1102,7 +1102,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 hPa",stateUsed->lifeData.pressure_surface_bar * 1000.0f); 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);
--- a/Discovery/Src/tMenuEditSystem.c Tue Nov 27 13:18:59 2018 +0300 +++ b/Discovery/Src/tMenuEditSystem.c Tue Nov 27 18:31:21 2018 +0100 @@ -506,14 +506,14 @@ active = 0; write_field_on_off(StMSYS2_Italian, 30, 800, ME_Y_LINE4, &FontT48, text, active); -/* + pSettings->selected_language = LANGUAGE_Espanol; if( actualLanguage == pSettings->selected_language) active = 1; else active = 0; write_field_on_off(StMSYS2_Espanol, 30, 800, ME_Y_LINE5, &FontT48, text, active); -*/ + pSettings->selected_language = actualLanguage; write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext); @@ -522,7 +522,7 @@ setEvent(StMSYS2_German, (uint32_t)OnAction_German); setEvent(StMSYS2_French, (uint32_t)OnAction_French); setEvent(StMSYS2_Italian, (uint32_t)OnAction_Italian); - //setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol); + setEvent(StMSYS2_Espanol, (uint32_t)OnAction_Espanol); } @@ -1237,7 +1237,7 @@ write_label_var( 20, 800, ME_Y_LINE4, &FontT42, text_content); offsetTemperature = ((float)settingsGetPointer()->offsetTemperature_centigrad) / 10; - snprintf(text_content,80,"%i mbar / %0.2f\140C",settingsGetPointer()->offsetPressure_mbar, offsetTemperature); + snprintf(text_content,80,"%i hPa / %0.2f\140C",settingsGetPointer()->offsetPressure_mbar, offsetTemperature); write_label_var( 20, 800, ME_Y_LINE5, &FontT42, text_content); text_button[0] = TXT_2BYTE;