Mercurial > public > ostc4
view Discovery/Src/gfx_fonts.c @ 304:43b44f8d4fb0 cleanup-4
bugfix, simulator: fix the 1 sec difference between stopwatch and divetime
This is a rather subtle bugfix. counterSecondsShallowDepth is used to decide
to increase dive_time_seconds_without_surface_time. But just after using
it, logic is present to reset counterSecondsShallowDepth. So, basically,
we are looking to an old state.
Simply increase dive_time_seconds_without_surface_time *after* we have reset
counterSecondsShallowDepth, so that we are looking to a current state instead
of an old one.
Notice that this is simulator only.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Mon, 20 May 2019 13:06:02 +0200 |
parents | 5ca88855da87 |
children | 1c95f811967c |
line wrap: on
line source
/** ****************************************************************************** * @file gfx_fonts.c * @author heinrichs/weikamp, JD Gascuel * @version V1.4.0 * @date 17-Decembre-2017 * @brief Font data (and images) stored in UPPER ROM. * ****************************************************************************** * @attention * * <h2><center>© COPYRIGHT(c) 2017 heinrichs weikamp</center></h2> * ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ #include "gfx_fonts.h" #ifdef DEBUG # define INCLUDE_FONTS_BINARY #endif #ifdef INCLUDE_FONTS_BINARY /* Fonts fixed in upper region */ #include "Fonts/font_awe48.h" #include "Fonts/font_T24.h" #include "Fonts/font_T42.h" #include "Fonts/font_T48_plus.h" #include "Fonts/font_T54.h" #include "Fonts/font_T84.h" #include "Fonts/font_T105.h" #include "Fonts/font_T144_plus.h" /* Images fixed in upper region */ #include "Fonts/image_battery.h" #include "Fonts/image_heinrichs_weikamp.h" #include "Fonts/image_ostc.h" #endif // INCLUDE_FONTS_BINARY