Mercurial > public > ostc4
view Discovery/Src/tMenuXtra.c @ 303:90e65971f15d cleanup-4
bugfix, cleanup: simplify stopwatch logic and fix fallout
The previous 2 commits (making the depth switch between surface
and diving consistent) increased the time difference (in the
simulator) to about 4 seconds. This commit fixes this again, and
we are back at 1 sec. difference between the 2 timers (notice:
in the simulator). Still not the wanted 0 sec. difference, but
the old stopwatch logic logic was rather convoluted. Resetting to
1 second (instead of 0), and second-1 logic. Basically, this feels
like a bug fixed with a second bug on top to mask it. The code
is now much more logic and consistent (despite the fact that the
real reason for the 1 sec. difference is not yet found).
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Mon, 20 May 2019 12:57:31 +0200 |
parents | 5f11787b4f42 |
children | 77de014928d6 |
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" /* 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; 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; if(is_stateUsedSetToSim()) { if((line == 0) || (line == 4)) { 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; } return StMXTRA; }