Эх сурвалжийг харах

fix: lcd/eink/u8g2补回oppo 14号字体

Wendal Chen 2 жил өмнө
parent
commit
2e64aad472

+ 4 - 0
components/eink/luat_lib_eink.c

@@ -1411,6 +1411,10 @@ static const rotable_Reg_t reg_eink[] =
     //@const font_opposansm12_chinese font 12号中文字体
     { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
+#ifdef USE_U8G2_OPPOSANSM14_CHINESE
+    //@const font_opposansm14_chinese font 14号中文字体
+    { "font_opposansm14_chinese", ROREG_PTR((void*)u8g2_font_opposansm14_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
     //@const font_opposansm16_chinese font 16号中文字体
     { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},

+ 4 - 0
components/lcd/luat_lib_lcd.c

@@ -1722,6 +1722,10 @@ static const rotable_Reg_t reg_lcd[] =
     //@const font_opposansm12_chinese font 12号中文字体
     { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif
+#ifdef USE_U8G2_OPPOSANSM14_CHINESE
+    //@const font_opposansm14_chinese font 14号中文字体
+    { "font_opposansm14_chinese", ROREG_PTR((void*)u8g2_font_opposansm14_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM16_CHINESE
     //@const font_opposansm16_chinese font 16号中文字体
     { "font_opposansm16_chinese", ROREG_PTR((void*)u8g2_font_opposansm16_chinese)},

+ 3 - 0
components/u8g2/luat_lib_u8g2.c

@@ -1080,6 +1080,9 @@ static const rotable_Reg_t reg_u8g2[] =
 #ifdef USE_U8G2_OPPOSANSM10_CHINESE
     { "font_opposansm10_chinese", ROREG_PTR((void*)u8g2_font_opposansm10_chinese)},
 #endif
+#ifdef USE_U8G2_OPPOSANSM14_CHINESE
+    { "font_opposansm14_chinese", ROREG_PTR((void*)u8g2_font_opposansm14_chinese)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM12_CHINESE
     { "font_opposansm12_chinese", ROREG_PTR((void*)u8g2_font_opposansm12_chinese)},
 #endif

+ 1 - 0
components/u8g2/u8g2_luat_fonts.h

@@ -30,6 +30,7 @@ extern const uint8_t u8g2_font_opposansm32[] U8G2_FONT_SECTION("u8g2_font_opposa
 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_opposansm14_chinese[] U8G2_FONT_SECTION("u8g2_font_opposansm14_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");