From 4c8963109d1b01ea190de82582601b399e95f269 Mon Sep 17 00:00:00 2001 From: yangnan Date: Mon, 5 Jun 2023 11:46:54 +0800 Subject: [PATCH 1/2] fix conflict between guard_name and font name when font name is all uppercase --- lib/writers/lvgl/lv_font.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/writers/lvgl/lv_font.js b/lib/writers/lvgl/lv_font.js index f1d917d..f672995 100644 --- a/lib/writers/lvgl/lv_font.js +++ b/lib/writers/lvgl/lv_font.js @@ -61,7 +61,7 @@ class LvFont extends Font { } toLVGL() { - let guard_name = this.font_name.toUpperCase(); + let guard_name = '_'+this.font_name.toUpperCase()+'_'; return `/******************************************************************************* * Size: ${this.src.size} px From 9203ed67cce191a00dbb060bba3d0a354362e571 Mon Sep 17 00:00:00 2001 From: yangnan Date: Mon, 5 Jun 2023 11:51:04 +0800 Subject: [PATCH 2/2] code format --- lib/writers/lvgl/lv_font.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/writers/lvgl/lv_font.js b/lib/writers/lvgl/lv_font.js index f672995..309e4b1 100644 --- a/lib/writers/lvgl/lv_font.js +++ b/lib/writers/lvgl/lv_font.js @@ -61,7 +61,7 @@ class LvFont extends Font { } toLVGL() { - let guard_name = '_'+this.font_name.toUpperCase()+'_'; + let guard_name = '_' + this.font_name.toUpperCase() + '_'; return `/******************************************************************************* * Size: ${this.src.size} px