Skip to content

Commit

Permalink
del:删除等宽字体，默认统一使用oppo，有需求可自行云编译或自己添加
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dozingfiretruck
Dozingfiretruck committed Apr 2, 2024
1 parent 026da4c commit d8a6474
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 149,050 deletions.
44 changes: 0 additions & 44 deletions components/eink/luat_lib_eink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1436,50 +1436,6 @@ static const rotable_Reg_t reg_eink[] =
{ "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
#endif

#ifdef USE_U8G2_SARASA_ENGLISH
{ "font_sarasa_m12_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m12_ascii)},
{ "font_sarasa_m14_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m14_ascii)},
{ "font_sarasa_m16_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m16_ascii)},
{ "font_sarasa_m18_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m18_ascii)},
{ "font_sarasa_m20_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m20_ascii)},
{ "font_sarasa_m22_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m22_ascii)},
//再大的很少用到先不加了
#endif

#ifdef USE_U8G2_SARASA_M8_CHINESE
{ "font_sarasa_m8_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m8_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M10_CHINESE
{ "font_sarasa_m10_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m10_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M12_CHINESE
{ "font_sarasa_m12_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m12_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M14_CHINESE
{ "font_sarasa_m14_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m14_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M16_CHINESE
{ "font_sarasa_m16_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m16_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M18_CHINESE
{ "font_sarasa_m18_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m18_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M20_CHINESE
{ "font_sarasa_m20_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m20_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M22_CHINESE
{ "font_sarasa_m22_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m22_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M24_CHINESE
{ "font_sarasa_m24_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m24_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M26_CHINESE
{ "font_sarasa_m26_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m26_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M28_CHINESE
{ "font_sarasa_m28_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m28_chinese)},
#endif

{ NULL, ROREG_INT(0)}
};

Expand Down
43 changes: 0 additions & 43 deletions components/lcd/luat_lib_lcd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1817,49 +1817,6 @@ static const rotable_Reg_t reg_lcd[] =
{ "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
#endif

#ifdef USE_U8G2_SARASA_ENGLISH
{ "font_sarasa_m12_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m12_ascii)},
{ "font_sarasa_m14_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m14_ascii)},
{ "font_sarasa_m16_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m16_ascii)},
{ "font_sarasa_m18_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m18_ascii)},
{ "font_sarasa_m20_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m20_ascii)},
{ "font_sarasa_m22_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m22_ascii)},
//再大的很少用到先不加了
#endif

#ifdef USE_U8G2_SARASA_M8_CHINESE
{ "font_sarasa_m8_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m8_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M10_CHINESE
{ "font_sarasa_m10_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m10_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M12_CHINESE
{ "font_sarasa_m12_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m12_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M14_CHINESE
{ "font_sarasa_m14_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m14_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M16_CHINESE
{ "font_sarasa_m16_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m16_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M18_CHINESE
{ "font_sarasa_m18_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m18_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M20_CHINESE
{ "font_sarasa_m20_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m20_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M22_CHINESE
{ "font_sarasa_m22_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m22_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M24_CHINESE
{ "font_sarasa_m24_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m24_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M26_CHINESE
{ "font_sarasa_m26_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m26_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M28_CHINESE
{ "font_sarasa_m28_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m28_chinese)},
#endif
{ "set_direction", ROREG_FUNC(l_lcd_set_direction)},
//@const direction_0 0°方向命令
{ "direction_0", ROREG_INT(0)},
Expand Down
43 changes: 0 additions & 43 deletions components/luatfonts/luat_lib_fonts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,49 +59,6 @@ static const u8g2_font_t u8g2_fonts[] = {
#ifdef USE_U8G2_OPPOSANSM32_CHINESE
{.name="opposansm32_chinese", .font=u8g2_font_opposansm32_chinese},
#endif
#ifdef USE_U8G2_SARASA_ENGLISH
{ .name="sarasa_m12_ascii", .font=u8g2_font_sarasa_m12_ascii},
{ .name="sarasa_m14_ascii", .font=u8g2_font_sarasa_m14_ascii},
{ .name="sarasa_m16_ascii", .font=u8g2_font_sarasa_m16_ascii},
{ .name="sarasa_m18_ascii", .font=u8g2_font_sarasa_m18_ascii},
{ .name="sarasa_m20_ascii", .font=u8g2_font_sarasa_m20_ascii},
{ .name="sarasa_m22_ascii", .font=u8g2_font_sarasa_m22_ascii},
//再大的很少用到先不加了
#endif

#ifdef USE_U8G2_SARASA_M8_CHINESE
{ .name="sarasa_m8_chinese", .font=u8g2_font_sarasa_m8_chinese},
#endif
#ifdef USE_U8G2_SARASA_M10_CHINESE
{ .name="sarasa_m10_chinese", .font=u8g2_font_sarasa_m10_chinese},
#endif
#ifdef USE_U8G2_SARASA_M12_CHINESE
{ .name="sarasa_m12_chinese", .font=u8g2_font_sarasa_m12_chinese},
#endif
#ifdef USE_U8G2_SARASA_M14_CHINESE
{ .name="sarasa_m14_chinese", .font=u8g2_font_sarasa_m14_chinese},
#endif
#ifdef USE_U8G2_SARASA_M16_CHINESE
{ .name="sarasa_m16_chinese", .font=u8g2_font_sarasa_m16_chinese},
#endif
#ifdef USE_U8G2_SARASA_M18_CHINESE
{ .name="sarasa_m18_chinese", .font=u8g2_font_sarasa_m18_chinese},
#endif
#ifdef USE_U8G2_SARASA_M20_CHINESE
{ .name="sarasa_m20_chinese", .font=u8g2_font_sarasa_m20_chinese},
#endif
#ifdef USE_U8G2_SARASA_M22_CHINESE
{ .name="sarasa_m22_chinese", .font=u8g2_font_sarasa_m22_chinese},
#endif
#ifdef USE_U8G2_SARASA_M24_CHINESE
{ .name="sarasa_m24_chinese", .font=u8g2_font_sarasa_m24_chinese},
#endif
#ifdef USE_U8G2_SARASA_M26_CHINESE
{ .name="sarasa_m26_chinese", .font=u8g2_font_sarasa_m26_chinese},
#endif
#ifdef USE_U8G2_SARASA_M28_CHINESE
{ .name="sarasa_m28_chinese", .font=u8g2_font_sarasa_m28_chinese},
#endif
#ifdef LUAT_FONTS_CUSTOM_U8G2
LUAT_FONTS_CUSTOM_U8G2
#endif
Expand Down
44 changes: 0 additions & 44 deletions components/u8g2/luat_lib_u8g2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1103,50 +1103,6 @@ static const rotable_Reg_t reg_u8g2[] =
{ "font_opposansm32_chinese", ROREG_PTR((void*)u8g2_font_opposansm32_chinese)},
#endif

#ifdef USE_U8G2_SARASA_ENGLISH
{ "font_sarasa_m12_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m12_ascii)},
{ "font_sarasa_m14_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m14_ascii)},
{ "font_sarasa_m16_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m16_ascii)},
{ "font_sarasa_m18_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m18_ascii)},
{ "font_sarasa_m20_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m20_ascii)},
{ "font_sarasa_m22_ascii", ROREG_PTR((void*)u8g2_font_sarasa_m22_ascii)},
//再大的很少用到先不加了
#endif

#ifdef USE_U8G2_SARASA_M8_CHINESE
{ "font_sarasa_m8_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m8_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M10_CHINESE
{ "font_sarasa_m10_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m10_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M12_CHINESE
{ "font_sarasa_m12_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m12_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M14_CHINESE
{ "font_sarasa_m14_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m14_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M16_CHINESE
{ "font_sarasa_m16_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m16_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M18_CHINESE
{ "font_sarasa_m18_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m18_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M20_CHINESE
{ "font_sarasa_m20_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m20_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M22_CHINESE
{ "font_sarasa_m22_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m22_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M24_CHINESE
{ "font_sarasa_m24_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m24_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M26_CHINESE
{ "font_sarasa_m26_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m26_chinese)},
#endif
#ifdef USE_U8G2_SARASA_M28_CHINESE
{ "font_sarasa_m28_chinese", ROREG_PTR((void*)u8g2_font_sarasa_m28_chinese)},
#endif

//@const DRAW_UPPER_RIGHT number 上右
{ "DRAW_UPPER_RIGHT", ROREG_INT(U8G2_DRAW_UPPER_RIGHT)},
//@const DRAW_UPPER_LEFT number 上左
Expand Down
Loading

0 comments on commit d8a6474

Please sign in to comment.