Browse Source

Correct includes (u8g.h) and spelling

Scott Lahteine 6 years ago
parent
commit
184c077c58

+ 4
- 4
Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h View File

@@ -22,7 +22,7 @@
22 22
 #include <U8glib.h>
23 23
 
24 24
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
25
-  // reduced font (only sysmbols 1 - 127) - saves about 1278 bytes of FLASH
25
+  // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
26 26
 
27 27
 /*
28 28
   Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
@@ -35,7 +35,7 @@
35 35
   X Font      ascent = 8 descent=-2
36 36
   Max Font    ascent = 8 descent=-2
37 37
 */
38
-#include <clib/u8g.h>
38
+
39 39
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
40 40
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
41 41
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
@@ -122,7 +122,8 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7")
122 122
   0x40,0x20,0x40,0x40,0x40,0x80,0x05,0x03,0x03,0x06,0x00,0x02,0x48,0xa8,0x90,0xff
123 123
   };
124 124
 #else
125
-  // extended (original) font (sysmbols 1 - 255)
125
+  // extended (original) font (symbols 1 - 255)
126
+
126 127
 /*
127 128
   Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
128 129
   Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
@@ -134,7 +135,6 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7")
134 135
   X Font      ascent = 8 descent=-2
135 136
   Max Font    ascent =10 descent=-2
136 137
 */
137
-#include <clib/u8g.h>
138 138
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7") = {
139 139
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0xff,0xfe,0x0a,0xfe,0x08,
140 140
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,

+ 2
- 2
buildroot/share/fonts/genallfont.sh View File

@@ -99,13 +99,13 @@ if [ 1 = 1 ]; then
99 99
 #include <U8glib.h>
100 100
 
101 101
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
102
-  // reduced font (only sysmbols 1 - 127) - saves about 1278 bytes of FLASH
102
+  // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH
103 103
 
104 104
 EOF
105 105
     cat tmp1.h >>tmp3.h
106 106
     cat << EOF >>tmp3.h
107 107
 #else
108
-  // extended (original) font (sysmbols 1 - 255)
108
+  // extended (original) font (symbols 1 - 255)
109 109
 EOF
110 110
     cat tmp2.h >>tmp3.h
111 111
     cat << EOF >>tmp3.h

+ 1
- 1
buildroot/share/fonts/uxggenpages.sh View File

@@ -147,7 +147,7 @@ grep -Hrn _UxGT . | grep '"' | \
147 147
   while read PAGE BEGIN END UTF8BEGIN UTF8END; do \
148 148
     if [ ! -f ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ]; then \
149 149
       ${EXEC_BDF2U8G} -u ${PAGE} -b ${BEGIN} -e ${END} ${FN_FONT} fontpage_${PAGE}_${BEGIN}_${END} ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h > /dev/null 2>&1 ;
150
-      #sed -i 's|#include "u8g.h"|#include <clib/u8g.h>|' ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ;
150
+      #sed -i 's|#include "u8g.h"|#include <U8glib.h>|' ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ;
151 151
     fi ;\
152 152
     grep -A 10000000000 u8g_fntpgm_uint8_t ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h >> tmpa ;\
153 153
     echo "    FONTDATA_ITEM(${PAGE}, ${BEGIN}, ${END}, fontpage_${PAGE}_${BEGIN}_${END}), // '${UTF8BEGIN}' -- '${UTF8END}'" >> tmpb ;\

Loading…
Cancel
Save