Merge pull request #139 from HASwitchPlate/mdi-icons

Change default fonts

.gitignore

@@ -14,6 +14,8 @@ user_setups/active/*
 build_output/*
 build_output/firmware/*.bin
 build_output/firmware/*.exe
+src/custom/*
+!src/custom/README.md
 
 ## Test result files
 *.xml

include/lv_conf_v7.h

@@ -11,6 +11,8 @@
 
 #include <stdint.h>
 
+#include "lv_symbol_mdi_def.h"
+
 #if defined(ARDUINO_ARCH_ESP8266)
 #define LV_HIGH_RESOURCE_MCU  0
 #endif
@@ -337,6 +339,64 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
  *    FONT USAGE
  *===================*/
 
+#if TFT_WIDTH>=320 || TFT_WIDTH>=480
+
+#ifndef HASP_FONT_1
+#define HASP_FONT_1 robotocondensed_regular_16_latin1  /* 5% Width */
+#endif
+#ifndef HASP_FONT_2
+#define HASP_FONT_2 robotocondensed_regular_24_latin1  /* 5% Width */
+#endif
+#ifndef HASP_FONT_3
+#define HASP_FONT_3 robotocondensed_regular_32_latin1  /* 10% Width */
+#endif
+#ifndef HASP_FONT_4
+#define HASP_FONT_4 robotocondensed_regular_48_latin1  /* 10% Height */
+#endif
+
+#ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1
+#define ROBOTOCONDENSED_REGULAR_16_LATIN1 1
+#endif
+#ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1
+#define ROBOTOCONDENSED_REGULAR_24_LATIN1 1
+#endif
+#ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1
+#define ROBOTOCONDENSED_REGULAR_32_LATIN1 1
+#endif
+#ifndef ROBOTOCONDENSED_REGULAR_48_LATIN1
+#define ROBOTOCONDENSED_REGULAR_48_LATIN1 1
+#endif
+
+#else
+
+#ifndef HASP_FONT_1
+#define HASP_FONT_1 robotocondensed_regular_12_latin1  /* 5% Width */
+#endif
+#ifndef HASP_FONT_2
+#define HASP_FONT_2 robotocondensed_regular_16_latin1  /* 5% Width */
+#endif
+#ifndef HASP_FONT_3
+#define HASP_FONT_3 robotocondensed_regular_24_latin1  /* 10% Width */
+#endif
+#ifndef HASP_FONT_4
+#define HASP_FONT_4 robotocondensed_regular_32_latin1  /* 10% Height */
+#endif
+
+#ifndef ROBOTOCONDENSED_REGULAR_12_LATIN1
+#define ROBOTOCONDENSED_REGULAR_12_LATIN1 1
+#endif
+#ifndef ROBOTOCONDENSED_REGULAR_16_LATIN1
+#define ROBOTOCONDENSED_REGULAR_16_LATIN1 1
+#endif
+#ifndef ROBOTOCONDENSED_REGULAR_24_LATIN1
+#define ROBOTOCONDENSED_REGULAR_24_LATIN1 1
+#endif
+#ifndef ROBOTOCONDENSED_REGULAR_32_LATIN1
+#define ROBOTOCONDENSED_REGULAR_32_LATIN1 1
+#endif
+
+#endif
+
 /* The built-in fonts contains the ASCII range and some Symbols with 4 bit-per-pixel.
  * The symbols are available via `LV_SYMBOL_...` defines
  * More info about fonts: https://docs.lvgl.io/v7/en/html/overview/font.html
@@ -411,22 +471,47 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
     /*Declare the type of the user data of fonts (can be e.g. `void *`, `int`, `struct`)*/
 typedef void* lv_font_user_data_t;
 
+// #define FONT_CONCAT2(a, b)  a ## b
+// #define FONT_CONCAT(a, b) FONT_CONCAT2(a, b)
+// #define HASP_FONTNAME robotocondensed_regular_
+// #define HASP_FONTNAME_BASE FONT_CONCAT(HASP_FONTNAME, _)
+// #define HASP_CHARACTER_SET latin1
+
+// /* Concatenate the fontname macros */
+// #define HASP_FONT_1_size FONT_CONCAT(HASP_FONTNAME, 12)
+// #define HASP_FONT_1_base FONT_CONCAT(HASP_FONT_1_size, _)
+// #define HASP_FONT_1 FONT_CONCAT(HASP_FONT_1_base, HASP_CHARACTER_SET)
+
+// /* Concatenate the fontname macros */
+// #define HASP_FONT_2_size FONT_CONCAT(HASP_FONTNAME, 16)
+// #define HASP_FONT_2_base FONT_CONCAT(HASP_FONT_2_size, _)
+// #define HASP_FONT_2 FONT_CONCAT(HASP_FONT_2_base, HASP_CHARACTER_SET)
+
+// /* Concatenate the fontname macros */
+// #define HASP_FONT_3_size FONT_CONCAT(HASP_FONTNAME, 22)
+// #define HASP_FONT_3_base FONT_CONCAT(HASP_FONT_3_size, _)
+// #define HASP_FONT_3 FONT_CONCAT(HASP_FONT_3_base, HASP_CHARACTER_SET)
+
+// /* Concatenate the fontname macros */
+// #define HASP_FONT_4_size FONT_CONCAT(HASP_FONTNAME, 28)
+// #define HASP_FONT_4_base FONT_CONCAT(HASP_FONT_4_size, _)
+// #define HASP_FONT_4 FONT_CONCAT(HASP_FONT_4_base, HASP_CHARACTER_SET)
 
 /*Always set a default font from the built-in fonts*/
 #if LV_HIGH_RESOURCE_MCU>0
 // #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(lv_font_montserrat_16);
 
