Mercurial > public > ostc4
changeset 739:4a6bffaa38b3
Enable start dive in Big font display:
The diver had to manually switch to the big font view in dive mode. By selecting the big font view as default view in the custom menu the BF view will now be shown from the start of the dive. In order to have a qucker access to the settings menu, the settings menu has been added to the quick menu selection. The settings menu will then also be left to the BF view.
| author | Ideenmodellierer |
|---|---|
| date | Thu, 02 Feb 2023 17:26:54 +0100 |
| parents | 30717de00f3a |
| children | 5078da3845c0 |
| files | Discovery/Src/t3.c Discovery/Src/tHome.c Discovery/Src/tMenuCustom.c Discovery/Src/tMenuEditCustom.c |
| diffstat | 4 files changed, 15 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Discovery/Src/t3.c Thu Feb 02 17:19:24 2023 +0100 +++ b/Discovery/Src/t3.c Thu Feb 02 17:26:54 2023 +0100 @@ -669,6 +669,9 @@ { switch(get_globalState()) { + case StDMENU: snprintf(text,TEXTSIZE,"\a\003\001%c%c", TXT_2BYTE, TXT2BYTE_DiveMenuQ); + GFX_write_string_color(&FontT42,tXr1,text,1,CLUT_WarningYellow); + break; case StDBEAR: snprintf(text,TEXTSIZE,"\a\003\001%c%c", TXT_2BYTE, TXT2BYTE_DiveBearingQ); GFX_write_string_color(&FontT42,tXr1,text,1,CLUT_WarningYellow); break;
--- a/Discovery/Src/tHome.c Thu Feb 02 17:19:24 2023 +0100 +++ b/Discovery/Src/tHome.c Thu Feb 02 17:26:54 2023 +0100 @@ -77,7 +77,13 @@ void set_globalState_tHome(void) { if(stateUsed->mode == MODE_DIVE) + { + if(settingsGetPointer()->extraDisplay == EXTRADISPLAY_BFACTIVE) + { + settingsGetPointer()->design = 3; + } set_globalState(StD); + } else set_globalState(StS); } @@ -205,6 +211,7 @@ #endif break; default: + set_globalState(StDMENU); break; } break;
--- a/Discovery/Src/tMenuCustom.c Thu Feb 02 17:19:24 2023 +0100 +++ b/Discovery/Src/tMenuCustom.c Thu Feb 02 17:26:54 2023 +0100 @@ -74,9 +74,9 @@ case EXTRADISPLAY_BIGFONT: text[textPointer++] = TXT2BYTE_ExtraBigFont; break; - /* DecoGame */ - case EXTRADISPLAY_DECOGAME: - text[textPointer++] = TXT2BYTE_ExtraDecoGame; + /* Start screen */ + case EXTRADISPLAY_BFACTIVE: + text[textPointer++] = TXT2BYTE_ExtraActive; break; /* none */ case EXTRADISPLAY_none:
--- a/Discovery/Src/tMenuEditCustom.c Thu Feb 02 17:19:24 2023 +0100 +++ b/Discovery/Src/tMenuEditCustom.c Thu Feb 02 17:26:54 2023 +0100 @@ -390,10 +390,7 @@ SSettings *pSettings = settingsGetPointer(); newValue = pSettings->extraDisplay + 1; - if(newValue == EXTRADISPLAY_DECOGAME) /* Decogame not yet implemented */ - { - newValue++; - } + if(newValue >= EXTRADISPLAY_END) { newValue = EXTRADISPLAY_none; @@ -960,10 +957,7 @@ uint8_t newValue; newValue = settingsGetPointer()->extraDisplay + 1; - if(newValue == EXTRADISPLAY_DECOGAME) /* Decogame not yet implemented */ - { - newValue++; - } + if(newValue >= EXTRADISPLAY_END) { newValue = EXTRADISPLAY_none;