From effe9c5e3235869ba5a8e4879087c55d8186c71c Mon Sep 17 00:00:00 2001 From: TT Date: Fri, 11 Oct 2019 21:21:44 +0900 Subject: [PATCH 1/2] add: plus/minus symbol --- numfont20x24.c | 70 +++++++++++++++----------------------------------- 1 file changed, 21 insertions(+), 49 deletions(-) diff --git a/numfont20x24.c b/numfont20x24.c index f1eb13b..f6b2525 100644 --- a/numfont20x24.c +++ b/numfont20x24.c @@ -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, From 0e982aa834cd542ae40a3a066d87590d33a80000 Mon Sep 17 00:00:00 2001 From: TT Date: Fri, 11 Oct 2019 21:22:00 +0900 Subject: [PATCH 2/2] add: support negative time value --- ui.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ui.c b/ui.c index 2aa2e86..5b79af0 100644 --- a/ui.c +++ b/ui.c @@ -1148,11 +1148,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; @@ -1211,8 +1210,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 } }; @@ -1736,6 +1736,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;