-#define LV_FONT_CUSTOM_12     LV_FONT_DECLARE(robotocondensed_regular_12_nokern)
+// #define LV_FONT_CUSTOM_12     LV_FONT_DECLARE(robotocondensed_regular_12)
-#define LV_FONT_CUSTOM_16     LV_FONT_DECLARE(robotocondensed_regular_16_nokern)
+// #define LV_FONT_CUSTOM_16     LV_FONT_DECLARE(robotocondensed_regular_16)
-#define LV_FONT_CUSTOM_22     LV_FONT_DECLARE(robotocondensed_regular_22_nokern)
+// #define LV_FONT_CUSTOM_22     LV_FONT_DECLARE(robotocondensed_regular_22)
-#define LV_FONT_CUSTOM_28     LV_FONT_DECLARE(robotocondensed_regular_28_nokern)
+// #define LV_FONT_CUSTOM_28     LV_FONT_DECLARE(robotocondensed_regular_28)
 
-#define LV_FONT_CUSTOM_DECLARE LV_FONT_CUSTOM_12 \
+#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(HASP_FONT_1) \
-                               LV_FONT_CUSTOM_16 \
+                               LV_FONT_DECLARE(HASP_FONT_2) \
-                               LV_FONT_CUSTOM_22 \
+                               LV_FONT_DECLARE(HASP_FONT_3) \
-                               LV_FONT_CUSTOM_28 \
+                               LV_FONT_DECLARE(HASP_FONT_4) \
 
-#define LV_FONT_DEFAULT        &robotocondensed_regular_16_nokern //&lv_font_montserrat_16
+#define LV_FONT_DEFAULT        &HASP_FONT_2 //&lv_font_montserrat_16
 #else
 #define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(unscii_8_icon);
 #define LV_FONT_DEFAULT        &unscii_8_icon //&lv_font_unscii_8
@@ -443,12 +528,12 @@ typedef void* lv_font_user_data_t;
 #define LV_THEME_DEFAULT_INIT               lv_theme_material_init // lv_theme_hasp_init // We init the theme ourselves
 #define LV_THEME_DEFAULT_COLOR_PRIMARY      LV_COLOR_RED
 #define LV_THEME_DEFAULT_COLOR_SECONDARY    LV_COLOR_BLUE
-#define LV_THEME_DEFAULT_FLAG              0 //LV_THEME_MATERIAL_FLAG_NONE
+#define LV_THEME_DEFAULT_FLAG               0 //LV_THEME_MATERIAL_FLAG_NONE
 #if LV_HIGH_RESOURCE_MCU
-#define LV_THEME_DEFAULT_FONT_SMALL         &robotocondensed_regular_12_nokern //&lv_font_montserrat_12
+#define LV_THEME_DEFAULT_FONT_SMALL         &HASP_FONT_1 //&lv_font_montserrat_12
-#define LV_THEME_DEFAULT_FONT_NORMAL        &robotocondensed_regular_16_nokern //&lv_font_montserrat_16
+#define LV_THEME_DEFAULT_FONT_NORMAL        &HASP_FONT_2 //&lv_font_montserrat_16
-#define LV_THEME_DEFAULT_FONT_SUBTITLE      &robotocondensed_regular_22_nokern //&lv_font_montserrat_22
+#define LV_THEME_DEFAULT_FONT_SUBTITLE      &HASP_FONT_3 //&lv_font_montserrat_22
-#define LV_THEME_DEFAULT_FONT_TITLE         &robotocondensed_regular_28_nokern //&lv_font_montserrat_22 //&lv_font_montserrat_28_compressed
+#define LV_THEME_DEFAULT_FONT_TITLE         &HASP_FONT_4 //&lv_font_montserrat_22 //&lv_font_montserrat_28_compressed
 #else
 #define LV_THEME_DEFAULT_FONT_SMALL         LV_FONT_DEFAULT // &lv_font_montserrat_12
 #define LV_THEME_DEFAULT_FONT_NORMAL        LV_FONT_DEFAULT // &lv_font_montserrat_16

