summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-02-01 00:29:19 +0000
committerQMK Bot <hello@qmk.fm>2022-02-01 00:29:19 +0000
commitd36c245400b03ddd12443e12fa4f43623541c232 (patch)
treee918d98e2ea5178ab2917531c7ba69804acdceec
parenta33dcb5a9a948d871cdceb219dba92f0512ff817 (diff)
parentf404ec329f62ef3978f78b516563619120557c8b (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/mikeneko65/rev3/config.h3
-rw-r--r--keyboards/mikeneko65/rev3/keymaps/default/keymap.c11
-rw-r--r--keyboards/mikeneko65/rev3/keymaps/via/keymap.c11
-rw-r--r--keyboards/mikeneko65/rev3/rev3.c3
-rw-r--r--keyboards/mikeneko65/rev3/rev3.h3
-rw-r--r--keyboards/mikeneko65/rev4/config.h5
-rw-r--r--keyboards/mikeneko65/rev4/keymaps/default/keymap.c5
-rw-r--r--keyboards/mikeneko65/rev4/keymaps/via/keymap.c5
-rw-r--r--keyboards/mikeneko65/rev4/rev4.c3
-rw-r--r--keyboards/mikeneko65/rev4/rev4.h3
10 files changed, 31 insertions, 21 deletions
diff --git a/keyboards/mikeneko65/rev3/config.h b/keyboards/mikeneko65/rev3/config.h
index 9fffb77c63..dad2532012 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 c40d48f2fe..69844b8c30 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 6c909b0c97..2a456503ea 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 8186588033..6da33ff78f 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 f6c3792bd3..cb490224fb 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 30ad8e9fa8..2e7efaf8db 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 <http://www.gnu.org/licenses/>.
*
*/
#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 4cbdd7a773..108ba0beb0 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 518cc8d5cf..2b9d125809 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 bf16b41c8e..35d8509a09 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 5a3e124c54..5f4a913fc9 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 19:33:50 +0000