Mercurial > public > ostc4
annotate Discovery/Src/gfx_fonts.c @ 311:ddbe8bed5096 cleanup-4
bugfix: make stopwatch and divetime run in sync
And this shows the fundamental issue in the difference between dive time and
stopwatch time. The dive time is constructed on the RTE, and rather
independently, the stopwatch time is constructed on CPU1.
This works rather well, but not perfect. This commit fixes things in
a relatively straightforward way. Instead of incrementing the stopwatch
locally on CPU1, simply use the same time data that is coming from the
RTE. Some logic was added to make this stopwatch resettable again.
Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author | Jan Mulder <jlmulder@xs4all.nl> |
---|---|
date | Wed, 29 May 2019 14:02:27 +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 |