Fonts in flash on F0, tidy up ttf locations. closes #60

andysworkshop · Sep 20, 2014 · 10250d6 · 10250d6
1 parent 0be8d17
commit 10250d6
Show file tree

Hide file tree

Showing 39 changed files with 1,008 additions and 1,149 deletions.
diff --git a/lib/include/display/graphic/fonts/Font_apple_8.xml b/lib/include/display/graphic/fonts/Font_apple_8.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>P:\docs\source\stm32plus\utils\fonts\apple\Apple.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\Apple.ttf</Filename>
   <Size>8</Size>
   <XOffset>0</XOffset>
   <YOffset>0</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_atari_st_16.xml b/lib/include/display/graphic/fonts/Font_atari_st_16.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>P:\docs\source\stm32plus\lib\resources\ttf\AtariST8x16SystemFont.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\AtariST8x16SystemFont.ttf</Filename>
   <Size>16</Size>
   <XOffset>0</XOffset>
   <YOffset>-1</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_dos_16.xml b/lib/include/display/graphic/fonts/Font_dos_16.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>C:\Users\andy\Desktop\New folder (2)\Perfect DOS VGA 437 Win.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\Perfect DOS VGA 437 Win.ttf</Filename>
   <Size>16</Size>
   <XOffset>1</XOffset>
   <YOffset>0</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_kyrou9_bold_8.xml b/lib/include/display/graphic/fonts/Font_kyrou9_bold_8.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>P:\docs\source\stm32plus\utils\fonts\kyrou_9\Kyrou 9 Regular Bold.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\Kyrou 9 Regular Bold.ttf</Filename>
   <Size>8</Size>
   <XOffset>0</XOffset>
   <YOffset>-3</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_kyrou9_regular_8.xml b/lib/include/display/graphic/fonts/Font_kyrou9_regular_8.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>P:\docs\source\stm32plus\utils\fonts\kyrou_9\Kyrou 9 Regular.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\Kyrou 9 Regular.ttf</Filename>
   <Size>8</Size>
   <XOffset>0</XOffset>
   <YOffset>-3</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_nintendo_ds_16.xml b/lib/include/display/graphic/fonts/Font_nintendo_ds_16.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>C:\Users\andy\Desktop\New folder (2)\Nintendo-DS-BIOS.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\Nintendo-DS-BIOS.ttf</Filename>
   <Size>16</Size>
   <XOffset>0</XOffset>
   <YOffset>-1</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_pixelade_13.xml b/lib/include/display/graphic/fonts/Font_pixelade_13.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>C:\Users\andy\Desktop\New folder (2)\PIXELADE.TTF</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\PIXELADE.TTF</Filename>
   <Size>13</Size>
   <XOffset>0</XOffset>
   <YOffset>0</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_proggy_clean_16.xml b/lib/include/display/graphic/fonts/Font_proggy_clean_16.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>C:\Users\andy\Desktop\New folder (2)\ProggyClean.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\ProggyClean.ttf</Filename>
   <Size>16</Size>
   <XOffset>0</XOffset>
   <YOffset>0</YOffset>

diff --git a/lib/include/display/graphic/fonts/Font_volter_goldfish_9.xml b/lib/include/display/graphic/fonts/Font_volter_goldfish_9.xml
@@ -1,5 +1,5 @@
 <FontConv>
-  <Filename>P:\docs\source\stm32plus\utils\fonts\VolterGoldfish_9\Volter__28Goldfish_29.ttf</Filename>
+  <Filename>P:\docs\source\stm32plus\utils\fonts\Volter__28Goldfish_29.ttf</Filename>
   <Size>9</Size>
   <XOffset>0</XOffset>
   <YOffset>0</YOffset>