include/lv_symbol_mdi_def.h

@@ -0,0 +1,44 @@
+#ifndef LV_SYMBOL_MDI_DEF_H
+#define LV_SYMBOL_MDI_DEF_H
+/* clang-format off */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/*----------------------------------------
+ * Symbols from Material Design Icons font
+ *--------------------------------------*/
+
+/* In the font converter use this list as range:
+    0XF0140, 0XF0141, 0XF0142, 0XF0143, 0XF012C, 0XF0208, 0XF0209, 0XF05A9, 0XF0156, 0XF060C, 0XF030D
+*/
+
+#define LV_SYMBOL_DOWN              "\xEE\x85\x80"  /* 0xE140, chevron-down */
+#define LV_SYMBOL_LEFT              "\xEE\x85\x81"  /* 0xE141, chevron-left */
+#define LV_SYMBOL_RIGHT             "\xEE\x85\x82"  /* 0xE142, chevron-right */
+#define LV_SYMBOL_OK                "\xEE\x84\xAC"  /* 0xE12C, check */
+#define LV_SYMBOL_EYE_OPEN          "\xEE\xBF\x86"  /* 0xEFC6, lock-open-variant */
+#define LV_SYMBOL_EYE_CLOSE         "\xEE\x8C\xBE"  /* 0xE33E, lock*/
+#define LV_SYMBOL_WIFI              "\xEE\x96\xA9"  /* 0xE5A9, wifi */
+#define LV_SYMBOL_KEY               "\xEE\x8C\x8B"  /* 0xE30B, key-variant */
+#define LV_SYMBOL_CLOSE             "\xEE\x85\x96"  /* 0xE156, close */
+#define LV_SYMBOL_NEW_LINE          "\xEE\x98\x8C"  /* 0xE60C, subdirectory-arrow-left */
+#define LV_SYMBOL_BACKSPACE         "\xEE\x81\x8D"  /* 0xE04D, arrow-left */
+
+/** Invalid symbol at (U+F8FF). If written before a string then `lv_img` will show it as a label*/
+#define LV_SYMBOL_DUMMY             "\xEF\xA3\xBF"
+
+/*-------------------------------
+ * Symbols from "normal" font
+ *-----------------------------*/
+#define LV_SYMBOL_BULLET            "\xE2\x80\xA2" /* 20042, 0x2022 */
+
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_SYMBOL_MDI_DEF_H*/

platformio.ini

@@ -48,6 +48,7 @@ build_flags =
     -D LV_CONF_INCLUDE_SIMPLE       ; for lvgl
     -D LV_LVGL_H_INCLUDE_SIMPLE     ; for lv_drivers
     -D LV_COMP_CONF_INCLUDE_SIMPLE  ; for components
+    -D LV_SYMBOL_DEF_H              ; don't load default symbol defines
     ; -- ESP build options ------------------------------------
     -D SPIFFS_TEMPORAL_FD_CACHE     ; speedup opening recent files
     ; -- ArduinoJson build options ----------------------------

src/custom/README.md

@@ -0,0 +1,6 @@
+Files and customizations in this folder will be ignored by version control.
+
+Use this folder to place:
+- Custom font source files
+- Custom boot screen
+- ...

src/font/hasp_mdi_font_shifted.sh

