Merge pull request #10417 from yhfudev/fix-fonts-merge-sk-cz
Scott Lahteine
7 years ago
committed by
GitHub
commit
f36ddef9a7
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {};
|
||||||
};
|
|
||||||
|
|||||||
@ -1,45 +1,60 @@
|
|||||||
/* Generated by buildroot/share/fonts/uxggenpages.sh */
|
/**
|
||||||
/* This file is generated automatically, any changes to the file may be REPLACED by future processing. */
|
* Generated automatically by buildroot/share/fonts/uxggenpages.sh
|
||||||
/* Please turn to the tools call this script to change the contents! */
|
* Contents will be REPLACED by future processing!
|
||||||
|
* Use genallfont.sh to generate font data for updated languages.
|
||||||
|
*/
|
||||||
#include <U8glib.h>
|
#include <U8glib.h>
|
||||||
|
|
||||||
const u8g_fntpgm_uint8_t fontpage_2_140_143[80] U8G_FONT_SECTION("fontpage_2_140_143") = {
|
const u8g_fntpgm_uint8_t fontpage_2_140_143[79] U8G_FONT_SECTION("fontpage_2_140_143") = {
|
||||||
0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8f,0x00,0x0b,0x00,0x00,
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0x8c,0x8f,0x00,0x0a,0x00,0x00,
|
||||||
0x00,0x06,0x0b,0x0b,0x07,0x00,0x00,0x28,0x10,0x00,0x3c,0x40,0x80,0x80,0x80,0x80,
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x80,0x80,0x88,
|
||||||
0x40,0x3c,0x04,0x09,0x09,0x05,0x00,0x00,0x50,0x20,0x00,0x70,0x80,0x80,0x80,0x80,
|
0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x88,0x70,0x05,
|
||||||
0x70,0x07,0x0b,0x0b,0x08,0x00,0x00,0x48,0x30,0x00,0xf8,0x84,0x82,0x82,0x82,0x82,
|
0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf0,0x48,0x48,0x48,0x48,0x48,0xf0,0x06,
|
||||||
0x84,0xf8,0x08,0x08,0x08,0x09,0x00,0x00,0x09,0x0a,0x78,0x88,0x88,0x88,0x88,0x78
|
0x0a,0x0a,0x06,0x00,0x00,0x14,0x08,0x00,0x08,0x08,0x78,0x88,0x88,0x88,0x78};
|
||||||
};
|
const u8g_fntpgm_uint8_t fontpage_2_185_186[49] U8G_FONT_SECTION("fontpage_2_185_186") = {
|
||||||
const u8g_fntpgm_uint8_t fontpage_2_200_200[32] U8G_FONT_SECTION("fontpage_2_200_200") = {
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xb9,0xba,0x00,0x0a,0x00,0x00,
|
||||||
0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc8,0xc8,0x00,0x09,0x00,0x00,
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0x80,0x80,0x80,0x80,0x80,0x80,
|
||||||
0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf0,0x88,0x88,0x88,0x88,0x88
|
0xf8,0x03,0x0a,0x0a,0x06,0x01,0x00,0x20,0x40,0x00,0xc0,0x40,0x40,0x40,0x40,0x40,
|
||||||
};
|
0xe0};
|
||||||
const u8g_fntpgm_uint8_t fontpage_2_224_225[49] U8G_FONT_SECTION("fontpage_2_224_225") = {
|
const u8g_fntpgm_uint8_t fontpage_2_189_190[49] U8G_FONT_SECTION("fontpage_2_189_190") = {
|
||||||
0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe0,0xe1,0x00,0x0b,0x00,0x00,
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xbd,0xbe,0x00,0x0a,0x00,0x00,
|
||||||
0x00,0x05,0x0b,0x0b,0x06,0x00,0x00,0x50,0x20,0x00,0x78,0x80,0x80,0x70,0x08,0x08,
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x80,0x80,0x80,0x80,0x80,0x80,
|
||||||
0x08,0xf0,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x60,0x10,0x88,
|
0xf8,0x03,0x0a,0x0a,0x06,0x01,0x00,0xa0,0x40,0x00,0xc0,0x40,0x40,0x40,0x40,0x40,
|
||||||
0x70};
|
0xe0};
|
||||||
const u8g_fntpgm_uint8_t fontpage_2_229_229[32] U8G_FONT_SECTION("fontpage_2_229_229") = {
|
const u8g_fntpgm_uint8_t fontpage_2_199_200[47] U8G_FONT_SECTION("fontpage_2_199_200") = {
|
||||||
0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe5,0xe5,0x00,0x09,0x00,0x00,
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xc7,0xc8,0x00,0x0a,0x00,0x00,
|
||||||
0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x08,0x50,0x40,0xf0,0x40,0x40,0x40,0x40,0x30
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x88,0x88,0xc8,0xa8,0x98,0x88,
|
||||||
};
|
0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xb0,0xc8,0x88,0x88,0x88};
|
||||||
const u8g_fntpgm_uint8_t fontpage_2_239_239[32] U8G_FONT_SECTION("fontpage_2_239_239") = {
|
const u8g_fntpgm_uint8_t fontpage_2_212_213[47] U8G_FONT_SECTION("fontpage_2_212_213") = {
|
||||||
0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xef,0xef,0x00,0x09,0x00,0x00,
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xd4,0xd5,0x00,0x0a,0x00,0x00,
|
||||||
0x00,0x05,0x09,0x09,0x06,0x00,0x00,0x20,0x50,0x20,0x88,0x88,0x88,0x88,0x88,0x78
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x10,0x20,0x00,0xf0,0x88,0x88,0xf0,0xa0,0x90,
|
||||||
};
|
0x88,0x05,0x08,0x08,0x06,0x00,0x00,0x10,0x20,0x00,0xb0,0xc8,0x80,0x80,0x80};
|
||||||
const u8g_fntpgm_uint8_t fontpage_2_253_254[49] U8G_FONT_SECTION("fontpage_2_253_254") = {
|
const u8g_fntpgm_uint8_t fontpage_2_224_225[47] U8G_FONT_SECTION("fontpage_2_224_225") = {
|
||||||
0x00,0x06,0x0a,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfd,0xfe,0x00,0x0b,0x00,0x00,
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe0,0xe1,0x00,0x0a,0x00,0x00,
|
||||||
0x00,0x07,0x0b,0x0b,0x08,0x00,0x00,0x24,0x18,0x00,0xfe,0x04,0x08,0x10,0x20,0x40,
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x70,0x88,0x80,0x70,0x08,0x88,
|
||||||
0x80,0xfe,0x05,0x09,0x09,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,
|
0x70,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0x78,0x80,0x70,0x08,0xf0};
|
||||||
0xf8};
|
const u8g_fntpgm_uint8_t fontpage_2_228_229[49] U8G_FONT_SECTION("fontpage_2_228_229") = {
|
||||||
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xe4,0xe5,0x00,0x0a,0x00,0x00,
|
||||||
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x20,0x20,0x20,0x20,0x20,
|
||||||
|
0x20,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0x20,0x20,0xf8,0x20,0x20,0x20,
|
||||||
|
0x18};
|
||||||
|
const u8g_fntpgm_uint8_t fontpage_2_239_239[31] U8G_FONT_SECTION("fontpage_2_239_239") = {
|
||||||
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xef,0xef,0x00,0x08,0x00,0x00,
|
||||||
|
0x00,0x05,0x08,0x08,0x06,0x00,0x00,0x20,0x50,0x20,0x88,0x88,0x88,0x88,0x70};
|
||||||
|
const u8g_fntpgm_uint8_t fontpage_2_253_254[47] U8G_FONT_SECTION("fontpage_2_253_254") = {
|
||||||
|
0x00,0x06,0x0c,0x00,0xfe,0x00,0x00,0x00,0x00,0x00,0xfd,0xfe,0x00,0x0a,0x00,0x00,
|
||||||
|
0x00,0x05,0x0a,0x0a,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x08,0x10,0x20,0x40,0x80,
|
||||||
|
0xf8,0x05,0x08,0x08,0x06,0x00,0x00,0x50,0x20,0x00,0xf8,0x10,0x20,0x40,0xf8};
|
||||||
|
|
||||||
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
#define FONTDATA_ITEM(page, begin, end, data) {page, begin, end, NUM_ARRAY(data), data}
|
||||||
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
static const uxg_fontinfo_t g_fontinfo[] PROGMEM = {
|
||||||
FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
|
FONTDATA_ITEM(2, 140, 143, fontpage_2_140_143), // 'Č' -- 'ď'
|
||||||
FONTDATA_ITEM(2, 200, 200, fontpage_2_200_200), // 'ň' -- 'ň'
|
FONTDATA_ITEM(2, 185, 186, fontpage_2_185_186), // 'Ĺ' -- 'ĺ'
|
||||||
|
FONTDATA_ITEM(2, 189, 190, fontpage_2_189_190), // 'Ľ' -- 'ľ'
|
||||||
|
FONTDATA_ITEM(2, 199, 200, fontpage_2_199_200), // 'Ň' -- 'ň'
|
||||||
|
FONTDATA_ITEM(2, 212, 213, fontpage_2_212_213), // 'Ŕ' -- 'ŕ'
|
||||||
FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
|
FONTDATA_ITEM(2, 224, 225, fontpage_2_224_225), // 'Š' -- 'š'
|
||||||
FONTDATA_ITEM(2, 229, 229, fontpage_2_229_229), // 'ť' -- 'ť'
|
FONTDATA_ITEM(2, 228, 229, fontpage_2_228_229), // 'Ť' -- 'ť'
|
||||||
FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
|
FONTDATA_ITEM(2, 239, 239, fontpage_2_239_239), // 'ů' -- 'ů'
|
||||||
FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
|
FONTDATA_ITEM(2, 253, 254, fontpage_2_253_254), // 'Ž' -- 'ž'
|
||||||
};
|
};
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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,10 +0,0 @@
|
|||||||
.\bdf2u8g.exe -b 1 -e 9 Marlin_symbols.bdf Marlin_symbols dogm_font_data_Marlin_symbols.h
|
|
||||||
.\bdf2u8g.exe -b 16 -e 255 HD44780_W.bdf HD44780_W_5x7 dogm_font_data_HD44780_W.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 HD44780_C.bdf HD44780_C_5x7 dogm_font_data_HD44780_C.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 HD44780_J.bdf HD44780_J_5x7 dogm_font_data_HD44780_J.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 ISO10646-1.bdf ISO10646_1_5x7 dogm_font_data_ISO10646_1.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 ISO10646-1-tr.bdf ISO10646_1_tr_5x7 dogm_font_data_ISO10646_1-tr.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 ISO10646_5_Cyrillic.bdf ISO10646_5_Cyrillic_5x7 dogm_font_data_ISO10646_5_Cyrillic.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 ISO10646_Kana.bdf ISO10646_Kana_5x7 dogm_font_data_ISO10646_Kana.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 ISO10646_CN.bdf ISO10646_CN dogm_font_data_ISO10646_CN.h
|
|
||||||
.\bdf2u8g.exe -b 32 -e 255 ISO10646_4_Greek.bdf ISO10646_Greek_5x7 dogm_font_data_ISO10646_Greek.h
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -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