ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2026-01-28 11:04:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/ttrftech/NanoVNA

Browse source
This commit is contained in:
Dennis Real (DL9CAT) 2019-10-11 19:49:46 +02:00
parent 654deb50a1 0e982aa834
commit 57a8c536b5
2 changed files with 31 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
numfont20x24.c
View file

@ -553,62 +553,34 @@ const uint32_t numfont20x24[][24] = {
0b00000000000000000000000000000000,
0b00000000000000000000000000000000
},
{ // speaker = \005
{ // plus/minus = \005
0b00000000000000000000000000000000,
0b00000000000000111000000000000000,
0b00000000000001111000000000000000,
0b00000000000011011000000000000000,
0b00000000000110011000000000000000,
0b00000000001100011000000000000000,
0b00011111111000011000000000000000,
0b00011111110000011000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000110000000000000000000,
0b00011000110000011000000000000000,
0b00011000110000011000000000000000,
0b00011000110000011000000000000000,
0b00011000110000011000000000000000,
0b00011000110000011000000000000000,
0b00011000110000011000000000000000,
0b00011111110000011000000000000000,
0b00011111111000011000000000000000,
0b00011100000110000000000000000000,
0b00011100000110000000000000000000,
0b00011100001100000000000000000000,
0b11111111101101111111000000000000,
0b11111111101101111111000000000000,
0b11111111101101111111000000000000,
0b00011100001100000000000000000000,
0b00011100011000000000000000000000,
0b00000000001100011000000000000000,
0b00000000000110011000000000000000,
0b00000000000011011000000000000000,
0b00000000000001111000000000000000,
0b00000000000000111000000000000000,
0b00011100011000000000000000000000,
0b00000000011000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000100000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000
},
{ // antenna = \006
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000,
0b00111111111111111100000000000000,
0b00111111111111111100000000000000,
0b00110000011000001100000000000000,
0b00011000011000011000000000000000,
0b00001100011000110000000000000000,
0b00000110011001100000000000000000,
0b00000011011011000000000000000000,
0b00000001111110000000000000000000,
0b00000000111100000000000000000000,
0b00000000011000000000000000000000,
0b00000000011000000000000000000000,
0b00000000011000000000000000000000,
0b00000000011000000000000000000000,
0b00000000011000000000000000000000,
0b00000000011000000000000000000000,
0b00000000011000000000100000000000,
0b00000000000000000000000000000000,
0b00000000000000000000000000000000
},
{ // keypad = \007
0b00000000000000000000000000000000,
0b00111101111011110000000000000000,

17
ui.c
View file

@ -1162,11 +1162,10 @@ void menu_invoke(int item)
#define KP_BS 16
#define KP_INF 17
#define KP_DB 18
#define KP_SPK 19
#define KP_ANT 20
#define KP_KEYPAD 21
#define KP_N 22
#define KP_P 23
#define KP_PLUSMINUS 19
#define KP_KEYPAD 20
#define KP_N 21
#define KP_P 22
typedef struct {
uint16_t x, y;
@ -1225,8 +1224,9 @@ const keypads_t keypads_time[] = {
{ KP_X(0), KP_Y(0), 7 },
{ KP_X(1), KP_Y(0), 8 },
{ KP_X(2), KP_Y(0), 9 },
{ KP_X(3), KP_Y(2), KP_N },
{ KP_X(3), KP_Y(3), KP_P },
{ KP_X(3), KP_Y(1), KP_N },
{ KP_X(3), KP_Y(2), KP_P },
{ KP_X(3), KP_Y(3), KP_MINUS },
{ KP_X(2), KP_Y(3), KP_BS },
{ 0, 0, -1 }
};
@ -1761,6 +1761,9 @@ keypad_click(int key)
// append period if there are no period
if (kp_index == j)
kp_buf[kp_index++] = '.';
} else if (c == KP_MINUS) {
if (kp_index == 0)
kp_buf[kp_index++] = '-';
} else if (c == KP_BS) {
if (kp_index == 0) {
return KP_CANCEL;