annotate Discovery/Inc/gfx_fonts.h @ 567:1c95f811967c

-Add 12HR Time Support -Add firmware image only font extensions -Show english units when required in log's graphs -Show decompression info with Font84 if 10 characters long -Remove usage of ' symbol to denote minutes and instead use min abbreviation -Show english units when required on the simulation configuration screen -Remove usage of ' symbol to denote feet in in non-metric mode and use ft abbrevation
author izzni
date Tue, 24 Nov 2020 13:22:23 -0600
parents f2d98ad6f1be
children 3508e6dc4f22
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
1 ///////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
2 /// -*- coding: UTF-8 -*-
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
3 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
4 /// \file Discovery/Inc/gfx_fonts.h
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
5 /// \brief Header file to control placement of font in STM32 Flash
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
6 /// \author heinrichs weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
7 /// \date 14-Aug-2014
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
8 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
9 /// $Id$
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
10 ///////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
11 /// \par Copyright (c) 2014-2018 Heinrichs Weikamp gmbh
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
12 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
13 /// This program is free software: you can redistribute it and/or modify
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
14 /// it under the terms of the GNU General Public License as published by
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
15 /// the Free Software Foundation, either version 3 of the License, or
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
16 /// (at your option) any later version.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
17 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
18 /// This program is distributed in the hope that it will be useful,
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
19 /// but WITHOUT ANY WARRANTY; without even the implied warranty of
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
20 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
21 /// GNU General Public License for more details.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
22 ///
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
23 /// You should have received a copy of the GNU General Public License
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
24 /// along with this program. If not, see <http://www.gnu.org/licenses/>.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
25 //////////////////////////////////////////////////////////////////////////////
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
26
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
27 /* Define to prevent recursive inclusion -------------------------------------*/
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
28 #ifndef GFX_FONTS_H
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
29 #define GFX_FONTS_H
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
30
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
31 #include "gfx.h"
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
32
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
33 // From image_heinrichs_weikamp.c
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
34 enum { indexHWcolorSIZE = 256 };
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
35
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
36 // Forward declarations
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
37 //
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
38 // 2018-01-01 jDG:
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
39 // - the exact address is fixed in linker script CPU1-F429.ld,
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
40 // so that every font can be used even when not included in the actual
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
41 // binary (boot-loader, fonts, or firmware).
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
42 //
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
43 // - Actual font data is defined by the OSTC4/FontPack project, that shall
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
44 // be loaded before the firmware is executed.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
45 //
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
46 // - Font directory starts at address 0x081E0000. Each header is 12 bytes.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
47 // A 0xFFFFFFFF (32 bits) marks the directory's end.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
48 // It is stored between __font_directory and __font_directory_end;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
49 //
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
50 // - Font data (chars) is stored after 0x08132040 (end of font's SFirmareData).
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
51 // So there is space for 0x081E0000 - 0x08132040 = ADFC0 = 694 KB of fonts.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
52 // Actual data is stored between __upper_font_data and __upper_font_data_end,
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
53 // and uses 0x081b9a3a - 0x08132040 = 879FA = 542 KB.
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
54 //
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
55 extern const tFont Awe48;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
56 extern const tFont FontT24;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
57 extern const tFont FontT42;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
58 extern const tFont FontT48;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
59 extern const tFont FontT54;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
60 extern const tFont FontT84;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
61 extern const tFont FontT105;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
62 extern const tFont FontT144;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
63
567
1c95f811967c -Add 12HR Time Support
izzni
parents: 74
diff changeset
64 extern const tFont FontT84Spaced;
1c95f811967c -Add 12HR Time Support
izzni
parents: 74
diff changeset
65
1c95f811967c -Add 12HR Time Support
izzni
parents: 74
diff changeset
66 extern const tFont FontT54Extra;
1c95f811967c -Add 12HR Time Support
izzni
parents: 74
diff changeset
67 extern const tFont FontT84Extra;
1c95f811967c -Add 12HR Time Support
izzni
parents: 74
diff changeset
68 extern const tFont FontT105Extra;
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
69 extern const tFont Batt24;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
70
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
71 extern const tImage ImgHWcolor;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
72 extern const tImage ImgOSTC;
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
73
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
74 extern const uint32_t indexHWcolor[indexHWcolorSIZE];
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
75
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
76 // Macro to store in UPPER rom font sections
44
7c786c7aa99b Placed directory sections in firmware memory space
Ideenmodellierer
parents: 38
diff changeset
77 /* TODO: Looking at older map files the directories should be placed within the firmware memory */
7c786c7aa99b Placed directory sections in firmware memory space
Ideenmodellierer
parents: 38
diff changeset
78 /* As well as the image data => to be confirmed */
74
f2d98ad6f1be Move font to upper memory
Ideenmodellierer
parents: 44
diff changeset
79 #define UPPER_FONT_DIRECTORY __attribute__ (( used, section(".upper_font_directory") ))
44
7c786c7aa99b Placed directory sections in firmware memory space
Ideenmodellierer
parents: 38
diff changeset
80
7c786c7aa99b Placed directory sections in firmware memory space
Ideenmodellierer
parents: 38
diff changeset
81 #define UPPER_IMAGE_DIRECTORY __attribute__(( section(".lower_image_directory") ))
7c786c7aa99b Placed directory sections in firmware memory space
Ideenmodellierer
parents: 38
diff changeset
82 #define UPPER_IMAGES __attribute__(( section(".lower_images") ))
38
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
83
5f11787b4f42 include in ostc4 repository
heinrichsweikamp
parents:
diff changeset
84 #endif // GFX_FONTS_H