diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
index 40676d6254..57d17acbd2 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp
@@ -497,7 +497,8 @@ bool UIFlashStorage::is_present = false;
if (verifyOk) {
SERIAL_ECHOLNPGM("DONE");
return SUCCESS;
- } else {
+ }
+ else {
SERIAL_ECHOLNPGM("FAIL");
return VERIFY_ERROR;
}
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
index 9780ebe858..e4524f29d5 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp
@@ -932,7 +932,8 @@ template <class T> bool CLCD::CommandFifo::_write_unaligned(T data, uint16_t len
if (command_read_ptr <= command_write_ptr) {
bytes_tail = 4096U - command_write_ptr;
bytes_head = command_read_ptr;
- } else {
+ }
+ else {
bytes_tail = command_read_ptr - command_write_ptr;
bytes_head = 0;
}
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
index b045ca203a..9c0a4c318a 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/command_processor.h
@@ -78,7 +78,8 @@ class CommandProcessor : public CLCD::CommandFifo {
y += (h - th) / 2;
w -= tracker ? th * 5.0 : th * 2;
h = th;
- } else {
+ }
+ else {
x += (w - th) / 2;
y += tracker ? th * 2.5 : th;
w = th;
@@ -254,7 +255,8 @@ class CommandProcessor : public CLCD::CommandFifo {
if (is_tracking) {
if (FTDI::EventLoop::is_touch_held()) {
return CLCD::get_tracker(value);
- } else {
+ }
+ else {
CLCD::CommandFifo::track(0, 0, 0, 0, 0);
CLCD::CommandFifo::execute();
is_tracking = false;
@@ -319,7 +321,8 @@ class CommandProcessor : public CLCD::CommandFifo {
if (is_utf8) {
width = get_utf8_text_width(text, font_size_t::from_romfont(font));
height = font_size_t::from_romfont(font).get_height();
- } else
+ }
+ else
#endif
{
CLCD::FontMetrics fm(font);
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
index f025b6a18d..3d603726bb 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.h
@@ -33,10 +33,10 @@
* DLCache dlcache(UNIQUE_ID);
*
* if (dlcache.hasData()) {
- * dlcache.append();
+ * dlcache.append();
* } else {
- * // Add stuff to the DL
- * dlcache.store();
+ * // Add stuff to the DL
+ * dlcache.store();
* }
*/
class DLCache {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
index b338758ed1..9761eba7ef 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/event_loop.cpp
@@ -140,15 +140,12 @@ namespace FTDI {
if (UIData::flags.bits.touch_start_sound) sound.play(press_sound);
}
- if (lastScreen != current_screen.getScreen()) {
- // In the case in which a touch event triggered a new screen to be
- // drawn, we don't issue a touchEnd since it would be sent to the
- // wrong screen.
- UIData::flags.bits.ignore_unpress = true;
- } else {
- UIData::flags.bits.ignore_unpress = false;
- }
- } else {
+ // In the case in which a touch event triggered a new screen to be
+ // drawn, we don't issue a touchEnd since it would be sent to the
+ // wrong screen.
+ UIData::flags.bits.ignore_unpress = (lastScreen != current_screen.getScreen());
+ }
+ else {
touch_timer.start();
}
break;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
index f1ec4fc476..1420b53fc9 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/screen_types.h
@@ -209,7 +209,8 @@ class CachedScreen {
if (dlcache.has_data()) {
dlcache.append();
- } else {
+ }
+ else {
#ifdef TOUCH_UI_USE_UTF8
load_utf8_bitmaps(cmd);
#endif
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
index a6d84dde5f..9d67260fee 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/sound_player.cpp
@@ -98,7 +98,8 @@ namespace FTDI {
if (ms == 0 && fx == SILENCE && nt == END_SONG) {
sequence = 0;
play(SILENCE, REST);
- } else {
+ }
+ else {
wait = ms;
timer.start();
play(fx, nt);
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
index 87baeb6d20..0db6b0d360 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_bitmaps.cpp
@@ -45,7 +45,8 @@ namespace FTDI {
cmd.cmd(BITMAP_HANDLE(handle));
cmd.cmd(CELL(cell));
cmd.cmd(VERTEX2F(x * 16, y * 16));
- } else {
+ }
+ else {
cmd.cmd(VERTEX2II(x, y, handle, cell));
}
}
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
index c449f11537..fd9beeaab1 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/font_size_t.cpp
@@ -21,7 +21,7 @@
#include "../ftdi_extended.h"
-#if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
+#if BOTH(FTDI_EXTENDED, TOUCH_UI_USE_UTF8)
namespace FTDI {
// Returns the height of a standard FTDI romfont
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
index fb049aee3b..85411a320d 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/standard_char_set.cpp
@@ -21,7 +21,7 @@
#include "../ftdi_extended.h"
-#if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
+#if BOTH(FTDI_EXTENDED, TOUCH_UI_USE_UTF8)
constexpr static uint8_t std_font = 31;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
index d717f7f154..6f6e9f5484 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/unicode.cpp
@@ -21,7 +21,7 @@
#include "../ftdi_extended.h"
-#if defined(FTDI_EXTENDED) && ENABLED(TOUCH_UI_USE_UTF8)
+#if BOTH(FTDI_EXTENDED, TOUCH_UI_USE_UTF8)
using namespace FTDI;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
index e2ce15dc8f..eef14d2932 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/western_char_set.cpp
@@ -21,7 +21,7 @@
#include "../ftdi_extended.h"
-#if defined(FTDI_EXTENDED) && BOTH(TOUCH_UI_USE_UTF8, TOUCH_UI_UTF8_WESTERN_CHARSET)
+#if ALL(FTDI_EXTENDED, TOUCH_UI_USE_UTF8, TOUCH_UI_UTF8_WESTERN_CHARSET)
#include "western_char_set_bitmap_31.h"
@@ -45,81 +45,81 @@
DOT_ABOVE,
CEDILLA,
NO_DOT_I,
-#if ENABLED(TOUCH_UI_UTF8_GERMANIC)
- SHARP_S,
-#endif
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- LRG_O_STROKE,
- SML_O_STROKE,
- LRG_AE,
- SML_AE,
- LRG_ETH,
- SML_ETH,
- LRG_THORN,
- SML_THORN,
-#endif
-#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
- LEFT_DBL_QUOTE,
- RIGHT_DBL_QUOTE,
- INV_EXCLAMATION,
- INV_QUESTION,
-#endif
-#if ENABLED(TOUCH_UI_UTF8_CURRENCY)
- CENT_SIGN,
- POUND_SIGN,
- CURRENCY_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
+ #if ENABLED(TOUCH_UI_UTF8_GERMANIC)
+ SHARP_S,
+ #endif
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ LRG_O_STROKE,
+ SML_O_STROKE,
+ LRG_AE,
+ SML_AE,
+ LRG_ETH,
+ SML_ETH,
+ LRG_THORN,
+ SML_THORN,
+ #endif
+ #if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
+ LEFT_DBL_QUOTE,
+ RIGHT_DBL_QUOTE,
+ INV_EXCLAMATION,
+ INV_QUESTION,
+ #endif
+ #if ENABLED(TOUCH_UI_UTF8_CURRENCY)
+ CENT_SIGN,
+ POUND_SIGN,
+ CURRENCY_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 */
- constexpr int8_t mid_a = 12;
- constexpr int8_t mid_e = 12;
- constexpr int8_t mid_i = 5;
- constexpr int8_t mid_o = 12;
- constexpr int8_t mid_u = 12;
- constexpr int8_t mid_y = 11;
- constexpr int8_t mid_n = 12;
- constexpr int8_t mid_c = 12;
- constexpr int8_t mid_A = 13;
- constexpr int8_t mid_E = 13;
- constexpr int8_t mid_I = 6;
- constexpr int8_t mid_O = 14;
- constexpr int8_t mid_U = 14;
- constexpr int8_t mid_Y = 13;
- constexpr int8_t mid_N = 15;
- constexpr int8_t mid_C = 13;
+ constexpr int8_t mid_a = 12,
+ mid_e = 12,
+ mid_i = 5,
+ mid_o = 12,
+ mid_u = 12,
+ mid_y = 11,
+ mid_n = 12,
+ mid_c = 12,
+ mid_A = 13,
+ mid_E = 13,
+ mid_I = 6,
+ mid_O = 14,
+ mid_U = 14,
+ mid_Y = 13,
+ mid_N = 15,
+ mid_C = 13;
/* Centerline of accent glyphs */
@@ -144,148 +144,148 @@
uint8_t alt_data; // For accented characters, the centerline; else char width
} char_recipe[] = {
{0, 0, NO_DOT_I, 10 },
-#if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
- {UTF8('¡'), 0 , INV_EXCLAMATION, 13 },
-#endif
-#if ENABLED(TOUCH_UI_UTF8_CURRENCY)
- {UTF8('¢'), 0 , CENT_SIGN, 23 },
- {UTF8('£'), 0 , POUND_SIGN, 24 },
- {UTF8('¤'), 0 , CURRENCY_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 },
-#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 },
-#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 },
-#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 },
-#endif
- {UTF8('À'), 'A', GRAVE, mid_A},
- {UTF8('Á'), 'A', ACUTE, mid_A},
- {UTF8('Â'), 'A', CIRCUMFLEX, mid_A},
- {UTF8('Ã'), 'A', TILDE, mid_A},
- {UTF8('Ä'), 'A', DIAERESIS, mid_A},
- {UTF8('Å'), 'A', DOT_ABOVE, mid_A},
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- {UTF8('Æ'), 0 , LRG_AE, 40},
-#endif
- {UTF8('Ç'), 'C', CEDILLA, mid_C},
- {UTF8('È'), 'E', GRAVE, mid_E},
- {UTF8('É'), 'E', ACUTE, mid_E},
- {UTF8('Ê'), 'E', CIRCUMFLEX, mid_E},
- {UTF8('Ë'), 'E', DIAERESIS, mid_E},
- {UTF8('Ì'), 'I', GRAVE, mid_I},
- {UTF8('Í'), 'I', ACUTE, mid_I},
- {UTF8('Î'), 'I', CIRCUMFLEX, mid_I},
- {UTF8('Ï'), 'I', DIAERESIS, mid_I},
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- {UTF8('Ð'), 0, LRG_ETH, 31 },
-#endif
- {UTF8('Ñ'), 'N', TILDE, mid_N},
- {UTF8('Ò'), 'O', GRAVE, mid_O},
- {UTF8('Ó'), 'O', ACUTE, mid_O},
- {UTF8('Ô'), 'O', CIRCUMFLEX, mid_O},
- {UTF8('Õ'), 'O', TILDE, 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 },
-#endif
- {UTF8('Ù'), 'U', GRAVE, mid_U},
- {UTF8('Ú'), 'U', ACUTE, mid_U},
- {UTF8('Û'), 'U', CIRCUMFLEX, mid_U},
- {UTF8('Ü'), 'U', DIAERESIS, mid_U},
- {UTF8('Ý'), 'Y', ACUTE, mid_Y},
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- {UTF8('Þ'), 0 , LRG_THORN, 25 },
-#endif
-#if ENABLED(TOUCH_UI_UTF8_GERMANIC)
- {UTF8('ß'), 0 , SHARP_S, 26 },
-#endif
- {UTF8('à'), 'a', GRAVE, mid_a},
- {UTF8('á'), 'a', ACUTE, mid_a},
- {UTF8('â'), 'a', CIRCUMFLEX, mid_a},
- {UTF8('ã'), 'a', TILDE, mid_a},
- {UTF8('ä'), 'a', DIAERESIS, mid_a},
- {UTF8('å'), 'a', DOT_ABOVE, mid_a},
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- {UTF8('æ'), 0 , SML_AE, 40 },
-#endif
- {UTF8('ç'), 'c', CEDILLA, mid_c},
- {UTF8('è'), 'e', GRAVE, mid_e},
- {UTF8('é'), 'e', ACUTE, mid_e},
- {UTF8('ê'), 'e', CIRCUMFLEX, mid_e},
- {UTF8('ë'), 'e', DIAERESIS, mid_e},
- {UTF8('ì'), 'i', GRAVE, mid_i},
- {UTF8('í'), 'i', ACUTE, mid_i},
- {UTF8('î'), 'i', CIRCUMFLEX, mid_i},
- {UTF8('ï'), 'i', DIAERESIS, mid_i},
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- {UTF8('ð'), 0, SML_ETH, 24 },
-#endif
- {UTF8('ñ'), 'n', TILDE, mid_n},
- {UTF8('ò'), 'o', GRAVE, mid_o},
- {UTF8('ó'), 'o', ACUTE, mid_o},
- {UTF8('ô'), 'o', CIRCUMFLEX, mid_o},
- {UTF8('õ'), 'o', TILDE, 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 },
-#endif
- {UTF8('ù'), 'u', GRAVE, mid_u},
- {UTF8('ú'), 'u', ACUTE, mid_u},
- {UTF8('û'), 'u', CIRCUMFLEX, mid_u},
- {UTF8('ü'), 'u', DIAERESIS, mid_u},
- {UTF8('ý'), 'y', ACUTE, mid_y},
-#if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
- {UTF8('þ'), 0 , SML_THORN, 25 },
-#endif
+ #if ENABLED(TOUCH_UI_UTF8_PUNCTUATION)
+ {UTF8('¡'), 0 , INV_EXCLAMATION, 13 },
+ #endif
+ #if ENABLED(TOUCH_UI_UTF8_CURRENCY)
+ {UTF8('¢'), 0 , CENT_SIGN, 23 },
+ {UTF8('£'), 0 , POUND_SIGN, 24 },
+ {UTF8('¤'), 0 , CURRENCY_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 },
+ #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 },
+ #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 },
+ #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 },
+ #endif
+ {UTF8('À'), 'A', GRAVE, mid_A},
+ {UTF8('Á'), 'A', ACUTE, mid_A},
+ {UTF8('Â'), 'A', CIRCUMFLEX, mid_A},
+ {UTF8('Ã'), 'A', TILDE, mid_A},
+ {UTF8('Ä'), 'A', DIAERESIS, mid_A},
+ {UTF8('Å'), 'A', DOT_ABOVE, mid_A},
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ {UTF8('Æ'), 0 , LRG_AE, 40},
+ #endif
+ {UTF8('Ç'), 'C', CEDILLA, mid_C},
+ {UTF8('È'), 'E', GRAVE, mid_E},
+ {UTF8('É'), 'E', ACUTE, mid_E},
+ {UTF8('Ê'), 'E', CIRCUMFLEX, mid_E},
+ {UTF8('Ë'), 'E', DIAERESIS, mid_E},
+ {UTF8('Ì'), 'I', GRAVE, mid_I},
+ {UTF8('Í'), 'I', ACUTE, mid_I},
+ {UTF8('Î'), 'I', CIRCUMFLEX, mid_I},
+ {UTF8('Ï'), 'I', DIAERESIS, mid_I},
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ {UTF8('Ð'), 0, LRG_ETH, 31 },
+ #endif
+ {UTF8('Ñ'), 'N', TILDE, mid_N},
+ {UTF8('Ò'), 'O', GRAVE, mid_O},
+ {UTF8('Ó'), 'O', ACUTE, mid_O},
+ {UTF8('Ô'), 'O', CIRCUMFLEX, mid_O},
+ {UTF8('Õ'), 'O', TILDE, 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 },
+ #endif
+ {UTF8('Ù'), 'U', GRAVE, mid_U},
+ {UTF8('Ú'), 'U', ACUTE, mid_U},
+ {UTF8('Û'), 'U', CIRCUMFLEX, mid_U},
+ {UTF8('Ü'), 'U', DIAERESIS, mid_U},
+ {UTF8('Ý'), 'Y', ACUTE, mid_Y},
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ {UTF8('Þ'), 0 , LRG_THORN, 25 },
+ #endif
+ #if ENABLED(TOUCH_UI_UTF8_GERMANIC)
+ {UTF8('ß'), 0 , SHARP_S, 26 },
+ #endif
+ {UTF8('à'), 'a', GRAVE, mid_a},
+ {UTF8('á'), 'a', ACUTE, mid_a},
+ {UTF8('â'), 'a', CIRCUMFLEX, mid_a},
+ {UTF8('ã'), 'a', TILDE, mid_a},
+ {UTF8('ä'), 'a', DIAERESIS, mid_a},
+ {UTF8('å'), 'a', DOT_ABOVE, mid_a},
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ {UTF8('æ'), 0 , SML_AE, 40 },
+ #endif
+ {UTF8('ç'), 'c', CEDILLA, mid_c},
+ {UTF8('è'), 'e', GRAVE, mid_e},
+ {UTF8('é'), 'e', ACUTE, mid_e},
+ {UTF8('ê'), 'e', CIRCUMFLEX, mid_e},
+ {UTF8('ë'), 'e', DIAERESIS, mid_e},
+ {UTF8('ì'), 'i', GRAVE, mid_i},
+ {UTF8('í'), 'i', ACUTE, mid_i},
+ {UTF8('î'), 'i', CIRCUMFLEX, mid_i},
+ {UTF8('ï'), 'i', DIAERESIS, mid_i},
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ {UTF8('ð'), 0, SML_ETH, 24 },
+ #endif
+ {UTF8('ñ'), 'n', TILDE, mid_n},
+ {UTF8('ò'), 'o', GRAVE, mid_o},
+ {UTF8('ó'), 'o', ACUTE, mid_o},
+ {UTF8('ô'), 'o', CIRCUMFLEX, mid_o},
+ {UTF8('õ'), 'o', TILDE, 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 },
+ #endif
+ {UTF8('ù'), 'u', GRAVE, mid_u},
+ {UTF8('ú'), 'u', ACUTE, mid_u},
+ {UTF8('û'), 'u', CIRCUMFLEX, mid_u},
+ {UTF8('ü'), 'u', DIAERESIS, mid_u},
+ {UTF8('ý'), 'y', ACUTE, mid_y},
+ #if ENABLED(TOUCH_UI_UTF8_SCANDINAVIAN)
+ {UTF8('þ'), 0 , SML_THORN, 25 },
+ #endif
{UTF8('ÿ'), 'y', DIAERESIS, mid_y}
};
@@ -424,7 +424,8 @@
accent_char = 0;
if (c == UTF8('°'))
x -= fs.scale(deg_sign_leading);
- } else {
+ }
+ else {
// Regular character with accent:
accent_dx = alt_data - mid_accent;
accent_dy = isupper(std_char) ? -7 : 0;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
index 9f531146e1..22260801b3 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extras/poly_ui.h
@@ -92,7 +92,8 @@ class PolyReader {
close_loop();
else
p = NULL;
- } else {
+ }
+ else {
x = pgm_read_word_far(p++);
if (x == eol)
close_loop();
@@ -225,7 +226,8 @@ class DeduplicatedPolyReader : public POLY_READER {
} while (POLY_READER::x == last_x && POLY_READER::y == last_y && !POLY_READER::end_of_loop());
if (POLY_READER::end_of_loop()) {
last_x = last_y = eol;
- } else {
+ }
+ else {
last_x = POLY_READER::x;
last_y = POLY_READER::y;
}
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
index 3e3f1d48a2..37f4e6e06d 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/base_numeric_adjustment_screen.cpp
@@ -73,13 +73,13 @@ void BaseNumericAdjustmentScreen::widgets_t::_button_style(CommandProcessor &cmd
const btn_colors *old_colors = &normal_btn;
const btn_colors *new_colors = &normal_btn;
- switch(_style) {
+ switch (_style) {
case BTN_ACTION: old_colors = &action_btn; break;
case BTN_TOGGLE: old_colors = &ui_toggle; break;
case BTN_DISABLED: old_colors = &disabled_btn; break;
default: break;
}
- switch(style) {
+ switch (style) {
case BTN_ACTION: new_colors = &action_btn; break;
case BTN_TOGGLE: new_colors = &ui_toggle; break;
case BTN_DISABLED: new_colors = &disabled_btn; break;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
index 4013065086..1f928db6f6 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/bio_printing_dialog_box.cpp
@@ -102,12 +102,11 @@ bool BioPrintingDialogBox::onTouchEnd(uint8_t tag) {
case 1: GOTO_SCREEN(FeedratePercentScreen); break;
case 2: GOTO_SCREEN(TuneMenu); break;
case 3:
- if (isPrinting()) {
- GOTO_SCREEN(ConfirmAbortPrintDialogBox);
- } else {
- GOTO_SCREEN(StatusScreen);
- }
- break;
+ if (isPrinting())
+ GOTO_SCREEN(ConfirmAbortPrintDialogBox);
+ else
+ GOTO_SCREEN(StatusScreen);
+ break;
default: return false;
}
return true;
@@ -136,9 +135,8 @@ void BioPrintingDialogBox::setStatusMessage(const char* message) {
SERIAL_ECHOLNPAIR("New status message: ", message);
#endif
- if (AT_SCREEN(BioPrintingDialogBox)) {
+ if (AT_SCREEN(BioPrintingDialogBox))
current_screen.onRefresh();
- }
}
void BioPrintingDialogBox::onIdle() {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
index 654fdba0b2..7573bce336 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/files_screen.cpp
@@ -114,7 +114,8 @@ void FilesScreen::drawFileList() {
for(uint8_t i = 0; i < files_per_page; i++, fileIndex++) {
if (files.seek(fileIndex)) {
drawFileButton(files.filename(), getTagForLine(i), files.isDir(), false);
- } else {
+ }
+ else {
break;
}
}
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
index f012a2218b..8f583356e0 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/lock_screen.cpp
@@ -72,19 +72,11 @@ void LockScreen::onRedraw(draw_mode_t what) {
message = GET_TEXT_F(MSG_PASSCODE_ACCEPTED);
break;
default:
- if (passcode == 0) {
- message = GET_TEXT_F(MSG_PASSCODE_SELECT);
- } else {
- message = GET_TEXT_F(MSG_PASSCODE_REQUEST);
- }
+ message = passcode ? GET_TEXT_F(MSG_PASSCODE_REQUEST) : GET_TEXT_F(MSG_PASSCODE_SELECT);
}
message_style() = '\0'; // Terminate the string.
- #ifdef TOUCH_UI_PORTRAIT
- constexpr uint8_t l = 6;
- #else
- constexpr uint8_t l = 3;
- #endif
+ constexpr uint8_t l = TERN(TOUCH_UI_PORTRAIT, 6, 3);
const uint8_t pressed = EventLoop::get_pressed_tag();
@@ -144,7 +136,8 @@ void LockScreen::onPasscodeEntered() {
onRefresh();
sound.play(twinkle, PLAY_SYNCHRONOUS);
GOTO_PREVIOUS();
- } else {
+ }
+ else {
message_style() = 'w';
onRefresh();
sound.play(sad_trombone, PLAY_SYNCHRONOUS);
@@ -162,7 +155,8 @@ bool LockScreen::onTouchEnd(uint8_t tag) {
// Backspace deletes previous entered characters.
*--c = '_';
}
- } else {
+ }
+ else {
// Append character to passcode
*c++ = tag;
if (*c == '\0') {
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
index d806c88ef5..41589dbd11 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/status_screen.cpp
@@ -380,7 +380,8 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
case 4:
if (isPrinting()) {
GOTO_SCREEN(TuneMenu);
- } else {
+ }
+ else {
GOTO_SCREEN(MainMenu);
}
break;
@@ -394,7 +395,8 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
#else
return false;
#endif
- } else {
+ }
+ else {
GOTO_SCREEN(MoveAxisScreen);
}
break;
diff --git a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
index b5e9263efa..795878f131 100644
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
@@ -123,7 +123,8 @@ void StressTestScreen::onIdle() {
if (!isPositionKnown()) {
extern const char G28_STR[];
injectCommands_P(G28_STR);
- } else {
+ }
+ else {
injectCommands_P(PSTR(
"G0 X100 Y100 Z100 F6000\n"
"T0\nG4 S1"