notBrad/flipper-zero-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use constants for enter/backspace.

Browse Source
This commit is contained in:
Derek Jamison 2023-03-23 10:28:32 -04:00
parent 6f43c5bc7b
commit e7b49ae7b2
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
subghz/plugins/rock_paper_scissors/rock_paper_scissors.c
View File

@ -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;

7
subghz/plugins/rock_paper_scissors/rock_paper_scissors.h
View File

@ -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.