From e7b49ae7b2745e4091dd694ca559de6643d37d43 Mon Sep 17 00:00:00 2001
From: Derek Jamison <djamiso8@ford.com>
Date: Thu, 23 Mar 2023 10:28:32 -0400
Subject: [PATCH] Use constants for enter/backspace.

---
 .../rock_paper_scissors/rock_paper_scissors.c      | 14 +++++++-------
 .../rock_paper_scissors/rock_paper_scissors.h      |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/subghz/plugins/rock_paper_scissors/rock_paper_scissors.c b/subghz/plugins/rock_paper_scissors/rock_paper_scissors.c
index 3dd9e80..928b539 100644
--- a/subghz/plugins/rock_paper_scissors/rock_paper_scissors.c
+++ b/subghz/plugins/rock_paper_scissors/rock_paper_scissors.c
@@ -790,9 +790,9 @@ static void rps_render_input_text(Canvas* canvas, void* ctx) {
 
             canvas_draw_glyph(canvas, x, y, ch);
 
-            if(ch == 8) {
+            if(ch == KEYBOARD_BACKSPACE) {
                 draw_arrow(canvas, x, y - 5, false);
-            } else if(ch == 13) {
+            } else if(ch == KEYBOARD_ENTER) {
                 draw_arrow(canvas, x, y - 5, true);
             }
             canvas_set_color(canvas, ColorBlack);
@@ -2048,19 +2048,19 @@ int32_t rock_paper_scissors_app(void* p) {
 
                     case InputKeyOk:
                         ch = get_char(game_context, true);
-                        if(ch >= ' ') {
+                        if(ch >= ' ' && ch <= '~') {
                             int len = furi_string_utf8_length(game_context->data->keyboard_data);
                             if(len < KEYBOARD_MAX_LEN) {
                                 furi_string_push_back(game_context->data->keyboard_data, ch);
                             } else {
                                 single_vibro();
                             }
-                        } else if(ch == 8) {
+                        } else if(ch == KEYBOARD_BACKSPACE) {
                             int len = furi_string_utf8_length(game_context->data->keyboard_data);
                             if(len > 0) {
                                 furi_string_left(game_context->data->keyboard_data, len - 1);
                             }
-                        } else if(ch == 13) {
+                        } else if(ch == KEYBOARD_ENTER) {
                             furi_string_printf(
                                 game_context->data->local_contact,
                                 "%c%s",
@@ -2082,14 +2082,14 @@ int32_t rock_paper_scissors_app(void* p) {
                     switch(event.input.key) {
                     case InputKeyOk:
                         ch = get_char(game_context, false);
-                        if(ch >= ' ') {
+                        if(ch >= ' ' && ch <= '~') {
                             int len = furi_string_utf8_length(game_context->data->keyboard_data);
                             if(len < KEYBOARD_MAX_LEN) {
                                 furi_string_push_back(game_context->data->keyboard_data, ch);
                             } else {
                                 single_vibro();
                             }
-                        } else if(ch == 8) {
+                        } else if(ch == KEYBOARD_BACKSPACE) {
                             furi_string_left(game_context->data->keyboard_data, 0);
                         }
                         break;
diff --git a/subghz/plugins/rock_paper_scissors/rock_paper_scissors.h b/subghz/plugins/rock_paper_scissors/rock_paper_scissors.h
index 6b70178..5c4c7ea 100644
--- a/subghz/plugins/rock_paper_scissors/rock_paper_scissors.h
+++ b/subghz/plugins/rock_paper_scissors/rock_paper_scissors.h
@@ -278,11 +278,14 @@ typedef struct {
     SubGhzTxRxWorker* subghz_txrx;
 } GameContext;
 
+#define KEYBOARD_BACKSPACE 0xAB
+#define KEYBOARD_ENTER 0xBB
+
 char keyboard[4][14] = {
-    {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '.', '_', 8},
+    {'1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '.', '_', KEYBOARD_BACKSPACE},
     {'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '!', '$', '*', '&'},
     {'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', '=', '+', ':', '(', ')'},
-    {'Z', 'X', 'C', 'V', 'B', 'N', 'M', ' ', '@', '"', '#', '/', '\'', 13}};
+    {'Z', 'X', 'C', 'V', 'B', 'N', 'M', ' ', '@', '"', '#', '/', '\'', KEYBOARD_ENTER}};
 
 // Checks if game state is winner.
 // @param state GameState to check.