From f404ec329f62ef3978f78b516563619120557c8b Mon Sep 17 00:00:00 2001 From: takishim <96878459+takishim@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:28:48 +0900 Subject: [PATCH] Fixed a bug in pin assignment. (#16158) Added original copyright notice. Assign the tilde key to layer 1. Co-authored-by: takishim --- keyboards/mikeneko65/rev3/config.h | 3 ++- keyboards/mikeneko65/rev3/keymaps/default/keymap.c | 11 ++++++----- keyboards/mikeneko65/rev3/keymaps/via/keymap.c | 11 ++++++----- keyboards/mikeneko65/rev3/rev3.c | 3 ++- keyboards/mikeneko65/rev3/rev3.h | 3 ++- keyboards/mikeneko65/rev4/config.h | 5 +++-- keyboards/mikeneko65/rev4/keymaps/default/keymap.c | 5 +++-- keyboards/mikeneko65/rev4/keymaps/via/keymap.c | 5 +++-- keyboards/mikeneko65/rev4/rev4.c | 3 ++- keyboards/mikeneko65/rev4/rev4.h | 3 ++- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/keyboards/mikeneko65/rev3/config.h b/keyboards/mikeneko65/rev3/config.h index 9fffb77c639..dad2532012e 100644 --- a/keyboards/mikeneko65/rev3/config.h +++ b/keyboards/mikeneko65/rev3/config.h @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + Copyright 2022 takishim 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 diff --git a/keyboards/mikeneko65/rev3/keymaps/default/keymap.c b/keyboards/mikeneko65/rev3/keymaps/default/keymap.c index c40d48f2fec..69844b8c304 100644 --- a/keyboards/mikeneko65/rev3/keymaps/default/keymap.c +++ b/keyboards/mikeneko65/rev3/keymaps/default/keymap.c @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 @@ -22,10 +23,10 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_END, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_all( diff --git a/keyboards/mikeneko65/rev3/keymaps/via/keymap.c b/keyboards/mikeneko65/rev3/keymaps/via/keymap.c index 6c909b0c974..2a456503ea8 100644 --- a/keyboards/mikeneko65/rev3/keymaps/via/keymap.c +++ b/keyboards/mikeneko65/rev3/keymaps/via/keymap.c @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 @@ -24,10 +25,10 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_L0] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_END, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_END, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_all( diff --git a/keyboards/mikeneko65/rev3/rev3.c b/keyboards/mikeneko65/rev3/rev3.c index 8186588033e..6da33ff78f3 100644 --- a/keyboards/mikeneko65/rev3/rev3.c +++ b/keyboards/mikeneko65/rev3/rev3.c @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 diff --git a/keyboards/mikeneko65/rev3/rev3.h b/keyboards/mikeneko65/rev3/rev3.h index f6c3792bd36..cb490224fbe 100644 --- a/keyboards/mikeneko65/rev3/rev3.h +++ b/keyboards/mikeneko65/rev3/rev3.h @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 diff --git a/keyboards/mikeneko65/rev4/config.h b/keyboards/mikeneko65/rev4/config.h index 30ad8e9fa87..2e7efaf8db8 100644 --- a/keyboards/mikeneko65/rev4/config.h +++ b/keyboards/mikeneko65/rev4/config.h @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + Copyright 2022 takishim 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 @@ -40,7 +41,7 @@ along with this program. If not, see . * */ #define MATRIX_ROW_PINS { D0, D2, D5, C6, C7 } -#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B4, B5, B6 } +#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, E6, B0, B7, D4, D6, D7, B6, B5, B4 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ diff --git a/keyboards/mikeneko65/rev4/keymaps/default/keymap.c b/keyboards/mikeneko65/rev4/keymaps/default/keymap.c index 4cbdd7a7737..108ba0beb02 100644 --- a/keyboards/mikeneko65/rev4/keymaps/default/keymap.c +++ b/keyboards/mikeneko65/rev4/keymaps/default/keymap.c @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 @@ -29,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT ), [_FN] = LAYOUT_all( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mikeneko65/rev4/keymaps/via/keymap.c b/keyboards/mikeneko65/rev4/keymaps/via/keymap.c index 518cc8d5cf1..2b9d125809f 100644 --- a/keyboards/mikeneko65/rev4/keymaps/via/keymap.c +++ b/keyboards/mikeneko65/rev4/keymaps/via/keymap.c @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 @@ -31,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_L1), KC_LEFT, KC_DOWN, KC_RGHT ), [_L1] = LAYOUT_all( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, + KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/mikeneko65/rev4/rev4.c b/keyboards/mikeneko65/rev4/rev4.c index bf16b41c8e2..35d8509a09d 100644 --- a/keyboards/mikeneko65/rev4/rev4.c +++ b/keyboards/mikeneko65/rev4/rev4.c @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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 diff --git a/keyboards/mikeneko65/rev4/rev4.h b/keyboards/mikeneko65/rev4/rev4.h index 5a3e124c54e..5f4a913fc9b 100644 --- a/keyboards/mikeneko65/rev4/rev4.h +++ b/keyboards/mikeneko65/rev4/rev4.h @@ -1,4 +1,5 @@ -/* Copyright 2022 takishim +/* Copyright 2020 kkatano + * Copyright 2022 takishim * * 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