Просмотр исходного кода

add:u8g2中文字体添加8 10 18 20 22字号

Dozingfiretruck 3 лет назад
Родитель
Сommit
c640011d0b

+ 15 - 0
components/lcd/luat_lib_lcd.c

@@ -1474,12 +1474,27 @@ static const rotable_Reg_t reg_lcd[] =
     { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
     { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
     { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
+#ifdef USE_U8G2_OPPOSANSM8_CHINESE
+    { "font_opposansm8_chinese", ROREG_PTR((void*)u8g2_font_opposansm8_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM10_CHINESE
+    { "font_opposansm10_chinese", ROREG_PTR((void*)u8g2_font_opposansm10_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
     { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
     { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
+#ifdef USE_U8G2_OPPOSANSM18_CHINESE
+    { "font_opposansm18_chinese", ROREG_PTR((void*)u8g2_font_opposansm18_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM20_CHINESE
+    { "font_opposansm20_chinese", ROREG_PTR((void*)u8g2_font_opposansm20_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM22_CHINESE
+    { "font_opposansm22_chinese", ROREG_PTR((void*)u8g2_font_opposansm22_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
     { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif

+ 15 - 0
luat/packages/eink/luat_lib_eink.c

@@ -1005,12 +1005,27 @@ static const rotable_Reg_t reg_eink[] =
     { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
     { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
     { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
+#ifdef USE_U8G2_OPPOSANSM8_CHINESE
+    { "font_opposansm8_chinese", ROREG_PTR((void*)u8g2_font_opposansm8_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM10_CHINESE
+    { "font_opposansm10_chinese", ROREG_PTR((void*)u8g2_font_opposansm10_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
     { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
     { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
+#ifdef USE_U8G2_OPPOSANSM18_CHINESE
+    { "font_opposansm18_chinese", ROREG_PTR((void*)u8g2_font_opposansm18_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM20_CHINESE
+    { "font_opposansm20_chinese", ROREG_PTR((void*)u8g2_font_opposansm20_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM22_CHINESE
+    { "font_opposansm22_chinese", ROREG_PTR((void*)u8g2_font_opposansm22_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
     { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif

+ 15 - 0
luat/packages/u8g2/luat_lib_u8g2.c

@@ -837,12 +837,27 @@ static const rotable_Reg_t reg_u8g2[] =
     { "font_opposansm22", ROREG_PTR((void*)u8g2_font_opposansm22)},
     { "font_opposansm24", ROREG_PTR((void*)u8g2_font_opposansm24)},
     { "font_opposansm32", ROREG_PTR((void*)u8g2_font_opposansm32)},
+#ifdef USE_U8G2_OPPOSANSM8_CHINESE
+    { "font_opposansm8_chinese", ROREG_PTR((void*)u8g2_font_opposansm8_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM10_CHINESE
+    { "font_opposansm10_chinese", ROREG_PTR((void*)u8g2_font_opposansm10_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
     { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
     { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},
 #endif
+#ifdef USE_U8G2_OPPOSANSM18_CHINESE
+    { "font_opposansm18_chinese", ROREG_PTR((void*)u8g2_font_opposansm18_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM20_CHINESE
+    { "font_opposansm20_chinese", ROREG_PTR((void*)u8g2_font_opposansm20_chinese)},
+#endif
+#ifdef USE_U8G2_OPPOSANSM22_CHINESE
+    { "font_opposansm22_chinese", ROREG_PTR((void*)u8g2_font_opposansm22_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM24_CHINESE
     { "font_opposansm24_chinese", ROREG_PTR((void*)u8g2_font_opposansm24_chinese)},
 #endif

Разница между файлами не показана из-за своего большого размера
+ 12700 - 0
luat/packages/u8g2/u8g2_font_opposansm.c


+ 5 - 0
luat/packages/u8g2/u8g2_luat_fonts.h

@@ -27,8 +27,13 @@ extern const uint8_t u8g2_font_opposansm20[] U8G2_FONT_SECTION("u8g2_font_opposa
 extern const uint8_t u8g2_font_opposansm22[] U8G2_FONT_SECTION("u8g2_font_opposansm22");
 extern const uint8_t u8g2_font_opposansm24[] U8G2_FONT_SECTION("u8g2_font_opposansm24");
 extern const uint8_t u8g2_font_opposansm32[] U8G2_FONT_SECTION("u8g2_font_opposansm32");
+extern const uint8_t u8g2_font_opposansm8_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm8_chinese");
+extern const uint8_t u8g2_font_opposansm10_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm10_chinese");
 extern const uint8_t u8g2_font_opposansm12_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm12_chinese");
 extern const uint8_t u8g2_font_opposansm16_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm16_chinese");
+extern const uint8_t u8g2_font_opposansm18_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm18_chinese");
+extern const uint8_t u8g2_font_opposansm20_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm20_chinese");
+extern const uint8_t u8g2_font_opposansm22_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm22_chinese");
 extern const uint8_t u8g2_font_opposansm24_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm24_chinese");
 extern const uint8_t u8g2_font_opposansm32_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm32_chinese");
 

Некоторые файлы не были показаны из-за большого количества измененных файлов