From 2026472d488286f7763f65d610bbf5cdaeec5ab1 Mon Sep 17 00:00:00 2001
From: Terrence <terrence@tenclass.com>
Date: Thu, 23 Jan 2025 21:52:27 +0800
Subject: [PATCH] fix font declare

---
 main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc | 4 ++--
 main/boards/esp-sparkbot/esp_sparkbot_board.cc               | 4 ++--
 main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc     | 4 ++--
 main/boards/kevin-box-1/kevin_box_board.cc                   | 4 ++--
 main/boards/kevin-box-2/kevin_box_board.cc                   | 4 ++--
 main/boards/magiclick-2p4/magiclick_2p4_board.cc             | 4 ++--
 main/boards/xmini-c3/xmini_c3_board.cc                       | 4 ++--
 main/idf_component.yml                                       | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc b/main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc
index e7d324e2..c679d790 100644
--- a/main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc
+++ b/main/boards/bread-compact-wifi-lcd/compact_wifi_board_lcd.cc
@@ -20,8 +20,8 @@
  
 #define TAG "CompactWifiBoardLCD"
 
-DECLARE_FONT(font_puhui_20_4);
-DECLARE_FONT(font_awesome_20_4);
+LV_FONT_DECLARE(font_puhui_20_4);
+LV_FONT_DECLARE(font_awesome_20_4);
 
 class CompactWifiBoardLCD : public WifiBoard {
 private:
diff --git a/main/boards/esp-sparkbot/esp_sparkbot_board.cc b/main/boards/esp-sparkbot/esp_sparkbot_board.cc
index 4ade6cc1..29e119bf 100644
--- a/main/boards/esp-sparkbot/esp_sparkbot_board.cc
+++ b/main/boards/esp-sparkbot/esp_sparkbot_board.cc
@@ -15,8 +15,8 @@
 
 #define TAG "esp_sparkbot"
 
-DECLARE_FONT(font_puhui_16_4);
-DECLARE_FONT(font_awesome_16_4);
+LV_FONT_DECLARE(font_puhui_16_4);
+LV_FONT_DECLARE(font_awesome_16_4);
 
 class SparkBotEs8311AudioCodec : public Es8311AudioCodec {
 private:    
diff --git a/main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc b/main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc
index 2758feb7..2999a279 100644
--- a/main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc
+++ b/main/boards/esp32s3-korvo2-v3/esp32s3_korvo2_v3_board.cc
@@ -16,8 +16,8 @@
 
 #define TAG "esp32s3_korvo2_v3"
 
-DECLARE_FONT(font_puhui_20_4);
-DECLARE_FONT(font_awesome_20_4);
+LV_FONT_DECLARE(font_puhui_20_4);
+LV_FONT_DECLARE(font_awesome_20_4);
 
 class esp32s3_korvo2_v3_board : public WifiBoard
 {
diff --git a/main/boards/kevin-box-1/kevin_box_board.cc b/main/boards/kevin-box-1/kevin_box_board.cc
index 04d976cc..fa36422d 100644
--- a/main/boards/kevin-box-1/kevin_box_board.cc
+++ b/main/boards/kevin-box-1/kevin_box_board.cc
@@ -14,8 +14,8 @@
 
 #define TAG "KevinBoxBoard"
 
-DECLARE_FONT(font_puhui_14_1);
-DECLARE_FONT(font_awesome_14_1);
+LV_FONT_DECLARE(font_puhui_14_1);
+LV_FONT_DECLARE(font_awesome_14_1);
 
 class KevinBoxBoard : public Ml307Board {
 private:
diff --git a/main/boards/kevin-box-2/kevin_box_board.cc b/main/boards/kevin-box-2/kevin_box_board.cc
index 959bf539..7ec3190f 100644
--- a/main/boards/kevin-box-2/kevin_box_board.cc
+++ b/main/boards/kevin-box-2/kevin_box_board.cc
@@ -16,8 +16,8 @@
 
 #define TAG "KevinBoxBoard"
 
-DECLARE_FONT(font_puhui_14_1);
-DECLARE_FONT(font_awesome_14_1);
+LV_FONT_DECLARE(font_puhui_14_1);
+LV_FONT_DECLARE(font_awesome_14_1);
 
 class KevinBoxBoard : public Ml307Board {
 private:
diff --git a/main/boards/magiclick-2p4/magiclick_2p4_board.cc b/main/boards/magiclick-2p4/magiclick_2p4_board.cc
index 354c9280..2edc34db 100644
--- a/main/boards/magiclick-2p4/magiclick_2p4_board.cc
+++ b/main/boards/magiclick-2p4/magiclick_2p4_board.cc
@@ -14,8 +14,8 @@
 #include "esp_lcd_nv3023.h"
 #define TAG "magiclick_2p4"
 
-DECLARE_FONT(font_puhui_16_4);
-DECLARE_FONT(font_awesome_16_4);
+LV_FONT_DECLARE(font_puhui_16_4);
+LV_FONT_DECLARE(font_awesome_16_4);
 
 class magiclick_2p4 : public WifiBoard {
 private:
diff --git a/main/boards/xmini-c3/xmini_c3_board.cc b/main/boards/xmini-c3/xmini_c3_board.cc
index dbbde151..5332fce0 100644
--- a/main/boards/xmini-c3/xmini_c3_board.cc
+++ b/main/boards/xmini-c3/xmini_c3_board.cc
@@ -14,8 +14,8 @@
 
 #define TAG "XminiC3Board"
 
-DECLARE_FONT(font_puhui_14_1);
-DECLARE_FONT(font_awesome_14_1);
+LV_FONT_DECLARE(font_puhui_14_1);
+LV_FONT_DECLARE(font_awesome_14_1);
 
 class XminiC3Board : public WifiBoard {
 private:
diff --git a/main/idf_component.yml b/main/idf_component.yml
index 8661e1c2..5881a32a 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -9,7 +9,7 @@ dependencies:
   78/esp-wifi-connect: "~2.0.2"
   78/esp-opus-encoder: "~2.1.0"
   78/esp-ml307: "~1.7.1"
-  78/xiaozhi-fonts: "~1.1.0"
+  78/xiaozhi-fonts: "~1.2.0"
   espressif/led_strip: "^2.4.1"
   espressif/esp_codec_dev: "~1.3.2"
   espressif/esp-sr: "^1.9.0"