From 4c5706f368cf15a7e3f1d032b7058f99817fc994 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 10 Sep 2024 16:13:11 +0200 Subject: [PATCH] add some lowercase letters to small_font to display serial devices --- src/ui.c | 20 ++++++------- src/ui_bitmaps_small_font.h | 60 +++++++++++++++++++++++++++++++++++++ src/ui_sdl2.c | 17 ++--------- 3 files changed, 73 insertions(+), 24 deletions(-) diff --git a/src/ui.c b/src/ui.c index 1da846c..4043bac 100644 --- a/src/ui.c +++ b/src/ui.c @@ -111,28 +111,28 @@ letter_t small_font[ 128 ] = { {0, 0, 0 }, /* a */ {0, 0, 0 }, /* b */ {0, 0, 0 }, /* c */ - {0, 0, 0 }, /* d */ - {0, 0, 0 }, /* e */ + {d_width, d_height, d_bits }, + {e_width, e_height, e_bits }, {0, 0, 0 }, /* f */ {0, 0, 0 }, /* g */ {0, 0, 0 }, /* h */ - {0, 0, 0 }, /* i */ + {i_width, i_height, i_bits }, {0, 0, 0 }, /* j */ {0, 0, 0 }, /* k */ {0, 0, 0 }, /* l */ {0, 0, 0 }, /* m */ {0, 0, 0 }, /* n */ {0, 0, 0 }, /* o */ - {0, 0, 0 }, /* p */ + {p_width, p_height, p_bits }, {0, 0, 0 }, /* q */ - {0, 0, 0 }, /* r */ - {0, 0, 0 }, /* s */ - {0, 0, 0 }, /* t */ + {r_width, r_height, r_bits }, + {s_width, s_height, s_bits }, + {t_width, t_height, t_bits }, {0, 0, 0 }, /* u */ - {0, 0, 0 }, /* v */ - {0, 0, 0 }, /* w */ + {v_width, v_height, v_bits }, + {w_width, w_height, w_bits }, {0, 0, 0 }, /* x */ - {0, 0, 0 }, /* y */ + {y_width, y_height, y_bits }, {0, 0, 0 }, /* z */ {lcurly_width, lcurly_height, lcurly_bits }, {0, 0, 0 }, diff --git a/src/ui_bitmaps_small_font.h b/src/ui_bitmaps_small_font.h index 53444b3..0a46923 100644 --- a/src/ui_bitmaps_small_font.h +++ b/src/ui_bitmaps_small_font.h @@ -85,6 +85,66 @@ static unsigned char nine_bits[] = { #define small_colon_height 7 static unsigned char small_colon_bits[] = { 0x00, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00 }; +#define d_width 5 +#define d_height 7 +static unsigned char d_bits[] = { + 16, 16, 30, 17, 17, 30, 0, +}; + +#define e_width 5 +#define e_height 7 +static unsigned char e_bits[] = { + 0, 14, 17, 15, 1, 14, 0, +}; + +#define i_width 5 +#define i_height 7 +static unsigned char i_bits[] = { + 4, 0, 6, 4, 4, 14, 0, +}; + +#define p_width 5 +#define p_height 7 +static unsigned char p_bits[] = { + 0, 15, 17, 17, 15, 1, 1, +}; + +#define r_width 5 +#define r_height 7 +static unsigned char r_bits[] = { + 0, 29, 3, 1, 1, 1, 0, +}; + +#define s_width 5 +#define s_height 7 +static unsigned char s_bits[] = { + 0, 30, 1, 14, 16, 15, 0, +}; + +#define t_width 5 +#define t_height 7 +static unsigned char t_bits[] = { + 2, 15, 2, 2, 2, 12, 0, +}; + +#define v_width 5 +#define v_height 7 +static unsigned char v_bits[] = { + 0, 17, 17, 10, 10, 4, 0, +}; + +#define w_width 5 +#define w_height 7 +static unsigned char w_bits[] = { + 0, 17, 17, 21, 21, 10, 0, +}; + +#define y_width 5 +#define y_height 7 +static unsigned char y_bits[] = { + 0, 0, 17, 17, 30, 16, 15, +}; + #define A_width 5 #define A_height 7 static unsigned char A_bits[] = { 0x0e, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }; diff --git a/src/ui_sdl2.c b/src/ui_sdl2.c index 85a2336..5ee88ed 100644 --- a/src/ui_sdl2.c +++ b/src/ui_sdl2.c @@ -826,7 +826,6 @@ static void _show_key( int hpkey ) static void _draw_serial_devices_path( void ) { - int i = 0; char text[ 1024 ] = ""; if ( config.verbose ) { @@ -835,25 +834,15 @@ static void _draw_serial_devices_path( void ) } if ( wire_name ) { - char wire_name_uppercase[ strlen( wire_name ) ]; - strcpy( wire_name_uppercase, wire_name ); - for ( i = 0; i < ( int )strlen( wire_name ); i++ ) - wire_name_uppercase[ i ] = toupper( wire_name_uppercase[ i ] ); - - strcat( text, "WIRE: " ); - strcat( text, wire_name_uppercase ); + strcat( text, "wire: " ); + strcat( text, wire_name ); } if ( ir_name ) { - char ir_name_uppercase[ strlen( ir_name ) ]; - strcpy( ir_name_uppercase, ir_name ); - for ( i = 0; i < ( int )strlen( ir_name ); i++ ) - ir_name_uppercase[ i ] = toupper( ir_name_uppercase[ i ] ); - if ( strlen( text ) > 0 ) strcat( text, " | " ); strcat( text, "IR: " ); - strcat( text, ir_name_uppercase ); + strcat( text, ir_name ); } if ( strlen( text ) > 0 )