Merge branch 'DiSlord_browser' of https://github.com/erikkaashoek/tinySA into DiSlord_browser

# Conflicts:
#	ui.c
pull/52/head
DiSlord Live 3 years ago
commit fae9a43825

@ -673,6 +673,10 @@ extern const uint8_t numfont16x22[];
#define S_OHM "\036" // 0x1E #define S_OHM "\036" // 0x1E
#define S_DEGREE "\037" // 0x1F #define S_DEGREE "\037" // 0x1F
#define C_ENTER 0x16 // 0x16
#define C_LARROW 0x1A // 0x1A
#define C_RARROW 0x1B // 0x1B
// String prefix for select font size (use not printable chars) // String prefix for select font size (use not printable chars)
#define FONT_s "\001" #define FONT_s "\001"
#define _FONT_s 1 #define _FONT_s 1

@ -1218,7 +1218,7 @@ static const keypads_t keypads_text[] = {
{0x00, '1'}, {0x10, '2'}, {0x20, '3'}, {0x30, '4'}, {0x40, '5'}, {0x50, '6'}, {0x60, '7'}, {0x70, '8'}, {0x80, '9'}, {0x90, '0'}, {0x00, '1'}, {0x10, '2'}, {0x20, '3'}, {0x30, '4'}, {0x40, '5'}, {0x50, '6'}, {0x60, '7'}, {0x70, '8'}, {0x80, '9'}, {0x90, '0'},
{0x01, 'Q'}, {0x11, 'W'}, {0x21, 'E'}, {0x31, 'R'}, {0x41, 'T'}, {0x51, 'Y'}, {0x61, 'U'}, {0x71, 'I'}, {0x81, 'O'}, {0x91, 'P'}, {0x01, 'Q'}, {0x11, 'W'}, {0x21, 'E'}, {0x31, 'R'}, {0x41, 'T'}, {0x51, 'Y'}, {0x61, 'U'}, {0x71, 'I'}, {0x81, 'O'}, {0x91, 'P'},
{0x02, 'A'}, {0x12, 'S'}, {0x22, 'D'}, {0x32, 'F'}, {0x42, 'G'}, {0x52, 'H'}, {0x62, 'J'}, {0x72, 'K'}, {0x82, 'L'}, {0x92, '_'}, {0x02, 'A'}, {0x12, 'S'}, {0x22, 'D'}, {0x32, 'F'}, {0x42, 'G'}, {0x52, 'H'}, {0x62, 'J'}, {0x72, 'K'}, {0x82, 'L'}, {0x92, '_'},
{0x03, '-'}, {0x13, 'Z'}, {0x23, 'X'}, {0x33, 'C'}, {0x43, 'V'}, {0x53, 'B'}, {0x63, 'N'}, {0x73, 'M'}, {0x83, S_LARROW[0]}, {0x93, S_ENTER[0]}, {0x03, '-'}, {0x13, 'Z'}, {0x23, 'X'}, {0x33, 'C'}, {0x43, 'V'}, {0x53, 'B'}, {0x63, 'N'}, {0x73, 'M'}, {0x83, C_LARROW}, {0x93, C_ENTER},
}; };
enum { enum {

Loading…
Cancel
Save

Powered by TurnKey Linux.