瀏覽代碼

add:支持等宽字体

Dozingfiretruck 2 年之前
父節點
當前提交
f4d39dd346
共有 3 個文件被更改,包括 184 次插入2 次删除
  1. 86 1
      cloudbuild/esp32c3-idf5.meta.json
  2. 86 1
      cloudbuild/esp32s3-idf5.meta.json
  3. 12 0
      luatos/include/luat_conf_bsp.h

+ 86 - 1
cloudbuild/esp32c3-idf5.meta.json

@@ -391,7 +391,92 @@
                  "name":"fonts",
                  "content":"通用字体,适用于u8g2/disp/eink/lcd库",
                  "rsize":0,
-                 "children":[{
+                 "children":[
+               {
+                  "name": "USE_U8G2_SARASA_M8_CHINESE",
+                  "content": "等宽字体 英文字体和特殊符号",
+                  "rsize": 191216,
+                  "fsize": 304416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M8_CHINESE",
+                  "content": "8pix等宽中文字体,调用时使用 lcd.font_sarasa_m8_chinese",
+                  "rsize": 251984,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M10_CHINESE",
+                  "content": "10pix等宽中文字体 lcd.font_sarasa_m10_chinese",
+                  "rsize": 331664,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M12_CHINESE",
+                  "content": "12pix等宽中文字体,同理,u8g2.font_sarasa_m12_chinese 也可以的",
+                  "rsize": 388176,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M14_CHINESE",
+                  "content": "14pix等宽中文字体",
+                  "rsize": 454592,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M16_CHINESE",
+                  "content": "16pix等宽中文字体",
+                  "rsize": 547432,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M18_CHINESE",
+                  "content": "18pix等宽中文字体",
+                  "rsize": 654527,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M20_CHINESE",
+                  "content": "20pix等宽中文字体",
+                  "rsize": 759421,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M22_CHINESE",
+                  "content": "22pix等宽中文字体",
+                  "rsize": 864352,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M24_CHINESE",
+                  "content": "24pix等宽中文字体",
+                  "rsize": 975376,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M26_CHINESE",
+                  "content": "26pix等宽中文字体",
+                  "rsize": 1084724,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M28_CHINESE",
+                  "content": "28pix等宽中文字体",
+                  "rsize": 11947457,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
                   "name": "USE_U8G2_OPPOSANSM_ENGLISH",
                   "content": "英文字体和特殊符号",
                   "rsize": 48176,

+ 86 - 1
cloudbuild/esp32s3-idf5.meta.json

@@ -369,7 +369,92 @@
                  "name":"fonts",
                  "content":"通用字体,适用于u8g2/disp/eink/lcd库",
                  "rsize":0,
-                 "children":[{
+                 "children":[
+               {
+                  "name": "USE_U8G2_SARASA_M8_CHINESE",
+                  "content": "等宽字体 英文字体和特殊符号",
+                  "rsize": 191216,
+                  "fsize": 304416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M8_CHINESE",
+                  "content": "8pix等宽中文字体,调用时使用 lcd.font_sarasa_m8_chinese",
+                  "rsize": 251984,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M10_CHINESE",
+                  "content": "10pix等宽中文字体 lcd.font_sarasa_m10_chinese",
+                  "rsize": 331664,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M12_CHINESE",
+                  "content": "12pix等宽中文字体,同理,u8g2.font_sarasa_m12_chinese 也可以的",
+                  "rsize": 388176,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M14_CHINESE",
+                  "content": "14pix等宽中文字体",
+                  "rsize": 454592,
+                  "fsize": 604416,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M16_CHINESE",
+                  "content": "16pix等宽中文字体",
+                  "rsize": 547432,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M18_CHINESE",
+                  "content": "18pix等宽中文字体",
+                  "rsize": 654527,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M20_CHINESE",
+                  "content": "20pix等宽中文字体",
+                  "rsize": 759421,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M22_CHINESE",
+                  "content": "22pix等宽中文字体",
+                  "rsize": 864352,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M24_CHINESE",
+                  "content": "24pix等宽中文字体",
+                  "rsize": 975376,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M26_CHINESE",
+                  "content": "26pix等宽中文字体",
+                  "rsize": 1084724,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
+                  "name": "USE_U8G2_SARASA_M28_CHINESE",
+                  "content": "28pix等宽中文字体",
+                  "rsize": 11947457,
+                  "fsize": 749372,
+                  "dft": false
+               },
+               {
                   "name": "USE_U8G2_OPPOSANSM_ENGLISH",
                   "content": "英文字体和特殊符号",
                   "rsize": 48176,

+ 12 - 0
luatos/include/luat_conf_bsp.h

@@ -133,6 +133,18 @@
 // #define USE_U8G2_OPPOSANSM16_CHINESE
 // #define USE_U8G2_OPPOSANSM24_CHINESE
 // #define USE_U8G2_OPPOSANSM32_CHINESE
+// SARASA
+// #define USE_U8G2_SARASA_M8_CHINESE
+// #define USE_U8G2_SARASA_M10_CHINESE
+// #define USE_U8G2_SARASA_M12_CHINESE
+// #define USE_U8G2_SARASA_M14_CHINESE
+// #define USE_U8G2_SARASA_M16_CHINESE
+// #define USE_U8G2_SARASA_M18_CHINESE
+// #define USE_U8G2_SARASA_M20_CHINESE
+// #define USE_U8G2_SARASA_M22_CHINESE
+// #define USE_U8G2_SARASA_M24_CHINESE
+// #define USE_U8G2_SARASA_M26_CHINESE
+// #define USE_U8G2_SARASA_M28_CHINESE
 /**********LVGL FONT*************/
 // #define LV_FONT_OPPOSANS_M_8
 // #define LV_FONT_OPPOSANS_M_10