Skip to content

Commit 8850041

Browse files
author
luoweiyuan
committed
third-party/cmodules/m5unified: Fix font symbol linkage errors.
Signed-off-by: luoweiyuan <luoweiyuan@m5stack.com>
1 parent 199254e commit 8850041

2 files changed

Lines changed: 31 additions & 5 deletions

File tree

third-party/cmodules/m5unified/mpy_m5gfx.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,22 @@ const font_obj_t gfx_font_efontCN_24_obj = {{ &mp_type_object }, &m5gfx::fonts::
12731273
const font_obj_t gfx_font_efontJA_24_obj = {{ &mp_type_object }, &m5gfx::fonts::efontJA_24 };
12741274
// const font_obj_t gfx_font_efontKR_14_obj = {{ &mp_type_object }, &m5gfx::fonts::efontKR_14 };
12751275
const font_obj_t gfx_font_efontKR_24_obj = {{ &mp_type_object }, &m5gfx::fonts::efontKR_24 };
1276+
// Compatibility aliases expected by m5unified_display fonts table.
1277+
const font_obj_t gfx_font_montserrat_12_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu12 };
1278+
const font_obj_t gfx_font_montserrat_14_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu12 };
1279+
const font_obj_t gfx_font_montserrat_16_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu18 };
1280+
const font_obj_t gfx_font_montserrat_18_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu18 };
1281+
const font_obj_t gfx_font_montserrat_20_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu24 };
1282+
const font_obj_t gfx_font_montserrat_22_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu24 };
1283+
const font_obj_t gfx_font_montserrat_24_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu24 };
1284+
const font_obj_t gfx_font_montserrat_30_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu40 };
1285+
const font_obj_t gfx_font_montserrat_36_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu40 };
1286+
const font_obj_t gfx_font_montserrat_40_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu40 };
1287+
const font_obj_t gfx_font_montserrat_44_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu56 };
1288+
const font_obj_t gfx_font_montserrat_48_obj = {{ &mp_type_object }, &m5gfx::fonts::DejaVu72 };
1289+
const font_obj_t gfx_font_AlibabaPuHuiTi_CN24_obj = {{ &mp_type_object }, &m5gfx::fonts::efontCN_24 };
1290+
const font_obj_t gfx_font_AlibabaSans_JP24_obj = {{ &mp_type_object }, &m5gfx::fonts::efontJA_24 };
1291+
const font_obj_t gfx_font_AlibabaSans_KR24_obj = {{ &mp_type_object }, &m5gfx::fonts::efontKR_24 };
12761292
// const font_obj_t gfx_font_montserrat_6_obj = {{ &mp_type_object }, &m5gfx::fonts::Montserrat6pt7b };
12771293
// const font_obj_t gfx_font_montserrat_7_obj = {{ &mp_type_object }, &m5gfx::fonts::Montserrat7pt7b };
12781294
// const font_obj_t gfx_font_montserrat_8_obj = {{ &mp_type_object }, &m5gfx::fonts::Montserrat8pt7b };

third-party/cmodules/m5unified/mpy_m5gfx.h

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,18 @@ extern const font_obj_t gfx_font_efontJA_14_obj;
6767
extern const font_obj_t gfx_font_efontJA_24_obj;
6868
extern const font_obj_t gfx_font_efontKR_14_obj;
6969
extern const font_obj_t gfx_font_efontKR_24_obj;
70-
// extern const font_obj_t gfx_font_montserrat_6_obj;
71-
// extern const font_obj_t gfx_font_montserrat_7_obj;
72-
// extern const font_obj_t gfx_font_montserrat_8_obj;
73-
// extern const font_obj_t gfx_font_montserrat_9_obj;
74-
// extern const font_obj_t gfx_font_montserrat_10_obj;
70+
extern const font_obj_t gfx_font_montserrat_12_obj;
71+
extern const font_obj_t gfx_font_montserrat_14_obj;
72+
extern const font_obj_t gfx_font_montserrat_16_obj;
73+
extern const font_obj_t gfx_font_montserrat_18_obj;
74+
extern const font_obj_t gfx_font_montserrat_20_obj;
75+
extern const font_obj_t gfx_font_montserrat_22_obj;
76+
extern const font_obj_t gfx_font_montserrat_24_obj;
77+
extern const font_obj_t gfx_font_montserrat_30_obj;
78+
extern const font_obj_t gfx_font_montserrat_36_obj;
79+
extern const font_obj_t gfx_font_montserrat_40_obj;
80+
extern const font_obj_t gfx_font_montserrat_44_obj;
81+
extern const font_obj_t gfx_font_montserrat_48_obj;
82+
extern const font_obj_t gfx_font_AlibabaPuHuiTi_CN24_obj;
83+
extern const font_obj_t gfx_font_AlibabaSans_JP24_obj;
84+
extern const font_obj_t gfx_font_AlibabaSans_KR24_obj;

0 commit comments

Comments
 (0)