From 184c077c58bf4d845c3c89e5ec783f0b476b9135 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 18 Apr 2018 17:06:18 -0500 Subject: [PATCH] Correct includes (u8g.h) and spelling --- Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h | 8 ++++---- buildroot/share/fonts/genallfont.sh | 4 ++-- buildroot/share/fonts/uxggenpages.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h index 446afde2ca..26e93f3a36 100644 --- a/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h +++ b/Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h @@ -22,7 +22,7 @@ #include #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7) - // reduced font (only sysmbols 1 - 127) - saves about 1278 bytes of FLASH + // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH /* Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1 @@ -35,7 +35,7 @@ X Font ascent = 8 descent=-2 Max Font ascent = 8 descent=-2 */ -#include + const u8g_fntpgm_uint8_t ISO10646_1_5x7[1328] U8G_FONT_SECTION("ISO10646_1_5x7") = { 0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0x7f,0xfe,0x08,0xfe,0x08, 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") 0x40,0x20,0x40,0x40,0x40,0x80,0x05,0x03,0x03,0x06,0x00,0x02,0x48,0xa8,0x90,0xff }; #else - // extended (original) font (sysmbols 1 - 255) + // extended (original) font (symbols 1 - 255) + /* Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1 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") X Font ascent = 8 descent=-2 Max Font ascent =10 descent=-2 */ -#include const u8g_fntpgm_uint8_t ISO10646_1_5x7[2651] U8G_FONT_SECTION("ISO10646_1_5x7") = { 0x00,0x06,0x0c,0x00,0xfe,0x07,0x02,0x29,0x03,0xbf,0x01,0xff,0xfe,0x0a,0xfe,0x08, 0xfe,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xf0,0xc8,0x88,0x88,0x98,0x78,0x10,0x05, diff --git a/buildroot/share/fonts/genallfont.sh b/buildroot/share/fonts/genallfont.sh index 8dfb583b8a..ec31e38e90 100755 --- a/buildroot/share/fonts/genallfont.sh +++ b/buildroot/share/fonts/genallfont.sh @@ -99,13 +99,13 @@ if [ 1 = 1 ]; then #include #if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7) - // reduced font (only sysmbols 1 - 127) - saves about 1278 bytes of FLASH + // reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH EOF cat tmp1.h >>tmp3.h cat << EOF >>tmp3.h #else - // extended (original) font (sysmbols 1 - 255) + // extended (original) font (symbols 1 - 255) EOF cat tmp2.h >>tmp3.h cat << EOF >>tmp3.h diff --git a/buildroot/share/fonts/uxggenpages.sh b/buildroot/share/fonts/uxggenpages.sh index 17545022af..b8f82a3467 100755 --- a/buildroot/share/fonts/uxggenpages.sh +++ b/buildroot/share/fonts/uxggenpages.sh @@ -147,7 +147,7 @@ grep -Hrn _UxGT . | grep '"' | \ while read PAGE BEGIN END UTF8BEGIN UTF8END; do \ if [ ! -f ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ]; then \ ${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 ; - #sed -i 's|#include "u8g.h"|#include |' ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ; + #sed -i 's|#include "u8g.h"|#include |' ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h ; fi ;\ grep -A 10000000000 u8g_fntpgm_uint8_t ${DN_DATA}/fontpage_${PAGE}_${BEGIN}_${END}.h >> tmpa ;\ echo " FONTDATA_ITEM(${PAGE}, ${BEGIN}, ${END}, fontpage_${PAGE}_${BEGIN}_${END}), // '${UTF8BEGIN}' -- '${UTF8END}'" >> tmpb ;\