Mercurial > public > ostc4
view Discovery/Src/tMenuXtra.c @ 682:8775d3dc6325 Betatest
Bugfix low ppO2 warning in bailout mode:
the code has different sources for divesettings (real and simulated). The ppo2 calculation code used the pointer to the real structure. As result in simulation mode an error occured caused by the ppo2 calculation which was not aware that a bailout happened (because the real structure was references instead of the simulator ones). The problem has been fixed by using the "stateUsed" pointer which is refering to the structure currenty in use.
author | Ideenmodellierer |
---|---|
date | Mon, 25 Apr 2022 21:15:01 +0200 |
parents | 1b995079c045 |
children | e81afd727993 |
line wrap: on
line source
/////////////////////////////////////////////////////////////////////////////// /// -*- coding: UTF-8 -*- /// /// \file Discovery/Src/tMenuXtra.c /// \brief Menu Xtra - Specials in Divemode like Reset Stopwatch /// \author heinrichs weikamp gmbh /// \date 02-Mar-2015 /// /// \details /// /// $Id$ /////////////////////////////////////////////////////////////////////////////// /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh /// /// This program is free software: you can redistribute it and/or modify /// it under the terms of the GNU General Public License as published by /// the Free Software Foundation, either version 3 of the License, or /// (at your option) any later version. /// /// This program is distributed in the hope that it will be useful, /// but WITHOUT ANY WARRANTY; without even the implied warranty of /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the /// GNU General Public License for more details. /// /// You should have received a copy of the GNU General Public License /// along with this program. If not, see <http://www.gnu.org/licenses/>. ////////////////////////////////////////////////////////////////////////////// /* Includes ------------------------------------------------------------------*/ #include <stdio.h> #include <string.h> #include "tMenu.h" #include "tStructure.h" #include "tMenuXtra.h" #include "text_multilanguage.h" #include "data_central.h" #include "simulation.h" #include "configuration.h" /* Exported functions --------------------------------------------------------*/ uint32_t tMXtra_refresh(uint8_t line, char *text, uint16_t *tab, char *subtext) { uint8_t textPointer; textPointer = 0; *tab = 500; *subtext = 0; SSettings *pSettings = settingsGetPointer(); /* DIVE MODE */ if(actual_menu_content != MENU_SURFACE) { if((line == 0) || (line == 1)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_ResetStopwatch; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; /* if((line == 0) || (line == 2)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_ResetAvgDepth; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; */ if((line == 0) || (line == 2)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_CompassHeading; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 3)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_SetMarker; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; #ifdef ENABLE_MOTION_CONTROL if((line == 0) || (line == 4)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_CalibView; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; #endif if(is_stateUsedSetToSim()) { if((line == 0) || (line == 5)) { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_SimFollowDecoStops; text[textPointer++] = ' '; text[textPointer++] = ' '; if(simulation_get_heed_decostops()) text[textPointer++] = '\005'; else text[textPointer++] = '\006'; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; } else { if((line == 0) || (line == 5)) /* end dive mode only used during real dives */ { text[textPointer++] = TXT_2BYTE; text[textPointer++] = TXT2BYTE_EndDiveMode; } strcpy(&text[textPointer],"\n\r"); textPointer += 2; } } else /* Surface MODE */ { if((line == 0) || (line == 1)) { textPointer += snprintf(&text[textPointer], 60,\ "%c" "\016\016(%c)\17" "\002" "%u" "\016\016" " %c" "\017" ,TXT_ScrubTime ,TXT_Maximum ,pSettings->scrubTimerMax ,TXT_Minutes ); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 2)) { textPointer += snprintf(&text[textPointer], 60,\ "%c\002%03u\016\016 %c\017" ,TXT_ScrubTimeReset ,pSettings->scrubTimerCur ,TXT_Minutes); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 3)) { switch(pSettings->scrubTimerMode) { case SCRUB_TIMER_OFF: default: textPointer += snprintf(&text[textPointer], 60,"%c\002%c%c",TXT_ScrubTimeMode, TXT_2BYTE, TXT2BYTE_MoCtrlNone ); break; case SCRUB_TIMER_MINUTES: textPointer += snprintf(&text[textPointer], 60,"%c\002%c",TXT_ScrubTimeMode, TXT_Minutes ); break; case SCRUB_TIMER_PERCENT: textPointer += snprintf(&text[textPointer], 60,"%c\002%c",TXT_ScrubTimeMode, TXT_Percent ); break; } } strcpy(&text[textPointer],"\n\r"); textPointer += 2; #ifdef ENABLE_PSCR_MODE if(pSettings->dive_mode == DIVEMODE_PSCR) { if((line == 0) || (line == 4)) { textPointer += snprintf(&text[textPointer], 60,\ "%c\002%02u\016\016%%\017" ,TXT_PSCRO2Drop ,pSettings->pscr_o2_drop); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; if((line == 0) || (line == 5)) { textPointer += snprintf(&text[textPointer], 60,\ "%c\002 1/%02u" ,TXT_PSCRLungRatio ,pSettings->pscr_lung_ratio); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; } #endif #ifdef ENABLE_CO2_SUPPORT if((line == 0) || (line == 6)) { textPointer += snprintf(&text[textPointer], 60, "%c", TXT_CO2Sensor); } #endif } return StMXTRA; }