Mercurial > public > ostc4
annotate 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 |
rev | line source |
---|---|
38 | 1 /** |
2 ****************************************************************************** | |
3 * @file gfx_fonts.c | |
4 * @author heinrichs/weikamp, JD Gascuel | |
5 * @version V1.4.0 | |
6 * @date 17-Decembre-2017 | |
7 * @brief Font data (and images) stored in UPPER ROM. | |
8 * | |
9 ****************************************************************************** | |
10 * @attention | |
11 * | |
12 * <h2><center>© COPYRIGHT(c) 2017 heinrichs weikamp</center></h2> | |
13 * | |
14 ****************************************************************************** | |
15 */ | |
16 | |
17 /* Includes ------------------------------------------------------------------*/ | |
18 | |
19 #include "gfx_fonts.h" | |
20 | |
170
5ca88855da87
Fix accidentally pushed local code
Jan Mulder <jlmulder@xs4all.nl>
parents:
169
diff
changeset
|
21 #ifdef DEBUG |
38 | 22 # define INCLUDE_FONTS_BINARY |
170
5ca88855da87
Fix accidentally pushed local code
Jan Mulder <jlmulder@xs4all.nl>
parents:
169
diff
changeset
|
23 #endif |
38 | 24 |
25 #ifdef INCLUDE_FONTS_BINARY | |
26 | |
27 /* Fonts fixed in upper region */ | |
28 #include "Fonts/font_awe48.h" | |
29 #include "Fonts/font_T24.h" | |
30 #include "Fonts/font_T42.h" | |
31 #include "Fonts/font_T48_plus.h" | |
32 #include "Fonts/font_T54.h" | |
33 #include "Fonts/font_T84.h" | |
34 #include "Fonts/font_T105.h" | |
35 #include "Fonts/font_T144_plus.h" | |
36 | |
37 /* Images fixed in upper region */ | |
38 #include "Fonts/image_battery.h" | |
39 #include "Fonts/image_heinrichs_weikamp.h" | |
40 #include "Fonts/image_ostc.h" | |
41 | |
42 #endif // INCLUDE_FONTS_BINARY |