From 519817ab53dcfd11deec83e3726abe0b8fac8d72 Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 24 Dec 2019 02:22:38 -0600 Subject: [PATCH] ASCII keyboard fixes Keymaps/asdf_keymaps.h: swap '0' and 'O' codes to compensate for physically swapped '0' and 'O' in early prototypes asdf_ascii.h: fix wrong code for comma (44, 0x2C; was defined as 0x44). --- firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h | 16 ++++++++-------- firmware/asdf/src/asdf_ascii.h | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h b/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h index 817dc59..6e28076 100644 --- a/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h +++ b/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h @@ -40,10 +40,10 @@ ACTION_SHIFT_LOCK, \ ASCII_CR, \ ASCII_LF, \ - 'o', \ + '0', \ 'l', \ ASCII_PERIOD }, \ - { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', '0', '9', '8' }, \ + { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', 'o', '9', '8' }, \ { \ ASCII_AT, '7', '6', '5', '4', '3', '2', '1' \ } \ @@ -61,10 +61,10 @@ ACTION_SHIFT_LOCK, \ ASCII_CR, \ ASCII_LF, \ - 'O', \ + '0', \ 'L', \ ASCII_PERIOD }, \ - { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', '0', '9', '8' }, \ + { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', 'O', '9', '8' }, \ { \ ASCII_AT, '7', '6', '5', '4', '3', '2', '1' \ } \ @@ -78,9 +78,9 @@ { ACTION_BREAK, '>', 'M', 'N', 'B', 'V', 'C', 'X' }, \ { ACTION_NOTHING, 'K', 'J', 'H', 'G', 'F', 'D', 'S' }, \ { ACTION_CLEAR, 'I', 'U', 'Y', 'T', 'R', 'E', 'W' }, \ - { ACTION_REPEAT, ACTION_HERE_IS, ACTION_SHIFT_LOCK, ASCII_CR, ASCII_LF, 'O', 'L', '<' }, \ + { ACTION_REPEAT, ACTION_HERE_IS, ACTION_SHIFT_LOCK, ASCII_CR, ASCII_LF, '0', 'L', '<' }, \ { ASCII_TILDE, ASCII_RT_CURLY_BRACE, ASCII_LT_CURLY_BRACE, '=', '*', \ - '0', ASCII_RT_PAREN, ASCII_LT_PAREN }, \ + 'O', ASCII_RT_PAREN, ASCII_LT_PAREN }, \ { \ ASCII_GRAVE_ACCENT, ASCII_SINGLE_QUOTE, '&', '%', '$', '#', ASCII_DOUBLE_QUOTE, '!' \ } \ @@ -103,9 +103,9 @@ { ACTION_CLEAR, ASCII_CTRL_I, ASCII_CTRL_U, ASCII_CTRL_Y, \ ASCII_CTRL_T, ASCII_CTRL_R, ASCII_CTRL_E, ASCII_CTRL_W }, \ { ACTION_REPEAT, ACTION_HERE_IS, ACTION_SHIFT_LOCK, ASCII_CR, \ - ASCII_LF, ASCII_CTRL_O, ASCII_CTRL_L, ACTION_NOTHING }, \ + ASCII_LF, ACTION_FN_10, ASCII_CTRL_L, ACTION_NOTHING }, \ { ACTION_NOTHING, 0x1d, ASCII_ESC, ACTION_NOTHING, \ - ACTION_NOTHING, ACTION_FN_1, ACTION_FN_9, ACTION_FN_8 }, \ + ACTION_NOTHING, ASCII_CTRL_O, ACTION_FN_9, ACTION_FN_8 }, \ { \ ACTION_NOTHING, ACTION_FN_7, ACTION_FN_6, ACTION_FN_5, ACTION_FN_4, ACTION_FN_3, \ ACTION_FN_2, ACTION_FN_2 \ diff --git a/firmware/asdf/src/asdf_ascii.h b/firmware/asdf/src/asdf_ascii.h index 7aef357..fd804b3 100644 --- a/firmware/asdf/src/asdf_ascii.h +++ b/firmware/asdf/src/asdf_ascii.h @@ -58,8 +58,9 @@ typedef enum { ASCII_ESC = 0x1b, ASCII_SPACE = 0x20, + ASCII_COMMA = 0x2C, + ASCII_ZERO = 0x30, ASCII_AT = 0x40, - ASCII_COMMA = 0x44, ASCII_LT_CURLY_BRACE = 0x7b, ASCII_RT_CURLY_BRACE = 0x7d, ASCII_LT_SQUARE_BRACE = 0x5b,