Mercurial > public > ostc4
annotate Discovery/Src/gfx_fonts.c @ 683:6f5a18bb25be Betatest
Bugfix: Set actual gas after basic dive settings were created:
Previous version showed unexpected warnings (ppo2 low) and deco data in simulator mode in case the dive mode had been changed before (e.g. from CCR to OC). Root cause was the update of the gas list before basic settings were set in the divesettings. To solve this the gas selection function has been moved behind the section initializing the gas variables.
author | Ideenmodellierer |
---|---|
date | Mon, 16 May 2022 20:50:26 +0200 |
parents | 1c95f811967c |
children |
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 | |
567 | 21 /* Fonts in the firmware image */ |
22 #include "Fonts/font_T54_extra.h" | |
23 #include "Fonts/font_T84_extra.h" | |
24 #include "Fonts/font_T105_extra.h" | |
25 | |
170
5ca88855da87
Fix accidentally pushed local code
Jan Mulder <jlmulder@xs4all.nl>
parents:
169
diff
changeset
|
26 #ifdef DEBUG |
38 | 27 # define INCLUDE_FONTS_BINARY |
170
5ca88855da87
Fix accidentally pushed local code
Jan Mulder <jlmulder@xs4all.nl>
parents:
169
diff
changeset
|
28 #endif |
38 | 29 |
30 #ifdef INCLUDE_FONTS_BINARY | |
31 | |
32 /* Fonts fixed in upper region */ | |
33 #include "Fonts/font_awe48.h" | |
34 #include "Fonts/font_T24.h" | |
35 #include "Fonts/font_T42.h" | |
36 #include "Fonts/font_T48_plus.h" | |
37 #include "Fonts/font_T54.h" | |
38 #include "Fonts/font_T84.h" | |
39 #include "Fonts/font_T105.h" | |
40 #include "Fonts/font_T144_plus.h" | |
41 | |
42 /* Images fixed in upper region */ | |
43 #include "Fonts/image_battery.h" | |
44 #include "Fonts/image_heinrichs_weikamp.h" | |
45 #include "Fonts/image_ostc.h" | |
46 | |
47 #endif // INCLUDE_FONTS_BINARY |