Mercurial > public > ostc4

diff Discovery/Inc/Fonts/image_battery.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_battery.h	Sun Jul 29 18:06:37 2018 +0200
+++ b/Discovery/Inc/Fonts/image_battery.h	Sun Jul 29 18:07:52 2018 +0200
@@ -29,7 +29,7 @@
 
 #include "gfx_fonts.h"
 
-static const uint8_t image_data_Batt2Top[168] UPPER_FONTS = {
+static const uint8_t image_data_Batt2Top[168] UPPER_IMAGES = {
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -39,27 +39,27 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static const uint8_t image_data_Batt2Empty4px_of_40px[96] UPPER_FONTS = {
+static const uint8_t image_data_Batt2Empty4px_of_40px[96] UPPER_IMAGES = {
     0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00,
     0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00,
     0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00,
     0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00
 };
 
-static const uint8_t image_data_Batt2Full4px_of_40px[96] UPPER_FONTS = {
+static const uint8_t image_data_Batt2Full4px_of_40px[96] UPPER_IMAGES = {
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
 };
 
-static const uint8_t image_data_Batt2Bottom[72] UPPER_FONTS = {
+static const uint8_t image_data_Batt2Bottom[72] UPPER_IMAGES = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
     0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00
 };
 
-static const uint8_t image_data_Batt2Blitz[312] UPPER_FONTS = {
+static const uint8_t image_data_Batt2Blitz[312] UPPER_IMAGES = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -75,13 +75,13 @@
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static const tImage Batt2Top              UPPER_FONTS = { image_data_Batt2Top, 7, 24};
-static const tImage Batt2Empty4px_of_40px UPPER_FONTS = { image_data_Batt2Empty4px_of_40px, 4, 24};
-static const tImage Batt2Full4px_of_40px  UPPER_FONTS = { image_data_Batt2Full4px_of_40px, 4, 24};
-static const tImage Batt2Bottom           UPPER_FONTS = { image_data_Batt2Bottom, 3, 24};
-static const tImage Batt2Blitz            UPPER_FONTS = { image_data_Batt2Blitz, 13, 24};
+static const tImage Batt2Top              UPPER_IMAGES = { image_data_Batt2Top, 7, 24};
+static const tImage Batt2Empty4px_of_40px UPPER_IMAGES = { image_data_Batt2Empty4px_of_40px, 4, 24};
+static const tImage Batt2Full4px_of_40px  UPPER_IMAGES = { image_data_Batt2Full4px_of_40px, 4, 24};
+static const tImage Batt2Bottom           UPPER_IMAGES = { image_data_Batt2Bottom, 3, 24};
+static const tImage Batt2Blitz            UPPER_IMAGES = { image_data_Batt2Blitz, 13, 24};
 
-static const tChar batt2_array[] UPPER_FONTS = {
+static const tChar batt2_array[] UPPER_IMAGES = {
 
   // character: battery header
   {'0', &Batt2Top},
@@ -99,4 +99,4 @@
   {'4', &Batt2Blitz},
 };
 
-const tFont Batt24 UPPER_FONT_DIRECTORY = { 5, batt2_array , 18, 18, 24};
+const tFont Batt24 UPPER_IMAGE_DIRECTORY = { 5, batt2_array , 18, 18, 24};