From 519af36d93b669ff1d87c2c20b0bc5db598b001c Mon Sep 17 00:00:00 2001 From: DiSlord Live Date: Sat, 3 Dec 2022 21:49:32 +0300 Subject: [PATCH] Add Enter button --- numfont20x22.c | 24 ++++++++++++++++++++++++ ui.c | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/numfont20x22.c b/numfont20x22.c index a7593e5..f4b70ae 100644 --- a/numfont20x22.c +++ b/numfont20x22.c @@ -599,4 +599,28 @@ const uint8_t numfont16x22[] = { _BMP16(0b1111000000000000), _BMP16(0b1111000000000000), _BMP16(0b1111000000000000), + + + _BMP16(0b1111010001011111), // ENTER + _BMP16(0b1000011001000100), + _BMP16(0b1111010101000100), + _BMP16(0b1000010011000100), + _BMP16(0b1111010001000100), + _BMP16(0b0000000000000000), + _BMP16(0b0000000000000000), + _BMP16(0b0000000000001111), + _BMP16(0b0000000000001111), + _BMP16(0b0000000000001111), + _BMP16(0b0000000000001111), + _BMP16(0b0000000000001111), + _BMP16(0b0000000000001111), + _BMP16(0b0000000000001111), + _BMP16(0b0001100000001111), + _BMP16(0b0011100000001111), + _BMP16(0b0111111111111111), + _BMP16(0b1111111111111111), + _BMP16(0b1111111111111111), + _BMP16(0b0111111111111111), + _BMP16(0b0011100000000000), + _BMP16(0b0001100000000000), }; diff --git a/ui.c b/ui.c index 39806cc..2a83bd5 100644 --- a/ui.c +++ b/ui.c @@ -1031,6 +1031,7 @@ const uint8_t right_icons [] = #define KP_u 22 #define KP_n 23 #define KP_p 24 +#define KP_ENTER 25 #define KP_0 31 #define KP_1 32 @@ -1107,7 +1108,7 @@ static const keypads_t keypads_positive[] = { { 0x00, 7 }, { 0x10, 8 }, { 0x20, 9 }, - { 0x33, KP_X1 }, + { 0x33, KP_ENTER }, { 0x23, KP_BS } }; @@ -6409,6 +6410,7 @@ ui_process_menu_lever(void) static int num_keypad_click(int c) { + if (c == KP_ENTER) c = KP_X1; if ((c >= KP_X1 && c <= KP_G) || c == KP_m || c == KP_u || c == KP_n) { #if 0 float scale = 1.0;