Mercurial > public > ostc4
view Discovery/Src/gfx_fonts.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 | 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