@@ -0,0 +1,133 @@
+#!/bin/bash
+
+# Default glyphs that need to be included in ALL fonts:
+ASCII=0x20-0x7E,0xA0,0XB0,0xB1,0xB5,0xD7,0xF7,0x2022
+
+ICONFONT=materialdesignicons-webfont.ttf
+ICONS='0xf0140=>0xE140','0xf0141=>0xE141','0xf0142=>0xE142','0xf0143=>0xE143','0xf012c=>0xE12C','0xF0156=>0xE156','0xF0311=>0xE311','0xf02dc=>0xE2DC','0xf0045=>0xE045','0xf004d=>0xE04D','0xf0054=>0xE054','0xf005d=>0xE05D','0xf0717=>0xE717','0xf0599=>0xE599','0xf0374=>0xE374','0xf0415=>0xE415','0xF05A8=>0xE5A8','0xf0594=>0xE594','0xf050f=>0xE50F','0xf058e=>0xE58E','0xf0335=>0xE335','0xf06e8=>0xE6E8','0xf140b=>0xF40B','0xf05a9=>0xE5A9','0xf0425=>0xE425','0xf011c=>0xE11C','0xf06a5=>0xE6A5','0xF0769=>0xE769','0xf081b=>0xE81B','0xf10af=>0xF0AF','0xf081c=>0xE81C','0xf0322=>0xE322','0xf12d4=>0xF2D4','0xf12d3=>0xF2D3','0xf111c=>0xF11C','0xf111e=>0xF11E','0xf111d=>0xF11D','0xf0150=>0xE150','0xf0606=>0xE606','0xf033e=>0xE33E','0xf0fc6=>0xEFC6','0xF099D=>0xE99D','0xf010b=>0xE10B','0xF070D=>0xE70D','0xf0ad7=>0xEAD7','0xf0438=>0xE438','0xF001B=>0xE01B','0xf0502=>0xE502','0xf032a=>0xE32A','0xf0026=>0xE026','0xf030b=>0xE30B','0xF068A=>0xE68A','0xf04ad=>0xE4AD','0xf04ae=>0xE4AE','0xf009a=>0xE09A','0xF0A70=>0xEA70','0xF0565=>0xE565','0xF070E=>0xE70E','0xf075f=>0xE75F','0xF00AC=>0xE0AC','0xF1011=>0xF011','0xF08DD=>0xE8DD','0xF1020=>0xF020','0xF06B5=>0xE6B5','0xF11E1=>0xF1E1','0xF091C=>0xE91C','0xf04b9=>0xE4B9','0xf04c3=>0xE4C3','0xf057e=>0xE57E','0xf0456=>0xE456','0xf0457=>0xE457','0xf0458=>0xE458','0xf049d=>0xE49D','0xf049e=>0xE49E','0xf0004=>0xE004','0xf0a79=>0xEA79','0xF11F3=>0xF1F3','0xf00af=>0xE0AF','0xF0210=>0xE210','0xF12BA=>0xF2BA','0xf02e3=>0xE2E3','0xf09a0=>0xE9A0','0xf03e4=>0xE3E4','0xf040a=>0xE40A','0xf04db=>0xE4DB','0xf0580=>0xE580','0xf0f5f=>0xEF5F','0xf0493=>0xE493','0xF0238=>0xE238','0xF04DE=>0xE4DE','0xF072A=>0xE72A','0xF0917=>0xE917','0xF058C=>0xE58C','0xf05f1=>0xE5F1','0xF095F=>0xE95F','0xf09ab=>0xE9AB','0xf064a=>0xE64A','0xf0176=>0xE176','0xF051B=>0xE51B','0xF0AAC=>0xEAAC','0xF05FA=>0xE5FA','0xf12a3=>0xF2A3','0xf008e=>0xE08E','0xf12a1=>0xF2A1','0xf12a2=>0xF2A2','0xF060C=>0xE60C'
+
+echo $ICONS
+
+for ISO8559 in 0 1 2 5 # 3 4 7 9 10 11 13 15 16
+do
+  if [ $ISO8559 -eq 1 ]
+  then
+    # EXTENDED_ASCII=0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
+    # Removed some symbols in 0xA0-0xBF
+    EXTENDED_ASCII=0xA1,0xA3,0XB0,0xB1,0xB5,0xBF,0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF
+    FOLDER=latin1
+
+  elif [ $ISO8559 -eq -1 ]
+  then
+    EXTENDED_ASCII=0x20
+    SYMBOLS=一在有個我不這了他也就人都說而我們你了要會對及和與以很種的大能著她那上但年還可以最自己為來所他們兩各可為或好等又將因為於由從更被才已者每次把三什麼問題其讓此做再所以只與則台灣卻並位想去呢學生表示到公司將如果社會看小天因此新但是它中使工作全覺得使用這些裡並由於時候知道這樣一認為時間事過向可能中國美國到和幾系統政府大家國家許多生活跟已經大學研究因本二活動該世界應四希望方式內項啊下環境一些必須文化高孩子沒有不能如開始元不同仍網路日本用中心來對雖然重要地方進行關係市場太老師提供學校應該指出經濟其他家發展教育成為多非常便方面很多吃然後未發現電腦一樣而且心不過無法企業正服務較不會臺灣曾嗎空間看到五如何國內們無對於以及之後可是當人員比先產品資訊資料比較先生地除了大陸需要像在給歲請月些名另若亦地區技術至特別其實國際不要發生參加一定其中問台北包括講造成看像常即喜歡去沒出現政治話走單位一直吧是否當然整處理歷史了解那怎麼機會家聽所有只要朋友令甚至用真六呀情況還是錢方法點任何經驗藝術你們十主要媽媽增加提出為什麼以您計畫作利用東西在條設計找之間成長能夠決定學習誰見半時代完成帶相當同學件能力別人生命下來場會議容易開發民眾事情書事實有關自組織言多愛建立相關均產生多業者解決完全的話接受知約一般推動過程管理功能手打水要求小朋友教授難我國告訴內容結果調查家庭成立選擇經營然而父母寫人類至於買尤其配合進入例如得討論依作品情形資源原因啦妳運動觀念給軟體品質經過如此嗯精神影響之過好像成參與以後於是部分另外公園透過訓練努力研究具有共同所謂下行為合作經合作目標起來考慮長意見辦法音樂連受廠商隻受到一切或是中央某女性教學極獲得真的路來快國小部份工程女人舉行句只是段根據現象人民土地面對注意這裡新聞繼續相信政策變成計劃強調學人士前前存在制度意義代表課程該沒至需求人生那些成功爸爸產業負責民間雖影響直接幾乎分實際團體價值使得類形成科技這麼當七不但往本身標準似乎應用或者動物電話態度建設事業老那麼常常字坐舉辦自我有的具目的塊條件即使好十分多少放又電影科學執行邊委員會溝通開一起張針對員工引起自然那麼安全總統此外擁有並且事件設計研究所語言嚴重故事學術片設備之外車基本實在久套達到改善死結構住皆改變拿小組支持座醫院既僅值得學者八交通階段就是申請主管申請同感覺電視母親嘛香港記者壓力快樂喝敢院也許人們談生產怕就身體規定程度積極知識作為機構而是鼓勵角色狀況專家據清楚不僅比賽玩效果越保護共開放附近上父親專業經費曾經工作願意分別重視不少歡迎小孩小時中國人顯示中共出男人避免屬於實施聲音主義行動不可只有校園興趣山表現得回來主任裡面經常不再電子受思想頭終於謝謝協助除當地正式真正低性份因素推出上價格去認識方向責任說明工業大量做逐漸心理一點供須簡單運用觀察往往規劃減少重新業務報導仍然感到開放領域有效女要從事發揮人才反而行政銀行公共媒體提高代自然社區力量啊教育部愈超過維持家長結合校長通常缺乏委員特色結果有時教師之前遠控制本否則法少原則要臉通過建議工具作業達節目智慧來自而變化同樣形式站以為健康擔任人口規劃剛特殊原來道分傳統總是前往投資加強不斷對象追求加上比思考製作台北市取得出來加入台安排兒童國中範圍老人雙方牠北京年輕結束教程式婦女找到彼此全球成本回到部而已之下等變期間非小姐整體採用根本叫歐洲正在加以充滿系列隨著早等等頗不足總分析深報告不錯在於旁笑故消費者意識公尺民族為主大眾到底願度大概對方官員發表進一步自由正確豐富國民黨戰爭怎麼樣只好明顯改革表達肯定強高興哪樹適合茶別國外關心蘇聯成績人物聽到創造不必不論尚居民不管美麗伊拉克帶來有般永遠感情兒子這樣子起全部
+
+  elif [ $ISO8559 -eq 2 ]
+  then
+    # EXTENDED_ASCII=0xA4,0xA7,0xA8,0xAD,0xB0,0xB4,0xB8,0xC1,0xC2,0xC4,0xC7,0xC9,0xCB,0xCD,0xCE,0xD3,0xD4,0xD6,0xD7,0xDA,0xDC,0xDD,0xDF,0xE1,0xE2,0xE4,0xE7,0xE9,0xEB,0xED,0xEE,0xF3,0xF4,0xF6,0xF7,0xFA,0xFC,0xFD,0x0102,0x0103,0x0104,0x0105,0x0106,0x0107,0x010C,0x010D,0x010E,0x010F,0x0110,0x0111,0x0118,0x0119,0x011A,0x011B,0x0139,0x013A,0x013D,0x013E,0x0141,0x0142,0x0143,0x0144,0x0147,0x0148,0x0150,0x0151,0x0154,0x0155,0x0158,0x0159,0x015A,0x015B,0x015E,0x015F,0x0160,0x0161,0x0162,0x0163,0x0164,0x0165,0x016E,0x016F,0x0170,0x0171,0x0179,0x017A,0x017B,0x017C,0x017D,0x017E,0x02C7,0x02D8,0x02D9,0x02DB,0x02DD
+    # Removed some symbols in 0xA0-0xBF
+    EXTENDED_ASCII=0xB0,0xC1,0xC2,0xC4,0xC7,0xC9,0xCB,0xCD,0xCE,0xD3,0xD4,0xD6,0xD7,0xDA,0xDC,0xDD,0xDF,0xE1,0xE2,0xE4,0xE7,0xE9,0xEB,0xED,0xEE,0xF3,0xF4,0xF6,0xF7,0xFA,0xFC,0xFD,0x0102,0x0103,0x0104,0x0105,0x0106,0x0107,0x010C,0x010D,0x010E,0x010F,0x0110,0x0111,0x0118,0x0119,0x011A,0x011B,0x0139,0x013A,0x013D,0x013E,0x0141,0x0142,0x0143,0x0144,0x0147,0x0148,0x0150,0x0151,0x0154,0x0155,0x0158,0x0159,0x015A,0x015B,0x015E,0x015F,0x0160,0x0161,0x0162,0x0163,0x0164,0x0165,0x016E,0x016F,0x0170,0x0171,0x0179,0x017A,0x017B,0x017C,0x017D,0x017E,0x02C7,0x02D8,0x02D9,0x02DB,0x02DD
+    # Add missing Romanian letters
+    EXTENDED_ASCII="${EXTENDED_ASCII},0x0218,0x0219,0x021A,0x021B"
+    FOLDER=latin2
+
+  elif [ $ISO8559 -eq 3 ]
+  then
+    EXTENDED_ASCII=0xA3,0xA4,0xA7,0xA8,0xAD,0xB0,0xB2,0xB3,0xB4,0xB5,0xB7,0xB8,0xBD,0xC0,0xC1,0xC2,0xC4,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD2,0xD3,0xD4,0xD6,0xD7,0xD9,0xDA,0xDB,0xDC,0xDF,0xE0,0xE1,0xE2,0xE4,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF1,0xF2,0xF3,0xF4,0xF6,0xF7,0xF9,0xFA,0xFB,0xFC,0x0108,0x0109,0x010A,0x010B,0x011C,0x011D,0x011E,0x011F,0x0120,0x0121,0x0124,0x0125,0x0126,0x0127,0x0130,0x0131,0x0134,0x0135,0x015C,0x015D,0x015E,0x015F,0x016C,0x016D,0x017B,0x017C,0x02D8,0x02D9
+    FOLDER=latin3
+
+  elif [ $ISO8559 -eq 4 ]
+  then
+    EXTENDED_ASCII=0xA4,0xA7,0xA8,0xAD,0xAF,0xB0,0xB4,0xB8,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC9,0xCB,0xCD,0xCE,0xD4,0xD5,0xD6,0xD7,0xD8,0xDA,0xDB,0xDC,0xDF,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE9,0xEB,0xED,0xEE,0xF4,0xF5,0xF6,0xF7,0xF8,0xFA,0xFB,0xFC,0x0100,0x0101,0x0104,0x0105,0x010C,0x010D,0x0110,0x0111,0x0112,0x0113,0x0116,0x0117,0x0118,0x0119,0x0122,0x0123,0x0128,0x0129,0x012A,0x012B,0x012E,0x012F,0x0136,0x0137,0x0138,0x013B,0x013C,0x0145,0x0146,0x014A,0x014B,0x014C,0x014D,0x0156,0x0157,0x0160,0x0161,0x0166,0x0167,0x0168,0x0169,0x016A,0x016B,0x0172,0x0173,0x017D,0x017E,0x02C7,0x02D9,0x02DB
+    FOLDER=latin5
+
+  elif [ $ISO8559 -eq 5 ]
+  then
+    EXTENDED_ASCII=0xA7,0xAD,0x0401,0x0402,0x0403,0x0404,0x0405,0x0406,0x0407,0x0408,0x0409,0x040A,0x040B,0x040C,0x040E,0x040F,0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F,0x0451,0x0452,0x0453,0x0454,0x0455,0x0456,0x0457,0x0458,0x0459,0x045A,0x045B,0x045C,0x045E,0x045F,0x2116
+    FOLDER=cyrillic
+
+  elif [ $ISO8559 -eq 7 ]
+  then
+    EXTENDED_ASCII=0xA3,0xA6,0xA7,0xA8,0xA9,0xAB,0xAC,0xAD,0xB0,0xB1,0xB2,0xB3,0xB7,0xBB,0xBD,0x037A,0x0384,0x0385,0x0386,0x0388,0x0389,0x038A,0x038C,0x038E,0x038F,0x0390,0x0391,0x0392,0x0393,0x0394,0x0395,0x0396,0x0397,0x0398,0x0399,0x039A,0x039B,0x039C,0x039D,0x039E,0x039F,0x03A0,0x03A1,0x03A3,0x03A4,0x03A5,0x03A6,0x03A7,0x03A8,0x03A9,0x03AA,0x03AB,0x03AC,0x03AD,0x03AE,0x03AF,0x03B0,0x03B1,0x03B2,0x03B3,0x03B4,0x03B5,0x03B6,0x03B7,0x03B8,0x03B9,0x03BA,0x03BB,0x03BC,0x03BD,0x03BE,0x03BF,0x03C0,0x03C1,0x03C2,0x03C3,0x03C4,0x03C5,0x03C6,0x03C7,0x03C8,0x03C9,0x03CA,0x03CB,0x03CC,0x03CD,0x03CE,0x2015,0x2018,0x2019,0x20AC,0x20AF
+    FOLDER=greek
+
+  elif [ $ISO8559 -eq 9 ]
+  then
+    EXTENDED_ASCII=0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDF,0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFF,0x011E,0x011F,0x0130,0x0131,0x015E,0x015F
+    FOLDER=turkish
+
+  elif [ $ISO8559 -eq 10 ]
+  then
+    EXTENDED_ASCII=0xA7,0xAD,0xB0,0xB7,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC9,0xCB,0xCD,0xCE,0xCF,0xD0,0xD3,0xD4,0xD5,0xD6,0xD8,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE9,0xEB,0xED,0xEE,0xEF,0xF0,0xF3,0xF4,0xF5,0xF6,0xF8,0xFA,0xFB,0xFC,0xFD,0xFE,0x0100,0x0101,0x0104,0x0105,0x010C,0x010D,0x0110,0x0111,0x0112,0x0113,0x0116,0x0117,0x0118,0x0119,0x0122,0x0123,0x0128,0x0129,0x012A,0x012B,0x012E,0x012F,0x0136,0x0137,0x0138,0x013B,0x013C,0x0145,0x0146,0x014A,0x014B,0x014C,0x014D,0x0160,0x0161,0x0166,0x0167,0x0168,0x0169,0x016A,0x016B,0x0172,0x0173,0x017D,0x017E,0x2015
+    FOLDER=latin10
+
+  elif [ $ISO8559 -eq 11 ]
+  then
+    EXTENDED_ASCII=0x0E01,0x0E02,0x0E03,0x0E04,0x0E05,0x0E06,0x0E07,0x0E08,0x0E09,0x0E0A,0x0E0B,0x0E0C,0x0E0D,0x0E0E,0x0E0F,0x0E10,0x0E11,0x0E12,0x0E13,0x0E14,0x0E15,0x0E16,0x0E17,0x0E18,0x0E19,0x0E1A,0x0E1B,0x0E1C,0x0E1D,0x0E1E,0x0E1F,0x0E20,0x0E21,0x0E22,0x0E23,0x0E24,0x0E25,0x0E26,0x0E27,0x0E28,0x0E29,0x0E2A,0x0E2B,0x0E2C,0x0E2D,0x0E2E,0x0E2F,0x0E30,0x0E31,0x0E32,0x0E33,0x0E34,0x0E35,0x0E36,0x0E37,0x0E38,0x0E39,0x0E3A,0x0E3F,0x0E40,0x0E41,0x0E42,0x0E43,0x0E44,0x0E45,0x0E46,0x0E47,0x0E48,0x0E49,0x0E4A,0x0E4B,0x0E4C,0x0E4D,0x0E4E,0x0E4F,0x0E50,0x0E51,0x0E52,0x0E53,0x0E54,0x0E55,0x0E56,0x0E57,0x0E58,0x0E59,0x0E5A,0x0E5B
+    FOLDER=thai
+
+  elif [ $ISO8559 -eq 13 ]
+  then
+    EXTENDED_ASCII=0xA2,0xA3,0xA4,0xA6,0xA7,0xA9,0xAB,0xAC,0xAD,0xAE,0xB0,0xB1,0xB2,0xB3,0xB5,0xB6,0xB7,0xB9,0xBB,0xBC,0xBD,0xBE,0xC4,0xC5,0xC6,0xC9,0xD3,0xD5,0xD6,0xD7,0xD8,0xDC,0xDF,0xE4,0xE5,0xE6,0xE9,0xF3,0xF5,0xF6,0xF7,0xF8,0xFC,0x0100,0x0101,0x0104,0x0105,0x0106,0x0107,0x010C,0x010D,0x0112,0x0113,0x0116,0x0117,0x0118,0x0119,0x0122,0x0123,0x012A,0x012B,0x012E,0x012F,0x0136,0x0137,0x013B,0x013C,0x0141,0x0142,0x0143,0x0144,0x0145,0x0146,0x014C,0x014D,0x0156,0x0157,0x015A,0x015B,0x0160,0x0161,0x016A,0x016B,0x0172,0x0173,0x0179,0x017A,0x017B,0x017C,0x017D,0x017E,0x2019,0x201C,0x201D,0x201E
+    FOLDER=baltic
+
+  elif [ $ISO8559 -eq 15 ]
+  then
+    EXTENDED_ASCII=0xA1,0xA2,0xA3,0xA5,0xA7,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0,0xB1,0xB2,0xB3,0xB5,0xB6,0xB7,0xB9,0xBA,0xBB,0xBF,0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,0x0152,0x0153,0x0160,0x0161,0x0178,0x017D,0x017E,0x20AC
+    FOLDER=latin9
+
+  elif [ $ISO8559 -eq 16 ]
+  then
+    EXTENDED_ASCII=0xA7,0xA9,0xAB,0xAD,0xB0,0xB1,0xB6,0xB7,0xBB,0xC0,0xC1,0xC2,0xC4,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,0xD2,0xD3,0xD4,0xD6,0xD9,0xDA,0xDB,0xDC,0xDF,0xE0,0xE1,0xE2,0xE4,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,0xF2,0xF3,0xF4,0xF6,0xF9,0xFA,0xFB,0xFC,0xFF,0x0102,0x0103,0x0104,0x0105,0x0106,0x0107,0x010C,0x010D,0x0110,0x0111,0x0118,0x0119,0x0141,0x0142,0x0143,0x0144,0x0150,0x0151,0x0152,0x0153,0x015A,0x015B,0x0160,0x0161,0x0170,0x0171,0x0178,0x0179,0x017A,0x017B,0x017C,0x017D,0x017E,0x0218,0x0219,0x021A,0x021B,0x201D,0x201E,0x20AC
+    FOLDER=latin10
+
+  else
+    EXTENDED_ASCII=0x20
+    FOLDER=ascii
+  fi
+
+  LETTERS="$ASCII,$EXTENDED_ASCII"
+
+  for SIZE in 12 14 16 20 22 24 26 28 32 36 38 40 44 48
+  do
+
+    for format in bin lvgl
+    do
+
+      if [ "$format" == "bin" ]
+      then
+        ext=bin
+      else
+        ext=c
+      fi
+
+      for FONT in fonts/*.ttf; do
+
+        FILE=$(basename $FONT)
+        FILE="${FILE//\-/_}"
+        echo "$FOLDER $FILE $SIZE"
+
+        #lowercase
+        FILENAME="$FOLDER/$format/${FILE%.*}"
+
+        lv_font_conv --no-kerning --bpp 3 --size $SIZE -o ${FILENAME,,}_${SIZE}_${FOLDER}.$ext --format $format --font $FONT -r $LETTERS $SYMBOLS --font "$ICONFONT" -r $ICONS
+        #lv_font_conv --bpp 3 --size $SIZE -o ${FILENAME,,}_${SIZE}_kern.$format --format $format --font $FONT -r $LETTERS --font "$ICONFONT" -r $ICONS
+
+      if [ "$format" == "lvgl" ]
+      then
+         charset="${FOLDER^^}"
+         shortname="${FILE%.*}"
+         search="${shortname^^}_${SIZE}_${charset}"
+         echo $search
+         # Default the build define of all fonts to 0 to speed up compiling
+         sed -i "s/#define $search 1/#define $search 0     \/\/ default to off/" ${FILENAME,,}_${SIZE}_${FOLDER}.$ext
+         # Add /* clang-format off */ to top of the file
+         sed -i "s/\/\*\*\*\*\*\*\*\*\*\*/\/* clang-format off *\/\n\/**********/" ${FILENAME,,}_${SIZE}_${FOLDER}.$ext
+      fi
+
+      done
+    done
+
+  done
+done
+

