From 46f15cd1a533cce8c9f7a406b1e6ee6765e48a20 Mon Sep 17 00:00:00 2001 From: yfuku <30647434+yfuku@users.noreply.github.com> Date: Sat, 11 Sep 2021 13:59:28 +0900 Subject: [PATCH] [Keyboard] owl8 bugfix (#14020) --- keyboards/owl8/config.h | 9 +++------ keyboards/owl8/keymaps/via/keymap.c | 8 ++++---- keyboards/owl8/owl8.h | 13 +++++-------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/keyboards/owl8/config.h b/keyboards/owl8/config.h index 7bbaff3985..d28fd9c927 100644 --- a/keyboards/owl8/config.h +++ b/keyboards/owl8/config.h @@ -27,8 +27,8 @@ along with this program. If not, see . #define PRODUCT owl8 /* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 4 +#define MATRIX_ROWS 1 +#define MATRIX_COLS 16 /* * Keyboard Matrix Assignments @@ -41,10 +41,7 @@ along with this program. If not, see . * */ #define DIRECT_PINS { \ - { F4, F7, B3, B6 }, \ - { F5, F6, B1, B2 }, \ - { D4, C6, D7, E6 }, \ - { NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ + { F4, F7, B3, B6, F5, F6, B1, B2, D4, C6, D7, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \ } #define UNUSED_PINS diff --git a/keyboards/owl8/keymaps/via/keymap.c b/keyboards/owl8/keymaps/via/keymap.c index dc981f4754..6e3f6ea90b 100644 --- a/keyboards/owl8/keymaps/via/keymap.c +++ b/keyboards/owl8/keymaps/via/keymap.c @@ -51,22 +51,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; keyevent_t encoder1_ccw = { - .key = (keypos_t){.row = 3, .col = 1}, + .key = (keypos_t){.row = 0, .col = 12}, .pressed = false }; keyevent_t encoder1_cw = { - .key = (keypos_t){.row = 3, .col = 0}, + .key = (keypos_t){.row = 0, .col = 13}, .pressed = false }; keyevent_t encoder2_ccw = { - .key = (keypos_t){.row = 3, .col = 3}, + .key = (keypos_t){.row = 0, .col = 14}, .pressed = false }; keyevent_t encoder2_cw = { - .key = (keypos_t){.row = 3, .col = 2}, + .key = (keypos_t){.row = 0, .col = 15}, .pressed = false }; diff --git a/keyboards/owl8/owl8.h b/keyboards/owl8/owl8.h index 656b3f17cd..5e561f580c 100644 --- a/keyboards/owl8/owl8.h +++ b/keyboards/owl8/owl8.h @@ -28,14 +28,11 @@ */ #define LAYOUT( \ - k30, k31, k32, k33, \ - k20, k21, k22, k23, \ - k00, k01, k02, k03, \ - k10, k11, k12, k13 \ + k012, k013, k014, k015, \ + k008, k009, k010, k011, \ + k000, k001, k002, k003, \ + k004, k005, k006, k007 \ ) \ { \ - {k00, k01, k02, k03 }, \ - {k10, k11, k12, k13 }, \ - {k20, k21, k22, k23 }, \ - {k30, k31, k32, k33 } \ + {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 } \ }