Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix avax bugs #1575

Merged
merged 1 commit into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions rust/apps/avalanche/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
#[macro_use]
extern crate alloc;
use alloc::{
format,
string::{String, ToString},
string::{String},
vec::Vec,
};

Expand All @@ -17,7 +16,6 @@ use transactions::tx_header::Header;
use crate::errors::{AvaxError, Result};
use core::{
convert::TryFrom,
fmt::{self, Debug},
};

pub mod constants;
Expand Down
2 changes: 1 addition & 1 deletion rust/apps/avalanche/src/transactions/C_chain/evm_export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ impl AvaxTxInfo for ExportTx {
.iter()
.map(|output| {
AvaxFromToInfo::from(
format!("{} AVAX", output.get_amount() as f64 / NAVAX_TO_AVAX_RATIO),
output.get_amount(),
output.get_addresses(),
C_CHAIN_PREFIX.to_string(),
)
Expand Down
2 changes: 1 addition & 1 deletion rust/apps/avalanche/src/transactions/C_chain/evm_import.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ impl AvaxTxInfo for ImportTx {
.iter()
.map(|output| {
AvaxFromToInfo::from(
format!("{} AVAX", output.amount as f64 / NAVAX_TO_AVAX_RATIO),
output.amount,
vec![output.address.encode()],
C_CHAIN_PREFIX.to_string(),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ impl AvaxTxInfo for AddPermissLessionDelegatorTx {
.into_iter()
.chain(self.stake_out.iter().map(|output| {
AvaxFromToInfo::from(
format!("{} AVAX", output.get_amount() as f64 / NAVAX_TO_AVAX_RATIO),
output.get_amount(),
output.get_addresses(),
X_P_CHAIN_PREFIX.to_string(),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ impl AvaxTxInfo for AddPermissLessionValidatorTx {
.into_iter()
.chain(self.stake_out.iter().map(|output| {
AvaxFromToInfo::from(
format!("{} AVAX", output.get_amount() as f64 / NAVAX_TO_AVAX_RATIO),
output.get_amount(),
output.get_addresses(),
X_P_CHAIN_PREFIX.to_string(),
)
Expand Down
2 changes: 1 addition & 1 deletion rust/apps/avalanche/src/transactions/base_tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ impl AvaxTxInfo for BaseTx {
.iter()
.map(|output| {
AvaxFromToInfo::from(
format!("{} AVAX", output.get_amount() as f64 / NAVAX_TO_AVAX_RATIO),
output.get_amount(),
output.get_addresses(),
X_P_CHAIN_PREFIX.to_string(),
)
Expand Down
2 changes: 1 addition & 1 deletion rust/apps/avalanche/src/transactions/export.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl AvaxTxInfo for ExportTx {
.into_iter()
.chain(self.transfer_out.iter().map(|output| {
AvaxFromToInfo::from(
format!("{} AVAX", output.get_amount() as f64 / NAVAX_TO_AVAX_RATIO),
output.get_amount(),
output.get_addresses(),
X_P_CHAIN_PREFIX.to_string(),
)
Expand Down
13 changes: 11 additions & 2 deletions rust/apps/avalanche/src/transactions/structs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ where
pub trait AvaxTxInfo {
fn get_total_input_amount(&self) -> u64;
fn get_total_output_amount(&self) -> u64;

fn get_output_amount(&self, address: String) -> u64 {
self.get_outputs_addresses()
.iter()
.find(|info| {info.address[0] == address})
.map(|info| info.amount)
.unwrap_or(0)
}

fn get_fee_amount(&self) -> u64 {
self.get_total_input_amount() - self.get_total_output_amount()
}
Expand Down Expand Up @@ -126,13 +135,13 @@ impl AvaxMethodInfo {

#[derive(Debug, Clone)]
pub struct AvaxFromToInfo {
pub amount: String,
pub amount: u64,
pub address: Vec<String>,
pub path_prefix: String,
}

impl AvaxFromToInfo {
pub fn from(amount: String, address: Vec<String>, path_prefix: String) -> Self {
pub fn from(amount: u64, address: Vec<String>, path_prefix: String) -> Self {
AvaxFromToInfo {
amount,
address,
Expand Down
27 changes: 22 additions & 5 deletions rust/rust_c/src/avalanche/structs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ pub struct DisplayTxAvaxData {
total_input_amount: PtrString,
fee_amount: PtrString,
reward_address: PtrString,
amount: PtrString,
method: PtrT<DisplayAvaxMethodInfo>,
to: PtrT<VecFFI<DisplayAvaxFromToInfo>>,
from: PtrT<DisplayAvaxFromToInfo>,
Expand All @@ -53,6 +54,7 @@ pub struct DisplayAvaxFromToInfo {
address: PtrString,
amount: PtrString,
path: PtrString,
is_change: bool,
}

impl Free for DisplayAvaxFromToInfo {
Expand All @@ -68,11 +70,16 @@ impl Free for DisplayAvaxFromToInfo {
impl_c_ptr!(DisplayAvaxFromToInfo);

impl DisplayAvaxFromToInfo {
fn from_index(value: &AvaxFromToInfo, wallet_index: u64) -> Self {
fn from_index(value: &AvaxFromToInfo, wallet_index: u64, from_address: String) -> Self {
let address = value.address.get(0).unwrap().clone();
DisplayAvaxFromToInfo {
address: convert_c_char(value.address.get(0).unwrap().clone()),
amount: convert_c_char(value.amount.clone()),
address: convert_c_char(address.clone()),
amount: convert_c_char(format!(
"{} AVAX",
value.amount as f64 / NAVAX_TO_AVAX_RATIO
)),
path: convert_c_char(format!("{}/0/{}", value.path_prefix, wallet_index)),
is_change: address == from_address,
}
}
}
Expand Down Expand Up @@ -130,14 +137,21 @@ impl DisplayTxAvaxData {
) -> Self {
DisplayTxAvaxData {
from: DisplayAvaxFromToInfo {
address: convert_c_char(from_address),
address: convert_c_char(from_address.clone()),
amount: convert_c_char(format!(
"{} AVAX",
value.get_total_input_amount() as f64 / NAVAX_TO_AVAX_RATIO
)),
path: convert_c_char(from_path),
is_change: false,
}
.c_ptr(),
amount: convert_c_char(format!(
"{} AVAX",value.get_output_amount(
from_address.clone()
) as f64
/ NAVAX_TO_AVAX_RATIO)),

total_input_amount: convert_c_char(format!(
"{} AVAX",
value.get_total_input_amount() as f64 / NAVAX_TO_AVAX_RATIO
Expand All @@ -154,7 +168,9 @@ impl DisplayTxAvaxData {
value
.get_outputs_addresses()
.iter()
.map(|v| DisplayAvaxFromToInfo::from_index(v, wallet_index))
.map(|v| {
DisplayAvaxFromToInfo::from_index(v, wallet_index, from_address.clone())
})
.collect::<Vec<DisplayAvaxFromToInfo>>(),
)
.c_ptr(),
Expand Down Expand Up @@ -189,6 +205,7 @@ impl Free for DisplayTxAvaxData {
v.free();
});

free_ptr_string(self.amount);
free_ptr_string(self.network);
free_ptr_string(self.network_key);
free_ptr_string(self.subnet_id);
Expand Down
3 changes: 1 addition & 2 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ int _write(int fd, char *pBuffer, int size)
for (int i = 0; i < size; i++) {
while (!UART_IsTXEmpty(UART0));
#ifdef BUILD_PRODUCTION
// UART_SendData(UART0, '-');
UART_SendData(UART0, (uint8_t) pBuffer[i]);
UART_SendData(UART0, '-');
#else
UART_SendData(UART0, (uint8_t) pBuffer[i]);
#endif
Expand Down
59 changes: 40 additions & 19 deletions src/ui/gui_assets/font/cn/cnText.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 24 px
* Bpp: 2
* Opts: --bpp 2 --size 24 --no-compress --font NotoSansSC-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€、一三上不与个中为主么了二于互交产享亮什从代以件传体何作使例保信候允入公共关准出分列创初删前办功加动助励包化升单卡即压原取受变可号各同名后吗启和固在地址坊型基处备复多天太失奖好如始委子字完定密导小屏展差已币帐幕广序度建开异式强当径待志忘快念态总息悉您情成我或户扩扫拒择持指振换捷接描播擦收改教数文新方日时明易是显暂更未本条析查标校格检概模款正毕气永池派测消添熵片版状理生用电白的相知短码确示私种秒称移程稍立端签简算管类系级纹络绝统继续维网置署脚自要解言计认记许设访证词试详语误请败账资路跳软载输过这连退选道重金钟钥钱锁错键闭问除隙页额验骰,:? --format lvgl -o ../gui_assets/font/cn/cnText.c
* Opts: --bpp 2 --size 24 --no-compress --font NotoSansSC-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·€、一三上不与个中为主么了二于互交产享亮什从代以件传体何作使例保信候允入公共关准出分列创初删前办功加动助励包化升单卡即压原取受变可号各同名后吗启和固在地址坊型基处备复多天太失奖好如始委子字完定密导小屏展差已币帐幕广序度建开异式强当径待志忘快念态总息悉您情成我或户扩扫拒择持指振换捷接描播擦收改教数文新方日时明易是显暂更未本条析查标校格检概模款正毕气永池派测消添熵片版状理生用电白的相知短码确示私种秒称移程稍立端签简算管类系级纹络绝统继续维网置署脚自要解言计认记许设访证词试详语误请败账资路跳软载输过这连退选道重金钟钥钱链锁错键闭问除隙页额验骰,:? --format lvgl -o ../gui_assets/font/cn/cnText.c
******************************************************************************/

#ifdef LV_LVGL_H_INCLUDE_SIMPLE
Expand Down Expand Up @@ -5680,6 +5680,26 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xf, 0xe0, 0xf, 0xf8, 0x0, 0x80, 0x1, 0x0,
0x3, 0xf0,

/* U+94FE "链" */
0x0, 0x0, 0x0, 0x0, 0x40, 0x0, 0x3, 0xc0,
0x0, 0x0, 0xe0, 0x0, 0x3, 0x80, 0x74, 0x1,
0xd0, 0x0, 0x7, 0xaa, 0x3c, 0x56, 0xe5, 0x54,
0xf, 0xff, 0x1d, 0xbf, 0xff, 0xfc, 0x1d, 0x0,
0xf, 0x7, 0x40, 0x0, 0x3c, 0x0, 0x4, 0xb,
0x18, 0x0, 0x34, 0x0, 0x0, 0xe, 0x2c, 0x0,
0xf, 0xfe, 0x0, 0x1c, 0x2c, 0x0, 0xa, 0xfa,
0xa9, 0x3e, 0xbe, 0xa4, 0x0, 0xe0, 0xfe, 0x3f,
0xff, 0xf4, 0x0, 0xe0, 0xe, 0x0, 0x2c, 0x0,
0x0, 0xe0, 0xe, 0x0, 0x2c, 0x0, 0x3f, 0xff,
0xe, 0x0, 0x2c, 0x0, 0x1a, 0xfa, 0xe, 0x7f,
0xff, 0xfc, 0x0, 0xe0, 0xe, 0x2a, 0xbe, 0xa8,
0x0, 0xe0, 0xe, 0x0, 0x2c, 0x0, 0x0, 0xe0,
0xe, 0x0, 0x2c, 0x0, 0x0, 0xe2, 0xe, 0x0,
0x2c, 0x0, 0x0, 0xff, 0x2f, 0x80, 0x2c, 0x0,
0x0, 0xfc, 0xb9, 0xe0, 0x0, 0x0, 0x3, 0xe1,
0xe0, 0x3f, 0xaa, 0xbd, 0x3, 0x40, 0xc0, 0xb,
0xff, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,

/* U+9501 "锁" */
0x0, 0x0, 0x0, 0x1, 0x40, 0x0, 0x0, 0xf0,
0x1, 0x2, 0xc0, 0x0, 0x1, 0xd0, 0x3, 0x82,
Expand Down Expand Up @@ -6273,20 +6293,21 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 37922, .adv_w = 384, .box_w = 23, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 38055, .adv_w = 384, .box_w = 22, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 38187, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 38325, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 38463, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 38325, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 38469, .adv_w = 384, .box_w = 24, .box_h = 23, .ofs_x = 0, .ofs_y = -2},
{.bitmap_index = 38607, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 38751, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 38861, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
{.bitmap_index = 38976, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 39114, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 39252, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 39373, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 38751, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 38895, .adv_w = 384, .box_w = 20, .box_h = 22, .ofs_x = 2, .ofs_y = -2},
{.bitmap_index = 39005, .adv_w = 384, .box_w = 20, .box_h = 23, .ofs_x = 2, .ofs_y = -3},
{.bitmap_index = 39120, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 39258, .adv_w = 384, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 39396, .adv_w = 384, .box_w = 22, .box_h = 22, .ofs_x = 1, .ofs_y = -3},
{.bitmap_index = 39517, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 39661, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 39788, .adv_w = 384, .box_w = 5, .box_h = 9, .ofs_x = 3, .ofs_y = -3},
{.bitmap_index = 39800, .adv_w = 384, .box_w = 4, .box_h = 17, .ofs_x = 4, .ofs_y = -1},
{.bitmap_index = 39817, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -1}
{.bitmap_index = 39661, .adv_w = 384, .box_w = 24, .box_h = 24, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 39805, .adv_w = 384, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2},
{.bitmap_index = 39932, .adv_w = 384, .box_w = 5, .box_h = 9, .ofs_x = 3, .ofs_y = -3},
{.bitmap_index = 39944, .adv_w = 384, .box_w = 4, .box_h = 17, .ofs_x = 4, .ofs_y = -1},
{.bitmap_index = 39961, .adv_w = 384, .box_w = 12, .box_h = 20, .ofs_x = 0, .ofs_y = -1}
};

/*---------------------
Expand Down Expand Up @@ -6326,9 +6347,9 @@ static const uint16_t unicode_list_1[] = {
0x8b0d, 0x8b15, 0x8b1b, 0x8b1c, 0x8b1e, 0x8b2a, 0x8b32, 0x8b43,
0x8b4a, 0x8b4c, 0x8b54, 0x8c82, 0x8c83, 0x8ca1, 0x8d4c, 0x8d50,
0x8ecc, 0x8eda, 0x8ef0, 0x8f24, 0x8f36, 0x8f3b, 0x8f5d, 0x8f66,
0x8fb0, 0x912a, 0x912e, 0x93fc, 0x9402, 0x940e, 0x945e, 0x9476,
0x948b, 0x954a, 0x954b, 0x95c1, 0x95f6, 0x97d2, 0x97fa, 0x99e9,
0x9a0d, 0xfe69, 0xfe77, 0xfe7c
0x8fb0, 0x912a, 0x912e, 0x93fc, 0x9402, 0x940e, 0x945b, 0x945e,
0x9476, 0x948b, 0x954a, 0x954b, 0x95c1, 0x95f6, 0x97d2, 0x97fa,
0x99e9, 0x9a0d, 0xfe69, 0xfe77, 0xfe7c
};

/*Collect the unicode lists and glyph_id offsets*/
Expand All @@ -6339,7 +6360,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
},
{
.range_start = 163, .range_length = 65149, .glyph_id_start = 96,
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 276, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 277, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};

Expand Down Expand Up @@ -6396,7 +6417,7 @@ static const uint8_t kern_left_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0
0, 0, 0, 0, 0
};

/*Map glyph_ids to kern right classes*/
Expand Down Expand Up @@ -6447,7 +6468,7 @@ static const uint8_t kern_right_class_mapping[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0
0, 0, 0, 0, 0
};

/*Kern values between classes*/
Expand Down
23 changes: 16 additions & 7 deletions src/ui/gui_assets/font/de/deIllustrate.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 20 px
* Bpp: 2
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·ÄÖÜßáäñóöü“„€ --format lvgl -o ../gui_assets/font/de/deIllustrate.c
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~£¥·ÄÖÜßáäñóöúü“„€ --format lvgl -o ../gui_assets/font/de/deIllustrate.c
******************************************************************************/

#ifdef LV_LVGL_H_INCLUDE_SIMPLE
Expand Down Expand Up @@ -725,6 +725,13 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
0xf3, 0xc0, 0x3, 0xcb, 0x0, 0xf, 0xe, 0x0,
0xb4, 0x2f, 0xaf, 0x80, 0x1f, 0xf4, 0x0,

/* U+00FA "ú" */
0x0, 0x1f, 0x0, 0x3, 0xc0, 0x0, 0xa0, 0x0,
0x0, 0x0, 0x74, 0x0, 0xe7, 0x40, 0xe, 0x74,
0x0, 0xe7, 0x40, 0xe, 0x74, 0x0, 0xe7, 0x40,
0xe, 0x74, 0x0, 0xe7, 0x40, 0x1e, 0x78, 0x2,
0xe3, 0xe5, 0xbe, 0xb, 0xf8, 0xe0,

/* U+00FC "ü" */
0x7, 0xb, 0x0, 0x70, 0xb0, 0x0, 0x0, 0x7,
0x40, 0xe, 0x74, 0x0, 0xe7, 0x40, 0xe, 0x74,
Expand Down Expand Up @@ -863,10 +870,11 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
{.bitmap_index = 3420, .adv_w = 198, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3458, .adv_w = 194, .box_w = 11, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3500, .adv_w = 194, .box_w = 11, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3539, .adv_w = 198, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3574, .adv_w = 115, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 9},
{.bitmap_index = 3583, .adv_w = 133, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 3593, .adv_w = 183, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0}
{.bitmap_index = 3539, .adv_w = 198, .box_w = 10, .box_h = 15, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3577, .adv_w = 198, .box_w = 10, .box_h = 14, .ofs_x = 1, .ofs_y = 0},
{.bitmap_index = 3612, .adv_w = 115, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 9},
{.bitmap_index = 3621, .adv_w = 133, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = -3},
{.bitmap_index = 3631, .adv_w = 183, .box_w = 12, .box_h = 14, .ofs_x = 0, .ofs_y = 0}
};

/*---------------------
Expand All @@ -875,7 +883,8 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {

static const uint16_t unicode_list_1[] = {
0x0, 0x2, 0x14, 0x21, 0x33, 0x39, 0x3c, 0x3e,
0x41, 0x4e, 0x50, 0x53, 0x59, 0x1f79, 0x1f7b, 0x2009
0x41, 0x4e, 0x50, 0x53, 0x57, 0x59, 0x1f79, 0x1f7b,
0x2009
};

/*Collect the unicode lists and glyph_id offsets*/
Expand All @@ -886,7 +895,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
},
{
.range_start = 163, .range_length = 8202, .glyph_id_start = 96,
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 16, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
.unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 17, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/ui/gui_assets/font/es/esIllustrate.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*******************************************************************************
* Size: 20 px
* Bpp: 2
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡£¥·¿ÁÉÍÑáéíñóú€ --format lvgl -o ../gui_assets/font/es/esIllustrate.c
* Opts: --bpp 2 --size 20 --no-compress --font NotoSans-Regular.ttf --symbols "!#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~¡£¥·¿ÁÉÍÑáéíñóú€、。于常用见 --format lvgl -o ../gui_assets/font/es/esIllustrate.c
******************************************************************************/

#ifdef LV_LVGL_H_INCLUDE_SIMPLE
Expand Down
Loading
Loading