Scott Lahteine
7 years ago
5 changed files with 188 additions and 195 deletions
@ -0,0 +1,31 @@ |
|||||
|
#!/usr/bin/env bash |
||||
|
|
||||
|
##################################################################### |
||||
|
# get-bdf2u8g.sh for Marlin |
||||
|
# |
||||
|
# This script downloads, patches, and builds bdf2u8g |
||||
|
# License: CC-SA |
||||
|
# |
||||
|
# Execute from within buildroot/share/fonts |
||||
|
# |
||||
|
##################################################################### |
||||
|
|
||||
|
HERE=$(pwd) |
||||
|
|
||||
|
[[ $HERE =~ 'buildroot/share/fonts'$ ]] || { echo "Change to buildroot/share/fonts to run $(basename $0)" ; exit 1; } |
||||
|
|
||||
|
# Download u8glib |
||||
|
curl -LJO https://github.com/olikraus/u8glib/archive/master.zip |
||||
|
unzip u8glib-master.zip >/dev/null 2>&1 |
||||
|
|
||||
|
# Patch and build bdf2u8g |
||||
|
cd u8glib-master/tools/font/bdf2u8g |
||||
|
patch -p0 <../../../../u8glib-bdf2u8g.patch bdf2u8g.c >/dev/null 2>&1 |
||||
|
make >/dev/null 2>&1 |
||||
|
mv bdf2u8g ../../../../ |
||||
|
|
||||
|
# Clean up |
||||
|
cd - |
||||
|
rm -rf u8glib-master* |
||||
|
|
||||
|
cd "$HERE" |
||||
@ -1,47 +1,32 @@ |
|||||
--- tools/font/bdf2u8g/bdf2u8g.c 2017-04-08 01:04:48.000000000 -0400
|
178c178 |
||||
+++ tools/font/bdf2u8g/bdf2u8g.c 2018-02-24 17:24:26.368926703 -0500
|
< fprintf(out_fp, "%d", data_buf[i]); |
||||
@@ -175,9 +175,9 @@
|
---
|
||||
for( i = 0; i < data_pos; i++ ) |
> fprintf(out_fp, "0x%02x", data_buf[i]); |
||||
{ |
180c180 |
||||
#ifdef BDF2U8G_COMPACT_OUTPUT |
< fprintf(out_fp, "%3d", data_buf[i]); |
||||
- fprintf(out_fp, "%d", data_buf[i]);
|
---
|
||||
+ fprintf(out_fp, "0x%02x", data_buf[i]);
|
> fprintf(out_fp, "0x%02x", data_buf[i]); |
||||
#else |
487c487,488 |
||||
- fprintf(out_fp, "%3d", data_buf[i]);
|
< int bdf_delta_x; /* DWIDTH arg 1 */ |
||||
+ fprintf(out_fp, "0x%02x", data_buf[i]);
|
---
|
||||
#endif |
> int bdf_delta_x_default = -1; |
||||
if ( i+1 != data_pos ) |
> int bdf_delta_x = -1; /* DWIDTH arg 1 */ |
||||
fprintf(out_fp, ","); |
1097a1099,1114 |
||||
@@ -484,7 +484,8 @@
|
> else if ( strcmp(p_buf, "CHARS") == 0 ) |
||||
int bdf_char_max_y; |
> { |
||||
int bdf_char_min_y; |
> if (bdf_delta_x < 0) { |
||||
|
> bdf_delta_x = 0; |
||||
-int bdf_delta_x; /* DWIDTH arg 1 */
|
> } |
||||
+int bdf_delta_x_default = -1;
|
> if (bdf_delta_x_default < 0) { |
||||
+int bdf_delta_x = -1; /* DWIDTH arg 1 */
|
> bdf_delta_x_default = bdf_delta_x; |
||||
int bdf_delta_max_x; |
> } |
||||
int bdf_delta_min_x; |
> } |
||||
int bdf_delta_y; /* DWIDTH arg 2 */ |
> else if ( strcmp(p_buf, "STARTCHAR") == 0 ) |
||||
@@ -1095,6 +1096,22 @@
|
> { |
||||
bdf_char_ascent = bdf_char_height + bdf_char_y; |
> if (bdf_delta_x_default < 0) { |
||||
//printf("h:%d w:%d ascent: %d\n", bdf_char_height, bdf_char_width, bdf_char_ascent); |
> bdf_delta_x_default = 0; |
||||
} |
> } |
||||
+ else if ( strcmp(p_buf, "CHARS") == 0 )
|
> bdf_delta_x = bdf_delta_x_default; |
||||
+ {
|
> } |
||||
+ if (bdf_delta_x < 0) {
|
1293d1309 |
||||
+ bdf_delta_x = 0;
|
< fprintf(out_fp, "#include \"u8g.h\"\n"); |
||||
+ }
|
|
||||
+ if (bdf_delta_x_default < 0) {
|
|
||||
+ bdf_delta_x_default = bdf_delta_x;
|
|
||||
+ }
|
|
||||
+ }
|
|
||||
+ else if ( strcmp(p_buf, "STARTCHAR") == 0 )
|
|
||||
+ {
|
|
||||
+ if (bdf_delta_x_default < 0) {
|
|
||||
+ bdf_delta_x_default = 0;
|
|
||||
+ }
|
|
||||
+ bdf_delta_x = bdf_delta_x_default;
|
|
||||
+ }
|
|
||||
else if ( strcmp(p_buf, "BITMAP") == 0 ) |
|
||||
{ |
|
||||
bdf_line_state = BDF_LINE_STATE_BITMAP; |
|
||||
|
|||||
Loading…
Reference in new issue