From d5d1eef10cdc218e515084cc8fdef1fcfa56a56c Mon Sep 17 00:00:00 2001 From: Dave Date: Tue, 24 Dec 2019 08:53:28 -0600 Subject: [PATCH] Fix swapped 'O' and '0' keys Reverts the ASCII keymap to proper position of 'O' and 'o' keys, and create a new keymap for rev 1.2 and earlier of the key matrix with swapped 'O' and '0' keys. --- .../asdf/src/Keymaps/asdf_keymaps_ascii.h | 10 +- .../Keymaps/asdf_keymaps_ascii_swapped_o.h | 134 ++++++++++++++++++ 2 files changed, 139 insertions(+), 5 deletions(-) create mode 100644 firmware/asdf/src/Keymaps/asdf_keymaps_ascii_swapped_o.h diff --git a/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h b/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h index 785cbcb..53c0b29 100644 --- a/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h +++ b/firmware/asdf/src/Keymaps/asdf_keymaps_ascii.h @@ -40,7 +40,7 @@ ACTION_CAPS, \ ASCII_CR, \ ASCII_LF, \ - '0', \ + 'O', \ 'l', \ ASCII_PERIOD }, \ { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', 'o', '9', '8' }, \ @@ -61,10 +61,10 @@ ACTION_CAPS, \ ASCII_CR, \ ASCII_LF, \ - '0', \ + 'O', \ 'L', \ ASCII_PERIOD }, \ - { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', 'O', '9', '8' }, \ + { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', ASCII_ZERO, '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_CAPS, ASCII_CR, ASCII_LF, '0', 'L', '<' }, \ + { ACTION_REPEAT, ACTION_HERE_IS, ACTION_CAPS, ASCII_CR, ASCII_LF, 'O', 'L', '<' }, \ { ASCII_TILDE, ASCII_RT_CURLY_BRACE, ASCII_LT_CURLY_BRACE, '=', '*', \ - 'O', ASCII_RT_PAREN, ASCII_LT_PAREN }, \ + ASCII_ZERO, ASCII_RT_PAREN, ASCII_LT_PAREN }, \ { \ ASCII_GRAVE_ACCENT, ASCII_SINGLE_QUOTE, '&', '%', '$', '#', ASCII_DOUBLE_QUOTE, '!' \ } \ diff --git a/firmware/asdf/src/Keymaps/asdf_keymaps_ascii_swapped_o.h b/firmware/asdf/src/Keymaps/asdf_keymaps_ascii_swapped_o.h new file mode 100644 index 0000000..785cbcb --- /dev/null +++ b/firmware/asdf/src/Keymaps/asdf_keymaps_ascii_swapped_o.h @@ -0,0 +1,134 @@ +// -*- mode: C; tab-width: 4 ; indent-tabs-mode: nil -*- +// +// Unfified Keyboard Project +// ASDF keyboard firmware +// +// asdf_keymaps.h +// +// Copyright 2019 David Fenyes +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free Software +// Foundation, either version 3 of the License, or (at your option) any later +// version. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +// details. +// +// You should have received a copy of the GNU General Public License along with +// this program. If not, see . + + +#if !defined(ASDF_KEYMAPS_H) +#define ASDF_KEYMAPS_H + +#include "asdf.h" +#include "asdf_ascii.h" +#include "asdf_modifiers.h" + +#define ASCII_PLAIN_MAP \ + { \ + { ACTION_NOTHING, ACTION_SHIFT, ACTION_SHIFT, ACTION_NOTHING, \ + ACTION_NOTHING, ASCII_ESC, ACTION_CTRL, ASCII_BACKSLASH }, \ + { ASCII_DEL, 'p', ';', '/', ASCII_SPACE, 'z', 'a', 'q' }, \ + { ACTION_BREAK, ASCII_COMMA, '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_CAPS, \ + ASCII_CR, \ + ASCII_LF, \ + '0', \ + 'l', \ + ASCII_PERIOD }, \ + { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', 'o', '9', '8' }, \ + { \ + ASCII_AT, '7', '6', '5', '4', '3', '2', '1' \ + } \ + } + +#define ASCII_CAPS_MAP \ + { \ + { ACTION_NOTHING, ACTION_SHIFT, ACTION_SHIFT, ACTION_NOTHING, \ + ACTION_NOTHING, ASCII_ESC, ACTION_CTRL, ASCII_BACKSLASH }, \ + { ASCII_DEL, 'P', ';', '/', ASCII_SPACE, 'Z', 'A', 'Q' }, \ + { ACTION_BREAK, ASCII_COMMA, '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_CAPS, \ + ASCII_CR, \ + ASCII_LF, \ + '0', \ + 'L', \ + ASCII_PERIOD }, \ + { ASCII_TILDE, ASCII_RT_SQUARE_BRACE, ASCII_LT_SQUARE_BRACE, '-', ':', 'O', '9', '8' }, \ + { \ + ASCII_AT, '7', '6', '5', '4', '3', '2', '1' \ + } \ + } + +#define ASCII_SHIFT_MAP \ + { \ + { ACTION_NOTHING, ACTION_SHIFT, ACTION_SHIFT, ACTION_NOTHING, \ + ACTION_NOTHING, ASCII_ESC, ACTION_CTRL, ASCII_VERT_BAR }, \ + { ASCII_DEL, 'P', '+', '?', ASCII_SPACE, 'Z', 'A', 'Q' }, \ + { 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_CAPS, ASCII_CR, ASCII_LF, '0', 'L', '<' }, \ + { ASCII_TILDE, ASCII_RT_CURLY_BRACE, ASCII_LT_CURLY_BRACE, '=', '*', \ + 'O', ASCII_RT_PAREN, ASCII_LT_PAREN }, \ + { \ + ASCII_GRAVE_ACCENT, ASCII_SINGLE_QUOTE, '&', '%', '$', '#', ASCII_DOUBLE_QUOTE, '!' \ + } \ + } + +#define ASCII_CTRL_MAP \ + { \ + { ACTION_NOTHING, ACTION_SHIFT, ACTION_SHIFT, ACTION_NOTHING, \ + ACTION_NOTHING, ASCII_ESC, ACTION_CTRL, 0x1c }, \ + { ACTION_NOTHING, ASCII_CTRL_P, ACTION_NOTHING, ACTION_NOTHING, \ + ASCII_SPACE, ASCII_CTRL_Z, ASCII_CTRL_A, ASCII_CTRL_Q }, \ + { ACTION_RESET /*ctrl-break is RESET*/, \ + ASCII_COMMA, \ + ASCII_CTRL_M, \ + ASCII_CTRL_N, \ + ASCII_CTRL_B, \ + ASCII_CTRL_V, \ + ASCII_CTRL_C, \ + ASCII_CTRL_X }, \ + { 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_CAPS, ASCII_CR, \ + ASCII_LF, ACTION_FN_10, ASCII_CTRL_L, ACTION_NOTHING }, \ + { ACTION_NOTHING, 0x1d, ASCII_ESC, ACTION_NOTHING, \ + 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 \ + } \ + } + +// PROCEDURE: asdf_keymaps_init +// INPUTS: none +// OUTPUTS: none +// DESCRIPTION: Assigns the keymaps to the indices specified by the modifier +// index, to avoid hard-coding constant index values. +void asdf_keymaps_init(void); + +// PROCEDURE: asdf_keymaps_get_code +// INPUTS: row, col: row and column of key that has been pressed +// modifiers_index: index into the keymap array, based on modifier state +// OUTPUTS: returns a key code. +// DESCRIPTION: Given a key row and column, and an index based on modifier +// state, return the appropriate keycode. +asdf_keycode_t asdf_keymaps_get_code(uint8_t row, uint8_t col, uint8_t modifier_index); + + +#endif /* !defined (ASDF_KEYMAPS_H) */ + +//-------|---------|---------+---------+---------+---------+---------+---------+ +// Above line is 80 columns, and should display completely in the editor.