LULZBOT_TOUCH_UI extended character set (#15301)

This commit is contained in:
Marcio Teixeira 2019-09-24 17:49:40 -06:00 committed by Scott Lahteine
parent bd2b44c4ed
commit 4ff59d178d
125 changed files with 4013 additions and 945 deletions

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -76,10 +76,27 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // Enable UTF8 processing and rendering. Unsupported characters
// will be shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#ifdef TOUCH_UI_USE_UTF8 #ifdef TOUCH_UI_USE_UTF8
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#ifdef TOUCH_UI_UTF8_WESTERN_CHARSET
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // When labels do not fit buttons, use smaller font
@ -97,14 +114,11 @@
//#define LCD_TIMEOUT_TO_STATUS 15000 //#define LCD_TIMEOUT_TO_STATUS 15000
// Enable this to debug the event framework // Enable this to debug the event framework
//#define UI_FRAMEWORK_DEBUG //#define TOUCH_UI_DEBUG
// Enable the developer's menu and screens // Enable the developer's menu and screens
//#define DEVELOPER_SCREENS //#define DEVELOPER_SCREENS
// Maximum feed rate for manual extrusion (mm/s)
#define MAX_MANUAL_FEEDRATE {50*60, 50*60, 4*60, 60}
// Sets the SPI speed in Hz // Sets the SPI speed in Hz
#define SPI_FREQUENCY 8000000 >> SPI_SPEED #define SPI_FREQUENCY 8000000 >> SPI_SPEED

View File

@ -921,7 +921,7 @@ template <class T> bool CLCD::CommandFifo::_write_unaligned(T data, uint16_t len
uint32_t bytes_tail, bytes_head; uint32_t bytes_tail, bytes_head;
uint32_t command_read_ptr; uint32_t command_read_ptr;
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
if (command_write_ptr == 0xFFFFFFFFul) { if (command_write_ptr == 0xFFFFFFFFul) {
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPGM("Attempt to write to FIFO before CommandFifo::Cmd_Start()."); SERIAL_ECHOLNPGM("Attempt to write to FIFO before CommandFifo::Cmd_Start().");
@ -940,7 +940,7 @@ template <class T> bool CLCD::CommandFifo::_write_unaligned(T data, uint16_t len
} }
// Check for faults which can lock up the command processor // Check for faults which can lock up the command processor
if (has_fault()) { if (has_fault()) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHOLNPGM("Fault waiting for space in the command processor"); SERIAL_ECHOLNPGM("Fault waiting for space in the command processor");
#endif #endif
return false; return false;
@ -985,7 +985,7 @@ void CLCD::CommandFifo::execute() {
} }
void CLCD::CommandFifo::reset() { void CLCD::CommandFifo::reset() {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHOLNPGM("Resetting command processor"); SERIAL_ECHOLNPGM("Resetting command processor");
#endif #endif
safe_delay(100); safe_delay(100);
@ -1004,7 +1004,7 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
const uint8_t padding = MULTIPLE_OF_4(len) - len; const uint8_t padding = MULTIPLE_OF_4(len) - len;
if (has_fault()) { if (has_fault()) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHOLNPGM("Faulted... ignoring write."); SERIAL_ECHOLNPGM("Faulted... ignoring write.");
#endif #endif
return false; return false;
@ -1014,7 +1014,7 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
// management. // management.
uint16_t Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF; uint16_t Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
if (Command_Space < (len + padding)) { if (Command_Space < (len + padding)) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Waiting for ", len + padding); SERIAL_ECHOPAIR("Waiting for ", len + padding);
SERIAL_ECHOPAIR(" bytes in command queue, now free: ", Command_Space); SERIAL_ECHOPAIR(" bytes in command queue, now free: ", Command_Space);
@ -1022,13 +1022,13 @@ template <class T> bool CLCD::CommandFifo::write(T data, uint16_t len) {
do { do {
Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF; Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
if (has_fault()) { if (has_fault()) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHOLNPGM("... fault"); SERIAL_ECHOLNPGM("... fault");
#endif #endif
return false; return false;
} }
} while (Command_Space < len + padding); } while (Command_Space < len + padding);
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHOLNPGM("... done"); SERIAL_ECHOLNPGM("... done");
#endif #endif
} }
@ -1070,7 +1070,7 @@ void CLCD::init() {
for(counter = 0; counter < 250; counter++) { for(counter = 0; counter < 250; counter++) {
uint8_t device_id = mem_read_8(REG::ID); // Read Device ID, Should Be 0x7C; uint8_t device_id = mem_read_8(REG::ID); // Read Device ID, Should Be 0x7C;
if (device_id == 0x7c) { if (device_id == 0x7c) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPGM("FTDI chip initialized "); SERIAL_ECHOLNPGM("FTDI chip initialized ");
#endif #endif
@ -1080,7 +1080,7 @@ void CLCD::init() {
delay(1); delay(1);
} }
if (counter == 249) { if (counter == 249) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("Timeout waiting for device ID, should be 124, got ", device_id); SERIAL_ECHOLNPAIR("Timeout waiting for device ID, should be 124, got ", device_id);
#endif #endif

View File

@ -208,7 +208,8 @@
#define SWITCH_ENABLED_ 1 #define SWITCH_ENABLED_ 1
#define ENABLED(b) _CAT(SWITCH_ENABLED_, b) #define ENABLED(b) _CAT(SWITCH_ENABLED_, b)
#define DISABLED(b) !ENABLED(b) #define DISABLED(b) !ENABLED(b)
#define ANY(A,B) ENABLED(A) || ENABLED(B) #define ANY(A,B) (ENABLED(A) || ENABLED(B))
#define BOTH(A,B) (ENABLED(A) && ENABLED(B))
// Remove compiler warning on an unused variable // Remove compiler warning on an unused variable
#ifndef UNUSED #ifndef UNUSED

View File

@ -310,15 +310,20 @@ class CommandProcessor : public CLCD::CommandFifo {
int8_t apply_fit_text(int16_t w, int16_t h, T text) { int8_t apply_fit_text(int16_t w, int16_t h, T text) {
using namespace FTDI; using namespace FTDI;
int8_t font = _font; int8_t font = _font;
const bool is_utf8 = has_utf8_chars(text);
for (;font >= 26;) { for (;font >= 26;) {
int16_t width, height;
#ifdef TOUCH_UI_USE_UTF8 #ifdef TOUCH_UI_USE_UTF8
const int16_t width = get_utf8_text_width(text, font_size_t::from_romfont(font)); if (is_utf8) {
const int16_t height = font_size_t::from_romfont(font).get_height(); width = get_utf8_text_width(text, font_size_t::from_romfont(font));
#else height = font_size_t::from_romfont(font).get_height();
CLCD::FontMetrics fm(font); } else
const int16_t width = fm.get_text_width(text);
const int16_t height = fm.height;
#endif #endif
{
CLCD::FontMetrics fm(font);
width = fm.get_text_width(text);
height = fm.height;
}
if (width < w && height < h) break; if (width < w && height < h) break;
font--; font--;
} }
@ -336,11 +341,11 @@ class CommandProcessor : public CLCD::CommandFifo {
uint16_t text_width(T text) { uint16_t text_width(T text) {
using namespace FTDI; using namespace FTDI;
#ifdef TOUCH_UI_USE_UTF8 #ifdef TOUCH_UI_USE_UTF8
if (has_utf8_chars(text))
return get_utf8_text_width(text, font_size_t::from_romfont(_font)); return get_utf8_text_width(text, font_size_t::from_romfont(_font));
#else #endif
CLCD::FontMetrics fm(_font); CLCD::FontMetrics fm(_font);
return fm.get_text_width(text); return fm.get_text_width(text);
#endif
} }
template<typename T> template<typename T>
@ -353,11 +358,14 @@ class CommandProcessor : public CLCD::CommandFifo {
const int8_t font = _font; const int8_t font = _font;
#endif #endif
#ifdef TOUCH_UI_USE_UTF8 #ifdef TOUCH_UI_USE_UTF8
if (has_utf8_chars(text))
draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), options); draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), options);
#else else
#endif
{
CLCD::CommandFifo::text(x, y, font, options); CLCD::CommandFifo::text(x, y, font, options);
CLCD::CommandFifo::str(text); CLCD::CommandFifo::str(text);
#endif }
return *this; return *this;
} }
@ -389,8 +397,9 @@ class CommandProcessor : public CLCD::CommandFifo {
#endif #endif
CLCD::CommandFifo::button(x, y, w, h, font, options); CLCD::CommandFifo::button(x, y, w, h, font, options);
#ifdef TOUCH_UI_USE_UTF8 #ifdef TOUCH_UI_USE_UTF8
apply_text_alignment(x, y, w, h, OPT_CENTER); if (has_utf8_chars(text)) {
CLCD::CommandFifo::str(F("")); CLCD::CommandFifo::str(F(""));
apply_text_alignment(x, y, w, h, OPT_CENTER);
if (!(options & FTDI::OPT_FLAT)) { if (!(options & FTDI::OPT_FLAT)) {
// Reproduce the black "shadow" the FTDI adds to the button label // Reproduce the black "shadow" the FTDI adds to the button label
CLCD::CommandFifo::cmd(SAVE_CONTEXT()); CLCD::CommandFifo::cmd(SAVE_CONTEXT());
@ -400,9 +409,10 @@ class CommandProcessor : public CLCD::CommandFifo {
} }
// Draw the button label // Draw the button label
draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), OPT_CENTER); draw_utf8_text(*this, x, y, text, font_size_t::from_romfont(font), OPT_CENTER);
#else }
CLCD::CommandFifo::str(text); else
#endif #endif
CLCD::CommandFifo::str(text);
if (_btn_style_callback && styleModified) _btn_style_callback(*this, _tag, _style, options, true); if (_btn_style_callback && styleModified) _btn_style_callback(*this, _tag, _style, options, true);
return *this; return *this;
} }

View File

@ -128,14 +128,14 @@ bool DLCache::store(uint32_t num_bytes /* = 0*/) {
if (dl_size > free_space) { if (dl_size > free_space) {
// Not enough memory to cache the display list. // Not enough memory to cache the display list.
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Not enough space in GRAM to cache display list, free space: ", free_space); SERIAL_ECHOPAIR("Not enough space in GRAM to cache display list, free space: ", free_space);
SERIAL_ECHOLNPAIR(" Required: ", dl_size); SERIAL_ECHOLNPAIR(" Required: ", dl_size);
#endif #endif
return false; return false;
} else { } else {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Saving DL to RAMG cache, bytes: ", dl_size); SERIAL_ECHOPAIR("Saving DL to RAMG cache, bytes: ", dl_size);
SERIAL_ECHOLNPAIR(" Free space: ", free_space); SERIAL_ECHOLNPAIR(" Free space: ", free_space);
@ -164,7 +164,7 @@ void DLCache::load_slot() {
void DLCache::append() { void DLCache::append() {
CLCD::CommandFifo cmd; CLCD::CommandFifo cmd;
cmd.append(dl_addr, dl_size); cmd.append(dl_addr, dl_size);
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
cmd.execute(); cmd.execute();
wait_until_idle(); wait_until_idle();
SERIAL_ECHO_START(); SERIAL_ECHO_START();

View File

@ -124,7 +124,7 @@ namespace FTDI {
switch (pressed_tag) { switch (pressed_tag) {
case UNPRESSED: case UNPRESSED:
if (tag != 0) { if (tag != 0) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("Touch start: ", tag); SERIAL_ECHOLNPAIR("Touch start: ", tag);
#endif #endif
@ -189,7 +189,7 @@ namespace FTDI {
if (UIData::flags.bits.touch_end_sound) sound.play(unpress_sound); if (UIData::flags.bits.touch_end_sound) sound.play(unpress_sound);
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("Touch end: ", tag); SERIAL_ECHOLNPAIR("Touch end: ", tag);
#endif #endif

View File

@ -31,7 +31,7 @@ uint8_t ScreenRef::lookupScreen(onRedraw_func_t onRedraw_ptr) {
return type; return type;
} }
} }
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Screen not found: ", (uintptr_t) onRedraw_ptr); SERIAL_ECHOPAIR("Screen not found: ", (uintptr_t) onRedraw_ptr);
#endif #endif
@ -42,7 +42,7 @@ void ScreenRef::setScreen(onRedraw_func_t onRedraw_ptr) {
uint8_t type = lookupScreen(onRedraw_ptr); uint8_t type = lookupScreen(onRedraw_ptr);
if (type != 0xFF) { if (type != 0xFF) {
setType(type); setType(type);
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("New screen: ", type); SERIAL_ECHOLNPAIR("New screen: ", type);
#endif #endif

View File

@ -36,7 +36,7 @@ namespace FTDI {
void SoundPlayer::play(effect_t effect, note_t note) { void SoundPlayer::play(effect_t effect, note_t note) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOPAIR("Playing note ", note); SERIAL_ECHOPAIR("Playing note ", note);
SERIAL_ECHOLNPAIR(", instrument ", effect); SERIAL_ECHOLNPAIR(", instrument ", effect);

View File

@ -104,11 +104,14 @@ namespace FTDI {
line[line_len - 1] = 0; line[line_len - 1] = 0;
#ifdef TOUCH_UI_USE_UTF8 #ifdef TOUCH_UI_USE_UTF8
if (has_utf8_chars(line)) {
draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY); draw_utf8_text(cmd, x + dx, y + dy, line, fm.fs, options & ~OPT_CENTERY);
#else } else
#endif
{
cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~OPT_CENTERY); cmd.CLCD::CommandFifo::text(x + dx, y + dy, font, options & ~OPT_CENTERY);
cmd.CLCD::CommandFifo::str(line); cmd.CLCD::CommandFifo::str(line);
#endif }
} }
y += fm.get_height(); y += fm.get_height();

View File

@ -26,7 +26,7 @@
namespace FTDI { namespace FTDI {
void write_rle_data(uint16_t addr, const uint8_t *data, size_t n) { void write_rle_data(uint16_t addr, const uint8_t *data, size_t n) {
for (; n > 2; n -= 2) { for (; n >= 2; n -= 2) {
uint8_t count = pgm_read_byte(data++); uint8_t count = pgm_read_byte(data++);
uint8_t value = pgm_read_byte(data++); uint8_t value = pgm_read_byte(data++);
while (count--) CLCD::mem_write_8(addr++, value); while (count--) CLCD::mem_write_8(addr++, value);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -11,13 +11,13 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="38" width="38"
height="1225" height="2107"
viewBox="0 0 10.054166 324.11458" viewBox="0 0 10.054166 557.47707"
version="1.1" version="1.1"
id="svg8" id="svg8"
inkscape:version="0.92.1 r15371" inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
sodipodi:docname="western_european_bitmap_31.svg" sodipodi:docname="western_char_set_bitmap_31.svg"
inkscape:export-filename="/home/aleph/git-repos/marlin-devel/tests/ftdi-eve-lib-examples/unicode_demo/src/ftdi_eve_lib/extended/unicode/font_bitmaps/western_european_bitmap_31.png" inkscape:export-filename="/home/aleph/git-repos/marlin-devel/tests/ftdi-eve-lib-examples/unicode_demo/src/ftdi_eve_lib/extended/unicode/font_bitmaps/western_char_set_bitmap_31.png"
inkscape:export-xdpi="96" inkscape:export-xdpi="96"
inkscape:export-ydpi="96"> inkscape:export-ydpi="96">
<defs <defs
@ -30,16 +30,16 @@
inkscape:pageopacity="1" inkscape:pageopacity="1"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="3.6948106" inkscape:zoom="3.6948106"
inkscape:cx="25.324413" inkscape:cx="-66.497155"
inkscape:cy="265.38829" inkscape:cy="512.92836"
inkscape:document-units="mm" inkscape:document-units="mm"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
units="px" units="px"
inkscape:window-width="1382" inkscape:window-width="1330"
inkscape:window-height="815" inkscape:window-height="965"
inkscape:window-x="2126" inkscape:window-x="59"
inkscape:window-y="131" inkscape:window-y="18"
inkscape:window-maximized="0"> inkscape:window-maximized="0">
<inkscape:grid <inkscape:grid
type="xygrid" type="xygrid"
@ -50,7 +50,7 @@
empspacing="1" empspacing="1"
color="#000000" color="#000000"
opacity="0" opacity="0"
originx="0" originx="8.1491663"
empcolor="#3fff69" empcolor="#3fff69"
empopacity="0.25098039" /> empopacity="0.25098039" />
<inkscape:grid <inkscape:grid
@ -114,7 +114,7 @@
inkscape:label="Layer 1" inkscape:label="Layer 1"
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer1" id="layer1"
transform="translate(0,27.114583)"> transform="translate(0,260.47708)">
<image <image
y="-947.59998" y="-947.59998"
x="-1.7763568e-15" x="-1.7763568e-15"
@ -139,140 +139,240 @@
xml:space="preserve" xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.26181126px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.20578496" style="font-style:normal;font-weight:normal;font-size:10.26181126px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.20578496"
x="-3.5527137e-15" x="-3.5527137e-15"
y="-38.800373" y="-272.16272"
id="text4642" id="text4642"
inkscape:export-xdpi="91.400002" inkscape:export-xdpi="91.400002"
inkscape:export-ydpi="91.400002"><tspan inkscape:export-ydpi="91.400002"><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="-29.721075" y="-263.08344"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.3770504px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.3770504px;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4614" /><tspan id="tspan4614" /><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="-16.761999" y="-250.12434"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4658"> ̀</tspan><tspan id="tspan4658"> ̀</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="-3.8029218" y="-237.16527"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4553"> ́</tspan><tspan id="tspan4553"> ́</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="9.1561546" y="-224.20619"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4555"> ̂</tspan><tspan id="tspan4555"> ̂</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="22.115232" y="-211.24712"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4557"> ̃</tspan><tspan id="tspan4557"> ̃</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="35.07431" y="-198.28804"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4559"> ̈</tspan><tspan id="tspan4559"> ̈</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="48.033386" y="-185.32896"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4561"> ̊</tspan><tspan id="tspan4561"> ̊</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="60.992462" y="-172.36989"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4609"> ̧</tspan><tspan id="tspan4609"> ̧</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="73.951538" y="-159.41081"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan8898">ı</tspan><tspan id="tspan8898">ı</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="86.910614" y="-146.45174"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4565">ß</tspan><tspan id="tspan4565">ß</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="99.86969" y="-133.49266"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4742">Ø</tspan><tspan id="tspan4742">Ø</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="112.82877" y="-120.53358"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4750">ø</tspan><tspan id="tspan4750">ø</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="125.78785" y="-107.5745"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4626">Æ</tspan><tspan id="tspan4626">Æ</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="138.74692" y="-94.615425"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4788">æ</tspan><tspan id="tspan4788">æ</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="151.70599" y="-81.656349"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4792">Ð</tspan><tspan id="tspan4792">Ð</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="164.66507" y="-68.697273"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4796">ð</tspan><tspan id="tspan4796">ð</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="177.62415" y="-55.738197"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4798">Þ</tspan><tspan id="tspan4798">Þ</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="190.58324" y="-42.779121"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4637">þ</tspan><tspan id="tspan4637">þ</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="203.54231" y="-29.820045"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4767">«</tspan><tspan id="tspan4767">«</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="216.50139" y="-16.86097"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4771">»</tspan><tspan id="tspan4771">»</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="229.46046" y="-3.9018936"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4643">¡</tspan><tspan id="tspan4643">¡</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="242.41954" y="9.0571823"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4720">¿</tspan><tspan id="tspan4720">¿</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="255.37862" y="22.016258"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4775">¢</tspan><tspan id="tspan4775">¢</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="268.33768" y="34.975334"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4724">£</tspan><tspan id="tspan4724">£</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="281.29675" y="47.934425"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4726">¤</tspan><tspan id="tspan4726">¤</tspan><tspan
sodipodi:role="line" sodipodi:role="line"
x="-3.5527137e-15" x="-3.5527137e-15"
y="294.25583" y="60.893501"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan4654">¥</tspan></text> id="tspan4654">¥</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="73.852577"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan881">¹</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="86.811653"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan864">²</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="99.770729"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan862">³</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="112.7298"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan866">º</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="125.68888"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan869">ª</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="138.64796"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan871">©</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="151.60704"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan873">®</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="164.56612"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan875">±</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="177.52519"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan877">×</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="190.48427"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan879">÷</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="203.44334"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan886">¼</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="216.40242"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan888">½</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="229.3615"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan890">¾</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="242.32057"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan882">µ</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="255.27965"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan892">¶</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="268.23871"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan896">¦</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="281.19778"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan898">§</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="294.15686"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan900">¬</tspan><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="306.98413"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan868" /><tspan
sodipodi:role="line"
x="-3.5527137e-15"
y="319.8114"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.93611145px;line-height:1.16499996;font-family:sans-serif;-inkscape-font-specification:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.20578496"
id="tspan860" /></text>
<text <text
xml:space="preserve" xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332" style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -21,7 +21,7 @@
#include "../ftdi_extended.h" #include "../ftdi_extended.h"
#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8) #if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
namespace FTDI { namespace FTDI {
// Returns the height of a standard FTDI romfont // Returns the height of a standard FTDI romfont

View File

@ -21,7 +21,7 @@
#include "../ftdi_extended.h" #include "../ftdi_extended.h"
#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8) #if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
constexpr static uint8_t std_font = 31; constexpr static uint8_t std_font = 31;
@ -89,6 +89,12 @@
uint8_t which = (c >= ' ' && c < 128) ? c : '?'; uint8_t which = (c >= ' ' && c < 128) ? c : '?';
uint8_t width = std_char_width(which); uint8_t width = std_char_width(which);
if (c == '\t') {
// Special handling for the tab character
which = ' ';
width = std_char_width(' ');
}
// Draw the character // Draw the character
if (cmd) ext_vertex2ii(*cmd, x, y, std_font, which); if (cmd) ext_vertex2ii(*cmd, x, y, std_font, which);
@ -97,4 +103,4 @@
return true; return true;
} }
#endif // FTDI_EXTENDED #endif // FTDI_EXTENDED && TOUCH_UI_USE_UTF8

View File

@ -21,10 +21,39 @@
#include "../ftdi_extended.h" #include "../ftdi_extended.h"
#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8) #if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
using namespace FTDI; using namespace FTDI;
/**
* Return true if a string has UTF8 characters
*
* Parameters:
*
* c - Pointer to a string.
*
* Returns: True if the strings has UTF8 characters
*/
bool FTDI::has_utf8_chars(const char *str) {
for (;;) {
const char c = *str++;
if (!c) break;
if ((c & 0xC0) == 0x80) return true;
}
return false;
}
bool FTDI::has_utf8_chars(progmem_str _str) {
const char *str = (const char *) _str;
for (;;) {
const char c = pgm_read_byte(str++);
if (!c) break;
if ((c & 0xC0) == 0x80) return true;
}
return false;
}
/** /**
* Return a character in a UTF8 string and increment the * Return a character in a UTF8 string and increment the
* pointer to the next character * pointer to the next character

View File

@ -38,6 +38,11 @@ namespace FTDI {
(0xF0808080 | ((c & 0b000111000000000000000000) << 6) | ((c & 0b111111000000000000) << 4) | ((c & 0b111111000000) << 2) | (c & 0b111111)); (0xF0808080 | ((c & 0b000111000000000000000000) << 6) | ((c & 0b111111000000000000) << 4) | ((c & 0b111111000000) << 2) | (c & 0b111111));
} }
/* Returns true if the string has UTF8 string characters */
bool has_utf8_chars(progmem_str str);
bool has_utf8_chars(const char *str);
/* Returns the next character in a UTF8 string and increments the /* Returns the next character in a UTF8 string and increments the
* pointer to the next character */ * pointer to the next character */

View File

@ -21,7 +21,8 @@
#include "../ftdi_extended.h" #include "../ftdi_extended.h"
#if defined(FTDI_EXTENDED) && defined(TOUCH_UI_USE_UTF8) && defined(TOUCH_UI_UTF8_WESTERN_CHARSET) #if defined(FTDI_EXTENDED) && BOTH(TOUCH_UI_USE_UTF8, TOUCH_UI_UTF8_WESTERN_CHARSET)
#include "western_char_set_bitmap_31.h" #include "western_char_set_bitmap_31.h"
#define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0])) #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0]))
@ -44,7 +45,10 @@
DOT_ABOVE, DOT_ABOVE,
CEDILLA, CEDILLA,
NO_DOT_I, NO_DOT_I,
#if ENABLED(TOUCH_UI_UTF8_GERMANIC)
SHARP_S, SHARP_S,
#endif
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
LRG_O_STROKE, LRG_O_STROKE,
SML_O_STROKE, SML_O_STROKE,
LRG_AE, LRG_AE,
@ -53,14 +57,49 @@
SML_ETH, SML_ETH,
LRG_THORN, LRG_THORN,
SML_THORN, SML_THORN,
#endif
#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
LEFT_DBL_QUOTE, LEFT_DBL_QUOTE,
RIGHT_DBL_QUOTE, RIGHT_DBL_QUOTE,
INV_EXCLAMATION, INV_EXCLAMATION,
INV_QUESTION, INV_QUESTION,
#endif
#if ENABLED(TOUCH_UI_UTF8_CURRENCY)
CENT_SIGN, CENT_SIGN,
POUND_SIGN, POUND_SIGN,
CURRENCY_SIGN, CURRENCY_SIGN,
YEN_SIGN YEN_SIGN,
#endif
#if ENABLED(TOUCH_UI_UTF8_SUPERSCRIPTS)
SUPERSCRIPT_ONE,
SUPERSCRIPT_TWO,
SUPERSCRIPT_THREE,
#endif
#if ENABLED(TOUCH_UI_UTF8_ORDINALS)
MASCULINE_ORDINAL,
FEMININE_ORDINAL,
#endif
#if ENABLED(TOUCH_UI_UTF8_COPYRIGHT)
COPYRIGHT_SIGN,
REGISTERED_SIGN,
#endif
#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
PLUS_MINUS_SIGN,
MULTIPLICATION_SIGN,
DIVISION_SIGN,
#endif
#if ENABLED(TOUCH_UI_UTF8_FRACTIONS)
FRACTION_QUARTER,
FRACTION_HALF,
FRACTION_THREE_FOURTHS,
#endif
#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
MICRON_SIGN,
PILCROW_SIGN,
BROKEN_BAR,
SECTION_SIGN,
NOT_SIGN
#endif
}; };
/* Centerline of characters that can take accents */ /* Centerline of characters that can take accents */
@ -105,22 +144,72 @@
uint8_t alt_data; // For accented characters, the centerline; else char width uint8_t alt_data; // For accented characters, the centerline; else char width
} char_recipe[] = { } char_recipe[] = {
{0, 0, NO_DOT_I, 10 }, {0, 0, NO_DOT_I, 10 },
#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
{UTF8('¡'), 0 , INV_EXCLAMATION, 13 }, {UTF8('¡'), 0 , INV_EXCLAMATION, 13 },
#endif
#if ENABLED(TOUCH_UI_UTF8_CURRENCY)
{UTF8('¢'), 0 , CENT_SIGN, 23 }, {UTF8('¢'), 0 , CENT_SIGN, 23 },
{UTF8('£'), 0 , POUND_SIGN, 24 }, {UTF8('£'), 0 , POUND_SIGN, 24 },
{UTF8('¤'), 0 , CURRENCY_SIGN, 26 }, {UTF8('¤'), 0 , CURRENCY_SIGN, 26 },
{UTF8('¥'), 0 , YEN_SIGN, 26 }, {UTF8('¥'), 0 , YEN_SIGN, 26 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
{UTF8('¦'), 0 , BROKEN_BAR, 11 },
{UTF8('§'), 0 , SECTION_SIGN, 21 },
#endif
#if ENABLED(TOUCH_UI_UTF8_COPYRIGHT)
{UTF8('©'), 0 , COPYRIGHT_SIGN, 38 },
#endif
#if ENABLED(TOUCH_UI_UTF8_ORDINALS)
{UTF8('ª'), 0 , FEMININE_ORDINAL, 19 },
#endif
#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
{UTF8('«'), 0 , LEFT_DBL_QUOTE, 23 }, {UTF8('«'), 0 , LEFT_DBL_QUOTE, 23 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
{UTF8('¬'), 0 , NOT_SIGN, 32 },
#endif
#if ENABLED(TOUCH_UI_UTF8_COPYRIGHT)
{UTF8('®'), 0 , REGISTERED_SIGN, 38 },
#endif
{UTF8('°'), 0 , DOT_ABOVE, 24 }, {UTF8('°'), 0 , DOT_ABOVE, 24 },
#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
{UTF8('±'), 0 , NOT_SIGN, 32 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SUPERSCRIPTS)
{UTF8('²'), 0 , SUPERSCRIPT_TWO, 16 },
{UTF8('³'), 0 , SUPERSCRIPT_THREE, 16 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SYMBOLS)
{UTF8('µ'), 0 , MICRON_SIGN, 28 },
{UTF8(''), 0 , PILCROW_SIGN, 24 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SUPERSCRIPTS)
{UTF8('¹'), 0 , SUPERSCRIPT_ONE, 16 },
#endif
#if ENABLED(TOUCH_UI_UTF8_ORDINALS)
{UTF8('º'), 0 , MASCULINE_ORDINAL, 19 },
#endif
#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
{UTF8('»'), 0 , RIGHT_DBL_QUOTE, 24 }, {UTF8('»'), 0 , RIGHT_DBL_QUOTE, 24 },
#endif
#if ENABLED(TOUCH_UI_UTF8_FRACTIONS)
{UTF8('¼'), 0 , FRACTION_QUARTER, 40 },
{UTF8('½'), 0 , FRACTION_HALF, 40 },
{UTF8('¾'), 0 , FRACTION_THREE_FOURTHS, 40 },
#endif
#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
{UTF8('¿'), 0 , INV_QUESTION, 21 }, {UTF8('¿'), 0 , INV_QUESTION, 21 },
#endif
{UTF8('À'), 'A', GRAVE, mid_A}, {UTF8('À'), 'A', GRAVE, mid_A},
{UTF8('Á'), 'A', ACUTE, mid_A}, {UTF8('Á'), 'A', ACUTE, mid_A},
{UTF8('Â'), 'A', CIRCUMFLEX, mid_A}, {UTF8('Â'), 'A', CIRCUMFLEX, mid_A},
{UTF8('Ã'), 'A', TILDE, mid_A}, {UTF8('Ã'), 'A', TILDE, mid_A},
{UTF8('Ä'), 'A', DIAERESIS, mid_A}, {UTF8('Ä'), 'A', DIAERESIS, mid_A},
{UTF8('Å'), 'A', DOT_ABOVE, mid_A}, {UTF8('Å'), 'A', DOT_ABOVE, mid_A},
{UTF8('Æ'), 0 , LRG_AE, mid_E}, #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('Æ'), 0 , LRG_AE, 40},
#endif
{UTF8('Ç'), 'C', CEDILLA, mid_C}, {UTF8('Ç'), 'C', CEDILLA, mid_C},
{UTF8('È'), 'E', GRAVE, mid_E}, {UTF8('È'), 'E', GRAVE, mid_E},
{UTF8('É'), 'E', ACUTE, mid_E}, {UTF8('É'), 'E', ACUTE, mid_E},
@ -130,28 +219,41 @@
{UTF8('Í'), 'I', ACUTE, mid_I}, {UTF8('Í'), 'I', ACUTE, mid_I},
{UTF8('Î'), 'I', CIRCUMFLEX, mid_I}, {UTF8('Î'), 'I', CIRCUMFLEX, mid_I},
{UTF8('Ï'), 'I', DIAERESIS, mid_I}, {UTF8('Ï'), 'I', DIAERESIS, mid_I},
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('Ð'), 0, LRG_ETH, 31 }, {UTF8('Ð'), 0, LRG_ETH, 31 },
#endif
{UTF8('Ñ'), 'N', TILDE, mid_N}, {UTF8('Ñ'), 'N', TILDE, mid_N},
{UTF8('Ò'), 'O', GRAVE, mid_O}, {UTF8('Ò'), 'O', GRAVE, mid_O},
{UTF8('Ó'), 'O', ACUTE, mid_O}, {UTF8('Ó'), 'O', ACUTE, mid_O},
{UTF8('Ô'), 'O', CIRCUMFLEX, mid_O}, {UTF8('Ô'), 'O', CIRCUMFLEX, mid_O},
{UTF8('Õ'), 'O', TILDE, mid_O}, {UTF8('Õ'), 'O', TILDE, mid_O},
{UTF8('Ö'), 'O', DIAERESIS, mid_O}, {UTF8('Ö'), 'O', DIAERESIS, mid_O},
#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
{UTF8('×'), 0 , MULTIPLICATION_SIGN, 32 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('Ø'), 0 , LRG_O_STROKE, 32 }, {UTF8('Ø'), 0 , LRG_O_STROKE, 32 },
#endif
{UTF8('Ù'), 'U', GRAVE, mid_U}, {UTF8('Ù'), 'U', GRAVE, mid_U},
{UTF8('Ú'), 'U', ACUTE, mid_U}, {UTF8('Ú'), 'U', ACUTE, mid_U},
{UTF8('Û'), 'U', CIRCUMFLEX, mid_U}, {UTF8('Û'), 'U', CIRCUMFLEX, mid_U},
{UTF8('Ü'), 'U', DIAERESIS, mid_U}, {UTF8('Ü'), 'U', DIAERESIS, mid_U},
{UTF8('Ý'), 'Y', ACUTE, mid_Y}, {UTF8('Ý'), 'Y', ACUTE, mid_Y},
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('Þ'), 0 , LRG_THORN, 25 }, {UTF8('Þ'), 0 , LRG_THORN, 25 },
#endif
#if ENABLED(TOUCH_UI_UTF8_GERMANIC)
{UTF8('ß'), 0 , SHARP_S, 26 }, {UTF8('ß'), 0 , SHARP_S, 26 },
#endif
{UTF8('à'), 'a', GRAVE, mid_a}, {UTF8('à'), 'a', GRAVE, mid_a},
{UTF8('á'), 'a', ACUTE, mid_a}, {UTF8('á'), 'a', ACUTE, mid_a},
{UTF8('â'), 'a', CIRCUMFLEX, mid_a}, {UTF8('â'), 'a', CIRCUMFLEX, mid_a},
{UTF8('ã'), 'a', TILDE, mid_a}, {UTF8('ã'), 'a', TILDE, mid_a},
{UTF8('ä'), 'a', DIAERESIS, mid_a}, {UTF8('ä'), 'a', DIAERESIS, mid_a},
{UTF8('å'), 'a', DOT_ABOVE, mid_a}, {UTF8('å'), 'a', DOT_ABOVE, mid_a},
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('æ'), 0 , SML_AE, 40 }, {UTF8('æ'), 0 , SML_AE, 40 },
#endif
{UTF8('ç'), 'c', CEDILLA, mid_c}, {UTF8('ç'), 'c', CEDILLA, mid_c},
{UTF8('è'), 'e', GRAVE, mid_e}, {UTF8('è'), 'e', GRAVE, mid_e},
{UTF8('é'), 'e', ACUTE, mid_e}, {UTF8('é'), 'e', ACUTE, mid_e},
@ -161,20 +263,29 @@
{UTF8('í'), 'i', ACUTE, mid_i}, {UTF8('í'), 'i', ACUTE, mid_i},
{UTF8('î'), 'i', CIRCUMFLEX, mid_i}, {UTF8('î'), 'i', CIRCUMFLEX, mid_i},
{UTF8('ï'), 'i', DIAERESIS, mid_i}, {UTF8('ï'), 'i', DIAERESIS, mid_i},
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('ð'), 0, SML_ETH, 24 }, {UTF8('ð'), 0, SML_ETH, 24 },
#endif
{UTF8('ñ'), 'n', TILDE, mid_n}, {UTF8('ñ'), 'n', TILDE, mid_n},
{UTF8('ò'), 'o', GRAVE, mid_o}, {UTF8('ò'), 'o', GRAVE, mid_o},
{UTF8('ó'), 'o', ACUTE, mid_o}, {UTF8('ó'), 'o', ACUTE, mid_o},
{UTF8('ô'), 'o', CIRCUMFLEX, mid_o}, {UTF8('ô'), 'o', CIRCUMFLEX, mid_o},
{UTF8('õ'), 'o', TILDE, mid_o}, {UTF8('õ'), 'o', TILDE, mid_o},
{UTF8('ö'), 'o', DIAERESIS, mid_o}, {UTF8('ö'), 'o', DIAERESIS, mid_o},
#if ENABLED(TOUCH_UI_UTF8_MATHEMATICS)
{UTF8('÷'), 0 , DIVISION_SIGN, 32 },
#endif
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('ø'), 0 , SML_O_STROKE, 25 }, {UTF8('ø'), 0 , SML_O_STROKE, 25 },
#endif
{UTF8('ù'), 'u', GRAVE, mid_u}, {UTF8('ù'), 'u', GRAVE, mid_u},
{UTF8('ú'), 'u', ACUTE, mid_u}, {UTF8('ú'), 'u', ACUTE, mid_u},
{UTF8('û'), 'u', CIRCUMFLEX, mid_u}, {UTF8('û'), 'u', CIRCUMFLEX, mid_u},
{UTF8('ü'), 'u', DIAERESIS, mid_u}, {UTF8('ü'), 'u', DIAERESIS, mid_u},
{UTF8('ý'), 'y', ACUTE, mid_y}, {UTF8('ý'), 'y', ACUTE, mid_y},
#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
{UTF8('þ'), 0 , SML_THORN, 25 }, {UTF8('þ'), 0 , SML_THORN, 25 },
#endif
{UTF8('ÿ'), 'y', DIAERESIS, mid_y} {UTF8('ÿ'), 'y', DIAERESIS, mid_y}
}; };

View File

@ -1,6 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
# Written By Marcio Teixeira 2018 - Aleph Objects, Inc. # Written By Marcio Teixeira 2019 - Aleph Objects, Inc.
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -38,13 +38,16 @@ def pack_rle(data):
return rle return rle
class WriteSource: class WriteSource:
def __init__(self): def __init__(self, lines_in_blocks):
self.blocks = []
self.values = [] self.values = []
self.block_size = lines_in_blocks
self.rows = 0
def add_pixel(self, value): def add_pixel(self, value):
self.values.append(value) self.values.append(value)
def convert_to_4bpp(self, data): def convert_to_4bpp(self, data, chunk_size = 0):
# Invert the image # Invert the image
data = map(lambda i: 255 - i, data) data = map(lambda i: 255 - i, data)
# Quanitize 8-bit values into 4-bits # Quanitize 8-bit values into 4-bits
@ -60,30 +63,46 @@ class WriteSource:
# Convert values into hex strings # Convert values into hex strings
return map(lambda a: "0x" + format(a, '02x'), data) return map(lambda a: "0x" + format(a, '02x'), data)
def end_row(self): def end_row(self, y):
# Pad each row into even number of values # Pad each row into even number of values
if len(self.values) & 1: if len(self.values) & 1:
self.values.append(0) self.values.append(0)
self.rows += 1
if self.block_size and (self.rows % self.block_size) == 0:
self.blocks.append(self.values)
self.values = []
def write(self): def write(self):
data = self.convert_to_4bpp(self.values) if len(self.values):
self.blocks.append(self.values)
block_strs = [];
for b in self.blocks:
data = self.convert_to_4bpp(b)
data = ', '.join(data) data = ', '.join(data)
data = textwrap.fill(data, 75, initial_indent = ' ', subsequent_indent = ' ') data = textwrap.fill(data, 75, initial_indent = ' ', subsequent_indent = ' ')
block_strs.append(data)
print("const unsigned char font[] PROGMEM = {") print("const unsigned char font[] PROGMEM = {")
print(data); for i, b in enumerate(block_strs):
print("};") if i:
print(',')
print('\n /* {} */'.format(i))
print(b, end='')
print("\n};")
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Converts a grayscale bitmap into a 16-level RLE packed C array for use as font data') parser = argparse.ArgumentParser(description='Converts a grayscale bitmap into a 16-level RLE packed C array for use as font data')
parser.add_argument("input") parser.add_argument("input")
parser.add_argument('--char_height', help='Adds a separator every so many lines', type=int)
args = parser.parse_args() args = parser.parse_args()
img = Image.open(args.input).convert('L') writer = WriteSource(args.char_height)
writer = WriteSource() img = Image.open(args.input).convert('L')
for y in range(img.height): for y in range(img.height):
for x in range(img.width): for x in range(img.width):
writer.add_pixel(img.getpixel((x,y))) writer.add_pixel(img.getpixel((x,y)))
writer.end_row() writer.end_row(y)
writer.write() writer.write()

View File

@ -130,7 +130,7 @@ void BioPrintingDialogBox::setStatusMessage(const char* message) {
draw_interaction_buttons(BACKGROUND); draw_interaction_buttons(BACKGROUND);
storeBackground(); storeBackground();
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("New status message: ", message); SERIAL_ECHOLNPAIR("New status message: ", message);
#endif #endif

View File

@ -333,7 +333,7 @@ void StatusScreen::setStatusMessage(const char* message) {
storeBackground(); storeBackground();
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("New status message: ", message); SERIAL_ECHOLNPAIR("New status message: ", message);
#endif #endif

View File

@ -51,7 +51,7 @@ void TouchCalibrationScreen::onEntry() {
.execute(); .execute();
while (CLCD::is_touching()) { while (CLCD::is_touching()) {
#ifdef UI_FRAMEWORK_DEBUG #if ENABLED(TOUCH_UI_DEBUG)
SERIAL_ECHO_START(); SERIAL_ECHO_START();
SERIAL_ECHOLNPGM("Waiting for touch release"); SERIAL_ECHOLNPGM("Waiting for touch release");
#endif #endif

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1209,13 +1209,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1224,6 +1241,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1208,13 +1208,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1223,6 +1240,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1209,13 +1209,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1224,6 +1241,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1213,13 +1213,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1228,6 +1245,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1204,13 +1204,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1219,6 +1236,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1209,13 +1209,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1224,6 +1241,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1209,13 +1209,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1224,6 +1241,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1146,6 +1146,85 @@
#endif // HAS_GRAPHICAL_LCD #endif // HAS_GRAPHICAL_LCD
//
// Lulzbot Touch UI
//
#if ENABLED(LULZBOT_TOUCH_UI)
// Display board used
//#define LCD_FTDI_VM800B35A // FTDI 3.5" with FT800 (320x240)
//#define LCD_4DSYSTEMS_4DLCD_FT843 // 4D Systems 4.3" (480x272)
//#define LCD_HAOYU_FT800CB // Haoyu with 4.3" or 5" (480x272)
//#define LCD_HAOYU_FT810CB // Haoyu with 5" (800x480)
//#define LCD_ALEPHOBJECTS_CLCD_UI // Aleph Objects Color LCD UI
// Correct the resolution if not using the stock TFT panel.
//#define TOUCH_UI_320x240
//#define TOUCH_UI_480x272
//#define TOUCH_UI_800x480
// Mappings for boards with a standard RepRapDiscount Display connector
//#define AO_EXP1_PINMAP // AlephObjects CLCD UI EXP1 mapping
//#define AO_EXP2_PINMAP // AlephObjects CLCD UI EXP2 mapping
//#define CR10_TFT_PINMAP // Rudolph Riedel's CR10 pin mapping
//#define OTHER_PIN_LAYOUT // Define pins manually below
#if ENABLED(OTHER_PIN_LAYOUT)
// The pins for CS and MOD_RESET (PD) must be chosen.
#define CLCD_MOD_RESET 9
#define CLCD_SPI_CS 10
// If using software SPI, specify pins for SCLK, MOSI, MISO
//#define CLCD_USE_SOFT_SPI
#if ENABLED(CLCD_USE_SOFT_SPI)
#define CLCD_SOFT_SPI_MOSI 11
#define CLCD_SOFT_SPI_MISO 12
#define CLCD_SOFT_SPI_SCLK 13
#endif
#endif
// Display Orientation. An inverted (i.e. upside-down) display
// is supported on the FT800. The FT810 and beyond also support
// portrait and mirrored orientations.
//#define TOUCH_UI_INVERTED
//#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED
// UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif
// Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE)
//#define TOUCH_UI_LANGUAGE_MENU
// Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif
// //
// FSMC Graphical TFT // FSMC Graphical TFT
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1210,13 +1210,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1225,6 +1242,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1210,13 +1210,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1225,6 +1242,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1206,13 +1206,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1221,6 +1238,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1201,13 +1201,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1216,6 +1233,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

View File

@ -1205,13 +1205,30 @@
//#define TOUCH_UI_PORTRAIT //#define TOUCH_UI_PORTRAIT
//#define TOUCH_UI_MIRRORED //#define TOUCH_UI_MIRRORED
// Enable UTF8 rendering capabilities. // UTF8 processing and rendering.
// Unsupported characters are shown as '?'.
//#define TOUCH_UI_USE_UTF8 //#define TOUCH_UI_USE_UTF8
#if ENABLED(TOUCH_UI_USE_UTF8) #if ENABLED(TOUCH_UI_USE_UTF8)
// Western accents support. These accented characters use
// combined bitmaps and require relatively little storage.
#define TOUCH_UI_UTF8_WESTERN_CHARSET #define TOUCH_UI_UTF8_WESTERN_CHARSET
#if ENABLED(TOUCH_UI_UTF8_WESTERN_CHARSET)
// Additional character groups. These characters require
// full bitmaps and take up considerable storage:
//#define TOUCH_UI_UTF8_SUPERSCRIPTS // ¹ ² ³
//#define TOUCH_UI_UTF8_COPYRIGHT // © ®
//#define TOUCH_UI_UTF8_GERMANIC // ß
//#define TOUCH_UI_UTF8_SCANDINAVIAN // Æ Ð Ø Þ æ ð ø þ
//#define TOUCH_UI_UTF8_PUNCTUATION // « » ¿ ¡
//#define TOUCH_UI_UTF8_CURRENCY // ¢ £ ¤ ¥
//#define TOUCH_UI_UTF8_ORDINALS // º ª
//#define TOUCH_UI_UTF8_MATHEMATICS // ± × ÷
//#define TOUCH_UI_UTF8_FRACTIONS // ¼ ½ ¾
//#define TOUCH_UI_UTF8_SYMBOLS // µ ¶ ¦ § ¬
#endif
#endif #endif
// When labels do not fit buttons, use smaller font // Use a smaller font when labels don't fit buttons
#define TOUCH_UI_FIT_TEXT #define TOUCH_UI_FIT_TEXT
// Runtime language selection (otherwise LCD_LANGUAGE) // Runtime language selection (otherwise LCD_LANGUAGE)
@ -1220,6 +1237,9 @@
// Use a numeric passcode for "Screen lock" keypad. // Use a numeric passcode for "Screen lock" keypad.
// (recommended for smaller displays) // (recommended for smaller displays)
//#define TOUCH_UI_PASSCODE //#define TOUCH_UI_PASSCODE
// Output extra debug info for Touch UI events
//#define TOUCH_UI_DEBUG
#endif #endif
// //

Some files were not shown because too many files have changed in this diff Show More