src/hasp/hasp.cpp

@@ -327,7 +327,7 @@ void haspSetup(void)
 
     LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, nullptr);
     LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, haspFonts[0]);
-    // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16_nokern);
+    // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, &robotocondensed_regular_16);
 
 #if HASP_USE_SPIFFS > 0 || HASP_USE_LITTLEFS > 0
 #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
@@ -344,7 +344,7 @@ void haspSetup(void)
         haspFonts[0] = hasp_font; // save it
     }
 
-    //  LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16_nokern);
+    //  LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16);
     LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, *hasp_font);
 
 #endif

src/hasp/hasp_attribute.cpp

@@ -459,7 +459,7 @@ static lv_font_t* haspPayloadToFont(const char* payload)
 
     switch(var) {
         case 0 ... 7:
-            // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_12_nokern);
+            // LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_12);
             return hasp_get_font(var);
 
         case 8:
@@ -467,27 +467,27 @@ static lv_font_t* haspPayloadToFont(const char* payload)
 
 #ifndef ARDUINO_ARCH_ESP8266
 
-#ifdef LV_FONT_CUSTOM_12
+#ifdef HASP_FONT_1
         case 12:
-            return &robotocondensed_regular_12_nokern;
+            return &HASP_FONT_1;
 #endif
 
-#ifdef LV_FONT_CUSTOM_16
+#ifdef HASP_FONT_2
         case 16:
-            LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_16_nokern);
+            LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, HASP_FONT_2);
-            return &robotocondensed_regular_16_nokern;
+            return &HASP_FONT_2;
 #endif
 
-#ifdef LV_FONT_CUSTOM_22
+#ifdef HASP_FONT_3
         case 22:
-            LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_22_nokern);
+            LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, HASP_FONT_3);
-            return &robotocondensed_regular_22_nokern;
+            return &HASP_FONT_3;
 #endif
 
-#ifdef LV_FONT_CUSTOM_28
+#ifdef HASP_FONT_4
         case 28:
-            LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, robotocondensed_regular_28_nokern);
+            LOG_WARNING(TAG_ATTR, "%s %d %x", __FILE__, __LINE__, HASP_FONT_4);
-            return &robotocondensed_regular_28_nokern;
+            return &HASP_FONT_4;
 #endif
 
 #endif

src/hasp_oobe.cpp

@@ -177,7 +177,7 @@ static void oobeSetupQR(const char* ssid, const char* pass)
     lv_label_set_text(network, txt.c_str());
 
     lv_obj_t* password = lv_label_create(panel, NULL);
-    txt                = String(F("\xef\x80\xA3")) + " " + String(pass);
+    txt                = String(F(LV_SYMBOL_KEY)) + " " + String(pass);
     lv_label_set_text(password, txt.c_str());
 }