Browse Source

Correct includes (u8g.h) and spelling

Scott Lahteine 7 years ago
parent
commit
184c077c58

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

22
 #include <U8glib.h>
22
 #include <U8glib.h>
23
 
23
 
24
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
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
   Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
28
   Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
35
   X Font      ascent = 8 descent=-2
35
   X Font      ascent = 8 descent=-2
36
   Max Font    ascent = 8 descent=-2
36
   Max Font    ascent = 8 descent=-2
37
 */
37
 */
38
-#include <clib/u8g.h>
38
+
39
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
39
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = {
40
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
40
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08,
41
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
41
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
122
   0x40,0x20,0x40,0x40,0x40,0x80,0x05,0x03,0x03,0x06,0x00,0x02,0x48,0xa8,0x90,0xff
122
   0x40,0x20,0x40,0x40,0x40,0x80,0x05,0x03,0x03,0x06,0x00,0x02,0x48,0xa8,0x90,0xff
123
   };
123
   };
124
 #else
124
 #else
125
-  // extended (original) font (sysmbols 1 - 255)
125
+  // extended (original) font (symbols 1 - 255)
126
+
126
 /*
127
 /*
127
   Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
128
   Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
128
   Copyright: Public domain terminal emulator font.  Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
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
   X Font      ascent = 8 descent=-2
135
   X Font      ascent = 8 descent=-2
135
   Max Font    ascent =10 descent=-2
136
   Max Font    ascent =10 descent=-2
136
 */
137
 */
137
-#include <clib/u8g.h>
138
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7") = {
138
 const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7") = {
139
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0xff,0xfe,0x0a,0xfe,0x08,
139
   0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0xff,0xfe,0x0a,0xfe,0x08,
140
   0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05,
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
 #include <U8glib.h>
99
 #include <U8glib.h>
100
 
100
 
101
 #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
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
 EOF
104
 EOF
105
     cat tmp1.h >>tmp3.h
105
     cat tmp1.h >>tmp3.h
106
     cat << EOF >>tmp3.h
106
     cat << EOF >>tmp3.h
107
 #else
107
 #else
108
-  // extended (original) font (sysmbols 1 - 255)
108
+  // extended (original) font (symbols 1 - 255)
109
 EOF
109
 EOF
110
     cat tmp2.h >>tmp3.h
110
     cat tmp2.h >>tmp3.h
111
     cat << EOF >>tmp3.h
111
     cat << EOF >>tmp3.h

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

147
   while read PAGE BEGIN END UTF8BEGIN UTF8END; do \
147
   while read PAGE BEGIN END UTF8BEGIN UTF8END; do \
148
     if [ ! -f ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ]; then \
148
     if [ ! -f ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ]; then \
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 ;
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
     fi ;\
151
     fi ;\
152
     grep -A 10000000000 u8g_fntpgm_uint8_t ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h >> tmpa ;\
152
     grep -A 10000000000 u8g_fntpgm_uint8_t ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h >> tmpa ;\
153
     echo "    FONTDATA_ITEM(${PAGE}, ${BEGIN}, ${END}, fontpage_${PAGE}_${BEGIN}_${END}), // '${UTF8BEGIN}' -- '${UTF8END}'" >> tmpb ;\
153
     echo "    FONTDATA_ITEM(${PAGE}, ${BEGIN}, ${END}, fontpage_${PAGE}_${BEGIN}_${END}), // '${UTF8BEGIN}' -- '${UTF8END}'" >> tmpb ;\

Loading…
Cancel
Save