Mercurial > public > ostc4
view Discovery/Src/tMenuXtra.c @ 924:4d98fb2a178e Evo_2_23
Bugfix real scrubber time decreased in sim mode:
In the previous version the condition check for dive / simulation had been commented out causing the scrubber timer to be decreased during simulator usage. The problem has been fixed. In addition the scrubbertimer will now be maintained in simulator mode. In case the +5 minutes option is used the scrubber time is decreased by 5 minutes as well.
author | Ideenmodellierer |
---|---|
date | Wed, 13 Nov 2024 17:55:05 +0100 |
parents | 7755a476f164 |
children |
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 <stdbool.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 = 0; uint8_t CcrModusTxtId = 0; textPointer = 0; *tab = 500; *subtext = 0; SSettings *pSettings = settingsGetPointer(); resetLineMask(StMXTRA); /* 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)) { switch(pSettings->CCR_Mode) { case CCRMODE_Sensors: CcrModusTxtId = TXT_Sensor; break; case CCRMODE_FixedSetpoint: CcrModusTxtId = TXT_FixedSP; break; case CCRMODE_Simulation: CcrModusTxtId = TXT_SimPpo2; break; default: CcrModusTxtId = 'X'; break; } textPointer += snprintf(&text[textPointer], 60,\ "%c" "\t" "%c" , TXT_CCRmode , CcrModusTxtId ); strcpy(&text[textPointer],"\n\r"); textPointer += 2; } if((line == 0) || (line == 2)) { bool canDoFallback = pSettings->CCR_Mode == CCRMODE_Sensors; if (!canDoFallback) { text[textPointer++] = '\031'; } textPointer += snprintf(&text[textPointer], 60,\ "%c" ,TXT_Fallback ); text[textPointer++] = '\t'; if(settingsGetPointer()->fallbackToFixedSetpoint && canDoFallback) text[textPointer++] = '\005'; else text[textPointer++] = '\006'; if (!canDoFallback) { text[textPointer++] = '\020'; disableLine(StMXTRA_O2_Fallback); } else { enableLine(StMXTRA_O2_Fallback); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; } if((line == 0) || (line == 3)) { textPointer += snprintf(&text[textPointer], 60,\ "%c" ,TXT_ScrubTime ); strcpy(&text[textPointer],"\n\r"); textPointer += 2; } #ifdef ENABLE_PSCR_MODE if((line == 0) || (line == 4)) { if(pSettings->dive_mode == DIVEMODE_PSCR) { textPointer += snprintf(&text[textPointer], 60, "%c",TXT_PSClosedCircuit); enableLine(StMXTRA_PSCR_O2_Drop); } else { text[textPointer++] = '\031'; /* change text color */ textPointer += snprintf(&text[textPointer], 60,"%c",TXT_PSClosedCircuit); text[textPointer++] = '\020'; /* restore text color */ disableLine(StMXTRA_PSCR_O2_Drop); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; } #endif #ifdef ENABLE_PREDIVE_CHECK if((line == 0) || (line == 5)) { if((pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_ANADIG) || (pSettings->ppo2sensors_source == O2_SENSOR_SOURCE_DIGITAL)) { textPointer += snprintf(&text[textPointer], 60,"%c",TXT_PreDive); } else { text[textPointer++] = '\031'; /* change text color */ textPointer += snprintf(&text[textPointer], 60,"%c",TXT_PreDive); text[textPointer++] = '\020'; /* restore text color */ disableLine(StMXTRA_Predive_Check); } strcpy(&text[textPointer],"\n\r"); textPointer += 2; } #endif } return StMXTRA; } void tMXtra_checkLineStatus(void) { uint8_t localLineMask = 0; uint8_t lineMask = getLineMask(StMXTRA); SSettings *pSettings = settingsGetPointer(); if(pSettings->CCR_Mode != CCRMODE_Sensors) { localLineMask |= 1 << 2; } if(pSettings->dive_mode != DIVEMODE_PSCR) { localLineMask |= 1 << 4; } if((pSettings->ppo2sensors_source != O2_SENSOR_SOURCE_ANADIG) && (pSettings->ppo2sensors_source != O2_SENSOR_SOURCE_DIGITAL)) { localLineMask |= 1 << 5; } if(lineMask != localLineMask) { updateMenu(); } }