From 322d5fa1ddc00149c4f50d59bca1e439184461f2 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 10 Sep 2024 13:44:42 +0200 Subject: [PATCH] *_bitmap => *_bits --- src/ui.c | 512 ++++++++++++++++++------------------ src/ui_bitmaps_big_font.h | 56 ++-- src/ui_bitmaps_small_font.h | 208 +++++++-------- 3 files changed, 388 insertions(+), 388 deletions(-) diff --git a/src/ui.c b/src/ui.c index e4a04c1..2f0168d 100644 --- a/src/ui.c +++ b/src/ui.c @@ -11,265 +11,265 @@ int last_annunc_state = -1; unsigned char lcd_nibbles_buffer[ DISP_ROWS ][ NIBS_PER_BUFFER_ROW ]; letter_t small_font[ 128 ] = { - {0, 0, 0 }, - {nl_gx_width, nl_gx_height, nl_gx_bitmap }, /* \001 == \n gx */ - {comma_gx_width, comma_gx_height, comma_gx_bitmap }, /* \002 == comma gx */ - {arrow_gx_width, arrow_gx_height, arrow_gx_bitmap }, /* \003 == \-> gx */ - {equal_gx_width, equal_gx_height, equal_gx_bitmap }, /* \004 == equal gx */ - {pi_gx_width, pi_gx_height, pi_gx_bitmap }, /* \005 == pi gx */ - {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 }, /* # 16 */ - {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 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {blank_width, blank_height, blank_bitmap }, /* # 32 */ - {0, 0, 0 }, - {0, 0, 0 }, - {hash_width, hash_height, hash_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {lbrace_width, lbrace_height, lbrace_bitmap }, - {rbrace_width, rbrace_height, rbrace_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {comma_width, comma_height, comma_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {slash_width, slash_height, slash_bitmap }, - {zero_width, zero_height, zero_bitmap }, /* # 48 */ - {one_width, one_height, one_bitmap }, - {two_width, two_height, two_bitmap }, - {three_width, three_height, three_bitmap }, - {four_width, four_height, four_bitmap }, - {five_width, five_height, five_bitmap }, - {six_width, six_height, six_bitmap }, - {seven_width, seven_height, seven_bitmap }, - {eight_width, eight_height, eight_bitmap }, - {nine_width, nine_height, nine_bitmap }, - {small_colon_width, small_colon_height, small_colon_bitmap}, - {0, 0, 0 }, - {0, 0, 0 }, - {equal_width, equal_height, equal_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, /* # 64 */ - {A_width, A_height, A_bitmap }, - {B_width, B_height, B_bitmap }, - {C_width, C_height, C_bitmap }, - {D_width, D_height, D_bitmap }, - {E_width, E_height, E_bitmap }, - {F_width, F_height, F_bitmap }, - {G_width, G_height, G_bitmap }, - {H_width, H_height, H_bitmap }, - {I_width, I_height, I_bitmap }, - {J_width, J_height, J_bitmap }, - {K_width, K_height, K_bitmap }, - {L_width, L_height, L_bitmap }, - {M_width, M_height, M_bitmap }, - {N_width, N_height, N_bitmap }, - {O_width, O_height, O_bitmap }, - {P_width, P_height, P_bitmap }, /* # 80 */ - {Q_width, Q_height, Q_bitmap }, - {R_width, R_height, R_bitmap }, - {S_width, S_height, S_bitmap }, - {T_width, T_height, T_bitmap }, - {U_width, U_height, U_bitmap }, - {V_width, V_height, V_bitmap }, - {W_width, W_height, W_bitmap }, - {X_width, X_height, X_bitmap }, - {Y_width, Y_height, Y_bitmap }, - {Z_width, Z_height, Z_bitmap }, - {lbracket_width, lbracket_height, lbracket_bitmap }, - {0, 0, 0 }, - {rbracket_width, rbracket_height, rbracket_bitmap }, - {0, 0, 0 }, - {under_width, under_height, under_bitmap }, - {0, 0, 0 }, /* # 96 */ - {arrow_width, arrow_height, arrow_bitmap }, /* a == left arrow */ - {diff_width, diff_height, diff_bitmap }, /* b == differential */ - {integral_width, integral_height, integral_bitmap }, /* c == integral */ - {sigma_width, sigma_height, sigma_bitmap }, /* d == sigma */ - {sqr_width, sqr_height, sqr_bitmap }, /* e == sqr */ - {root_width, root_height, root_bitmap }, /* f == root */ - {pow10_width, pow10_height, pow10_bitmap }, /* g == pow10 */ - {exp_width, exp_height, exp_bitmap }, /* h == exp */ - {prog_width, prog_height, prog_bitmap }, /* i == << >> */ - {string_width, string_height, string_bitmap }, /* j == " " */ - {nl_width, nl_height, nl_bitmap }, /* k == New Line */ - {pi_width, pi_height, pi_bitmap }, /* l == pi */ - {angle_width, angle_height, angle_bitmap }, /* m == angle */ - {sqr_gx_width, sqr_gx_height, sqr_gx_bitmap }, /* n == sqr gx */ - {root_gx_width, root_gx_height, root_gx_bitmap }, /* o == root gx */ - {pow10_gx_width, pow10_gx_height, pow10_gx_bitmap }, /* p == pow10 gx */ - {exp_gx_width, exp_gx_height, exp_gx_bitmap }, /* q == exp gx */ - {parens_gx_width, parens_gx_height, parens_gx_bitmap }, /* r == ( ) gx */ - {hash_gx_width, hash_gx_height, hash_gx_bitmap }, /* s == # gx */ - {bracket_gx_width, bracket_gx_height, bracket_gx_bitmap }, /* t == [] gx */ - {under_gx_width, under_gx_height, under_gx_bitmap }, /* u == _ gx */ - {prog_gx_width, prog_gx_height, prog_gx_bitmap }, /* v == << >> gx */ - {quote_gx_width, quote_gx_height, quote_gx_bitmap }, /* w == " " gx */ - {curly_gx_width, curly_gx_height, curly_gx_bitmap }, /* x == {} gx */ - {colon_gx_width, colon_gx_height, colon_gx_bitmap }, /* y == :: gx */ - {angle_gx_width, angle_gx_height, angle_gx_bitmap }, /* z == angle gx */ - {lcurly_width, lcurly_height, lcurly_bitmap }, - {0, 0, 0 }, - {rcurly_width, rcurly_height, rcurly_bitmap }, - {0, 0, 0 }, - {0, 0, 0 } + {0, 0, 0 }, + {nl_gx_width, nl_gx_height, nl_gx_bits }, /* \001 == \n gx */ + {comma_gx_width, comma_gx_height, comma_gx_bits }, /* \002 == comma gx */ + {arrow_gx_width, arrow_gx_height, arrow_gx_bits }, /* \003 == \-> gx */ + {equal_gx_width, equal_gx_height, equal_gx_bits }, /* \004 == equal gx */ + {pi_gx_width, pi_gx_height, pi_gx_bits }, /* \005 == pi gx */ + {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 }, /* # 16 */ + {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 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {blank_width, blank_height, blank_bits }, /* # 32 */ + {0, 0, 0 }, + {0, 0, 0 }, + {hash_width, hash_height, hash_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {lbrace_width, lbrace_height, lbrace_bits }, + {rbrace_width, rbrace_height, rbrace_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {comma_width, comma_height, comma_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {slash_width, slash_height, slash_bits }, + {zero_width, zero_height, zero_bits }, /* # 48 */ + {one_width, one_height, one_bits }, + {two_width, two_height, two_bits }, + {three_width, three_height, three_bits }, + {four_width, four_height, four_bits }, + {five_width, five_height, five_bits }, + {six_width, six_height, six_bits }, + {seven_width, seven_height, seven_bits }, + {eight_width, eight_height, eight_bits }, + {nine_width, nine_height, nine_bits }, + {small_colon_width, small_colon_height, small_colon_bits}, + {0, 0, 0 }, + {0, 0, 0 }, + {equal_width, equal_height, equal_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, /* # 64 */ + {A_width, A_height, A_bits }, + {B_width, B_height, B_bits }, + {C_width, C_height, C_bits }, + {D_width, D_height, D_bits }, + {E_width, E_height, E_bits }, + {F_width, F_height, F_bits }, + {G_width, G_height, G_bits }, + {H_width, H_height, H_bits }, + {I_width, I_height, I_bits }, + {J_width, J_height, J_bits }, + {K_width, K_height, K_bits }, + {L_width, L_height, L_bits }, + {M_width, M_height, M_bits }, + {N_width, N_height, N_bits }, + {O_width, O_height, O_bits }, + {P_width, P_height, P_bits }, /* # 80 */ + {Q_width, Q_height, Q_bits }, + {R_width, R_height, R_bits }, + {S_width, S_height, S_bits }, + {T_width, T_height, T_bits }, + {U_width, U_height, U_bits }, + {V_width, V_height, V_bits }, + {W_width, W_height, W_bits }, + {X_width, X_height, X_bits }, + {Y_width, Y_height, Y_bits }, + {Z_width, Z_height, Z_bits }, + {lbracket_width, lbracket_height, lbracket_bits }, + {0, 0, 0 }, + {rbracket_width, rbracket_height, rbracket_bits }, + {0, 0, 0 }, + {under_width, under_height, under_bits }, + {0, 0, 0 }, /* # 96 */ + {arrow_width, arrow_height, arrow_bits }, /* a == left arrow */ + {diff_width, diff_height, diff_bits }, /* b == differential */ + {integral_width, integral_height, integral_bits }, /* c == integral */ + {sigma_width, sigma_height, sigma_bits }, /* d == sigma */ + {sqr_width, sqr_height, sqr_bits }, /* e == sqr */ + {root_width, root_height, root_bits }, /* f == root */ + {pow10_width, pow10_height, pow10_bits }, /* g == pow10 */ + {exp_width, exp_height, exp_bits }, /* h == exp */ + {prog_width, prog_height, prog_bits }, /* i == << >> */ + {string_width, string_height, string_bits }, /* j == " " */ + {nl_width, nl_height, nl_bits }, /* k == New Line */ + {pi_width, pi_height, pi_bits }, /* l == pi */ + {angle_width, angle_height, angle_bits }, /* m == angle */ + {sqr_gx_width, sqr_gx_height, sqr_gx_bits }, /* n == sqr gx */ + {root_gx_width, root_gx_height, root_gx_bits }, /* o == root gx */ + {pow10_gx_width, pow10_gx_height, pow10_gx_bits }, /* p == pow10 gx */ + {exp_gx_width, exp_gx_height, exp_gx_bits }, /* q == exp gx */ + {parens_gx_width, parens_gx_height, parens_gx_bits }, /* r == ( ) gx */ + {hash_gx_width, hash_gx_height, hash_gx_bits }, /* s == # gx */ + {bracket_gx_width, bracket_gx_height, bracket_gx_bits }, /* t == [] gx */ + {under_gx_width, under_gx_height, under_gx_bits }, /* u == _ gx */ + {prog_gx_width, prog_gx_height, prog_gx_bits }, /* v == << >> gx */ + {quote_gx_width, quote_gx_height, quote_gx_bits }, /* w == " " gx */ + {curly_gx_width, curly_gx_height, curly_gx_bits }, /* x == {} gx */ + {colon_gx_width, colon_gx_height, colon_gx_bits }, /* y == :: gx */ + {angle_gx_width, angle_gx_height, angle_gx_bits }, /* z == angle gx */ + {lcurly_width, lcurly_height, lcurly_bits }, + {0, 0, 0 }, + {rcurly_width, rcurly_height, rcurly_bits }, + {0, 0, 0 }, + {0, 0, 0 } }; letter_t big_font[ 128 ] = { - {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 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, /* # 16 */ - {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 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, /* # 32 */ - {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 }, - {0, 0, 0 }, - {0, 0, 0 }, - {big_font_dot_width, big_font_dot_height, big_font_dot_bitmap}, /* # 46 */ - {0, 0, 0 }, - {big_font_0_width, big_font_0_height, big_font_0_bitmap }, /* # 48 */ - {big_font_1_width, big_font_1_height, big_font_1_bitmap }, - {big_font_2_width, big_font_2_height, big_font_2_bitmap }, - {big_font_3_width, big_font_3_height, big_font_3_bitmap }, - {big_font_4_width, big_font_4_height, big_font_4_bitmap }, - {big_font_5_width, big_font_5_height, big_font_5_bitmap }, - {big_font_6_width, big_font_6_height, big_font_6_bitmap }, - {big_font_7_width, big_font_7_height, big_font_7_bitmap }, - {big_font_8_width, big_font_8_height, big_font_8_bitmap }, - {big_font_9_width, big_font_9_height, big_font_9_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, /* # 64 */ - {big_font_A_width, big_font_A_height, big_font_A_bitmap }, - {0, 0, 0 }, - {big_font_C_width, big_font_C_height, big_font_C_bitmap }, - {big_font_D_width, big_font_D_height, big_font_D_bitmap }, - {big_font_E_width, big_font_E_height, big_font_E_bitmap }, - {0, 0, 0 }, - {big_font_G_width, big_font_G_height, big_font_G_bitmap }, - {big_font_H_width, big_font_H_height, big_font_H_bitmap }, - {big_font_I_width, big_font_I_height, big_font_I_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {big_font_L_width, big_font_L_height, big_font_L_bitmap }, - {big_font_M_width, big_font_M_height, big_font_M_bitmap }, - {big_font_N_width, big_font_N_height, big_font_N_bitmap }, - {big_font_O_width, big_font_O_height, big_font_O_bitmap }, - {big_font_P_width, big_font_P_height, big_font_P_bitmap }, /* # 80 */ - {0, 0, 0 }, - {big_font_R_width, big_font_R_height, big_font_R_bitmap }, - {big_font_S_width, big_font_S_height, big_font_S_bitmap }, - {big_font_T_width, big_font_T_height, big_font_T_bitmap }, - {0, 0, 0 }, - {big_font_V_width, big_font_V_height, big_font_V_bitmap }, - {0, 0, 0 }, - {big_font_X_width, big_font_X_height, big_font_X_bitmap }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, - {0, 0, 0 }, /* # 96 */ - {0, 0, 0 }, /* a == left arrow */ - {0, 0, 0 }, /* b == differential */ - {0, 0, 0 }, /* c == integral */ - {0, 0, 0 }, /* d == sigma */ - {0, 0, 0 }, /* e == sqr */ - {0, 0, 0 }, /* f == root */ - {0, 0, 0 }, /* g == pow10 */ - {0, 0, 0 }, /* h == exp */ - {0, 0, 0 }, /* i == << >> */ - {0, 0, 0 }, /* j == " " */ - {0, 0, 0 }, /* k == New Line */ - {0, 0, 0 }, /* l == pi */ - {0, 0, 0 }, /* m == angle */ - {0, 0, 0 }, /* n == sqr gx */ - {0, 0, 0 }, /* o == root gx */ - {0, 0, 0 }, /* p == pow10 gx */ - {0, 0, 0 }, /* q == exp gx */ - {0, 0, 0 }, /* r == ( ) gx */ - {0, 0, 0 }, /* s == # gx */ - {0, 0, 0 }, /* t == [] gx */ - {0, 0, 0 }, /* u == _ gx */ - {0, 0, 0 }, /* v == << >> gx */ - {0, 0, 0 }, /* w == " " gx */ - {0, 0, 0 }, /* x == {} gx */ - {0, 0, 0 }, /* y == :: gx */ - {0, 0, 0 }, /* z == angle gx */ - {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 }, + {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 }, /* # 16 */ + {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 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, /* # 32 */ + {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 }, + {0, 0, 0 }, + {0, 0, 0 }, + {big_font_dot_width, big_font_dot_height, big_font_dot_bits}, /* # 46 */ + {0, 0, 0 }, + {big_font_0_width, big_font_0_height, big_font_0_bits }, /* # 48 */ + {big_font_1_width, big_font_1_height, big_font_1_bits }, + {big_font_2_width, big_font_2_height, big_font_2_bits }, + {big_font_3_width, big_font_3_height, big_font_3_bits }, + {big_font_4_width, big_font_4_height, big_font_4_bits }, + {big_font_5_width, big_font_5_height, big_font_5_bits }, + {big_font_6_width, big_font_6_height, big_font_6_bits }, + {big_font_7_width, big_font_7_height, big_font_7_bits }, + {big_font_8_width, big_font_8_height, big_font_8_bits }, + {big_font_9_width, big_font_9_height, big_font_9_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, /* # 64 */ + {big_font_A_width, big_font_A_height, big_font_A_bits }, + {0, 0, 0 }, + {big_font_C_width, big_font_C_height, big_font_C_bits }, + {big_font_D_width, big_font_D_height, big_font_D_bits }, + {big_font_E_width, big_font_E_height, big_font_E_bits }, + {0, 0, 0 }, + {big_font_G_width, big_font_G_height, big_font_G_bits }, + {big_font_H_width, big_font_H_height, big_font_H_bits }, + {big_font_I_width, big_font_I_height, big_font_I_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {big_font_L_width, big_font_L_height, big_font_L_bits }, + {big_font_M_width, big_font_M_height, big_font_M_bits }, + {big_font_N_width, big_font_N_height, big_font_N_bits }, + {big_font_O_width, big_font_O_height, big_font_O_bits }, + {big_font_P_width, big_font_P_height, big_font_P_bits }, /* # 80 */ + {0, 0, 0 }, + {big_font_R_width, big_font_R_height, big_font_R_bits }, + {big_font_S_width, big_font_S_height, big_font_S_bits }, + {big_font_T_width, big_font_T_height, big_font_T_bits }, + {0, 0, 0 }, + {big_font_V_width, big_font_V_height, big_font_V_bits }, + {0, 0, 0 }, + {big_font_X_width, big_font_X_height, big_font_X_bits }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, /* # 96 */ + {0, 0, 0 }, /* a == left arrow */ + {0, 0, 0 }, /* b == differential */ + {0, 0, 0 }, /* c == integral */ + {0, 0, 0 }, /* d == sigma */ + {0, 0, 0 }, /* e == sqr */ + {0, 0, 0 }, /* f == root */ + {0, 0, 0 }, /* g == pow10 */ + {0, 0, 0 }, /* h == exp */ + {0, 0, 0 }, /* i == << >> */ + {0, 0, 0 }, /* j == " " */ + {0, 0, 0 }, /* k == New Line */ + {0, 0, 0 }, /* l == pi */ + {0, 0, 0 }, /* m == angle */ + {0, 0, 0 }, /* n == sqr gx */ + {0, 0, 0 }, /* o == root gx */ + {0, 0, 0 }, /* p == pow10 gx */ + {0, 0, 0 }, /* q == exp gx */ + {0, 0, 0 }, /* r == ( ) gx */ + {0, 0, 0 }, /* s == # gx */ + {0, 0, 0 }, /* t == [] gx */ + {0, 0, 0 }, /* u == _ gx */ + {0, 0, 0 }, /* v == << >> gx */ + {0, 0, 0 }, /* w == " " gx */ + {0, 0, 0 }, /* x == {} gx */ + {0, 0, 0 }, /* y == :: gx */ + {0, 0, 0 }, /* z == angle gx */ + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 }, + {0, 0, 0 } }; color_t colors_sx[ NB_COLORS ] = { diff --git a/src/ui_bitmaps_big_font.h b/src/ui_bitmaps_big_font.h index 6209801..85b8c46 100644 --- a/src/ui_bitmaps_big_font.h +++ b/src/ui_bitmaps_big_font.h @@ -3,169 +3,169 @@ #define big_font_dot_width 8 #define big_font_dot_height 13 -static unsigned char big_font_dot_bitmap[] = { +static unsigned char big_font_dot_bits[] = { 0, 0, 0, 0, 0, 0, 0, 24, 24, 0, 0, 0, 0, }; #define big_font_0_width 8 #define big_font_0_height 13 -static unsigned char big_font_0_bitmap[] = { +static unsigned char big_font_0_bits[] = { 24, 60, 102, 102, 195, 195, 195, 195, 195, 102, 102, 60, 24, }; #define big_font_1_width 8 #define big_font_1_height 13 -static unsigned char big_font_1_bitmap[] = { +static unsigned char big_font_1_bits[] = { 24, 28, 30, 27, 24, 24, 24, 24, 24, 24, 24, 24, 255, }; #define big_font_2_width 8 #define big_font_2_height 13 -static unsigned char big_font_2_bitmap[] = { +static unsigned char big_font_2_bits[] = { 60, 102, 195, 195, 192, 192, 96, 56, 12, 6, 3, 3, 255, }; #define big_font_3_width 8 #define big_font_3_height 13 -static unsigned char big_font_3_bitmap[] = { +static unsigned char big_font_3_bits[] = { 60, 102, 195, 195, 192, 96, 56, 96, 192, 195, 195, 102, 60, }; #define big_font_4_width 8 #define big_font_4_height 13 -static unsigned char big_font_4_bitmap[] = { +static unsigned char big_font_4_bits[] = { 96, 112, 120, 108, 102, 99, 99, 255, 96, 96, 96, 96, 96, }; #define big_font_5_width 8 #define big_font_5_height 13 -static unsigned char big_font_5_bitmap[] = { +static unsigned char big_font_5_bits[] = { 255, 3, 3, 3, 3, 59, 103, 192, 192, 192, 195, 102, 60, }; #define big_font_6_width 8 #define big_font_6_height 13 -static unsigned char big_font_6_bitmap[] = { +static unsigned char big_font_6_bits[] = { 60, 102, 67, 3, 3, 59, 103, 195, 195, 195, 195, 102, 60, }; #define big_font_7_width 8 #define big_font_7_height 13 -static unsigned char big_font_7_bitmap[] = { +static unsigned char big_font_7_bits[] = { 255, 192, 192, 96, 96, 48, 48, 24, 24, 12, 12, 6, 6, }; #define big_font_8_width 8 #define big_font_8_height 13 -static unsigned char big_font_8_bitmap[] = { +static unsigned char big_font_8_bits[] = { 60, 102, 195, 195, 195, 102, 60, 102, 195, 195, 195, 102, 60, }; #define big_font_9_width 8 #define big_font_9_height 13 -static unsigned char big_font_9_bitmap[] = { +static unsigned char big_font_9_bits[] = { 62, 195, 195, 195, 195, 195, 230, 220, 192, 192, 194, 102, 60, }; #define big_font_A_width 8 #define big_font_A_height 10 -static unsigned char big_font_A_bitmap[] = { +static unsigned char big_font_A_bits[] = { 30, 51, 51, 51, 51, 51, 63, 51, 51, 51, }; #define big_font_C_width 8 #define big_font_C_height 10 -static unsigned char big_font_C_bitmap[] = { +static unsigned char big_font_C_bits[] = { 30, 51, 51, 3, 3, 3, 3, 51, 51, 30, }; #define big_font_D_width 8 #define big_font_D_height 10 -static unsigned char big_font_D_bitmap[] = { +static unsigned char big_font_D_bits[] = { 15, 27, 51, 51, 51, 51, 51, 51, 27, 15, }; #define big_font_E_width 8 #define big_font_E_height 10 -static unsigned char big_font_E_bitmap[] = { +static unsigned char big_font_E_bits[] = { 63, 3, 3, 3, 31, 3, 3, 3, 3, 63, }; #define big_font_G_width 8 #define big_font_G_height 10 -static unsigned char big_font_G_bitmap[] = { +static unsigned char big_font_G_bits[] = { 30, 51, 51, 3, 3, 59, 51, 51, 51, 30, }; #define big_font_H_width 8 #define big_font_H_height 10 -static unsigned char big_font_H_bitmap[] = { +static unsigned char big_font_H_bits[] = { 51, 51, 51, 51, 63, 51, 51, 51, 51, 51, }; #define big_font_I_width 8 #define big_font_I_height 10 -static unsigned char big_font_I_bitmap[] = { +static unsigned char big_font_I_bits[] = { 63, 12, 12, 12, 12, 12, 12, 12, 12, 63, }; #define big_font_L_width 8 #define big_font_L_height 10 -static unsigned char big_font_L_bitmap[] = { +static unsigned char big_font_L_bits[] = { 3, 3, 3, 3, 3, 3, 3, 3, 3, 63, }; #define big_font_M_width 8 #define big_font_M_height 10 -static unsigned char big_font_M_bitmap[] = { +static unsigned char big_font_M_bits[] = { 33, 51, 51, 63, 63, 51, 51, 51, 51, 51, }; #define big_font_N_width 8 #define big_font_N_height 10 -static unsigned char big_font_N_bitmap[] = { +static unsigned char big_font_N_bits[] = { 51, 51, 55, 55, 55, 59, 59, 59, 51, 51, }; #define big_font_O_width 8 #define big_font_O_height 10 -static unsigned char big_font_O_bitmap[] = { +static unsigned char big_font_O_bits[] = { 30, 51, 51, 51, 51, 51, 51, 51, 51, 30, }; #define big_font_P_width 8 #define big_font_P_height 10 -static unsigned char big_font_P_bitmap[] = { +static unsigned char big_font_P_bits[] = { 31, 51, 51, 51, 51, 31, 3, 3, 3, 3, }; #define big_font_R_width 8 #define big_font_R_height 10 -static unsigned char big_font_R_bitmap[] = { +static unsigned char big_font_R_bits[] = { 31, 51, 51, 51, 31, 27, 51, 51, 51, 51, }; #define big_font_S_width 8 #define big_font_S_height 10 -static unsigned char big_font_S_bitmap[] = { +static unsigned char big_font_S_bits[] = { 30, 51, 51, 6, 12, 12, 24, 51, 51, 30, }; #define big_font_T_width 8 #define big_font_T_height 10 -static unsigned char big_font_T_bitmap[] = { +static unsigned char big_font_T_bits[] = { 63, 12, 12, 12, 12, 12, 12, 12, 12, 12, }; #define big_font_V_width 8 #define big_font_V_height 10 -static unsigned char big_font_V_bitmap[] = { +static unsigned char big_font_V_bits[] = { 51, 51, 51, 51, 51, 51, 51, 30, 30, 12, }; #define big_font_X_width 8 #define big_font_X_height 10 -static unsigned char big_font_X_bitmap[] = { +static unsigned char big_font_X_bits[] = { 51, 51, 30, 30, 12, 12, 30, 30, 51, 51, }; diff --git a/src/ui_bitmaps_small_font.h b/src/ui_bitmaps_small_font.h index dd281bb..53444b3 100644 --- a/src/ui_bitmaps_small_font.h +++ b/src/ui_bitmaps_small_font.h @@ -3,361 +3,361 @@ #define blank_width 4 #define blank_height 7 -static unsigned char blank_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static unsigned char blank_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; #define hash_width 5 #define hash_height 7 -static unsigned char hash_bitmap[] = { 0x00, 0x0a, 0x1f, 0x0a, 0x0a, 0x1f, 0x0a }; +static unsigned char hash_bits[] = { 0x00, 0x0a, 0x1f, 0x0a, 0x0a, 0x1f, 0x0a }; #define lbrace_width 3 #define lbrace_height 7 -static unsigned char lbrace_bitmap[] = { 0x04, 0x02, 0x01, 0x01, 0x01, 0x02, 0x04 }; +static unsigned char lbrace_bits[] = { 0x04, 0x02, 0x01, 0x01, 0x01, 0x02, 0x04 }; #define rbrace_width 3 #define rbrace_height 7 -static unsigned char rbrace_bitmap[] = { 0x01, 0x02, 0x04, 0x04, 0x04, 0x02, 0x01 }; +static unsigned char rbrace_bits[] = { 0x01, 0x02, 0x04, 0x04, 0x04, 0x02, 0x01 }; #define comma_width 3 #define comma_height 7 -static unsigned char comma_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x03 }; +static unsigned char comma_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x03 }; #define slash_width 3 #define slash_height 7 -static unsigned char slash_bitmap[] = { 0x04, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01 }; +static unsigned char slash_bits[] = { 0x04, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01 }; #define zero_width 5 #define zero_height 7 -static unsigned char zero_bitmap[] = { +static unsigned char zero_bits[] = { 14, 17, 25, 21, 19, 17, 14, }; #define one_width 5 #define one_height 7 -static unsigned char one_bitmap[] = { +static unsigned char one_bits[] = { 4, 6, 5, 4, 4, 4, 31, }; #define two_width 5 #define two_height 7 -static unsigned char two_bitmap[] = { 0x0e, 0x11, 0x10, 0x08, 0x04, 0x02, 0x1f }; +static unsigned char two_bits[] = { 0x0e, 0x11, 0x10, 0x08, 0x04, 0x02, 0x1f }; #define three_width 5 #define three_height 7 -static unsigned char three_bitmap[] = { 0x0e, 0x11, 0x10, 0x0c, 0x10, 0x11, 0x0e }; +static unsigned char three_bits[] = { 0x0e, 0x11, 0x10, 0x0c, 0x10, 0x11, 0x0e }; #define four_width 5 #define four_height 7 -static unsigned char four_bitmap[] = { +static unsigned char four_bits[] = { 8, 12, 10, 9, 31, 8, 8, }; #define five_width 5 #define five_height 7 -static unsigned char five_bitmap[] = { +static unsigned char five_bits[] = { 31, 1, 1, 15, 16, 16, 15, }; #define six_width 5 #define six_height 7 -static unsigned char six_bitmap[] = { +static unsigned char six_bits[] = { 14, 17, 1, 15, 17, 17, 14, }; #define seven_width 5 #define seven_height 7 -static unsigned char seven_bitmap[] = { +static unsigned char seven_bits[] = { 31, 16, 8, 4, 2, 1, 1, }; #define eight_width 5 #define eight_height 7 -static unsigned char eight_bitmap[] = { +static unsigned char eight_bits[] = { 14, 17, 17, 14, 17, 17, 14, }; #define nine_width 5 #define nine_height 7 -static unsigned char nine_bitmap[] = { +static unsigned char nine_bits[] = { 14, 17, 17, 30, 16, 17, 14, }; #define small_colon_width 2 #define small_colon_height 7 -static unsigned char small_colon_bitmap[] = { 0x00, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00 }; +static unsigned char small_colon_bits[] = { 0x00, 0x03, 0x03, 0x00, 0x03, 0x03, 0x00 }; #define A_width 5 #define A_height 7 -static unsigned char A_bitmap[] = { 0x0e, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }; +static unsigned char A_bits[] = { 0x0e, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }; #define B_width 5 #define B_height 7 -static unsigned char B_bitmap[] = { 0x0f, 0x11, 0x11, 0x0f, 0x11, 0x11, 0x0f }; +static unsigned char B_bits[] = { 0x0f, 0x11, 0x11, 0x0f, 0x11, 0x11, 0x0f }; #define C_width 5 #define C_height 7 -static unsigned char C_bitmap[] = { 0x0e, 0x11, 0x01, 0x01, 0x01, 0x11, 0x0e }; +static unsigned char C_bits[] = { 0x0e, 0x11, 0x01, 0x01, 0x01, 0x11, 0x0e }; #define D_width 5 #define D_height 7 -static unsigned char D_bitmap[] = { 0x0f, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0f }; +static unsigned char D_bits[] = { 0x0f, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0f }; #define E_width 5 #define E_height 7 -static unsigned char E_bitmap[] = { 0x1f, 0x01, 0x01, 0x0f, 0x01, 0x01, 0x1f }; +static unsigned char E_bits[] = { 0x1f, 0x01, 0x01, 0x0f, 0x01, 0x01, 0x1f }; #define F_width 5 #define F_height 7 -static unsigned char F_bitmap[] = { 0x1f, 0x01, 0x01, 0x0f, 0x01, 0x01, 0x01 }; +static unsigned char F_bits[] = { 0x1f, 0x01, 0x01, 0x0f, 0x01, 0x01, 0x01 }; #define G_width 5 #define G_height 7 -static unsigned char G_bitmap[] = { 0x0e, 0x11, 0x01, 0x01, 0x19, 0x11, 0x0e }; +static unsigned char G_bits[] = { 0x0e, 0x11, 0x01, 0x01, 0x19, 0x11, 0x0e }; #define H_width 5 #define H_height 7 -static unsigned char H_bitmap[] = { 0x11, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }; +static unsigned char H_bits[] = { 0x11, 0x11, 0x11, 0x1f, 0x11, 0x11, 0x11 }; #define I_width 1 #define I_height 7 -static unsigned char I_bitmap[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; +static unsigned char I_bits[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; #define J_width 4 #define J_height 7 -static unsigned char J_bitmap[] = { 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x06 }; +static unsigned char J_bits[] = { 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x06 }; #define K_width 5 #define K_height 7 -static unsigned char K_bitmap[] = { 0x11, 0x09, 0x05, 0x03, 0x05, 0x09, 0x11 }; +static unsigned char K_bits[] = { 0x11, 0x09, 0x05, 0x03, 0x05, 0x09, 0x11 }; #define L_width 4 #define L_height 7 -static unsigned char L_bitmap[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0f }; +static unsigned char L_bits[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0f }; #define M_width 5 #define M_height 7 -static unsigned char M_bitmap[] = { 0x11, 0x1b, 0x15, 0x11, 0x11, 0x11, 0x11 }; +static unsigned char M_bits[] = { 0x11, 0x1b, 0x15, 0x11, 0x11, 0x11, 0x11 }; #define N_width 5 #define N_height 7 -static unsigned char N_bitmap[] = { 0x11, 0x11, 0x13, 0x15, 0x19, 0x11, 0x11 }; +static unsigned char N_bits[] = { 0x11, 0x11, 0x13, 0x15, 0x19, 0x11, 0x11 }; #define O_width 5 #define O_height 7 -static unsigned char O_bitmap[] = { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }; +static unsigned char O_bits[] = { 0x0e, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }; #define P_width 5 #define P_height 7 -static unsigned char P_bitmap[] = { 0x0f, 0x11, 0x11, 0x0f, 0x01, 0x01, 0x01 }; +static unsigned char P_bits[] = { 0x0f, 0x11, 0x11, 0x0f, 0x01, 0x01, 0x01 }; #define Q_width 5 #define Q_height 7 -static unsigned char Q_bitmap[] = { 0x0e, 0x11, 0x11, 0x11, 0x15, 0x09, 0x16 }; +static unsigned char Q_bits[] = { 0x0e, 0x11, 0x11, 0x11, 0x15, 0x09, 0x16 }; #define R_width 5 #define R_height 7 -static unsigned char R_bitmap[] = { 0x0f, 0x11, 0x11, 0x0f, 0x05, 0x09, 0x11 }; +static unsigned char R_bits[] = { 0x0f, 0x11, 0x11, 0x0f, 0x05, 0x09, 0x11 }; #define S_width 5 #define S_height 7 -static unsigned char S_bitmap[] = { 0x0e, 0x11, 0x01, 0x0e, 0x10, 0x11, 0x0e }; +static unsigned char S_bits[] = { 0x0e, 0x11, 0x01, 0x0e, 0x10, 0x11, 0x0e }; #define T_width 5 #define T_height 7 -static unsigned char T_bitmap[] = { 0x1f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 }; +static unsigned char T_bits[] = { 0x1f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04 }; #define U_width 5 #define U_height 7 -static unsigned char U_bitmap[] = { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }; +static unsigned char U_bits[] = { 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x0e }; #define V_width 5 #define V_height 7 -static unsigned char V_bitmap[] = { 0x11, 0x11, 0x11, 0x11, 0x0a, 0x0a, 0x04 }; +static unsigned char V_bits[] = { 0x11, 0x11, 0x11, 0x11, 0x0a, 0x0a, 0x04 }; #define W_width 5 #define W_height 7 -static unsigned char W_bitmap[] = { 0x11, 0x11, 0x11, 0x11, 0x15, 0x1b, 0x11 }; +static unsigned char W_bits[] = { 0x11, 0x11, 0x11, 0x11, 0x15, 0x1b, 0x11 }; #define X_width 5 #define X_height 7 -static unsigned char X_bitmap[] = { 0x11, 0x11, 0x0a, 0x04, 0x0a, 0x11, 0x11 }; +static unsigned char X_bits[] = { 0x11, 0x11, 0x0a, 0x04, 0x0a, 0x11, 0x11 }; #define Y_width 5 #define Y_height 7 -static unsigned char Y_bitmap[] = { 0x11, 0x11, 0x0a, 0x04, 0x04, 0x04, 0x04 }; +static unsigned char Y_bits[] = { 0x11, 0x11, 0x0a, 0x04, 0x04, 0x04, 0x04 }; #define Z_width 5 #define Z_height 7 -static unsigned char Z_bitmap[] = { 0x1f, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1f }; +static unsigned char Z_bits[] = { 0x1f, 0x10, 0x08, 0x04, 0x02, 0x01, 0x1f }; #define lbracket_width 3 #define lbracket_height 7 -static unsigned char lbracket_bitmap[] = { 0x07, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07 }; +static unsigned char lbracket_bits[] = { 0x07, 0x01, 0x01, 0x01, 0x01, 0x01, 0x07 }; #define rbracket_width 3 #define rbracket_height 7 -static unsigned char rbracket_bitmap[] = { 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07 }; +static unsigned char rbracket_bits[] = { 0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07 }; #define arrow_width 7 #define arrow_height 7 -static unsigned char arrow_bitmap[] = { 0x00, 0x08, 0x18, 0x3f, 0x18, 0x08, 0x00 }; +static unsigned char arrow_bits[] = { 0x00, 0x08, 0x18, 0x3f, 0x18, 0x08, 0x00 }; #define diff_width 5 #define diff_height 7 -static unsigned char diff_bitmap[] = { 0x0e, 0x10, 0x10, 0x1e, 0x11, 0x11, 0x0e }; +static unsigned char diff_bits[] = { 0x0e, 0x10, 0x10, 0x1e, 0x11, 0x11, 0x0e }; #define integral_width 5 #define integral_height 8 -static unsigned char integral_bitmap[] = { 0x0c, 0x12, 0x02, 0x04, 0x04, 0x08, 0x09, 0x06 }; +static unsigned char integral_bits[] = { 0x0c, 0x12, 0x02, 0x04, 0x04, 0x08, 0x09, 0x06 }; #define sigma_width 6 #define sigma_height 9 -static unsigned char sigma_bitmap[] = { 0x3f, 0x21, 0x02, 0x04, 0x08, 0x04, 0x02, 0x21, 0x3f }; +static unsigned char sigma_bits[] = { 0x3f, 0x21, 0x02, 0x04, 0x08, 0x04, 0x02, 0x21, 0x3f }; #define sqr_width 11 #define sqr_height 10 -static unsigned char sqr_bitmap[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00, 0x02, 0x26, 0x01, - 0x94, 0x07, 0x08, 0x00, 0x14, 0x00, 0x53, 0x00, 0x21, 0x00 }; +static unsigned char sqr_bits[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00, 0x02, 0x26, 0x01, + 0x94, 0x07, 0x08, 0x00, 0x14, 0x00, 0x53, 0x00, 0x21, 0x00 }; #define root_width 18 #define root_height 13 -static unsigned char root_bitmap[] = { 0x26, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0xfe, 0x03, 0x14, 0x02, 0x02, 0x53, - 0x02, 0x00, 0x21, 0x99, 0x00, 0x00, 0x91, 0x00, 0x10, 0x91, 0x00, 0xa0, 0x50, - 0x00, 0xc0, 0x60, 0x00, 0x80, 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x00 }; +static unsigned char root_bits[] = { 0x26, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0xfe, 0x03, 0x14, 0x02, 0x02, 0x53, + 0x02, 0x00, 0x21, 0x99, 0x00, 0x00, 0x91, 0x00, 0x10, 0x91, 0x00, 0xa0, 0x50, + 0x00, 0xc0, 0x60, 0x00, 0x80, 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x00 }; #define pow10_width 13 #define pow10_height 9 -static unsigned char pow10_bitmap[] = { 0x00, 0x12, 0x00, 0x0c, 0x32, 0x04, 0x4b, 0x0a, 0x4a, - 0x09, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 }; +static unsigned char pow10_bits[] = { 0x00, 0x12, 0x00, 0x0c, 0x32, 0x04, 0x4b, 0x0a, 0x4a, + 0x09, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 }; #define exp_width 11 #define exp_height 9 -static unsigned char exp_bitmap[] = { 0x80, 0x04, 0x00, 0x03, 0x00, 0x01, 0x8c, 0x02, 0x52, - 0x02, 0x09, 0x00, 0x07, 0x00, 0x21, 0x00, 0x1e, 0x00 }; +static unsigned char exp_bits[] = { 0x80, 0x04, 0x00, 0x03, 0x00, 0x01, 0x8c, 0x02, 0x52, + 0x02, 0x09, 0x00, 0x07, 0x00, 0x21, 0x00, 0x1e, 0x00 }; #define under_width 6 #define under_height 7 -static unsigned char under_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f }; +static unsigned char under_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f }; #define prog_width 16 #define prog_height 7 -static unsigned char prog_bitmap[] = { 0x48, 0x12, 0x24, 0x24, 0x12, 0x48, 0x09, 0x90, 0x12, 0x48, 0x24, 0x24, 0x48, 0x12 }; +static unsigned char prog_bits[] = { 0x48, 0x12, 0x24, 0x24, 0x12, 0x48, 0x09, 0x90, 0x12, 0x48, 0x24, 0x24, 0x48, 0x12 }; #define string_width 10 #define string_height 7 -static unsigned char string_bitmap[] = { 0x85, 0x02, 0x85, 0x02, 0x85, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static unsigned char string_bits[] = { 0x85, 0x02, 0x85, 0x02, 0x85, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; #define equal_width 5 #define equal_height 7 -static unsigned char equal_bitmap[] = { 0x00, 0x1f, 0x00, 0x00, 0x1f, 0x00, 0x00 }; +static unsigned char equal_bits[] = { 0x00, 0x1f, 0x00, 0x00, 0x1f, 0x00, 0x00 }; #define nl_width 8 #define nl_height 7 -static unsigned char nl_bitmap[] = { 0x00, 0x84, 0x86, 0xff, 0x06, 0x04, 0x00 }; +static unsigned char nl_bits[] = { 0x00, 0x84, 0x86, 0xff, 0x06, 0x04, 0x00 }; #define pi_width 6 #define pi_height 7 -static unsigned char pi_bitmap[] = { 0x20, 0x1f, 0x12, 0x12, 0x12, 0x12, 0x12 }; +static unsigned char pi_bits[] = { 0x20, 0x1f, 0x12, 0x12, 0x12, 0x12, 0x12 }; #define angle_width 8 #define angle_height 7 -static unsigned char angle_bitmap[] = { 0x40, 0x20, 0x10, 0x28, 0x44, 0x42, 0xff }; +static unsigned char angle_bits[] = { 0x40, 0x20, 0x10, 0x28, 0x44, 0x42, 0xff }; #define lcurly_width 5 #define lcurly_height 7 -static unsigned char lcurly_bitmap[] = { 0x18, 0x04, 0x04, 0x02, 0x04, 0x04, 0x18 }; +static unsigned char lcurly_bits[] = { 0x18, 0x04, 0x04, 0x02, 0x04, 0x04, 0x18 }; #define rcurly_width 5 #define rcurly_height 7 -static unsigned char rcurly_bitmap[] = { 0x03, 0x04, 0x04, 0x08, 0x04, 0x04, 0x03 }; +static unsigned char rcurly_bits[] = { 0x03, 0x04, 0x04, 0x08, 0x04, 0x04, 0x03 }; #define sqr_gx_width 11 #define sqr_gx_height 13 -static unsigned char sqr_gx_bitmap[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x80, 0x07, 0x00, - 0x00, 0x66, 0x00, 0x14, 0x00, 0x08, 0x00, 0x14, 0x00, 0x53, 0x00, 0x21, 0x00 }; +static unsigned char sqr_gx_bits[] = { 0x00, 0x03, 0x80, 0x04, 0x00, 0x04, 0x00, 0x02, 0x00, 0x01, 0x80, 0x07, 0x00, + 0x00, 0x66, 0x00, 0x14, 0x00, 0x08, 0x00, 0x14, 0x00, 0x53, 0x00, 0x21, 0x00 }; #define root_gx_width 18 #define root_gx_height 15 -static unsigned char root_gx_bitmap[] = { 0x66, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0x00, 0x00, 0x14, 0x00, 0x00, 0x53, 0xfe, 0x03, - 0x21, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x99, 0x00, 0x00, 0x91, 0x00, 0x10, 0x91, 0x00, - 0xa0, 0x50, 0x00, 0xc0, 0x60, 0x00, 0x80, 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x00 }; +static unsigned char root_gx_bits[] = { 0x66, 0x00, 0x00, 0x14, 0x00, 0x00, 0x08, 0x00, 0x00, 0x14, 0x00, 0x00, 0x53, 0xfe, 0x03, + 0x21, 0x02, 0x02, 0x00, 0x02, 0x00, 0x00, 0x99, 0x00, 0x00, 0x91, 0x00, 0x10, 0x91, 0x00, + 0xa0, 0x50, 0x00, 0xc0, 0x60, 0x00, 0x80, 0x20, 0x00, 0x00, 0x14, 0x00, 0x00, 0x0c, 0x00 }; #define pow10_gx_width 13 #define pow10_gx_height 12 -static unsigned char pow10_gx_bitmap[] = { 0x00, 0x12, 0x00, 0x0c, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x09, 0x32, 0x00, - 0x4b, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 }; +static unsigned char pow10_gx_bits[] = { 0x00, 0x12, 0x00, 0x0c, 0x00, 0x04, 0x00, 0x0a, 0x00, 0x09, 0x32, 0x00, + 0x4b, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x4a, 0x00, 0x32, 0x00 }; #define exp_gx_width 13 #define exp_gx_height 12 -static unsigned char exp_gx_bitmap[] = { 0x00, 0xfb, 0x00, 0xf6, 0x00, 0xe6, 0x00, 0xf6, 0x80, 0xed, 0x18, 0xe0, - 0x36, 0xe0, 0x36, 0xe0, 0x1f, 0xe0, 0x03, 0xe0, 0x13, 0xe0, 0x0e, 0xe0 }; +static unsigned char exp_gx_bits[] = { 0x00, 0xfb, 0x00, 0xf6, 0x00, 0xe6, 0x00, 0xf6, 0x80, 0xed, 0x18, 0xe0, + 0x36, 0xe0, 0x36, 0xe0, 0x1f, 0xe0, 0x03, 0xe0, 0x13, 0xe0, 0x0e, 0xe0 }; #define parens_gx_width 20 #define parens_gx_height 12 -static unsigned char parens_gx_bitmap[] = { 0x0c, 0x00, 0x03, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x03, 0x00, 0x0c, - 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, - 0x03, 0x00, 0x0c, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x0c, 0x00, 0x03 }; +static unsigned char parens_gx_bits[] = { 0x0c, 0x00, 0x03, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x03, 0x00, 0x0c, + 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, 0x03, 0x00, 0x0c, + 0x03, 0x00, 0x0c, 0x06, 0x00, 0x06, 0x06, 0x00, 0x06, 0x0c, 0x00, 0x03 }; #define hash_gx_width 8 #define hash_gx_height 12 -static unsigned char hash_gx_bitmap[] = { 0x00, 0x00, 0x48, 0x48, 0xfe, 0x24, 0x24, 0x7f, 0x12, 0x12, 0x00, 0x00 }; +static unsigned char hash_gx_bits[] = { 0x00, 0x00, 0x48, 0x48, 0xfe, 0x24, 0x24, 0x7f, 0x12, 0x12, 0x00, 0x00 }; #define bracket_gx_width 12 #define bracket_gx_height 12 -static unsigned char bracket_gx_bitmap[] = { 0x0f, 0x0f, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, - 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x0f, 0x0f }; +static unsigned char bracket_gx_bits[] = { 0x0f, 0x0f, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, + 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x03, 0x0c, 0x0f, 0x0f }; #define under_gx_width 10 #define under_gx_height 12 -static unsigned char under_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03 }; +static unsigned char under_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x03, 0xff, 0x03 }; #define prog_gx_width 24 #define prog_gx_height 12 -static unsigned char prog_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xc3, 0x18, - 0x8c, 0x81, 0x31, 0xc6, 0x00, 0x63, 0x63, 0x00, 0xc6, 0xc6, 0x00, 0x63, - 0x8c, 0x81, 0x31, 0x18, 0xc3, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static unsigned char prog_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0xc3, 0x18, + 0x8c, 0x81, 0x31, 0xc6, 0x00, 0x63, 0x63, 0x00, 0xc6, 0xc6, 0x00, 0x63, + 0x8c, 0x81, 0x31, 0x18, 0xc3, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; #define quote_gx_width 12 #define quote_gx_height 12 -static unsigned char quote_gx_bitmap[] = { 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static unsigned char quote_gx_bits[] = { 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x05, 0x0a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; #define curly_gx_width 14 #define curly_gx_height 12 -static unsigned char curly_gx_bitmap[] = { 0x0c, 0x0c, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x03, 0x30, - 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x0c, 0x0c }; +static unsigned char curly_gx_bits[] = { 0x0c, 0x0c, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x03, 0x30, + 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x06, 0x18, 0x0c, 0x0c }; #define colon_gx_width 8 #define colon_gx_height 12 -static unsigned char colon_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x00, 0x00, 0xc3, 0xc3, 0x00 }; +static unsigned char colon_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x00, 0x00, 0xc3, 0xc3, 0x00 }; #define angle_gx_width 12 #define angle_gx_height 12 -static unsigned char angle_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x00, 0xe0, 0x01, - 0xb0, 0x03, 0x18, 0x03, 0x0c, 0x03, 0x06, 0x03, 0xff, 0x0f, 0xff, 0x0f }; +static unsigned char angle_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x00, 0xe0, 0x01, + 0xb0, 0x03, 0x18, 0x03, 0x0c, 0x03, 0x06, 0x03, 0xff, 0x0f, 0xff, 0x0f }; #define pi_gx_width 10 #define pi_gx_height 12 -static unsigned char pi_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfe, 0x03, 0xff, 0x01, - 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00 }; +static unsigned char pi_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xfe, 0x03, 0xff, 0x01, + 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0xcc, 0x00 }; #define nl_gx_width 18 #define nl_gx_height 12 -static unsigned char nl_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x03, 0xf0, 0x00, 0x03, - 0xfc, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0xfc, 0x00, 0x00, - 0xf0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static unsigned char nl_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xc0, 0x00, 0x03, 0xf0, 0x00, 0x03, + 0xfc, 0x00, 0x03, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0xfc, 0x00, 0x00, + 0xf0, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; #define comma_gx_width 3 #define comma_gx_height 12 -static unsigned char comma_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x04, 0x04, 0x02 }; +static unsigned char comma_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x07, 0x04, 0x04, 0x02 }; #define arrow_gx_width 18 #define arrow_gx_height 12 -static unsigned char arrow_gx_bitmap[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x3c, 0x00, - 0x00, 0xfc, 0x00, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0x00, 0xfc, 0x00, - 0x00, 0x3c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static unsigned char arrow_gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x3c, 0x00, + 0x00, 0xfc, 0x00, 0xff, 0xff, 0x03, 0xff, 0xff, 0x03, 0x00, 0xfc, 0x00, + 0x00, 0x3c, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; #define equal_gx_width 8 #define equal_gx_height 12 -static unsigned char equal_gx_bitmap[] = { 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00 }; +static unsigned char equal_gx_bits[] = { 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00 }; #endif /* _UI_SMALL_FONT_H 1 */