add: 添加USE_U8G2_OPPOSANSM_ENGLISH 宏,使得lcd的英文字体可选

components/lcd/luat_lib_lcd.c

@@ -1527,10 +1527,12 @@ static const rotable_Reg_t reg_lcd[] =
     { "drawGtfontUtf8Gray", ROREG_FUNC(l_lcd_draw_gtfont_utf8_gray)},
 #endif // LUAT_USE_GTFONT_UTF8
 #endif // LUAT_USE_GTFONT
+    // 默认只带英文8号字体
+    { "font_opposansm8",  ROREG_PTR((void*)u8g2_font_opposansm8)},
+#ifdef USE_U8G2_OPPOSANSM_ENGLISH
     { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
     { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
 
-    { "font_opposansm8",  ROREG_PTR((void*)u8g2_font_opposansm8)},
     { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
     { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
     { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
@@ -1539,6 +1541,7 @@ 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)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM8_CHINESE
     { "font_opposansm8_chinese", ROREG_PTR((void*)u8g2_font_opposansm8_chinese)},
 #endif

components/luatfonts/luat_lib_fonts.c

@@ -11,6 +11,7 @@ typedef struct u8g2_font
 
 
 static u8g2_font_t u8g2_fonts[] = {
+#ifdef USE_U8G2_OPPOSANSM_ENGLISH
     {.name="unifont_t_symbols", .font=u8g2_font_unifont_t_symbols},
     {.name="open_iconic_weather_6x_t", .font=u8g2_font_open_iconic_weather_6x_t},
     {.name="opposansm8", .font=u8g2_font_opposansm8},
@@ -20,6 +21,7 @@ static u8g2_font_t u8g2_fonts[] = {
     {.name="opposansm20", .font=u8g2_font_opposansm20},
     {.name="opposansm24", .font=u8g2_font_opposansm24},
     {.name="opposansm32", .font=u8g2_font_opposansm32},
+#endif
 #ifdef USE_U8G2_OPPOSANSM8_CHINESE
     {.name="opposansm8_chinese", .font=u8g2_font_opposansm8_chinese},
 #endif

luat/packages/eink/luat_lib_eink.c

@@ -992,11 +992,12 @@ static const rotable_Reg_t reg_eink[] =
     { "MODEL_2in9d",          ROREG_INT(MODEL_2in9d)},
     { "MODEL_2in9f",          ROREG_INT(MODEL_2in9f)},
     { "MODEL_3in7",           ROREG_INT(MODEL_3in7)},
-
+    // 默认只带8号字体
+    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
+#ifdef USE_U8G2_OPPOSANSM_ENGLISH
     { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
     { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
 
-    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
     { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
     { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
     { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
@@ -1005,6 +1006,7 @@ 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)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM8_CHINESE
     { "font_opposansm8_chinese", ROREG_PTR((void*)u8g2_font_opposansm8_chinese)},
 #endif

luat/packages/u8g2/luat_lib_u8g2.c

@@ -826,10 +826,12 @@ static const rotable_Reg_t reg_u8g2[] =
     { "drawGtfontUtf8", ROREG_FUNC(l_u8g2_draw_gtfont_utf8)},
 #endif // LUAT_USE_GTFONT_UTF8
 #endif // LUAT_USE_GTFONT
+    // 默认只带8号字体
+    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
+#ifdef USE_U8G2_OPPOSANSM_ENGLISH
     { "font_unifont_t_symbols",   ROREG_PTR((void*)u8g2_font_unifont_t_symbols)},
     { "font_open_iconic_weather_6x_t", ROREG_PTR((void*)u8g2_font_open_iconic_weather_6x_t)},
 
-    { "font_opposansm8", ROREG_PTR((void*)u8g2_font_opposansm8)},
     { "font_opposansm10", ROREG_PTR((void*)u8g2_font_opposansm10)},
     { "font_opposansm12", ROREG_PTR((void*)u8g2_font_opposansm12)},
     { "font_opposansm16", ROREG_PTR((void*)u8g2_font_opposansm16)},
@@ -838,6 +840,7 @@ 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)},
+#endif
 #ifdef USE_U8G2_OPPOSANSM8_CHINESE
     { "font_opposansm8_chinese", ROREG_PTR((void*)u8g2_font_opposansm8_chinese)},
 #endif