diff --git a/lib/include/display/graphic/gl/Bitmap.inl b/lib/include/display/graphic/gl/Bitmap.inl
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include "display/graphic/JpegDecoder.h"
-
 
 namespace stm32plus {
   namespace display {

diff --git a/lib/include/display/graphic/gl/Primitives.inl b/lib/include/display/graphic/gl/Primitives.inl
@@ -6,9 +6,6 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include "util/MinMax.h"
-
 
 namespace stm32plus {
   namespace display {

diff --git a/lib/include/display/graphic/gl/Text.inl b/lib/include/display/graphic/gl/Text.inl
@@ -6,9 +6,6 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include "string/StringUtil.h"
-
 
 namespace stm32plus {
   namespace display {

diff --git a/lib/include/display/graphic/gl/f0/Text.inl b/lib/include/display/graphic/gl/f0/Text.inl
@@ -6,8 +6,10 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include "string/StringUtil.h"
+// ensure the MCU series is correct
+#ifndef STM32PLUS_F0
+#error This class can only be used with the STM32F0 series
+#endif
 
 
 namespace stm32plus {
@@ -65,7 +67,7 @@ namespace stm32plus {
 
     /**
      * Write a single character withoug filling the background. Slower than filling the background due
-     * to the movement calculations
+     * to the movement calculations.  (the F0 does not have bitbanding for access to the font data)
      */
 
     template<class TDevice,typename TDeviceAccessMode>

diff --git a/lib/include/display/graphic/gl/f1/Text.inl b/lib/include/display/graphic/gl/f1/Text.inl
@@ -6,8 +6,10 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include "string/StringUtil.h"
+// ensure the MCU series is correct
+#ifndef STM32PLUS_F1
+#error This class can only be used with the STM32F1 series
+#endif
 
 
 namespace stm32plus {

diff --git a/lib/include/display/graphic/gl/f4/Text.inl b/lib/include/display/graphic/gl/f4/Text.inl
@@ -6,8 +6,10 @@
 
 #pragma once
 
-#include <stdlib.h>
-#include "string/StringUtil.h"
+// ensure the MCU series is correct
+#ifndef STM32PLUS_F4
+#error This class can only be used with the STM32F4 series
+#endif
 
 
 namespace stm32plus {

diff --git a/lib/src/display/graphic/fonts/Font_apple_8.cpp b/lib/src/display/graphic/fonts/Font_apple_8.cpp
@@ -1,105 +1,111 @@
 #include "config/stm32plus.h"
 #include "config/display/font.h"
 
+#if defined STM32PLUS_F0
+#define FONTCONST const
+#else
+#define FONTCONST
+#endif
+
 namespace stm32plus { namespace display {
 
   // byte definitions for FDEF_APPLE
 
-  uint8_t FDEF_APPLE32_BYTES[]={ 0,0,0,0,0,0,0,0,};
-  uint8_t FDEF_APPLE33_BYTES[]={ 8,8,8,8,8,0,8,0,};
-  uint8_t FDEF_APPLE34_BYTES[]={ 20,20,20,0,0,0,0,0,};
-  uint8_t FDEF_APPLE35_BYTES[]={ 20,20,62,20,62,20,20,0,};
-  uint8_t FDEF_APPLE36_BYTES[]={ 8,60,10,28,40,30,8,0,};
-  uint8_t FDEF_APPLE37_BYTES[]={ 3,35,16,8,4,98,96,0,};
-  uint8_t FDEF_APPLE38_BYTES[]={ 4,10,10,4,42,18,44,0,};
-  uint8_t FDEF_APPLE39_BYTES[]={ 8,8,8,0,0,0,0,0,};
-  uint8_t FDEF_APPLE40_BYTES[]={ 16,8,4,4,4,8,16,0,};
-  uint8_t FDEF_APPLE41_BYTES[]={ 8,16,32,32,32,16,8,0,};
-  uint8_t FDEF_APPLE42_BYTES[]={ 8,42,28,8,28,42,8,0,};
-  uint8_t FDEF_APPLE43_BYTES[]={ 0,8,8,62,8,8,0,0,};
-  uint8_t FDEF_APPLE44_BYTES[]={ 0,0,0,0,16,16,8,0,};
-  uint8_t FDEF_APPLE45_BYTES[]={ 0,0,0,62,0,0,0,0,};
-  uint8_t FDEF_APPLE46_BYTES[]={ 0,0,0,0,0,0,8,0,};
-  uint8_t FDEF_APPLE47_BYTES[]={ 0,32,16,8,4,2,0,0,};
-  uint8_t FDEF_APPLE48_BYTES[]={ 28,34,50,42,38,34,28,0,};
-  uint8_t FDEF_APPLE49_BYTES[]={ 8,12,8,8,8,8,28,0,};
-  uint8_t FDEF_APPLE50_BYTES[]={ 28,34,32,24,4,2,62,0,};
-  uint8_t FDEF_APPLE51_BYTES[]={ 62,32,16,24,32,34,28,0,};
-  uint8_t FDEF_APPLE52_BYTES[]={ 16,24,20,18,62,16,16,0,};
-  uint8_t FDEF_APPLE53_BYTES[]={ 62,2,30,32,32,34,28,0,};
-  uint8_t FDEF_APPLE54_BYTES[]={ 56,4,2,30,34,34,28,0,};
-  uint8_t FDEF_APPLE55_BYTES[]={ 62,32,16,8,4,4,4,0,};
-  uint8_t FDEF_APPLE56_BYTES[]={ 28,34,34,28,34,34,28,0,};
-  uint8_t FDEF_APPLE57_BYTES[]={ 28,34,34,60,32,16,14,0,};
-  uint8_t FDEF_APPLE58_BYTES[]={ 0,0,8,0,8,0,0,0,};
-  uint8_t FDEF_APPLE59_BYTES[]={ 0,0,8,0,8,8,4,0,};
-  uint8_t FDEF_APPLE60_BYTES[]={ 16,8,4,2,4,8,16,0,};
-  uint8_t FDEF_APPLE61_BYTES[]={ 0,0,62,0,62,0,0,0,};
-  uint8_t FDEF_APPLE62_BYTES[]={ 4,8,16,32,16,8,4,0,};
-  uint8_t FDEF_APPLE63_BYTES[]={ 28,34,16,8,8,0,8,0,};
-  uint8_t FDEF_APPLE64_BYTES[]={ 28,34,42,58,26,2,60,0,};
-  uint8_t FDEF_APPLE65_BYTES[]={ 8,20,34,34,62,34,34,0,};
-  uint8_t FDEF_APPLE66_BYTES[]={ 30,34,34,30,34,34,30,0,};
-  uint8_t FDEF_APPLE67_BYTES[]={ 28,34,2,2,2,34,28,0,};
-  uint8_t FDEF_APPLE68_BYTES[]={ 30,34,34,34,34,34,30,0,};
-  uint8_t FDEF_APPLE69_BYTES[]={ 62,2,2,30,2,2,62,0,};
-  uint8_t FDEF_APPLE70_BYTES[]={ 62,2,2,30,2,2,2,0,};
-  uint8_t FDEF_APPLE71_BYTES[]={ 60,2,2,2,50,34,60,0,};
-  uint8_t FDEF_APPLE72_BYTES[]={ 34,34,34,62,34,34,34,0,};
-  uint8_t FDEF_APPLE73_BYTES[]={ 28,8,8,8,8,8,28,0,};
-  uint8_t FDEF_APPLE74_BYTES[]={ 32,32,32,32,32,34,28,0,};
-  uint8_t FDEF_APPLE75_BYTES[]={ 34,18,10,6,10,18,34,0,};
-  uint8_t FDEF_APPLE76_BYTES[]={ 2,2,2,2,2,2,62,0,};
-  uint8_t FDEF_APPLE77_BYTES[]={ 34,54,42,42,34,34,34,0,};
-  uint8_t FDEF_APPLE78_BYTES[]={ 34,34,38,42,50,34,34,0,};
-  uint8_t FDEF_APPLE79_BYTES[]={ 28,34,34,34,34,34,28,0,};
-  uint8_t FDEF_APPLE80_BYTES[]={ 30,34,34,30,2,2,2,0,};
-  uint8_t FDEF_APPLE81_BYTES[]={ 28,34,34,34,42,18,44,0,};
-  uint8_t FDEF_APPLE82_BYTES[]={ 30,34,34,30,10,18,34,0,};
-  uint8_t FDEF_APPLE83_BYTES[]={ 28,34,2,28,32,34,28,0,};
-  uint8_t FDEF_APPLE84_BYTES[]={ 62,8,8,8,8,8,8,0,};
-  uint8_t FDEF_APPLE85_BYTES[]={ 34,34,34,34,34,34,28,0,};
-  uint8_t FDEF_APPLE86_BYTES[]={ 34,34,34,34,34,20,8,0,};
-  uint8_t FDEF_APPLE87_BYTES[]={ 34,34,34,42,42,54,34,0,};
-  uint8_t FDEF_APPLE88_BYTES[]={ 34,34,20,8,20,34,34,0,};
-  uint8_t FDEF_APPLE89_BYTES[]={ 34,34,20,8,8,8,8,0,};
-  uint8_t FDEF_APPLE90_BYTES[]={ 62,32,16,8,4,2,62,0,};
-  uint8_t FDEF_APPLE91_BYTES[]={ 62,6,6,6,6,6,62,0,};
-  uint8_t FDEF_APPLE92_BYTES[]={ 0,2,4,8,16,32,0,0,};
-  uint8_t FDEF_APPLE93_BYTES[]={ 62,48,48,48,48,48,62,0,};
-  uint8_t FDEF_APPLE94_BYTES[]={ 0,0,8,20,34,0,0,0,};
-  uint8_t FDEF_APPLE95_BYTES[]={ 0,0,0,0,0,0,0,127,};
-  uint8_t FDEF_APPLE96_BYTES[]={ 4,8,16,0,0,0,0,0,};
-  uint8_t FDEF_APPLE97_BYTES[]={ 0,0,28,32,60,34,60,0,};
-  uint8_t FDEF_APPLE98_BYTES[]={ 2,2,30,34,34,34,30,0,};
-  uint8_t FDEF_APPLE99_BYTES[]={ 0,0,60,2,2,2,60,0,};
-  uint8_t FDEF_APPLE100_BYTES[]={ 32,32,60,34,34,34,60,0,};
-  uint8_t FDEF_APPLE101_BYTES[]={ 0,0,28,34,62,2,60,0,};
-  uint8_t FDEF_APPLE102_BYTES[]={ 24,36,4,30,4,4,4,0,};
-  uint8_t FDEF_APPLE103_BYTES[]={ 0,0,28,34,34,60,32,28,};
-  uint8_t FDEF_APPLE104_BYTES[]={ 2,2,30,34,34,34,34,0,};
-  uint8_t FDEF_APPLE105_BYTES[]={ 8,0,12,8,8,8,28,0,};
-  uint8_t FDEF_APPLE106_BYTES[]={ 16,0,24,16,16,16,18,12,};
-  uint8_t FDEF_APPLE107_BYTES[]={ 2,2,34,18,14,18,34,0,};
-  uint8_t FDEF_APPLE108_BYTES[]={ 12,8,8,8,8,8,28,0,};
-  uint8_t FDEF_APPLE109_BYTES[]={ 0,0,54,42,42,42,34,0,};
-  uint8_t FDEF_APPLE110_BYTES[]={ 0,0,30,34,34,34,34,0,};
-  uint8_t FDEF_APPLE111_BYTES[]={ 0,0,28,34,34,34,28,0,};
-  uint8_t FDEF_APPLE112_BYTES[]={ 0,0,30,34,34,34,30,2,};
-  uint8_t FDEF_APPLE113_BYTES[]={ 0,0,60,34,34,34,60,32,};
-  uint8_t FDEF_APPLE114_BYTES[]={ 0,0,58,6,2,2,2,0,};
-  uint8_t FDEF_APPLE115_BYTES[]={ 0,0,60,2,28,32,30,0,};
-  uint8_t FDEF_APPLE116_BYTES[]={ 8,8,60,8,8,72,48,0,};
-  uint8_t FDEF_APPLE117_BYTES[]={ 0,0,34,34,34,50,44,0,};
-  uint8_t FDEF_APPLE118_BYTES[]={ 0,0,34,34,34,20,8,0,};
-  uint8_t FDEF_APPLE119_BYTES[]={ 0,0,34,34,42,42,54,0,};
-  uint8_t FDEF_APPLE120_BYTES[]={ 0,0,34,20,8,20,34,0,};
-  uint8_t FDEF_APPLE121_BYTES[]={ 0,0,34,34,34,60,32,28,};
-  uint8_t FDEF_APPLE122_BYTES[]={ 0,0,62,16,8,4,62,0,};
-  uint8_t FDEF_APPLE123_BYTES[]={ 56,12,12,6,12,12,56,0,};
-  uint8_t FDEF_APPLE124_BYTES[]={ 8,8,8,8,8,8,8,8,};
-  uint8_t FDEF_APPLE125_BYTES[]={ 14,24,24,48,24,24,14,0,};
-  uint8_t FDEF_APPLE126_BYTES[]={ 44,26,0,0,0,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE32_BYTES[]={ 0,0,0,0,0,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE33_BYTES[]={ 8,8,8,8,8,0,8,0,};
+  FONTCONST uint8_t FDEF_APPLE34_BYTES[]={ 20,20,20,0,0,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE35_BYTES[]={ 20,20,62,20,62,20,20,0,};
+  FONTCONST uint8_t FDEF_APPLE36_BYTES[]={ 8,60,10,28,40,30,8,0,};
+  FONTCONST uint8_t FDEF_APPLE37_BYTES[]={ 3,35,16,8,4,98,96,0,};
+  FONTCONST uint8_t FDEF_APPLE38_BYTES[]={ 4,10,10,4,42,18,44,0,};
+  FONTCONST uint8_t FDEF_APPLE39_BYTES[]={ 8,8,8,0,0,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE40_BYTES[]={ 16,8,4,4,4,8,16,0,};
+  FONTCONST uint8_t FDEF_APPLE41_BYTES[]={ 8,16,32,32,32,16,8,0,};
+  FONTCONST uint8_t FDEF_APPLE42_BYTES[]={ 8,42,28,8,28,42,8,0,};
+  FONTCONST uint8_t FDEF_APPLE43_BYTES[]={ 0,8,8,62,8,8,0,0,};
+  FONTCONST uint8_t FDEF_APPLE44_BYTES[]={ 0,0,0,0,16,16,8,0,};
+  FONTCONST uint8_t FDEF_APPLE45_BYTES[]={ 0,0,0,62,0,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE46_BYTES[]={ 0,0,0,0,0,0,8,0,};
+  FONTCONST uint8_t FDEF_APPLE47_BYTES[]={ 0,32,16,8,4,2,0,0,};
+  FONTCONST uint8_t FDEF_APPLE48_BYTES[]={ 28,34,50,42,38,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE49_BYTES[]={ 8,12,8,8,8,8,28,0,};
+  FONTCONST uint8_t FDEF_APPLE50_BYTES[]={ 28,34,32,24,4,2,62,0,};
+  FONTCONST uint8_t FDEF_APPLE51_BYTES[]={ 62,32,16,24,32,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE52_BYTES[]={ 16,24,20,18,62,16,16,0,};
+  FONTCONST uint8_t FDEF_APPLE53_BYTES[]={ 62,2,30,32,32,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE54_BYTES[]={ 56,4,2,30,34,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE55_BYTES[]={ 62,32,16,8,4,4,4,0,};
+  FONTCONST uint8_t FDEF_APPLE56_BYTES[]={ 28,34,34,28,34,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE57_BYTES[]={ 28,34,34,60,32,16,14,0,};
+  FONTCONST uint8_t FDEF_APPLE58_BYTES[]={ 0,0,8,0,8,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE59_BYTES[]={ 0,0,8,0,8,8,4,0,};
+  FONTCONST uint8_t FDEF_APPLE60_BYTES[]={ 16,8,4,2,4,8,16,0,};
+  FONTCONST uint8_t FDEF_APPLE61_BYTES[]={ 0,0,62,0,62,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE62_BYTES[]={ 4,8,16,32,16,8,4,0,};
+  FONTCONST uint8_t FDEF_APPLE63_BYTES[]={ 28,34,16,8,8,0,8,0,};
+  FONTCONST uint8_t FDEF_APPLE64_BYTES[]={ 28,34,42,58,26,2,60,0,};
+  FONTCONST uint8_t FDEF_APPLE65_BYTES[]={ 8,20,34,34,62,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE66_BYTES[]={ 30,34,34,30,34,34,30,0,};
+  FONTCONST uint8_t FDEF_APPLE67_BYTES[]={ 28,34,2,2,2,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE68_BYTES[]={ 30,34,34,34,34,34,30,0,};
+  FONTCONST uint8_t FDEF_APPLE69_BYTES[]={ 62,2,2,30,2,2,62,0,};
+  FONTCONST uint8_t FDEF_APPLE70_BYTES[]={ 62,2,2,30,2,2,2,0,};
+  FONTCONST uint8_t FDEF_APPLE71_BYTES[]={ 60,2,2,2,50,34,60,0,};
+  FONTCONST uint8_t FDEF_APPLE72_BYTES[]={ 34,34,34,62,34,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE73_BYTES[]={ 28,8,8,8,8,8,28,0,};
+  FONTCONST uint8_t FDEF_APPLE74_BYTES[]={ 32,32,32,32,32,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE75_BYTES[]={ 34,18,10,6,10,18,34,0,};
+  FONTCONST uint8_t FDEF_APPLE76_BYTES[]={ 2,2,2,2,2,2,62,0,};
+  FONTCONST uint8_t FDEF_APPLE77_BYTES[]={ 34,54,42,42,34,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE78_BYTES[]={ 34,34,38,42,50,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE79_BYTES[]={ 28,34,34,34,34,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE80_BYTES[]={ 30,34,34,30,2,2,2,0,};
+  FONTCONST uint8_t FDEF_APPLE81_BYTES[]={ 28,34,34,34,42,18,44,0,};
+  FONTCONST uint8_t FDEF_APPLE82_BYTES[]={ 30,34,34,30,10,18,34,0,};
+  FONTCONST uint8_t FDEF_APPLE83_BYTES[]={ 28,34,2,28,32,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE84_BYTES[]={ 62,8,8,8,8,8,8,0,};
+  FONTCONST uint8_t FDEF_APPLE85_BYTES[]={ 34,34,34,34,34,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE86_BYTES[]={ 34,34,34,34,34,20,8,0,};
+  FONTCONST uint8_t FDEF_APPLE87_BYTES[]={ 34,34,34,42,42,54,34,0,};
+  FONTCONST uint8_t FDEF_APPLE88_BYTES[]={ 34,34,20,8,20,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE89_BYTES[]={ 34,34,20,8,8,8,8,0,};
+  FONTCONST uint8_t FDEF_APPLE90_BYTES[]={ 62,32,16,8,4,2,62,0,};
+  FONTCONST uint8_t FDEF_APPLE91_BYTES[]={ 62,6,6,6,6,6,62,0,};
+  FONTCONST uint8_t FDEF_APPLE92_BYTES[]={ 0,2,4,8,16,32,0,0,};
+  FONTCONST uint8_t FDEF_APPLE93_BYTES[]={ 62,48,48,48,48,48,62,0,};
+  FONTCONST uint8_t FDEF_APPLE94_BYTES[]={ 0,0,8,20,34,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE95_BYTES[]={ 0,0,0,0,0,0,0,127,};
+  FONTCONST uint8_t FDEF_APPLE96_BYTES[]={ 4,8,16,0,0,0,0,0,};
+  FONTCONST uint8_t FDEF_APPLE97_BYTES[]={ 0,0,28,32,60,34,60,0,};
+  FONTCONST uint8_t FDEF_APPLE98_BYTES[]={ 2,2,30,34,34,34,30,0,};
+  FONTCONST uint8_t FDEF_APPLE99_BYTES[]={ 0,0,60,2,2,2,60,0,};
+  FONTCONST uint8_t FDEF_APPLE100_BYTES[]={ 32,32,60,34,34,34,60,0,};
+  FONTCONST uint8_t FDEF_APPLE101_BYTES[]={ 0,0,28,34,62,2,60,0,};
+  FONTCONST uint8_t FDEF_APPLE102_BYTES[]={ 24,36,4,30,4,4,4,0,};
+  FONTCONST uint8_t FDEF_APPLE103_BYTES[]={ 0,0,28,34,34,60,32,28,};
+  FONTCONST uint8_t FDEF_APPLE104_BYTES[]={ 2,2,30,34,34,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE105_BYTES[]={ 8,0,12,8,8,8,28,0,};
+  FONTCONST uint8_t FDEF_APPLE106_BYTES[]={ 16,0,24,16,16,16,18,12,};
+  FONTCONST uint8_t FDEF_APPLE107_BYTES[]={ 2,2,34,18,14,18,34,0,};
+  FONTCONST uint8_t FDEF_APPLE108_BYTES[]={ 12,8,8,8,8,8,28,0,};
+  FONTCONST uint8_t FDEF_APPLE109_BYTES[]={ 0,0,54,42,42,42,34,0,};
+  FONTCONST uint8_t FDEF_APPLE110_BYTES[]={ 0,0,30,34,34,34,34,0,};
+  FONTCONST uint8_t FDEF_APPLE111_BYTES[]={ 0,0,28,34,34,34,28,0,};
+  FONTCONST uint8_t FDEF_APPLE112_BYTES[]={ 0,0,30,34,34,34,30,2,};
+  FONTCONST uint8_t FDEF_APPLE113_BYTES[]={ 0,0,60,34,34,34,60,32,};
+  FONTCONST uint8_t FDEF_APPLE114_BYTES[]={ 0,0,58,6,2,2,2,0,};
+  FONTCONST uint8_t FDEF_APPLE115_BYTES[]={ 0,0,60,2,28,32,30,0,};
+  FONTCONST uint8_t FDEF_APPLE116_BYTES[]={ 8,8,60,8,8,72,48,0,};
+  FONTCONST uint8_t FDEF_APPLE117_BYTES[]={ 0,0,34,34,34,50,44,0,};
+  FONTCONST uint8_t FDEF_APPLE118_BYTES[]={ 0,0,34,34,34,20,8,0,};
+  FONTCONST uint8_t FDEF_APPLE119_BYTES[]={ 0,0,34,34,42,42,54,0,};
+  FONTCONST uint8_t FDEF_APPLE120_BYTES[]={ 0,0,34,20,8,20,34,0,};
+  FONTCONST uint8_t FDEF_APPLE121_BYTES[]={ 0,0,34,34,34,60,32,28,};
+  FONTCONST uint8_t FDEF_APPLE122_BYTES[]={ 0,0,62,16,8,4,62,0,};
+  FONTCONST uint8_t FDEF_APPLE123_BYTES[]={ 56,12,12,6,12,12,56,0,};
+  FONTCONST uint8_t FDEF_APPLE124_BYTES[]={ 8,8,8,8,8,8,8,8,};
+  FONTCONST uint8_t FDEF_APPLE125_BYTES[]={ 14,24,24,48,24,24,14,0,};
+  FONTCONST uint8_t FDEF_APPLE126_BYTES[]={ 44,26,0,0,0,0,0,0,};
 
   // character definitions for FDEF_APPLE
 
@@ -202,3 +208,5 @@ namespace stm32plus { namespace display {
   };
 
 } }
+
+#undef FONTCONST