From 061a6df122454988ba8c9ddf7a418435be230406 Mon Sep 17 00:00:00 2001 From: Fju Date: Fri, 18 Jun 2021 07:06:34 +0200 Subject: [PATCH] Updated source files to version 1.0.1 --- README.rst | 9 ++ core-fw/src/control/sequence.c | 3 +- display-fw/TouchGFX/VPO-display.touchgfx | 37 ++--- display-fw/TouchGFX/assets/texts/texts.xlsx | Bin 21136 -> 21183 bytes .../generated/fonts/UnicodeListarial_14_4.txt | 2 +- .../generated/fonts/UnicodeListarial_16_4.txt | 33 +++++ .../generated/fonts/UnicodeListarial_20_4.txt | 1 + .../fonts/cache/ApplicationFontProvider.cache | 2 +- .../cache/ApplicationFontProviderHpp.cache | 2 +- .../fonts/cache/Font_arial_14_4bppCpp.cache | 2 +- .../fonts/cache/Font_arial_16_4bppCpp.cache | 35 +++++ .../include/fonts/ApplicationFontProvider.hpp | 14 +- .../fonts/src/ApplicationFontProvider.cpp | 3 + .../fonts/src/Font_arial_14_4bpp_0.cpp | 9 +- .../fonts/src/Font_arial_16_4bpp_0.cpp | 140 ++++++++++++++++++ .../fonts/src/Kerning_arial_16_4bpp.cpp | 11 ++ .../fonts/src/Table_arial_14_4bpp.cpp | 72 ++++----- .../fonts/src/Table_arial_16_4bpp.cpp | 58 ++++++++ .../src/menu_screen/menuViewBase.cpp | 10 +- .../texts/cache/LanguageCpp_Gb.cache | 2 +- .../texts/cache/TextKeysAndLanguages.cache | 2 +- .../generated/texts/cache/TextsCpp.cache | 2 +- .../texts/cache/TypedTextDatabaseCpp.cache | 2 +- .../include/texts/TextKeysAndLanguages.hpp | 3 +- .../generated/texts/src/LanguageGb.cpp | 109 +++++++------- .../TouchGFX/generated/texts/src/Texts.cpp | 75 +++++----- .../generated/texts/src/TypedTextDatabase.cpp | 16 +- .../msvs/Application.vcxproj.filters | 2 +- 28 files changed, 472 insertions(+), 184 deletions(-) create mode 100644 display-fw/TouchGFX/generated/fonts/UnicodeListarial_16_4.txt create mode 100644 display-fw/TouchGFX/generated/fonts/cache/Font_arial_16_4bppCpp.cache create mode 100644 display-fw/TouchGFX/generated/fonts/src/Font_arial_16_4bpp_0.cpp create mode 100644 display-fw/TouchGFX/generated/fonts/src/Kerning_arial_16_4bpp.cpp create mode 100644 display-fw/TouchGFX/generated/fonts/src/Table_arial_16_4bpp.cpp diff --git a/README.rst b/README.rst index b487b3a1..cf5fc016 100644 --- a/README.rst +++ b/README.rst @@ -30,3 +30,12 @@ In general you have to loosely follow these steps to build and sign images for t 7. (Option 2) Sign the images by running ``sign_all_images.sh`` from the tools folder of the display bootloader. 8. (Option 2) Copy the signed (without _unsigned) `.BIN` files onto an SD card. And flash using the bootloader. +##################### +Flashing +##################### + +##################### +Display +##################### + +Flash the display with the STM32CubeProgrammer, as external Loader use the MT25QL128A_STM32469I-DK. Flash the Bootloader and then the Display.hex File diff --git a/core-fw/src/control/sequence.c b/core-fw/src/control/sequence.c index a85f6d09..6b7f51f9 100644 --- a/core-fw/src/control/sequence.c +++ b/core-fw/src/control/sequence.c @@ -141,6 +141,7 @@ static void seq_fsm() { vpo_log("Profile in preheat"); seq_state = SEQ_GENERATE_VAPOUR; } else { + vpo_log("profile aborted - in preheat"); seq_state = SEQ_IDLE; } break; @@ -208,7 +209,7 @@ static int safety_checks() { rc = 0; //check if lid is closed - if (lid_axis.encoder->position > 200) + if (!lid_control_lid_closed()) rc = 0; return rc; diff --git a/display-fw/TouchGFX/VPO-display.touchgfx b/display-fw/TouchGFX/VPO-display.touchgfx index f19f722c..45bcaabf 100644 --- a/display-fw/TouchGFX/VPO-display.touchgfx +++ b/display-fw/TouchGFX/VPO-display.touchgfx @@ -342,7 +342,6 @@ "AutoSize": true, "LineSpacing": 0, "Wildcard1": { - "TextId": "SingleUseId34", "UseBuffer": true, "BufferSize": 4 }, @@ -351,10 +350,10 @@ "BufferSize": 2 }, "Name": "galden_tmp", - "X": 594, - "Y": 41, - "Width": 109, - "Height": 17, + "X": 593, + "Y": 53, + "Width": 107, + "Height": 19, "Visible": true, "LockPosition": false, "Draggable": false, @@ -367,8 +366,8 @@ "RelativeFilename": "drop.png", "Alpha": 150, "Name": "galden", - "X": 549, - "Y": 31, + "X": 553, + "Y": 43, "Width": 36, "Height": 36, "Visible": true, @@ -559,10 +558,10 @@ "BufferSize": 2 }, "Name": "watersystem_tmp", - "X": 173, - "Y": 41, - "Width": 178, - "Height": 17, + "X": 118, + "Y": 52, + "Width": 172, + "Height": 19, "Visible": true, "LockPosition": false, "Draggable": false, @@ -581,8 +580,8 @@ "LoopEnabled": true, "AnimationEndedCallback": false, "Name": "watersystem", - "X": 126, - "Y": 31, + "X": 69, + "Y": 43, "Width": 36, "Height": 36, "Visible": true, @@ -1576,10 +1575,6 @@ "TextEntryId": "SingleUseId19", "IsResource": false }, - { - "TextEntryId": "SingleUseId20", - "IsResource": false - }, { "TextEntryId": "SingleUseId21", "IsResource": false @@ -1624,10 +1619,6 @@ "TextEntryId": "SingleUseId32", "IsResource": true }, - { - "TextEntryId": "SingleUseId34", - "IsResource": false - }, { "TextEntryId": "SingleUseId37", "IsResource": true @@ -1779,6 +1770,10 @@ { "TextEntryId": "SelftestRunningBody", "IsResource": true + }, + { + "TextEntryId": "SingleUseId20", + "IsResource": false } ], "Name": "STM32F469I-DISCO", diff --git a/display-fw/TouchGFX/assets/texts/texts.xlsx b/display-fw/TouchGFX/assets/texts/texts.xlsx index 20b43cb71bcf56c8dbea2be29870f36f56dd9f2d..9be6fe8a8aacaadd5435c6e45ad61a9f5d0313de 100644 GIT binary patch delta 6706 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 NZ4UI=`wI&I{2wX}DZ&5% diff --git a/display-fw/TouchGFX/generated/fonts/UnicodeListarial_14_4.txt b/display-fw/TouchGFX/generated/fonts/UnicodeListarial_14_4.txt index d99fcc09..d5a6a105 100644 --- a/display-fw/TouchGFX/generated/fonts/UnicodeListarial_14_4.txt +++ b/display-fw/TouchGFX/generated/fonts/UnicodeListarial_14_4.txt @@ -21,7 +21,6 @@ 67 68 70 -71 72 76 78 @@ -30,6 +29,7 @@ 82 83 84 +85 86 97 98 diff --git a/display-fw/TouchGFX/generated/fonts/UnicodeListarial_16_4.txt b/display-fw/TouchGFX/generated/fonts/UnicodeListarial_16_4.txt new file mode 100644 index 00000000..747eb4ce --- /dev/null +++ b/display-fw/TouchGFX/generated/fonts/UnicodeListarial_16_4.txt @@ -0,0 +1,33 @@ +32 +44 +45 +46 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +63 +67 +70 +71 +83 +97 +100 +101 +103 +105 +108 +109 +110 +111 +115 +116 +121 +176 \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/fonts/UnicodeListarial_20_4.txt b/display-fw/TouchGFX/generated/fonts/UnicodeListarial_20_4.txt index ffed3891..6dd43d37 100644 --- a/display-fw/TouchGFX/generated/fonts/UnicodeListarial_20_4.txt +++ b/display-fw/TouchGFX/generated/fonts/UnicodeListarial_20_4.txt @@ -1,3 +1,4 @@ +10 32 45 46 diff --git a/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProvider.cache b/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProvider.cache index 7fcc1826..4038307d 100644 --- a/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProvider.cache +++ b/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProvider.cache @@ -1 +1 @@ -{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4]],"generate_font_format":"0"} \ No newline at end of file +{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4],["text_graph_size","arial.ttf",16,4]],"generate_font_format":"0"} \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProviderHpp.cache b/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProviderHpp.cache index 7fcc1826..4038307d 100644 --- a/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProviderHpp.cache +++ b/display-fw/TouchGFX/generated/fonts/cache/ApplicationFontProviderHpp.cache @@ -1 +1 @@ -{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4]],"generate_font_format":"0"} \ No newline at end of file +{"typographies":[["Default","arial.ttf",20,4],["Large","arial.ttf",40,4],["Small","arial.ttf",10,4],["Medium","arial.ttf",14,4],["VPO_default","arial.ttf",26,4],["text_graph_size","arial.ttf",16,4]],"generate_font_format":"0"} \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/fonts/cache/Font_arial_14_4bppCpp.cache b/display-fw/TouchGFX/generated/fonts/cache/Font_arial_14_4bppCpp.cache index f40d2f23..5c270086 100644 --- a/display-fw/TouchGFX/generated/fonts/cache/Font_arial_14_4bppCpp.cache +++ b/display-fw/TouchGFX/generated/fonts/cache/Font_arial_14_4bppCpp.cache @@ -22,7 +22,6 @@ F0 67 68 70 -71 72 76 78 @@ -31,6 +30,7 @@ F0 82 83 84 +85 86 97 98 diff --git a/display-fw/TouchGFX/generated/fonts/cache/Font_arial_16_4bppCpp.cache b/display-fw/TouchGFX/generated/fonts/cache/Font_arial_16_4bppCpp.cache new file mode 100644 index 00000000..3917a48d --- /dev/null +++ b/display-fw/TouchGFX/generated/fonts/cache/Font_arial_16_4bppCpp.cache @@ -0,0 +1,35 @@ +BA +F0 +32 +44 +45 +46 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +63 +67 +70 +71 +83 +97 +100 +101 +103 +105 +108 +109 +110 +111 +115 +116 +121 +176 diff --git a/display-fw/TouchGFX/generated/fonts/include/fonts/ApplicationFontProvider.hpp b/display-fw/TouchGFX/generated/fonts/include/fonts/ApplicationFontProvider.hpp index 34ab63d8..c2b59551 100644 --- a/display-fw/TouchGFX/generated/fonts/include/fonts/ApplicationFontProvider.hpp +++ b/display-fw/TouchGFX/generated/fonts/include/fonts/ApplicationFontProvider.hpp @@ -18,16 +18,18 @@ struct Typography static const touchgfx::FontId SMALL = 2; static const touchgfx::FontId MEDIUM = 3; static const touchgfx::FontId VPO_DEFAULT = 4; + static const touchgfx::FontId TEXT_GRAPH_SIZE = 5; }; struct TypographyFontIndex { - static const touchgfx::FontId DEFAULT = 0; // arial_20_4bpp - static const touchgfx::FontId LARGE = 1; // arial_40_4bpp - static const touchgfx::FontId SMALL = 2; // arial_10_4bpp - static const touchgfx::FontId MEDIUM = 3; // arial_14_4bpp - static const touchgfx::FontId VPO_DEFAULT = 4; // arial_26_4bpp - static const uint16_t NUMBER_OF_FONTS = 5; + static const touchgfx::FontId DEFAULT = 0; // arial_20_4bpp + static const touchgfx::FontId LARGE = 1; // arial_40_4bpp + static const touchgfx::FontId SMALL = 2; // arial_10_4bpp + static const touchgfx::FontId MEDIUM = 3; // arial_14_4bpp + static const touchgfx::FontId VPO_DEFAULT = 4; // arial_26_4bpp + static const touchgfx::FontId TEXT_GRAPH_SIZE = 5; // arial_16_4bpp + static const uint16_t NUMBER_OF_FONTS = 6; }; class ApplicationFontProvider : public touchgfx::FontProvider diff --git a/display-fw/TouchGFX/generated/fonts/src/ApplicationFontProvider.cpp b/display-fw/TouchGFX/generated/fonts/src/ApplicationFontProvider.cpp index 8a7aeab0..50dbb59d 100644 --- a/display-fw/TouchGFX/generated/fonts/src/ApplicationFontProvider.cpp +++ b/display-fw/TouchGFX/generated/fonts/src/ApplicationFontProvider.cpp @@ -24,6 +24,9 @@ touchgfx::Font* ApplicationFontProvider::getFont(touchgfx::FontId typography) case Typography::VPO_DEFAULT: // arial_26_4bpp return const_cast(TypedTextDatabase::getFonts()[4]); + case Typography::TEXT_GRAPH_SIZE: + // arial_16_4bpp + return const_cast(TypedTextDatabase::getFonts()[5]); default: return 0; } diff --git a/display-fw/TouchGFX/generated/fonts/src/Font_arial_14_4bpp_0.cpp b/display-fw/TouchGFX/generated/fonts/src/Font_arial_14_4bpp_0.cpp index f731c236..5f3d5b8a 100644 --- a/display-fw/TouchGFX/generated/fonts/src/Font_arial_14_4bpp_0.cpp +++ b/display-fw/TouchGFX/generated/fonts/src/Font_arial_14_4bpp_0.cpp @@ -81,11 +81,6 @@ KEEP extern const uint8_t unicodes_arial_14_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A 0xFD, 0xFF, 0xFF, 0x0E, 0x9D, 0x44, 0x44, 0x04, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x11, 0x11, 0x00, 0xFD, 0xFF, 0xFF, 0x03, 0x9D, 0x44, 0x44, 0x01, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, 0x7D, 0x00, 0x00, 0x00, - // Unicode: [0x0047] - 0x00, 0x71, 0xED, 0xBE, 0x03, 0x10, 0xEC, 0x46, 0xA5, 0x3F, 0x80, 0x2E, 0x00, 0x00, 0xAA, 0xE0, - 0x07, 0x00, 0x00, 0x11, 0xF2, 0x03, 0x00, 0x00, 0x00, 0xF3, 0x02, 0x40, 0xFF, 0xFF, 0xF2, 0x03, - 0x10, 0x33, 0xF7, 0xE0, 0x07, 0x00, 0x00, 0xF4, 0x80, 0x2E, 0x00, 0x00, 0xF7, 0x10, 0xEC, 0x58, - 0xB6, 0xAF, 0x00, 0x70, 0xEC, 0xBE, 0x05, // Unicode: [0x0048] 0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0xFD, 0xFF, 0xFF, 0xFF, 0x9D, 0x33, 0x33, 0xF7, 0x7D, 0x00, 0x00, 0xF5, @@ -123,6 +118,10 @@ KEEP extern const uint8_t unicodes_arial_14_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_A 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x60, 0x0E, 0x00, 0x00, + // Unicode: [0x0055] + 0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, + 0x6E, 0x00, 0x00, 0xF5, 0x6E, 0x00, 0x00, 0xF5, 0x7D, 0x00, 0x00, 0xF5, 0x8C, 0x00, 0x00, 0xE6, + 0xCA, 0x00, 0x00, 0xBB, 0xF3, 0x5B, 0xA6, 0x4F, 0x40, 0xEB, 0xCE, 0x04, // Unicode: [0x0056] 0xAB, 0x00, 0x00, 0x40, 0x1F, 0xE6, 0x00, 0x00, 0xA0, 0x0A, 0xF1, 0x05, 0x00, 0xE0, 0x05, 0xB0, 0x0A, 0x00, 0xE5, 0x01, 0x50, 0x0E, 0x00, 0x9A, 0x00, 0x10, 0x4E, 0x00, 0x4E, 0x00, 0x00, 0x9A, diff --git a/display-fw/TouchGFX/generated/fonts/src/Font_arial_16_4bpp_0.cpp b/display-fw/TouchGFX/generated/fonts/src/Font_arial_16_4bpp_0.cpp new file mode 100644 index 00000000..5b269b0f --- /dev/null +++ b/display-fw/TouchGFX/generated/fonts/src/Font_arial_16_4bpp_0.cpp @@ -0,0 +1,140 @@ +#include + +FONT_GLYPH_LOCATION_FLASH_PRAGMA +KEEP extern const uint8_t unicodes_arial_16_4bpp_0[] FONT_GLYPH_LOCATION_FLASH_ATTRIBUTE = +{ + // Unicode: [0x0020] + // (Has no glyph data) + // Unicode: [0x002C] + 0xB6, 0xF9, 0xC0, 0xA5, 0x12, + // Unicode: [0x002D] + 0x84, 0x88, 0x06, 0xF7, 0xFF, 0x0C, + // Unicode: [0x002E] + 0xB6, 0x01, 0xF8, 0x01, + // Unicode: [0x0030] + 0x00, 0xD5, 0xCF, 0x04, 0x00, 0x50, 0x8F, 0xA5, 0x3F, 0x00, 0xD0, 0x0A, 0x00, 0xAC, 0x00, 0xF1, + 0x05, 0x00, 0xE8, 0x00, 0xF4, 0x03, 0x00, 0xF6, 0x01, 0xF5, 0x02, 0x00, 0xF5, 0x02, 0xF5, 0x02, + 0x00, 0xF5, 0x02, 0xF4, 0x03, 0x00, 0xF6, 0x01, 0xF2, 0x05, 0x00, 0xE8, 0x00, 0xD0, 0x09, 0x00, + 0xAC, 0x00, 0x60, 0x8F, 0xA4, 0x3F, 0x00, 0x00, 0xD6, 0xCF, 0x04, 0x00, + // Unicode: [0x0031] + 0x00, 0x40, 0x0F, 0x00, 0xE3, 0x0F, 0x60, 0xEE, 0x0F, 0xE4, 0x77, 0x0F, 0x11, 0x70, 0x0F, 0x00, + 0x70, 0x0F, 0x00, 0x70, 0x0F, 0x00, 0x70, 0x0F, 0x00, 0x70, 0x0F, 0x00, 0x70, 0x0F, 0x00, 0x70, + 0x0F, 0x00, 0x70, 0x0F, + // Unicode: [0x0032] + 0x00, 0xD7, 0xDE, 0x06, 0x00, 0x80, 0x7E, 0x84, 0x7F, 0x00, 0xF1, 0x07, 0x00, 0xD9, 0x00, 0x81, + 0x02, 0x00, 0xF7, 0x00, 0x00, 0x00, 0x00, 0xCB, 0x00, 0x00, 0x00, 0x60, 0x5F, 0x00, 0x00, 0x00, + 0xF6, 0x08, 0x00, 0x00, 0x70, 0x8F, 0x00, 0x00, 0x00, 0xF8, 0x06, 0x00, 0x00, 0x70, 0x5F, 0x00, + 0x00, 0x00, 0xF2, 0x7C, 0x77, 0x77, 0x00, 0xF6, 0xFF, 0xFF, 0xFF, 0x01, + // Unicode: [0x0033] + 0x00, 0xD7, 0xBE, 0x03, 0x00, 0x80, 0x7E, 0xA4, 0x2E, 0x00, 0xE1, 0x07, 0x00, 0x8E, 0x00, 0x30, + 0x01, 0x00, 0x8E, 0x00, 0x00, 0x00, 0x81, 0x3F, 0x00, 0x00, 0x70, 0xFF, 0x08, 0x00, 0x00, 0x20, + 0x73, 0x8F, 0x00, 0x00, 0x00, 0x00, 0xF8, 0x01, 0x61, 0x01, 0x00, 0xF5, 0x02, 0xF2, 0x07, 0x00, + 0xEA, 0x00, 0x90, 0x7E, 0x94, 0x6F, 0x00, 0x00, 0xD8, 0xCF, 0x05, 0x00, + // Unicode: [0x0034] + 0x00, 0x00, 0xD1, 0x09, 0x00, 0x00, 0x00, 0xF8, 0x09, 0x00, 0x00, 0x30, 0xEE, 0x09, 0x00, 0x00, + 0xD0, 0xC7, 0x09, 0x00, 0x00, 0xC8, 0xC0, 0x09, 0x00, 0x30, 0x3F, 0xC0, 0x09, 0x00, 0xD0, 0x08, + 0xC0, 0x09, 0x00, 0xD8, 0x12, 0xD1, 0x19, 0x00, 0xFC, 0xFF, 0xFF, 0xFF, 0x02, 0x43, 0x44, 0xD4, + 0x4A, 0x01, 0x00, 0x00, 0xC0, 0x09, 0x00, 0x00, 0x00, 0xC0, 0x09, 0x00, + // Unicode: [0x0035] + 0x10, 0xFF, 0xFF, 0xBF, 0x00, 0x40, 0x7F, 0x66, 0x56, 0x00, 0x60, 0x0E, 0x00, 0x00, 0x00, 0x90, + 0x0B, 0x00, 0x00, 0x00, 0xC0, 0xCC, 0xEF, 0x08, 0x00, 0xE0, 0x6E, 0x94, 0x9F, 0x00, 0x50, 0x03, + 0x00, 0xF9, 0x01, 0x00, 0x00, 0x00, 0xF4, 0x04, 0x61, 0x01, 0x00, 0xF5, 0x02, 0xF2, 0x07, 0x00, + 0xDA, 0x00, 0xA0, 0x7E, 0x94, 0x5F, 0x00, 0x00, 0xD8, 0xCF, 0x05, 0x00, + // Unicode: [0x0036] + 0x00, 0xC4, 0xDF, 0x07, 0x00, 0x40, 0x9F, 0x74, 0x7F, 0x00, 0xC0, 0x0A, 0x00, 0xB8, 0x00, 0xF1, + 0x04, 0x00, 0x00, 0x00, 0xF4, 0xB3, 0xEF, 0x08, 0x00, 0xF5, 0x8D, 0x95, 0x7F, 0x00, 0xF6, 0x09, + 0x00, 0xE9, 0x00, 0xF5, 0x04, 0x00, 0xF5, 0x02, 0xF3, 0x04, 0x00, 0xF5, 0x02, 0xE0, 0x0A, 0x00, + 0xDA, 0x00, 0x60, 0x8F, 0x84, 0x5F, 0x00, 0x00, 0xC5, 0xDF, 0x06, 0x00, + // Unicode: [0x0037] + 0xF4, 0xFF, 0xFF, 0xFF, 0x03, 0x61, 0x66, 0x66, 0xDE, 0x01, 0x00, 0x00, 0x60, 0x3F, 0x00, 0x00, + 0x00, 0xE1, 0x08, 0x00, 0x00, 0x00, 0xE9, 0x01, 0x00, 0x00, 0x10, 0x8F, 0x00, 0x00, 0x00, 0x70, + 0x1F, 0x00, 0x00, 0x00, 0xC0, 0x0B, 0x00, 0x00, 0x00, 0xF1, 0x06, 0x00, 0x00, 0x00, 0xF5, 0x02, + 0x00, 0x00, 0x00, 0xF7, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x00, 0x00, 0x00, + // Unicode: [0x0038] + 0x00, 0xD7, 0xCE, 0x04, 0x00, 0x60, 0x8F, 0xA4, 0x3F, 0x00, 0xC0, 0x0A, 0x00, 0x9D, 0x00, 0xC0, + 0x09, 0x00, 0xAC, 0x00, 0x60, 0x4E, 0x61, 0x5F, 0x00, 0x00, 0xFA, 0xFF, 0x08, 0x00, 0xB0, 0x6E, + 0x84, 0x6F, 0x00, 0xF3, 0x05, 0x00, 0xE8, 0x01, 0xF5, 0x02, 0x00, 0xF4, 0x03, 0xF3, 0x05, 0x00, + 0xF7, 0x01, 0xA0, 0x6E, 0x74, 0x8F, 0x00, 0x00, 0xD8, 0xCF, 0x06, 0x00, + // Unicode: [0x0039] + 0x00, 0xE8, 0xBE, 0x03, 0x00, 0xA0, 0x7F, 0x84, 0x3E, 0x00, 0xF2, 0x07, 0x00, 0xBA, 0x00, 0xF5, + 0x02, 0x00, 0xF6, 0x01, 0xF3, 0x04, 0x00, 0xF8, 0x02, 0xC0, 0x4D, 0x62, 0xFE, 0x03, 0x20, 0xFC, + 0xDF, 0xF6, 0x02, 0x00, 0x20, 0x03, 0xF6, 0x01, 0x50, 0x02, 0x00, 0xD8, 0x00, 0xE0, 0x07, 0x10, + 0x9E, 0x00, 0x80, 0x6E, 0xC4, 0x2E, 0x00, 0x00, 0xD8, 0xBE, 0x02, 0x00, + // Unicode: [0x003A] + 0xF8, 0x01, 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x00, + 0xF8, 0x01, + // Unicode: [0x003F] + 0x00, 0xD7, 0xCE, 0x06, 0x00, 0x90, 0x7F, 0x84, 0x7F, 0x00, 0xF1, 0x08, 0x00, 0xE9, 0x00, 0x82, + 0x02, 0x00, 0xF6, 0x01, 0x00, 0x00, 0x10, 0xBC, 0x00, 0x00, 0x00, 0xB1, 0x2E, 0x00, 0x00, 0x00, + 0xEA, 0x02, 0x00, 0x00, 0x20, 0x5F, 0x00, 0x00, 0x00, 0x40, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x01, + 0x00, 0x00, 0x00, 0x40, 0x2B, 0x00, 0x00, 0x00, 0x60, 0x3F, 0x00, 0x00, + // Unicode: [0x0043] + 0x00, 0x40, 0xEB, 0xCE, 0x06, 0x00, 0x00, 0xF8, 0x7B, 0xA6, 0xAF, 0x00, 0x50, 0x7F, 0x00, 0x00, + 0xF7, 0x05, 0xC0, 0x0D, 0x00, 0x00, 0xA0, 0x05, 0xF1, 0x08, 0x00, 0x00, 0x00, 0x00, 0xF2, 0x06, + 0x00, 0x00, 0x00, 0x00, 0xF2, 0x06, 0x00, 0x00, 0x00, 0x00, 0xF1, 0x08, 0x00, 0x00, 0x20, 0x01, + 0xB0, 0x0C, 0x00, 0x00, 0xD0, 0x0B, 0x50, 0x7F, 0x00, 0x00, 0xF7, 0x05, 0x00, 0xF9, 0x7B, 0xB7, + 0x9F, 0x00, 0x00, 0x60, 0xEC, 0xCE, 0x06, 0x00, + // Unicode: [0x0046] + 0xFA, 0xFF, 0xFF, 0xFF, 0x01, 0xEA, 0x77, 0x77, 0x77, 0x00, 0xCA, 0x00, 0x00, 0x00, 0x00, 0xCA, + 0x00, 0x00, 0x00, 0x00, 0xDA, 0x22, 0x22, 0x02, 0x00, 0xFA, 0xFF, 0xFF, 0x3F, 0x00, 0xDA, 0x55, + 0x55, 0x15, 0x00, 0xCA, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x00, 0x00, + 0x00, 0x00, 0xCA, 0x00, 0x00, 0x00, 0x00, 0xCA, 0x00, 0x00, 0x00, 0x00, + // Unicode: [0x0047] + 0x00, 0x30, 0xDA, 0xEF, 0x3A, 0x00, 0x00, 0xF6, 0x8D, 0x76, 0xFD, 0x05, 0x30, 0xAF, 0x00, 0x00, + 0xB0, 0x0E, 0xA0, 0x1E, 0x00, 0x00, 0x30, 0x2A, 0xE0, 0x09, 0x00, 0x00, 0x00, 0x00, 0xF1, 0x07, + 0x00, 0x21, 0x22, 0x12, 0xF1, 0x07, 0x00, 0xF6, 0xFF, 0x7F, 0xF0, 0x09, 0x00, 0x42, 0x54, 0x7F, + 0xA0, 0x1E, 0x00, 0x00, 0x00, 0x7F, 0x30, 0xAF, 0x01, 0x00, 0x50, 0x7F, 0x00, 0xF6, 0x9E, 0x87, + 0xFC, 0x2C, 0x00, 0x20, 0xD9, 0xEF, 0x5B, 0x00, + // Unicode: [0x0053] + 0x00, 0xB4, 0xFE, 0x8D, 0x01, 0x40, 0xCF, 0x78, 0xFA, 0x0B, 0xB0, 0x0C, 0x00, 0x50, 0x4F, 0xC0, + 0x0B, 0x00, 0x00, 0x49, 0x70, 0x9F, 0x03, 0x00, 0x00, 0x00, 0xE7, 0xEF, 0x6B, 0x00, 0x00, 0x00, + 0x84, 0xFC, 0x1D, 0x00, 0x00, 0x00, 0x30, 0x9E, 0xF3, 0x04, 0x00, 0x00, 0xCA, 0xE0, 0x1C, 0x00, + 0x10, 0xAD, 0x50, 0xDF, 0x79, 0xD9, 0x2E, 0x00, 0xA4, 0xFE, 0xAE, 0x02, + // Unicode: [0x0061] + 0x10, 0xD9, 0xEF, 0x19, 0x00, 0xB0, 0x6D, 0x74, 0x8F, 0x00, 0xB1, 0x05, 0x00, 0xBB, 0x00, 0x00, + 0x20, 0x74, 0xCD, 0x00, 0x50, 0xFD, 0xBE, 0xCD, 0x00, 0xF3, 0x29, 0x00, 0xCA, 0x00, 0xF6, 0x02, + 0x10, 0xCE, 0x00, 0xF3, 0x3A, 0xB4, 0xCF, 0x00, 0x60, 0xFD, 0x9D, 0xF6, 0x01, + // Unicode: [0x0064] + 0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00, 0xBA, 0x00, 0x00, 0x00, 0xBA, 0x00, 0xE9, 0x8E, 0xBA, + 0xA0, 0x6E, 0xC5, 0xBF, 0xF2, 0x06, 0x10, 0xBE, 0xF5, 0x02, 0x00, 0xBA, 0xF6, 0x00, 0x00, 0xB8, + 0xF5, 0x02, 0x00, 0xBA, 0xF2, 0x07, 0x10, 0xBE, 0x90, 0x7F, 0xB5, 0xBE, 0x00, 0xE8, 0x9E, 0xB9, + // Unicode: [0x0065] + 0x00, 0xD7, 0xCF, 0x05, 0x00, 0x80, 0x8F, 0x94, 0x5F, 0x00, 0xF1, 0x08, 0x00, 0xDA, 0x00, 0xF5, + 0x03, 0x00, 0xF5, 0x02, 0xF6, 0xFF, 0xFF, 0xFF, 0x03, 0xF5, 0x35, 0x33, 0x33, 0x01, 0xF2, 0x06, + 0x00, 0xB6, 0x01, 0x90, 0x7E, 0x74, 0x9E, 0x00, 0x00, 0xD7, 0xDF, 0x08, 0x00, + // Unicode: [0x0067] + 0x00, 0xE8, 0x9E, 0xC8, 0xA0, 0x7E, 0xB5, 0xCF, 0xF2, 0x06, 0x10, 0xCE, 0xF6, 0x01, 0x00, 0xC9, + 0xF7, 0x00, 0x00, 0xC8, 0xF5, 0x01, 0x00, 0xC9, 0xF2, 0x06, 0x00, 0xCD, 0x90, 0x6E, 0xB5, 0xCF, + 0x10, 0xE9, 0x9E, 0xCA, 0x61, 0x01, 0x00, 0xAB, 0xE1, 0x4B, 0x94, 0x4F, 0x30, 0xEB, 0xCE, 0x04, + // Unicode: [0x0069] + 0x7E, 0x5A, 0x00, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, + // Unicode: [0x006C] + 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, + // Unicode: [0x006D] + 0x6E, 0xEA, 0x7E, 0xB2, 0xDE, 0x05, 0xEE, 0x27, 0xF8, 0x6D, 0xA2, 0x1E, 0xAE, 0x00, 0xF1, 0x09, + 0x20, 0x4F, 0x8E, 0x00, 0xF0, 0x06, 0x10, 0x4F, 0x7E, 0x00, 0xF0, 0x06, 0x10, 0x4F, 0x7E, 0x00, + 0xF0, 0x06, 0x10, 0x4F, 0x7E, 0x00, 0xF0, 0x06, 0x10, 0x4F, 0x7E, 0x00, 0xF0, 0x06, 0x10, 0x4F, + 0x7E, 0x00, 0xF0, 0x06, 0x10, 0x4F, + // Unicode: [0x006E] + 0x6E, 0xEA, 0x9E, 0x00, 0xFE, 0x27, 0xF5, 0x07, 0xAE, 0x00, 0xB0, 0x0B, 0x7E, 0x00, 0x90, 0x0C, + 0x7E, 0x00, 0x90, 0x0C, 0x7E, 0x00, 0x90, 0x0C, 0x7E, 0x00, 0x90, 0x0C, 0x7E, 0x00, 0x90, 0x0C, + 0x7E, 0x00, 0x90, 0x0C, + // Unicode: [0x006F] + 0x00, 0xD7, 0xDF, 0x06, 0x00, 0x90, 0x7F, 0x94, 0x7F, 0x00, 0xF2, 0x07, 0x00, 0xE9, 0x01, 0xF6, + 0x02, 0x00, 0xF4, 0x04, 0xF7, 0x00, 0x00, 0xF3, 0x04, 0xF6, 0x02, 0x00, 0xF4, 0x03, 0xF2, 0x07, + 0x00, 0xE9, 0x00, 0x90, 0x7F, 0x94, 0x7F, 0x00, 0x00, 0xD8, 0xCF, 0x06, 0x00, + // Unicode: [0x0073] + 0x30, 0xEB, 0xAE, 0x02, 0xE1, 0x4A, 0xD5, 0x0C, 0xF3, 0x03, 0x40, 0x08, 0xE1, 0x8E, 0x04, 0x00, + 0x30, 0xEA, 0xEF, 0x07, 0x00, 0x00, 0xA4, 0x3F, 0xE5, 0x01, 0x20, 0x5F, 0xE1, 0x5B, 0xB4, 0x1E, + 0x30, 0xEB, 0xBE, 0x03, + // Unicode: [0x0074] + 0x40, 0x09, 0x00, 0xA0, 0x0B, 0x00, 0xA0, 0x0B, 0x00, 0xFB, 0xFF, 0x02, 0xB2, 0x2B, 0x00, 0xA0, + 0x0B, 0x00, 0xA0, 0x0B, 0x00, 0xA0, 0x0B, 0x00, 0xA0, 0x0B, 0x00, 0xA0, 0x0B, 0x00, 0x90, 0x6E, + 0x01, 0x30, 0xFD, 0x03, + // Unicode: [0x0079] + 0xE8, 0x00, 0x00, 0xAB, 0xF3, 0x05, 0x10, 0x5F, 0xC0, 0x0A, 0x70, 0x0E, 0x70, 0x1E, 0xC0, 0x09, + 0x10, 0x5F, 0xF2, 0x03, 0x00, 0xAB, 0xD7, 0x00, 0x00, 0xE5, 0x7C, 0x00, 0x00, 0xE0, 0x2F, 0x00, + 0x00, 0xA0, 0x0C, 0x00, 0x00, 0xE0, 0x06, 0x00, 0x71, 0xEB, 0x01, 0x00, 0xE1, 0x4D, 0x00, 0x00, + // Unicode: [0x00B0] + 0xB2, 0x5D, 0x00, 0x4B, 0xC1, 0x02, 0x0D, 0x80, 0x05, 0x4B, 0xC1, 0x02, 0xC2, 0x6D, 0x00 +}; diff --git a/display-fw/TouchGFX/generated/fonts/src/Kerning_arial_16_4bpp.cpp b/display-fw/TouchGFX/generated/fonts/src/Kerning_arial_16_4bpp.cpp new file mode 100644 index 00000000..3dbaaa70 --- /dev/null +++ b/display-fw/TouchGFX/generated/fonts/src/Kerning_arial_16_4bpp.cpp @@ -0,0 +1,11 @@ +#include + +FONT_KERNING_LOCATION_FLASH_PRAGMA +KEEP extern const touchgfx::KerningNode kerning_arial_16_4bpp[] FONT_KERNING_LOCATION_FLASH_ATTRIBUTE = +{ + { 0x0046, -1 }, // (First char = [0x0046, F], Second char = [0x002C, ,], Kerning dist = -1) + { 0x0079, -1 }, // (First char = [0x0079, y], Second char = [0x002C, ,], Kerning dist = -1) + { 0x0046, -1 }, // (First char = [0x0046, F], Second char = [0x002E, .], Kerning dist = -1) + { 0x0079, -1 }, // (First char = [0x0079, y], Second char = [0x002E, .], Kerning dist = -1) + { 0x0031, -1 }, // (First char = [0x0031, 1], Second char = [0x0031, 1], Kerning dist = -1) +}; diff --git a/display-fw/TouchGFX/generated/fonts/src/Table_arial_14_4bpp.cpp b/display-fw/TouchGFX/generated/fonts/src/Table_arial_14_4bpp.cpp index f9ee69b9..83dca128 100644 --- a/display-fw/TouchGFX/generated/fonts/src/Table_arial_14_4bpp.cpp +++ b/display-fw/TouchGFX/generated/fonts/src/Table_arial_14_4bpp.cpp @@ -27,42 +27,42 @@ KEEP extern const touchgfx::GlyphNode glyphs_arial_14_4bpp[] FONT_TABLE_LOCATION { 577, 0x0043, 10, 11, 11, 0, 10, 0, 0, 0x00 }, { 632, 0x0044, 9, 11, 11, 1, 10, 0, 0, 0x00 }, { 687, 0x0046, 7, 11, 11, 1, 9, 0, 0, 0x00 }, - { 731, 0x0047, 10, 11, 11, 0, 11, 0, 0, 0x00 }, - { 786, 0x0048, 8, 11, 11, 1, 10, 0, 0, 0x00 }, - { 830, 0x004C, 7, 11, 11, 1, 8, 0, 0, 0x00 }, - { 874, 0x004E, 8, 11, 11, 1, 10, 0, 0, 0x00 }, - { 918, 0x004F, 11, 11, 11, 0, 11, 0, 0, 0x00 }, - { 984, 0x0050, 8, 11, 11, 1, 9, 0, 0, 0x00 }, - { 1028, 0x0052, 9, 11, 11, 1, 10, 0, 0, 0x00 }, - { 1083, 0x0053, 9, 11, 11, 0, 9, 0, 0, 0x00 }, - { 1138, 0x0054, 9, 11, 11, 0, 9, 17, 2, 0x00 }, - { 1193, 0x0056, 10, 11, 11, 0, 9, 19, 2, 0x00 }, - { 1248, 0x0061, 8, 8, 8, 0, 8, 21, 2, 0x00 }, - { 1280, 0x0062, 8, 11, 11, 0, 8, 0, 0, 0x00 }, - { 1324, 0x0063, 7, 8, 8, 0, 7, 23, 1, 0x00 }, - { 1356, 0x0064, 7, 11, 11, 0, 8, 0, 0, 0x00 }, - { 1400, 0x0065, 8, 8, 8, 0, 8, 24, 1, 0x00 }, - { 1432, 0x0066, 5, 11, 11, 0, 4, 0, 0, 0x00 }, - { 1465, 0x0067, 7, 11, 8, 0, 8, 0, 0, 0x00 }, - { 1509, 0x0068, 7, 11, 11, 0, 8, 0, 0, 0x00 }, - { 1553, 0x0069, 3, 11, 11, 0, 3, 0, 0, 0x00 }, - { 1575, 0x006A, 4, 14, 11, -1, 3, 0, 0, 0x00 }, - { 1603, 0x006B, 7, 11, 11, 0, 7, 0, 0, 0x00 }, - { 1647, 0x006C, 3, 11, 11, 0, 3, 0, 0, 0x00 }, - { 1669, 0x006D, 11, 8, 8, 0, 12, 0, 0, 0x00 }, - { 1717, 0x006E, 7, 8, 8, 0, 8, 0, 0, 0x00 }, - { 1749, 0x006F, 8, 8, 8, 0, 8, 25, 1, 0x00 }, - { 1781, 0x0070, 8, 11, 8, 0, 8, 0, 0, 0x00 }, - { 1825, 0x0071, 7, 11, 8, 0, 8, 0, 0, 0x00 }, - { 1869, 0x0072, 5, 8, 8, 0, 5, 0, 0, 0x00 }, - { 1893, 0x0073, 7, 8, 8, 0, 7, 26, 1, 0x00 }, - { 1925, 0x0074, 4, 11, 11, 0, 4, 0, 0, 0x00 }, - { 1947, 0x0075, 7, 8, 8, 0, 8, 0, 0, 0x00 }, - { 1979, 0x0076, 7, 8, 8, 0, 7, 0, 0, 0x00 }, - { 2011, 0x0077, 10, 8, 8, 0, 10, 0, 0, 0x00 }, - { 2051, 0x0078, 7, 8, 8, 0, 7, 0, 0, 0x00 }, - { 2083, 0x0079, 7, 11, 8, 0, 7, 0, 0, 0x00 }, - { 2127, 0x00B0, 5, 4, 11, 0, 6, 0, 0, 0x00 } + { 731, 0x0048, 8, 11, 11, 1, 10, 0, 0, 0x00 }, + { 775, 0x004C, 7, 11, 11, 1, 8, 0, 0, 0x00 }, + { 819, 0x004E, 8, 11, 11, 1, 10, 0, 0, 0x00 }, + { 863, 0x004F, 11, 11, 11, 0, 11, 0, 0, 0x00 }, + { 929, 0x0050, 8, 11, 11, 1, 9, 0, 0, 0x00 }, + { 973, 0x0052, 9, 11, 11, 1, 10, 0, 0, 0x00 }, + { 1028, 0x0053, 9, 11, 11, 0, 9, 0, 0, 0x00 }, + { 1083, 0x0054, 9, 11, 11, 0, 9, 17, 2, 0x00 }, + { 1138, 0x0055, 8, 11, 11, 1, 10, 0, 0, 0x00 }, + { 1182, 0x0056, 10, 11, 11, 0, 9, 19, 2, 0x00 }, + { 1237, 0x0061, 8, 8, 8, 0, 8, 21, 2, 0x00 }, + { 1269, 0x0062, 8, 11, 11, 0, 8, 0, 0, 0x00 }, + { 1313, 0x0063, 7, 8, 8, 0, 7, 23, 1, 0x00 }, + { 1345, 0x0064, 7, 11, 11, 0, 8, 0, 0, 0x00 }, + { 1389, 0x0065, 8, 8, 8, 0, 8, 24, 1, 0x00 }, + { 1421, 0x0066, 5, 11, 11, 0, 4, 0, 0, 0x00 }, + { 1454, 0x0067, 7, 11, 8, 0, 8, 0, 0, 0x00 }, + { 1498, 0x0068, 7, 11, 11, 0, 8, 0, 0, 0x00 }, + { 1542, 0x0069, 3, 11, 11, 0, 3, 0, 0, 0x00 }, + { 1564, 0x006A, 4, 14, 11, -1, 3, 0, 0, 0x00 }, + { 1592, 0x006B, 7, 11, 11, 0, 7, 0, 0, 0x00 }, + { 1636, 0x006C, 3, 11, 11, 0, 3, 0, 0, 0x00 }, + { 1658, 0x006D, 11, 8, 8, 0, 12, 0, 0, 0x00 }, + { 1706, 0x006E, 7, 8, 8, 0, 8, 0, 0, 0x00 }, + { 1738, 0x006F, 8, 8, 8, 0, 8, 25, 1, 0x00 }, + { 1770, 0x0070, 8, 11, 8, 0, 8, 0, 0, 0x00 }, + { 1814, 0x0071, 7, 11, 8, 0, 8, 0, 0, 0x00 }, + { 1858, 0x0072, 5, 8, 8, 0, 5, 0, 0, 0x00 }, + { 1882, 0x0073, 7, 8, 8, 0, 7, 26, 1, 0x00 }, + { 1914, 0x0074, 4, 11, 11, 0, 4, 0, 0, 0x00 }, + { 1936, 0x0075, 7, 8, 8, 0, 8, 0, 0, 0x00 }, + { 1968, 0x0076, 7, 8, 8, 0, 7, 0, 0, 0x00 }, + { 2000, 0x0077, 10, 8, 8, 0, 10, 0, 0, 0x00 }, + { 2040, 0x0078, 7, 8, 8, 0, 7, 0, 0, 0x00 }, + { 2072, 0x0079, 7, 11, 8, 0, 7, 0, 0, 0x00 }, + { 2116, 0x00B0, 5, 4, 11, 0, 6, 0, 0, 0x00 } }; // arial_14_4bpp diff --git a/display-fw/TouchGFX/generated/fonts/src/Table_arial_16_4bpp.cpp b/display-fw/TouchGFX/generated/fonts/src/Table_arial_16_4bpp.cpp new file mode 100644 index 00000000..bd0a86b4 --- /dev/null +++ b/display-fw/TouchGFX/generated/fonts/src/Table_arial_16_4bpp.cpp @@ -0,0 +1,58 @@ +// Autogenerated, do not edit + +#include + +FONT_TABLE_LOCATION_FLASH_PRAGMA +KEEP extern const touchgfx::GlyphNode glyphs_arial_16_4bpp[] FONT_TABLE_LOCATION_FLASH_ATTRIBUTE = +{ + { 0, 0x0020, 0, 0, 0, 0, 4, 0, 0, 0x00 }, + { 0, 0x002C, 2, 5, 2, 1, 4, 0, 2, 0x00 }, + { 5, 0x002D, 5, 2, 6, 0, 5, 0, 0, 0x00 }, + { 11, 0x002E, 3, 2, 2, 1, 4, 2, 2, 0x00 }, + { 15, 0x0030, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 75, 0x0031, 5, 12, 12, 1, 9, 4, 1, 0x00 }, + { 111, 0x0032, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 171, 0x0033, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 231, 0x0034, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 291, 0x0035, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 351, 0x0036, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 411, 0x0037, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 471, 0x0038, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 531, 0x0039, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 591, 0x003A, 3, 9, 9, 1, 4, 0, 0, 0x00 }, + { 609, 0x003F, 9, 12, 12, 0, 9, 0, 0, 0x00 }, + { 669, 0x0043, 11, 12, 12, 0, 12, 0, 0, 0x00 }, + { 741, 0x0046, 9, 12, 12, 1, 10, 0, 0, 0x00 }, + { 801, 0x0047, 12, 12, 12, 0, 12, 0, 0, 0x00 }, + { 873, 0x0053, 10, 12, 12, 0, 11, 0, 0, 0x00 }, + { 933, 0x0061, 9, 9, 9, 0, 9, 0, 0, 0x00 }, + { 978, 0x0064, 8, 12, 12, 0, 9, 0, 0, 0x00 }, + { 1026, 0x0065, 9, 9, 9, 0, 9, 0, 0, 0x00 }, + { 1071, 0x0067, 8, 12, 9, 0, 9, 0, 0, 0x00 }, + { 1119, 0x0069, 2, 12, 12, 1, 4, 0, 0, 0x00 }, + { 1131, 0x006C, 2, 12, 12, 1, 4, 0, 0, 0x00 }, + { 1143, 0x006D, 12, 9, 9, 1, 13, 0, 0, 0x00 }, + { 1197, 0x006E, 7, 9, 9, 1, 9, 0, 0, 0x00 }, + { 1233, 0x006F, 9, 9, 9, 0, 9, 0, 0, 0x00 }, + { 1278, 0x0073, 8, 9, 9, 0, 8, 0, 0, 0x00 }, + { 1314, 0x0074, 5, 12, 12, 0, 4, 0, 0, 0x00 }, + { 1350, 0x0079, 8, 12, 9, 0, 8, 0, 0, 0x00 }, + { 1398, 0x00B0, 5, 5, 13, 1, 6, 0, 0, 0x00 } +}; + +// arial_16_4bpp +extern const touchgfx::GlyphNode glyphs_arial_16_4bpp[]; +extern const uint8_t unicodes_arial_16_4bpp_0[]; +extern const uint8_t* const unicodes_arial_16_4bpp[] = +{ + unicodes_arial_16_4bpp_0 +}; +extern const touchgfx::KerningNode kerning_arial_16_4bpp[]; + +touchgfx::GeneratedFont& getFont_arial_16_4bpp(); + +touchgfx::GeneratedFont& getFont_arial_16_4bpp() +{ + static touchgfx::GeneratedFont arial_16_4bpp(glyphs_arial_16_4bpp, 33, 16, 3, 4, 1, 0, 1, unicodes_arial_16_4bpp, kerning_arial_16_4bpp, 63, 0, 0); + return arial_16_4bpp; +} diff --git a/display-fw/TouchGFX/generated/gui_generated/src/menu_screen/menuViewBase.cpp b/display-fw/TouchGFX/generated/gui_generated/src/menu_screen/menuViewBase.cpp index fa18d6f9..57ade6dd 100644 --- a/display-fw/TouchGFX/generated/gui_generated/src/menu_screen/menuViewBase.cpp +++ b/display-fw/TouchGFX/generated/gui_generated/src/menu_screen/menuViewBase.cpp @@ -86,11 +86,11 @@ menuViewBase::menuViewBase() : y_axis_naming.setTypedText(touchgfx::TypedText(T_SINGLEUSEID21)); graphs.add(y_axis_naming); - galden_tmp.setXY(594, 41); + galden_tmp.setXY(593, 53); galden_tmp.setColor(touchgfx::Color::getColorFrom24BitRGB(255, 255, 255)); galden_tmp.setLinespacing(0); galden_tmp.setAlpha(150); - touchgfx::Unicode::snprintf(galden_tmpBuffer1, GALDEN_TMPBUFFER1_SIZE, "%s", touchgfx::TypedText(T_SINGLEUSEID34).getText()); + galden_tmpBuffer1[0] = 0; galden_tmp.setWildcard1(galden_tmpBuffer1); galden_tmpBuffer2[0] = 0; galden_tmp.setWildcard2(galden_tmpBuffer2); @@ -98,7 +98,7 @@ menuViewBase::menuViewBase() : galden_tmp.setTypedText(touchgfx::TypedText(T_SINGLEUSEID20)); graphs.add(galden_tmp); - galden.setXY(549, 31); + galden.setXY(553, 43); galden.setBitmap(touchgfx::Bitmap(BITMAP_DROP_ID)); galden.setAlpha(150); graphs.add(galden); @@ -162,7 +162,7 @@ menuViewBase::menuViewBase() : dynamicGraph_ist.addGraphElement(dynamicGraph_istVerticalFrontline); graphs.add(dynamicGraph_ist); - watersystem_tmp.setXY(173, 41); + watersystem_tmp.setXY(118, 52); watersystem_tmp.setColor(touchgfx::Color::getColorFrom24BitRGB(255, 255, 255)); watersystem_tmp.setLinespacing(0); watersystem_tmp.setAlpha(150); @@ -174,7 +174,7 @@ menuViewBase::menuViewBase() : watersystem_tmp.setTypedText(touchgfx::TypedText(T_SINGLEUSEID19)); graphs.add(watersystem_tmp); - watersystem.setXY(126, 31); + watersystem.setXY(69, 43); watersystem.setBitmaps(BITMAP_ARROW1_ID, BITMAP_ARROW2_ID); watersystem.setUpdateTicksInterval(30); watersystem.setAlpha(150); diff --git a/display-fw/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache b/display-fw/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache index 958c6505..be541f5d 100644 --- a/display-fw/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache +++ b/display-fw/TouchGFX/generated/texts/cache/LanguageCpp_Gb.cache @@ -1 +1 @@ -{"remap":"yes","language":"Gb","language_index":0,"indices":[["1133","T_SingleUseId3"],["1402","T_SingleUseId4"],["1525","T_Graph_legend_text_00"],["1525","T_Graph_y_value"],["1102","T_SingleUseId19"],["1179","T_SingleUseId20"],["1534","T_SingleUseId21"],["1386","T_SingleUseId22"],["1133","T_SingleUseId23"],["1133","T_SingleUseId24"],["1133","T_SingleUseId25"],["1433","T_SingleUseId26"],["1563","T_SingleUseId27"],["1337","T_SingleUseId28"],["1448","T_SingleUseId29"],["1535","T_SingleUseId31"],["1577","T_SingleUseId32"],["1574","T_SingleUseId34"],["1580","T_SingleUseId37"],["480","T_SingleUseId38"],["1580","T_SingleUseId39"],["1514","T_SingleUseId44"],["1571","T_SingleUseId45"],["1418","T_SingleUseId47"],["1514","T_SingleUseId48"],["0","T_SingleUseId49"],["1133","T_SingleUseId30"],["1555","T_LidBlockedTitle"],["811","T_LidBlockedBody"],["1288","T_ComErrorTitle"],["608","T_ComErrorBody"],["1525","T_SingleUseId50"],["1525","T_SingleUseId51"],["1525","T_SingleUseId52"],["1537","T_SingleUseId53"],["1135","T_DummyResource"],["1231","T_DummyResourceL"],["1463","T_ProcessCancelTitle"],["1477","T_ProcessCancelBody"],["1535","T_SingleUseId42"],["1535","T_SingleUseId41"],["1133","T_SingleUseId54"],["1354","T_SingleUseId55"],["1503","T_HeaterOtpErrorTitle"],["1006","T_HeaterOtpErrorBody"],["1491","T_CoolantOtpErrorTitle"],["909","T_CoolantOtpErrorBody"],["1555","T_LidOcpErrorTitle"],["713","T_LidOcpErrorBody"],["1200","T_StartConditionErrorTitle"],["327","T_StartConditionErrorBody"],["1261","T_LidConditionErrorTitle"],["482","T_LidConditionErrorBody"],["1546","T_SelftestTitle"],["1370","T_SelftestQuestionBody"],["1313","T_SelftestRunningBody"]]} \ No newline at end of file +{"remap":"yes","language":"Gb","language_index":0,"indices":[["1301","T_SingleUseId3"],["1470","T_SingleUseId4"],["1638","T_Graph_legend_text_00"],["1638","T_Graph_y_value"],["1277","T_SingleUseId19"],["1656","T_SingleUseId21"],["1518","T_SingleUseId22"],["1301","T_SingleUseId23"],["1301","T_SingleUseId24"],["1301","T_SingleUseId25"],["1534","T_SingleUseId26"],["1667","T_SingleUseId27"],["1437","T_SingleUseId28"],["1549","T_SingleUseId29"],["1657","T_SingleUseId31"],["1675","T_SingleUseId32"],["1681","T_SingleUseId37"],["661","T_SingleUseId38"],["1681","T_SingleUseId39"],["1618","T_SingleUseId44"],["1678","T_SingleUseId45"],["1564","T_SingleUseId47"],["1618","T_SingleUseId48"],["0","T_SingleUseId49"],["1301","T_SingleUseId30"],["1659","T_LidBlockedTitle"],["890","T_LidBlockedBody"],["1412","T_ComErrorTitle"],["785","T_ComErrorBody"],["1638","T_SingleUseId50"],["1638","T_SingleUseId51"],["1638","T_SingleUseId52"],["1629","T_SingleUseId53"],["1233","T_DummyResource"],["1355","T_DummyResourceL"],["1579","T_ProcessCancelTitle"],["1593","T_ProcessCancelBody"],["1657","T_SingleUseId42"],["1657","T_SingleUseId41"],["1301","T_SingleUseId54"],["1486","T_SingleUseId55"],["1607","T_HeaterOtpErrorTitle"],["1086","T_HeaterOtpErrorBody"],["1502","T_CoolantOtpErrorTitle"],["663","T_CoolantOtpErrorBody"],["1659","T_LidOcpErrorTitle"],["988","T_LidOcpErrorBody"],["1324","T_StartConditionErrorTitle"],["508","T_StartConditionErrorBody"],["1385","T_LidConditionErrorTitle"],["327","T_LidConditionErrorBody"],["1647","T_SelftestTitle"],["1454","T_SelftestQuestionBody"],["1182","T_SelftestRunningBody"],["1303","T_SingleUseId20"]]} \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache b/display-fw/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache index 52bd1515..068a5aba 100644 --- a/display-fw/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache +++ b/display-fw/TouchGFX/generated/texts/cache/TextKeysAndLanguages.cache @@ -1 +1 @@ -{"languages":["Gb"],"textids":["T_SingleUseId3","T_SingleUseId4","T_Graph_legend_text_00","T_Graph_y_value","T_SingleUseId19","T_SingleUseId20","T_SingleUseId21","T_SingleUseId22","T_SingleUseId23","T_SingleUseId24","T_SingleUseId25","T_SingleUseId26","T_SingleUseId27","T_SingleUseId28","T_SingleUseId29","T_SingleUseId31","T_SingleUseId32","T_SingleUseId34","T_SingleUseId37","T_SingleUseId38","T_SingleUseId39","T_SingleUseId44","T_SingleUseId45","T_SingleUseId47","T_SingleUseId48","T_SingleUseId49","T_SingleUseId30","T_LidBlockedTitle","T_LidBlockedBody","T_ComErrorTitle","T_ComErrorBody","T_SingleUseId50","T_SingleUseId51","T_SingleUseId52","T_SingleUseId53","T_DummyResource","T_DummyResourceL","T_ProcessCancelTitle","T_ProcessCancelBody","T_SingleUseId42","T_SingleUseId41","T_SingleUseId54","T_SingleUseId55","T_HeaterOtpErrorTitle","T_HeaterOtpErrorBody","T_CoolantOtpErrorTitle","T_CoolantOtpErrorBody","T_LidOcpErrorTitle","T_LidOcpErrorBody","T_StartConditionErrorTitle","T_StartConditionErrorBody","T_LidConditionErrorTitle","T_LidConditionErrorBody","T_SelftestTitle","T_SelftestQuestionBody","T_SelftestRunningBody"]} \ No newline at end of file +{"languages":["Gb"],"textids":["T_SingleUseId3","T_SingleUseId4","T_Graph_legend_text_00","T_Graph_y_value","T_SingleUseId19","T_SingleUseId21","T_SingleUseId22","T_SingleUseId23","T_SingleUseId24","T_SingleUseId25","T_SingleUseId26","T_SingleUseId27","T_SingleUseId28","T_SingleUseId29","T_SingleUseId31","T_SingleUseId32","T_SingleUseId37","T_SingleUseId38","T_SingleUseId39","T_SingleUseId44","T_SingleUseId45","T_SingleUseId47","T_SingleUseId48","T_SingleUseId49","T_SingleUseId30","T_LidBlockedTitle","T_LidBlockedBody","T_ComErrorTitle","T_ComErrorBody","T_SingleUseId50","T_SingleUseId51","T_SingleUseId52","T_SingleUseId53","T_DummyResource","T_DummyResourceL","T_ProcessCancelTitle","T_ProcessCancelBody","T_SingleUseId42","T_SingleUseId41","T_SingleUseId54","T_SingleUseId55","T_HeaterOtpErrorTitle","T_HeaterOtpErrorBody","T_CoolantOtpErrorTitle","T_CoolantOtpErrorBody","T_LidOcpErrorTitle","T_LidOcpErrorBody","T_StartConditionErrorTitle","T_StartConditionErrorBody","T_LidConditionErrorTitle","T_LidConditionErrorBody","T_SelftestTitle","T_SelftestQuestionBody","T_SelftestRunningBody","T_SingleUseId20"]} \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/texts/cache/TextsCpp.cache b/display-fw/TouchGFX/generated/texts/cache/TextsCpp.cache index 2dbbc2b9..7c1f47f5 100644 --- a/display-fw/TouchGFX/generated/texts/cache/TextsCpp.cache +++ b/display-fw/TouchGFX/generated/texts/cache/TextsCpp.cache @@ -1 +1 @@ -{"remap":"yes","languages":["Gb"],"characters":[76,111,114,101,109,32,105,112,115,117,109,32,100,111,108,111,114,32,115,105,116,32,97,109,101,116,44,32,99,111,110,115,101,116,101,116,117,114,32,115,97,100,105,112,115,99,105,110,103,32,101,108,105,116,114,44,32,115,101,100,32,100,105,97,109,10,110,111,110,117,109,121,32,101,105,114,109,111,100,32,116,101,109,112,111,114,32,105,110,118,105,100,117,110,116,32,117,116,32,108,97,98,111,114,101,32,101,116,32,100,111,108,111,114,101,32,109,97,103,110,97,32,97,108,105,113,117,121,97,109,32,10,101,114,97,116,44,32,115,101,100,32,100,105,97,109,32,118,111,108,117,112,116,117,97,46,32,65,116,32,118,101,114,111,32,101,111,115,32,101,116,32,97,99,99,117,115,97,109,32,101,116,32,106,117,115,116,111,32,100,117,111,32,100,111,108,111,114,101,115,32,10,101,116,32,101,97,32,114,101,98,117,109,46,32,83,116,101,116,32,99,108,105,116,97,32,107,97,115,100,32,103,117,98,101,114,103,114,101,110,44,32,110,111,32,115,101,97,32,116,97,107,105,109,97,116,97,32,115,97,110,99,116,117,115,32,10,101,115,116,32,76,111,114,101,109,32,105,112,115,117,109,32,100,111,108,111,114,32,115,105,116,32,97,109,101,116,46,32,76,111,114,101,109,32,105,112,115,117,109,32,100,111,108,111,114,32,115,105,116,32,97,109,101,116,46,0,83,116,97,114,116,32,99,111,110,100,105,116,105,111,110,115,32,102,111,114,32,82,101,102,108,111,119,32,97,114,101,32,110,111,116,32,103,105,118,101,110,46,10,80,108,101,97,115,101,32,99,104,101,99,107,32,105,102,58,10,45,32,83,111,108,100,101,114,32,112,114,111,102,105,108,101,32,115,101,108,101,99,116,101,100,10,45,32,76,105,100,32,105,115,32,112,114,111,112,101,114,108,121,32,99,108,111,115,101,100,10,45,32,67,111,111,108,97,110,116,32,116,101,109,112,101,114,97,116,117,114,101,32,105,115,32,117,110,100,101,114,32,54,48,176,67,32,47,32,49,52,48,176,70,0,83,116,97,114,116,32,99,111,110,100,105,116,105,111,110,115,32,102,111,114,32,79,112,101,110,32,76,105,100,32,97,114,101,32,110,111,116,32,103,105,118,101,110,46,10,80,108,101,97,115,101,32,99,104,101,99,107,32,105,102,58,10,45,32,83,111,108,100,101,114,32,109,101,100,105,117,109,32,116,101,109,112,101,114,97,116,117,114,101,32,116,111,111,32,104,105,103,104,44,32,112,108,101,97,115,101,32,119,97,105,116,32,116,111,32,99,111,111,108,32,100,111,119,110,46,0,65,110,32,101,114,114,111,114,32,111,99,99,117,114,101,100,32,105,110,32,116,104,101,32,99,111,109,109,117,110,105,99,97,116,105,111,110,32,119,105,116,104,32,116,104,101,32,99,111,114,101,32,99,111,110,116,114,111,108,108,101,114,46,10,84,104,101,32,100,105,115,112,108,97,121,101,100,32,118,97,108,117,101,115,32,109,105,103,104,116,32,98,101,32,105,110,99,111,114,114,101,99,116,46,0,76,105,100,32,111,118,101,114,32,99,117,114,114,101,110,116,32,101,118,101,110,116,32,100,101,116,101,99,116,101,100,46,32,76,105,100,32,119,97,115,32,98,108,111,99,107,101,100,44,32,112,108,101,97,115,101,32,114,101,109,111,118,101,32,98,108,111,99,107,97,103,101,46,10,65,110,100,32,80,111,119,101,114,32,99,121,99,108,101,32,100,101,118,105,99,101,46,0,76,105,100,32,111,118,101,114,32,99,117,114,114,101,110,116,32,101,118,101,110,116,32,100,101,116,101,99,116,101,100,46,10,76,105,100,32,119,97,115,32,98,108,111,99,107,101,100,44,32,112,108,101,97,115,101,32,114,101,109,111,118,101,32,98,108,111,99,107,97,103,101,46,10,65,110,100,32,80,111,119,101,114,32,99,121,99,108,101,32,100,101,118,105,99,101,46,0,67,111,111,108,97,110,116,32,116,101,109,112,101,114,97,116,117,114,101,32,115,101,110,115,111,114,32,112,114,111,98,108,101,109,32,100,101,116,101,99,116,101,100,44,32,112,108,101,97,115,101,32,114,101,97,100,32,109,97,110,117,97,108,46,10,68,111,110,39,116,32,116,117,114,110,32,111,102,102,32,86,97,112,111,114,32,80,104,97,115,101,32,79,110,101,46,0,72,101,97,116,101,114,32,116,101,109,112,101,114,97,116,117,114,101,32,115,101,110,115,111,114,32,112,114,111,98,108,101,109,32,100,101,116,101,99,116,101,100,44,32,112,108,101,97,115,101,32,114,101,97,100,32,109,97,110,117,97,108,46,10,68,111,110,39,116,32,116,117,114,110,32,111,102,102,32,86,97,112,111,114,32,80,104,97,115,101,32,79,110,101,46,0,67,111,111,108,105,110,103,32,83,121,115,116,101,109,58,32,32,2,176,32,32,32,32,32,32,32,2,32,32,32,32,32,0,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,228,246,252,46,45,95,47,49,50,51,52,53,54,55,56,57,48,0,71,97,108,100,101,110,58,32,2,32,176,2,32,32,32,32,32,32,32,32,0,83,116,97,114,116,32,82,101,102,108,111,119,32,99,111,110,100,105,116,105,111,110,32,110,111,116,32,109,101,116,0,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,196,214,220,0,76,105,100,32,79,112,101,110,32,99,111,110,100,105,116,105,111,110,32,110,111,116,32,109,101,116,0,67,111,114,101,32,67,111,109,109,117,110,105,99,97,116,105,111,110,32,69,114,114,111,114,0,83,101,108,102,116,101,115,116,32,105,110,32,112,114,111,103,114,101,115,115,46,46,46,0,79,112,101,110,32,116,101,109,112,101,114,97,116,117,114,101,0,80,114,111,102,105,108,101,32,97,98,111,114,116,101,100,0,83,116,97,114,116,32,83,101,108,102,116,101,115,116,63,0,84,105,109,101,32,105,110,32,83,101,99,111,110,100,115,0,86,97,112,111,114,32,80,104,97,115,101,32,79,110,101,0,86,101,114,115,105,111,110,58,32,49,46,48,46,48,0,68,105,115,112,108,97,121,101,100,32,117,110,105,116,0,83,111,108,100,101,114,32,112,114,111,102,105,108,101,0,67,97,110,99,101,108,32,82,101,102,108,111,119,0,65,114,101,32,121,111,117,32,115,117,114,101,63,0,67,111,111,108,97,110,116,32,79,84,80,0,72,101,97,116,101,114,32,79,84,80,0,77,111,100,97,108,84,105,116,108,101,0,78,101,119,32,84,101,120,116,0,176,2,0,116,101,115,116,46,99,115,118,0,83,101,108,102,116,101,115,116,0,76,105,100,32,79,67,80,0,83,68,32,99,97,114,100,0,51,48,0,52,53,0,55,48,0,67,0]} \ No newline at end of file +{"remap":"yes","languages":["Gb"],"characters":[76,111,114,101,109,32,105,112,115,117,109,32,100,111,108,111,114,32,115,105,116,32,97,109,101,116,44,32,99,111,110,115,101,116,101,116,117,114,32,115,97,100,105,112,115,99,105,110,103,32,101,108,105,116,114,44,32,115,101,100,32,100,105,97,109,10,110,111,110,117,109,121,32,101,105,114,109,111,100,32,116,101,109,112,111,114,32,105,110,118,105,100,117,110,116,32,117,116,32,108,97,98,111,114,101,32,101,116,32,100,111,108,111,114,101,32,109,97,103,110,97,32,97,108,105,113,117,121,97,109,32,10,101,114,97,116,44,32,115,101,100,32,100,105,97,109,32,118,111,108,117,112,116,117,97,46,32,65,116,32,118,101,114,111,32,101,111,115,32,101,116,32,97,99,99,117,115,97,109,32,101,116,32,106,117,115,116,111,32,100,117,111,32,100,111,108,111,114,101,115,32,10,101,116,32,101,97,32,114,101,98,117,109,46,32,83,116,101,116,32,99,108,105,116,97,32,107,97,115,100,32,103,117,98,101,114,103,114,101,110,44,32,110,111,32,115,101,97,32,116,97,107,105,109,97,116,97,32,115,97,110,99,116,117,115,32,10,101,115,116,32,76,111,114,101,109,32,105,112,115,117,109,32,100,111,108,111,114,32,115,105,116,32,97,109,101,116,46,32,76,111,114,101,109,32,105,112,115,117,109,32,100,111,108,111,114,32,115,105,116,32,97,109,101,116,46,0,83,116,97,114,116,32,99,111,110,100,105,116,105,111,110,115,32,102,111,114,32,79,112,101,110,32,76,105,100,32,97,114,101,32,110,111,116,32,103,105,118,101,110,46,10,80,108,101,97,115,101,32,99,104,101,99,107,32,105,102,58,10,45,32,83,111,108,100,101,114,32,109,101,100,105,117,109,32,116,101,109,112,101,114,97,116,117,114,101,32,116,111,111,32,104,105,103,104,44,32,112,108,101,97,115,101,32,119,97,105,116,32,116,111,32,99,111,111,108,32,100,111,119,110,46,10,45,32,76,105,102,116,32,111,114,32,108,105,100,32,105,115,32,99,97,108,105,98,114,97,116,105,110,103,10,45,32,76,105,100,32,105,115,32,99,117,114,114,101,110,116,108,121,32,109,111,118,105,110,103,0,83,116,97,114,116,32,99,111,110,100,105,116,105,111,110,115,32,102,111,114,32,82,101,102,108,111,119,32,97,114,101,32,110,111,116,32,103,105,118,101,110,46,10,80,108,101,97,115,101,32,99,104,101,99,107,32,105,102,58,10,45,32,83,111,108,100,101,114,32,112,114,111,102,105,108,101,32,115,101,108,101,99,116,101,100,10,45,32,76,105,100,32,105,115,32,112,114,111,112,101,114,108,121,32,99,108,111,115,101,100,10,45,32,67,111,111,108,97,110,116,32,116,101,109,112,101,114,97,116,117,114,101,32,105,115,32,117,110,100,101,114,32,54,48,176,67,32,47,32,49,52,48,176,70,0,85,110,100,101,114,32,116,101,109,112,101,114,97,116,117,114,101,32,112,114,111,116,101,99,116,105,111,110,32,111,114,32,111,118,101,114,32,116,101,109,112,101,114,97,116,117,114,101,32,112,114,111,116,101,99,116,105,111,110,32,100,101,116,101,99,116,101,100,46,10,80,108,101,97,115,101,32,114,101,97,100,32,109,97,110,117,97,108,46,32,68,111,110,39,116,32,116,117,114,110,32,111,102,102,32,86,97,112,111,114,32,80,104,97,115,101,32,79,110,101,46,0,65,110,32,101,114,114,111,114,32,111,99,99,117,114,101,100,32,105,110,32,116,104,101,32,99,111,109,109,117,110,105,99,97,116,105,111,110,32,119,105,116,104,32,116,104,101,32,99,111,114,101,32,99,111,110,116,114,111,108,108,101,114,46,10,84,104,101,32,100,105,115,112,108,97,121,101,100,32,118,97,108,117,101,115,32,109,105,103,104,116,32,98,101,32,105,110,99,111,114,114,101,99,116,46,0,76,105,100,32,111,118,101,114,32,99,117,114,114,101,110,116,32,101,118,101,110,116,32,100,101,116,101,99,116,101,100,46,10,76,105,100,32,119,97,115,32,98,108,111,99,107,101,100,44,32,112,108,101,97,115,101,32,114,101,109,111,118,101,32,98,108,111,99,107,97,103,101,46,10,65,110,100,32,80,111,119,101,114,32,99,121,99,108,101,32,100,101,118,105,99,101,46,0,76,105,100,32,111,118,101,114,32,99,117,114,114,101,110,116,32,101,118,101,110,116,32,100,101,116,101,99,116,101,100,46,32,76,105,100,32,119,97,115,32,98,108,111,99,107,101,100,44,32,112,108,101,97,115,101,32,114,101,109,111,118,101,32,98,108,111,99,107,97,103,101,46,10,65,110,100,32,80,111,119,101,114,32,99,121,99,108,101,32,100,101,118,105,99,101,46,0,72,101,97,116,101,114,32,116,101,109,112,101,114,97,116,117,114,101,32,115,101,110,115,111,114,32,112,114,111,98,108,101,109,32,100,101,116,101,99,116,101,100,44,32,112,108,101,97,115,101,32,114,101,97,100,32,109,97,110,117,97,108,46,10,68,111,110,39,116,32,116,117,114,110,32,111,102,102,32,86,97,112,111,114,32,80,104,97,115,101,32,79,110,101,46,0,83,101,108,102,116,101,115,116,32,105,110,32,112,114,111,103,114,101,115,115,46,46,46,10,84,104,105,115,32,119,105,108,108,32,116,97,107,101,32,102,101,119,32,109,105,110,117,116,101,115,0,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,228,246,252,46,45,95,47,49,50,51,52,53,54,55,56,57,48,0,67,111,111,108,105,110,103,32,83,121,115,116,101,109,58,32,2,32,176,2,32,32,32,32,32,0,71,97,108,100,101,110,58,32,2,32,176,2,32,32,32,32,32,32,32,32,0,83,116,97,114,116,32,82,101,102,108,111,119,32,99,111,110,100,105,116,105,111,110,32,110,111,116,32,109,101,116,0,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,196,214,220,0,76,105,100,32,79,112,101,110,32,99,111,110,100,105,116,105,111,110,32,110,111,116,32,109,101,116,0,67,111,114,101,32,67,111,109,109,117,110,105,99,97,116,105,111,110,32,69,114,114,111,114,0,79,112,101,110,32,116,101,109,112,101,114,97,116,117,114,101,0,83,116,97,114,116,32,83,101,108,102,116,101,115,116,63,0,86,97,112,111,114,32,80,104,97,115,101,32,79,110,101,0,80,114,111,102,105,108,101,32,97,98,111,114,116,101,100,0,67,111,111,108,97,110,116,32,85,84,80,47,79,84,80,0,84,105,109,101,32,105,110,32,83,101,99,111,110,100,115,0,68,105,115,112,108,97,121,101,100,32,117,110,105,116,0,83,111,108,100,101,114,32,112,114,111,102,105,108,101,0,86,101,114,115,105,111,110,58,32,49,46,48,46,49,0,67,97,110,99,101,108,32,82,101,102,108,111,119,0,65,114,101,32,121,111,117,32,115,117,114,101,63,0,72,101,97,116,101,114,32,79,84,80,0,77,111,100,97,108,84,105,116,108,101,0,116,101,115,116,46,99,115,118,0,78,101,119,32,84,101,120,116,0,83,101,108,102,116,101,115,116,0,176,2,0,76,105,100,32,79,67,80,0,83,68,32,99,97,114,100,0,55,48,0,51,48,0,67,0]} \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache b/display-fw/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache index 824af892..f9697cbc 100644 --- a/display-fw/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache +++ b/display-fw/TouchGFX/generated/texts/cache/TypedTextDatabaseCpp.cache @@ -1 +1 @@ -{"databases":{"DEFAULT":[[0,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[4,"LEFT","LTR"],[4,"LEFT","LTR"],[4,"LEFT","LTR"],[4,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"RIGHT","LTR"],[3,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"]]},"database_list":["DEFAULT"],"fonts":{"getFont_arial_20_4bpp":0,"getFont_arial_40_4bpp":1,"getFont_arial_10_4bpp":2,"getFont_arial_14_4bpp":3,"getFont_arial_26_4bpp":4},"generate_font_format":"0"} \ No newline at end of file +{"databases":{"DEFAULT":[[0,"CENTER","LTR"],[1,"LEFT","LTR"],[2,"LEFT","LTR"],[2,"LEFT","LTR"],[5,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[0,"CENTER","LTR"],[4,"LEFT","LTR"],[4,"LEFT","LTR"],[4,"LEFT","LTR"],[4,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[5,"LEFT","LTR"],[3,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"RIGHT","LTR"],[3,"LEFT","LTR"],[0,"CENTER","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[3,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[0,"LEFT","LTR"],[5,"LEFT","LTR"]]},"database_list":["DEFAULT"],"fonts":{"getFont_arial_20_4bpp":0,"getFont_arial_40_4bpp":1,"getFont_arial_10_4bpp":2,"getFont_arial_14_4bpp":3,"getFont_arial_26_4bpp":4,"getFont_arial_16_4bpp":5},"generate_font_format":"0"} \ No newline at end of file diff --git a/display-fw/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp b/display-fw/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp index 6dffd6c5..2be8f887 100644 --- a/display-fw/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp +++ b/display-fw/TouchGFX/generated/texts/include/texts/TextKeysAndLanguages.hpp @@ -19,7 +19,6 @@ typedef enum T_GRAPH_LEGEND_TEXT_00, T_GRAPH_Y_VALUE, T_SINGLEUSEID19, - T_SINGLEUSEID20, T_SINGLEUSEID21, T_SINGLEUSEID22, T_SINGLEUSEID23, @@ -31,7 +30,6 @@ typedef enum T_SINGLEUSEID29, T_SINGLEUSEID31, T_SINGLEUSEID32, - T_SINGLEUSEID34, T_SINGLEUSEID37, T_SINGLEUSEID38, T_SINGLEUSEID39, @@ -70,6 +68,7 @@ typedef enum T_SELFTESTTITLE, T_SELFTESTQUESTIONBODY, T_SELFTESTRUNNINGBODY, + T_SINGLEUSEID20, NUMBER_OF_TEXT_KEYS } TEXTS; diff --git a/display-fw/TouchGFX/generated/texts/src/LanguageGb.cpp b/display-fw/TouchGFX/generated/texts/src/LanguageGb.cpp index 7a16470f..0fe1cdc3 100644 --- a/display-fw/TouchGFX/generated/texts/src/LanguageGb.cpp +++ b/display-fw/TouchGFX/generated/texts/src/LanguageGb.cpp @@ -10,60 +10,59 @@ KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE; TEXT_LOCATION_FLASH_PRAGMA KEEP extern const uint32_t indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE = { - 1133, // T_SingleUseId3 - 1402, // T_SingleUseId4 - 1525, // T_Graph_legend_text_00 - 1525, // T_Graph_y_value - 1102, // T_SingleUseId19 - 1179, // T_SingleUseId20 - 1534, // T_SingleUseId21 - 1386, // T_SingleUseId22 - 1133, // T_SingleUseId23 - 1133, // T_SingleUseId24 - 1133, // T_SingleUseId25 - 1433, // T_SingleUseId26 - 1563, // T_SingleUseId27 - 1337, // T_SingleUseId28 - 1448, // T_SingleUseId29 - 1535, // T_SingleUseId31 - 1577, // T_SingleUseId32 - 1574, // T_SingleUseId34 - 1580, // T_SingleUseId37 - 480, // T_SingleUseId38 - 1580, // T_SingleUseId39 - 1514, // T_SingleUseId44 - 1571, // T_SingleUseId45 - 1418, // T_SingleUseId47 - 1514, // T_SingleUseId48 + 1301, // T_SingleUseId3 + 1470, // T_SingleUseId4 + 1638, // T_Graph_legend_text_00 + 1638, // T_Graph_y_value + 1277, // T_SingleUseId19 + 1656, // T_SingleUseId21 + 1518, // T_SingleUseId22 + 1301, // T_SingleUseId23 + 1301, // T_SingleUseId24 + 1301, // T_SingleUseId25 + 1534, // T_SingleUseId26 + 1667, // T_SingleUseId27 + 1437, // T_SingleUseId28 + 1549, // T_SingleUseId29 + 1657, // T_SingleUseId31 + 1675, // T_SingleUseId32 + 1681, // T_SingleUseId37 + 661, // T_SingleUseId38 + 1681, // T_SingleUseId39 + 1618, // T_SingleUseId44 + 1678, // T_SingleUseId45 + 1564, // T_SingleUseId47 + 1618, // T_SingleUseId48 0, // T_SingleUseId49 - 1133, // T_SingleUseId30 - 1555, // T_LidBlockedTitle - 811, // T_LidBlockedBody - 1288, // T_ComErrorTitle - 608, // T_ComErrorBody - 1525, // T_SingleUseId50 - 1525, // T_SingleUseId51 - 1525, // T_SingleUseId52 - 1537, // T_SingleUseId53 - 1135, // T_DummyResource - 1231, // T_DummyResourceL - 1463, // T_ProcessCancelTitle - 1477, // T_ProcessCancelBody - 1535, // T_SingleUseId42 - 1535, // T_SingleUseId41 - 1133, // T_SingleUseId54 - 1354, // T_SingleUseId55 - 1503, // T_HeaterOtpErrorTitle - 1006, // T_HeaterOtpErrorBody - 1491, // T_CoolantOtpErrorTitle - 909, // T_CoolantOtpErrorBody - 1555, // T_LidOcpErrorTitle - 713, // T_LidOcpErrorBody - 1200, // T_StartConditionErrorTitle - 327, // T_StartConditionErrorBody - 1261, // T_LidConditionErrorTitle - 482, // T_LidConditionErrorBody - 1546, // T_SelftestTitle - 1370, // T_SelftestQuestionBody - 1313 // T_SelftestRunningBody + 1301, // T_SingleUseId30 + 1659, // T_LidBlockedTitle + 890, // T_LidBlockedBody + 1412, // T_ComErrorTitle + 785, // T_ComErrorBody + 1638, // T_SingleUseId50 + 1638, // T_SingleUseId51 + 1638, // T_SingleUseId52 + 1629, // T_SingleUseId53 + 1233, // T_DummyResource + 1355, // T_DummyResourceL + 1579, // T_ProcessCancelTitle + 1593, // T_ProcessCancelBody + 1657, // T_SingleUseId42 + 1657, // T_SingleUseId41 + 1301, // T_SingleUseId54 + 1486, // T_SingleUseId55 + 1607, // T_HeaterOtpErrorTitle + 1086, // T_HeaterOtpErrorBody + 1502, // T_CoolantOtpErrorTitle + 663, // T_CoolantOtpErrorBody + 1659, // T_LidOcpErrorTitle + 988, // T_LidOcpErrorBody + 1324, // T_StartConditionErrorTitle + 508, // T_StartConditionErrorBody + 1385, // T_LidConditionErrorTitle + 327, // T_LidConditionErrorBody + 1647, // T_SelftestTitle + 1454, // T_SelftestQuestionBody + 1182, // T_SelftestRunningBody + 1303 // T_SingleUseId20 }; diff --git a/display-fw/TouchGFX/generated/texts/src/Texts.cpp b/display-fw/TouchGFX/generated/texts/src/Texts.cpp index 8b6e89bc..e6d5a35d 100644 --- a/display-fw/TouchGFX/generated/texts/src/Texts.cpp +++ b/display-fw/TouchGFX/generated/texts/src/Texts.cpp @@ -62,44 +62,43 @@ TEXT_LOCATION_FLASH_PRAGMA KEEP extern const touchgfx::Unicode::UnicodeChar texts_all_languages[] TEXT_LOCATION_FLASH_ATTRIBUTE = { 0x4c, 0x6f, 0x72, 0x65, 0x6d, 0x20, 0x69, 0x70, 0x73, 0x75, 0x6d, 0x20, 0x64, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x73, 0x69, 0x74, 0x20, 0x61, 0x6d, 0x65, 0x74, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x73, 0x65, 0x74, 0x65, 0x74, 0x75, 0x72, 0x20, 0x73, 0x61, 0x64, 0x69, 0x70, 0x73, 0x63, 0x69, 0x6e, 0x67, 0x20, 0x65, 0x6c, 0x69, 0x74, 0x72, 0x2c, 0x20, 0x73, 0x65, 0x64, 0x20, 0x64, 0x69, 0x61, 0x6d, 0xa, 0x6e, 0x6f, 0x6e, 0x75, 0x6d, 0x79, 0x20, 0x65, 0x69, 0x72, 0x6d, 0x6f, 0x64, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x76, 0x69, 0x64, 0x75, 0x6e, 0x74, 0x20, 0x75, 0x74, 0x20, 0x6c, 0x61, 0x62, 0x6f, 0x72, 0x65, 0x20, 0x65, 0x74, 0x20, 0x64, 0x6f, 0x6c, 0x6f, 0x72, 0x65, 0x20, 0x6d, 0x61, 0x67, 0x6e, 0x61, 0x20, 0x61, 0x6c, 0x69, 0x71, 0x75, 0x79, 0x61, 0x6d, 0x20, 0xa, 0x65, 0x72, 0x61, 0x74, 0x2c, 0x20, 0x73, 0x65, 0x64, 0x20, 0x64, 0x69, 0x61, 0x6d, 0x20, 0x76, 0x6f, 0x6c, 0x75, 0x70, 0x74, 0x75, 0x61, 0x2e, 0x20, 0x41, 0x74, 0x20, 0x76, 0x65, 0x72, 0x6f, 0x20, 0x65, 0x6f, 0x73, 0x20, 0x65, 0x74, 0x20, 0x61, 0x63, 0x63, 0x75, 0x73, 0x61, 0x6d, 0x20, 0x65, 0x74, 0x20, 0x6a, 0x75, 0x73, 0x74, 0x6f, 0x20, 0x64, 0x75, 0x6f, 0x20, 0x64, 0x6f, 0x6c, 0x6f, 0x72, 0x65, 0x73, 0x20, 0xa, 0x65, 0x74, 0x20, 0x65, 0x61, 0x20, 0x72, 0x65, 0x62, 0x75, 0x6d, 0x2e, 0x20, 0x53, 0x74, 0x65, 0x74, 0x20, 0x63, 0x6c, 0x69, 0x74, 0x61, 0x20, 0x6b, 0x61, 0x73, 0x64, 0x20, 0x67, 0x75, 0x62, 0x65, 0x72, 0x67, 0x72, 0x65, 0x6e, 0x2c, 0x20, 0x6e, 0x6f, 0x20, 0x73, 0x65, 0x61, 0x20, 0x74, 0x61, 0x6b, 0x69, 0x6d, 0x61, 0x74, 0x61, 0x20, 0x73, 0x61, 0x6e, 0x63, 0x74, 0x75, 0x73, 0x20, 0xa, 0x65, 0x73, 0x74, 0x20, 0x4c, 0x6f, 0x72, 0x65, 0x6d, 0x20, 0x69, 0x70, 0x73, 0x75, 0x6d, 0x20, 0x64, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x73, 0x69, 0x74, 0x20, 0x61, 0x6d, 0x65, 0x74, 0x2e, 0x20, 0x4c, 0x6f, 0x72, 0x65, 0x6d, 0x20, 0x69, 0x70, 0x73, 0x75, 0x6d, 0x20, 0x64, 0x6f, 0x6c, 0x6f, 0x72, 0x20, 0x73, 0x69, 0x74, 0x20, 0x61, 0x6d, 0x65, 0x74, 0x2e, 0x0, // @0 "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam?nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ?erat, sed diam voluptua. At vero eos et accusam et justo duo dolores ?et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus ?est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet." - 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x52, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x20, 0x61, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x2e, 0xa, 0x50, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x20, 0x69, 0x66, 0x3a, 0xa, 0x2d, 0x20, 0x53, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0xa, 0x2d, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x6c, 0x79, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, 0xa, 0x2d, 0x20, 0x43, 0x6f, 0x6f, 0x6c, 0x61, 0x6e, 0x74, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x36, 0x30, 0xb0, 0x43, 0x20, 0x2f, 0x20, 0x31, 0x34, 0x30, 0xb0, 0x46, 0x0, // @327 "Start conditions for Reflow are not given.?Please check if:?- Solder profile selected?- Lid is properly closed?- Coolant temperature is under 60?C / 140?F" - 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x61, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x2e, 0xa, 0x50, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x20, 0x69, 0x66, 0x3a, 0xa, 0x2d, 0x20, 0x53, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x20, 0x6d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x20, 0x68, 0x69, 0x67, 0x68, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x77, 0x61, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6f, 0x6c, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x2e, 0x0, // @482 "Start conditions for Open Lid are not given.?Please check if:?- Solder medium temperature too high, please wait to cool down." - 0x41, 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x20, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0xa, 0x54, 0x68, 0x65, 0x20, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20, 0x6d, 0x69, 0x67, 0x68, 0x74, 0x20, 0x62, 0x65, 0x20, 0x69, 0x6e, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74, 0x2e, 0x0, // @608 "An error occured in the communication with the core controller.?The displayed values might be incorrect." - 0x4c, 0x69, 0x64, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x77, 0x61, 0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0xa, 0x41, 0x6e, 0x64, 0x20, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x0, // @713 "Lid over current event detected. Lid was blocked, please remove blockage.?And Power cycle device." - 0x4c, 0x69, 0x64, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0xa, 0x4c, 0x69, 0x64, 0x20, 0x77, 0x61, 0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0xa, 0x41, 0x6e, 0x64, 0x20, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x0, // @811 "Lid over current event detected.?Lid was blocked, please remove blockage.?And Power cycle device." - 0x43, 0x6f, 0x6f, 0x6c, 0x61, 0x6e, 0x74, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x73, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x62, 0x6c, 0x65, 0x6d, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x61, 0x64, 0x20, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x2e, 0xa, 0x44, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x66, 0x66, 0x20, 0x56, 0x61, 0x70, 0x6f, 0x72, 0x20, 0x50, 0x68, 0x61, 0x73, 0x65, 0x20, 0x4f, 0x6e, 0x65, 0x2e, 0x0, // @909 "Coolant temperature sensor problem detected, please read manual.?Don't turn off Vapor Phase One." - 0x48, 0x65, 0x61, 0x74, 0x65, 0x72, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x73, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x62, 0x6c, 0x65, 0x6d, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x61, 0x64, 0x20, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x2e, 0xa, 0x44, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x66, 0x66, 0x20, 0x56, 0x61, 0x70, 0x6f, 0x72, 0x20, 0x50, 0x68, 0x61, 0x73, 0x65, 0x20, 0x4f, 0x6e, 0x65, 0x2e, 0x0, // @1006 "Heater temperature sensor problem detected, please read manual.?Don't turn off Vapor Phase One." - 0x43, 0x6f, 0x6f, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x3a, 0x20, 0x20, 0x2, 0xb0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0, // @1102 "Cooling System: <>? <> " - 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0xe4, 0xf6, 0xfc, 0x2e, 0x2d, 0x5f, 0x2f, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x0, // @1135 "abcdefghijklmnopqrstuvwxyz???.-_/1234567890" - 0x47, 0x61, 0x6c, 0x64, 0x65, 0x6e, 0x3a, 0x20, 0x2, 0x20, 0xb0, 0x2, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0, // @1179 "Galden: <> ?<> " - 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x52, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6d, 0x65, 0x74, 0x0, // @1200 "Start Reflow condition not met" - 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xc4, 0xd6, 0xdc, 0x0, // @1231 "ABCDEFGHIJKLMNOPQRSTUVWXYZ???" - 0x4c, 0x69, 0x64, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6d, 0x65, 0x74, 0x0, // @1261 "Lid Open condition not met" - 0x43, 0x6f, 0x72, 0x65, 0x20, 0x43, 0x6f, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x0, // @1288 "Core Communication Error" - 0x53, 0x65, 0x6c, 0x66, 0x74, 0x65, 0x73, 0x74, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x2e, 0x2e, 0x0, // @1313 "Selftest in progress..." - 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x0, // @1337 "Open temperature" - 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x61, 0x62, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x0, // @1354 "Profile aborted" - 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x53, 0x65, 0x6c, 0x66, 0x74, 0x65, 0x73, 0x74, 0x3f, 0x0, // @1370 "Start Selftest?" - 0x54, 0x69, 0x6d, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x0, // @1386 "Time in Seconds" - 0x56, 0x61, 0x70, 0x6f, 0x72, 0x20, 0x50, 0x68, 0x61, 0x73, 0x65, 0x20, 0x4f, 0x6e, 0x65, 0x0, // @1402 "Vapor Phase One" - 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x2e, 0x30, 0x2e, 0x30, 0x0, // @1418 "Version: 1.0.0" - 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x20, 0x75, 0x6e, 0x69, 0x74, 0x0, // @1433 "Displayed unit" - 0x53, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x0, // @1448 "Solder profile" - 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x20, 0x52, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x0, // @1463 "Cancel Reflow" - 0x41, 0x72, 0x65, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x73, 0x75, 0x72, 0x65, 0x3f, 0x0, // @1477 "Are you sure?" - 0x43, 0x6f, 0x6f, 0x6c, 0x61, 0x6e, 0x74, 0x20, 0x4f, 0x54, 0x50, 0x0, // @1491 "Coolant OTP" - 0x48, 0x65, 0x61, 0x74, 0x65, 0x72, 0x20, 0x4f, 0x54, 0x50, 0x0, // @1503 "Heater OTP" - 0x4d, 0x6f, 0x64, 0x61, 0x6c, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x0, // @1514 "ModalTitle" - 0x4e, 0x65, 0x77, 0x20, 0x54, 0x65, 0x78, 0x74, 0x0, // @1525 "New Text" - 0xb0, 0x2, 0x0, // @1534 "?<>" - 0x74, 0x65, 0x73, 0x74, 0x2e, 0x63, 0x73, 0x76, 0x0, // @1537 "test.csv" - 0x53, 0x65, 0x6c, 0x66, 0x74, 0x65, 0x73, 0x74, 0x0, // @1546 "Selftest" - 0x4c, 0x69, 0x64, 0x20, 0x4f, 0x43, 0x50, 0x0, // @1555 "Lid OCP" - 0x53, 0x44, 0x20, 0x63, 0x61, 0x72, 0x64, 0x0, // @1563 "SD card" - 0x33, 0x30, 0x0, // @1571 "30" - 0x34, 0x35, 0x0, // @1574 "45" - 0x37, 0x30, 0x0, // @1577 "70" - 0x43, 0x0 // @1580 "C" + 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x61, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x2e, 0xa, 0x50, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x20, 0x69, 0x66, 0x3a, 0xa, 0x2d, 0x20, 0x53, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x20, 0x6d, 0x65, 0x64, 0x69, 0x75, 0x6d, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x74, 0x6f, 0x6f, 0x20, 0x68, 0x69, 0x67, 0x68, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x77, 0x61, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x6f, 0x6f, 0x6c, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x2e, 0xa, 0x2d, 0x20, 0x4c, 0x69, 0x66, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x6c, 0x69, 0x64, 0x20, 0x69, 0x73, 0x20, 0x63, 0x61, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0xa, 0x2d, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x69, 0x73, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x20, 0x6d, 0x6f, 0x76, 0x69, 0x6e, 0x67, 0x0, // @327 "Start conditions for Open Lid are not given.?Please check if:?- Solder medium temperature too high, please wait to cool down.?- Lift or lid is calibrating?- Lid is currently moving" + 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x52, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x20, 0x61, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x2e, 0xa, 0x50, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x20, 0x69, 0x66, 0x3a, 0xa, 0x2d, 0x20, 0x53, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0xa, 0x2d, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x6c, 0x79, 0x20, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, 0xa, 0x2d, 0x20, 0x43, 0x6f, 0x6f, 0x6c, 0x61, 0x6e, 0x74, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x69, 0x73, 0x20, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x36, 0x30, 0xb0, 0x43, 0x20, 0x2f, 0x20, 0x31, 0x34, 0x30, 0xb0, 0x46, 0x0, // @508 "Start conditions for Reflow are not given.?Please check if:?- Solder profile selected?- Lid is properly closed?- Coolant temperature is under 60?C / 140?F" + 0x55, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x72, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0xa, 0x50, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x61, 0x64, 0x20, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x2e, 0x20, 0x44, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x66, 0x66, 0x20, 0x56, 0x61, 0x70, 0x6f, 0x72, 0x20, 0x50, 0x68, 0x61, 0x73, 0x65, 0x20, 0x4f, 0x6e, 0x65, 0x2e, 0x0, // @663 "Under temperature protection or over temperature protection detected.?Please read manual. Don't turn off Vapor Phase One." + 0x41, 0x6e, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x20, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0xa, 0x54, 0x68, 0x65, 0x20, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20, 0x6d, 0x69, 0x67, 0x68, 0x74, 0x20, 0x62, 0x65, 0x20, 0x69, 0x6e, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74, 0x2e, 0x0, // @785 "An error occured in the communication with the core controller.?The displayed values might be incorrect." + 0x4c, 0x69, 0x64, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0xa, 0x4c, 0x69, 0x64, 0x20, 0x77, 0x61, 0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0xa, 0x41, 0x6e, 0x64, 0x20, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x0, // @890 "Lid over current event detected.?Lid was blocked, please remove blockage.?And Power cycle device." + 0x4c, 0x69, 0x64, 0x20, 0x6f, 0x76, 0x65, 0x72, 0x20, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0x20, 0x4c, 0x69, 0x64, 0x20, 0x77, 0x61, 0x73, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x61, 0x67, 0x65, 0x2e, 0xa, 0x41, 0x6e, 0x64, 0x20, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x20, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x20, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x0, // @988 "Lid over current event detected. Lid was blocked, please remove blockage.?And Power cycle device." + 0x48, 0x65, 0x61, 0x74, 0x65, 0x72, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x20, 0x73, 0x65, 0x6e, 0x73, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x62, 0x6c, 0x65, 0x6d, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x20, 0x72, 0x65, 0x61, 0x64, 0x20, 0x6d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x2e, 0xa, 0x44, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x66, 0x66, 0x20, 0x56, 0x61, 0x70, 0x6f, 0x72, 0x20, 0x50, 0x68, 0x61, 0x73, 0x65, 0x20, 0x4f, 0x6e, 0x65, 0x2e, 0x0, // @1086 "Heater temperature sensor problem detected, please read manual.?Don't turn off Vapor Phase One." + 0x53, 0x65, 0x6c, 0x66, 0x74, 0x65, 0x73, 0x74, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x2e, 0x2e, 0xa, 0x54, 0x68, 0x69, 0x73, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x74, 0x61, 0x6b, 0x65, 0x20, 0x66, 0x65, 0x77, 0x20, 0x6d, 0x69, 0x6e, 0x75, 0x74, 0x65, 0x73, 0x0, // @1182 "Selftest in progress...?This will take few minutes" + 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0xe4, 0xf6, 0xfc, 0x2e, 0x2d, 0x5f, 0x2f, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30, 0x0, // @1233 "abcdefghijklmnopqrstuvwxyz???.-_/1234567890" + 0x43, 0x6f, 0x6f, 0x6c, 0x69, 0x6e, 0x67, 0x20, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x3a, 0x20, 0x2, 0x20, 0xb0, 0x2, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0, // @1277 "Cooling System: <> ?<> " + 0x47, 0x61, 0x6c, 0x64, 0x65, 0x6e, 0x3a, 0x20, 0x2, 0x20, 0xb0, 0x2, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0, // @1303 "Galden: <> ?<> " + 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x52, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6d, 0x65, 0x74, 0x0, // @1324 "Start Reflow condition not met" + 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0xc4, 0xd6, 0xdc, 0x0, // @1355 "ABCDEFGHIJKLMNOPQRSTUVWXYZ???" + 0x4c, 0x69, 0x64, 0x20, 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x6d, 0x65, 0x74, 0x0, // @1385 "Lid Open condition not met" + 0x43, 0x6f, 0x72, 0x65, 0x20, 0x43, 0x6f, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x0, // @1412 "Core Communication Error" + 0x4f, 0x70, 0x65, 0x6e, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x65, 0x72, 0x61, 0x74, 0x75, 0x72, 0x65, 0x0, // @1437 "Open temperature" + 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x53, 0x65, 0x6c, 0x66, 0x74, 0x65, 0x73, 0x74, 0x3f, 0x0, // @1454 "Start Selftest?" + 0x56, 0x61, 0x70, 0x6f, 0x72, 0x20, 0x50, 0x68, 0x61, 0x73, 0x65, 0x20, 0x4f, 0x6e, 0x65, 0x0, // @1470 "Vapor Phase One" + 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x61, 0x62, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x0, // @1486 "Profile aborted" + 0x43, 0x6f, 0x6f, 0x6c, 0x61, 0x6e, 0x74, 0x20, 0x55, 0x54, 0x50, 0x2f, 0x4f, 0x54, 0x50, 0x0, // @1502 "Coolant UTP/OTP" + 0x54, 0x69, 0x6d, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x0, // @1518 "Time in Seconds" + 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x20, 0x75, 0x6e, 0x69, 0x74, 0x0, // @1534 "Displayed unit" + 0x53, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x0, // @1549 "Solder profile" + 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x31, 0x2e, 0x30, 0x2e, 0x31, 0x0, // @1564 "Version: 1.0.1" + 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x20, 0x52, 0x65, 0x66, 0x6c, 0x6f, 0x77, 0x0, // @1579 "Cancel Reflow" + 0x41, 0x72, 0x65, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x73, 0x75, 0x72, 0x65, 0x3f, 0x0, // @1593 "Are you sure?" + 0x48, 0x65, 0x61, 0x74, 0x65, 0x72, 0x20, 0x4f, 0x54, 0x50, 0x0, // @1607 "Heater OTP" + 0x4d, 0x6f, 0x64, 0x61, 0x6c, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x0, // @1618 "ModalTitle" + 0x74, 0x65, 0x73, 0x74, 0x2e, 0x63, 0x73, 0x76, 0x0, // @1629 "test.csv" + 0x4e, 0x65, 0x77, 0x20, 0x54, 0x65, 0x78, 0x74, 0x0, // @1638 "New Text" + 0x53, 0x65, 0x6c, 0x66, 0x74, 0x65, 0x73, 0x74, 0x0, // @1647 "Selftest" + 0xb0, 0x2, 0x0, // @1656 "?<>" + 0x4c, 0x69, 0x64, 0x20, 0x4f, 0x43, 0x50, 0x0, // @1659 "Lid OCP" + 0x53, 0x44, 0x20, 0x63, 0x61, 0x72, 0x64, 0x0, // @1667 "SD card" + 0x37, 0x30, 0x0, // @1675 "70" + 0x33, 0x30, 0x0, // @1678 "30" + 0x43, 0x0 // @1681 "C" }; TEXT_LOCATION_FLASH_PRAGMA KEEP extern uint32_t const indicesGb[] TEXT_LOCATION_FLASH_ATTRIBUTE; diff --git a/display-fw/TouchGFX/generated/texts/src/TypedTextDatabase.cpp b/display-fw/TouchGFX/generated/texts/src/TypedTextDatabase.cpp index c2344dcb..99b907a6 100644 --- a/display-fw/TouchGFX/generated/texts/src/TypedTextDatabase.cpp +++ b/display-fw/TouchGFX/generated/texts/src/TypedTextDatabase.cpp @@ -10,6 +10,7 @@ extern touchgfx::GeneratedFont& getFont_arial_40_4bpp(); extern touchgfx::GeneratedFont& getFont_arial_10_4bpp(); extern touchgfx::GeneratedFont& getFont_arial_14_4bpp(); extern touchgfx::GeneratedFont& getFont_arial_26_4bpp(); +extern touchgfx::GeneratedFont& getFont_arial_16_4bpp(); const touchgfx::Font* touchgfx_fonts[] = { @@ -17,7 +18,8 @@ const touchgfx::Font* touchgfx_fonts[] = &(getFont_arial_40_4bpp()), &(getFont_arial_10_4bpp()), &(getFont_arial_14_4bpp()), - &(getFont_arial_26_4bpp()) + &(getFont_arial_26_4bpp()), + &(getFont_arial_16_4bpp()) }; extern const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[]; @@ -30,8 +32,7 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT { 1, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 2, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, - { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, - { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, + { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, @@ -46,9 +47,8 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, - { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, - { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, + { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::CENTER, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, @@ -81,7 +81,8 @@ const touchgfx::TypedText::TypedTextData typedText_database_DEFAULT[] TEXT_LOCAT { 3, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, - { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR } + { 0, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR }, + { 5, touchgfx::LEFT, touchgfx::TEXT_DIRECTION_LTR } }; TEXT_LOCATION_FLASH_PRAGMA @@ -133,6 +134,9 @@ void resetFont(touchgfx::FontId fontId) case 4: touchgfx_fonts[4] = &(getFont_arial_26_4bpp()); break; + case 5: + touchgfx_fonts[5] = &(getFont_arial_16_4bpp()); + break; } } } // namespace TypedTextDatabase diff --git a/display-fw/TouchGFX/simulator/msvs/Application.vcxproj.filters b/display-fw/TouchGFX/simulator/msvs/Application.vcxproj.filters index c0f4d077..32f92bfc 100644 --- a/display-fw/TouchGFX/simulator/msvs/Application.vcxproj.filters +++ b/display-fw/TouchGFX/simulator/msvs/Application.vcxproj.filters @@ -206,7 +206,7 @@ 27658C64-AD2D-9C59-8E84-A1C34DB95143 - 753AF58B-120E-DC1E-A52E-9D48915617B2 + 19216C9C-727E-3070-01AC-1A9E15EBAD07