Mercurial > public > ostc4

diff Discovery/Inc/Fonts/image_ostc.h @ 45:219943ef9dc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced generic with individual sections to invert the link order and to be able to place specific fonts at defined locations
author Ideenmodellierer
date Sun, 29 Jul 2018 18:07:52 +0200
parents 5f11787b4f42
children
line wrap: on
line diff
--- a/Discovery/Inc/Fonts/image_ostc.h	Sun Jul 29 18:06:37 2018 +0200
+++ b/Discovery/Inc/Fonts/image_ostc.h	Sun Jul 29 18:07:52 2018 +0200
@@ -29,7 +29,7 @@
 
 #include "gfx_fonts.h"
 
-static const uint8_t image_data_ostc_fuer_Tauchcomputer_240px[17710] UPPER_FONTS = {
+static const uint8_t image_data_ostc_fuer_Tauchcomputer_240px[17710] __attribute__(( section(".upper_images.image_data_ostc_fuer_Tauchcomputer_240px") )) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x0a, 0x0f, 0x1f, 0x31, 0x4c, 0x5a, 0x88, 0x8e, 0x8c, 0x8c, 0x8c, 0x8c, 0x8d, 0x91, 0x68, 0x4c, 0x3a, 0x1d, 0x0f, 0x09, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x12, 0x29, 0x4a, 0x80, 0xdd, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xce, 0x8d, 0x48, 0x20, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x17, 0x43, 0x89, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xcd, 0xcb, 0xcb, 0xcb, 0xcb, 0xcb, 0xcf, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd3, 0x7b, 0x38, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -262,4 +262,4 @@
     0x00, 0x00, 0x00, 0x00, 0x24, 0x30, 0x12, 0x0a, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x05, 0x06, 0x00, 0x00, 0x00
 };
 
-const tImage ImgOSTC UPPER_FONT_DIRECTORY = { image_data_ostc_fuer_Tauchcomputer_240px, 230, 77};
+const tImage ImgOSTC  = { image_data_ostc_fuer_Tauchcomputer_240px, 230, 77};