From 2c98e795f7a857596ef550708bf0baf8b9d92154 Mon Sep 17 00:00:00 2001
From: jack <0x6A73@pm.me>
Date: Sun, 15 Jan 2023 01:03:16 -0700
Subject: [PATCH 1/2] [Keyboard] Fixup gingko65 matrix pins (#19589)
---
keyboards/mokey/ginkgo65/config.h | 34 +++---------------------------
keyboards/mokey/ginkgo65/info.json | 11 ++++++++++
2 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/keyboards/mokey/ginkgo65/config.h b/keyboards/mokey/ginkgo65/config.h
index 6605744221..320718238a 100644
--- a/keyboards/mokey/ginkgo65/config.h
+++ b/keyboards/mokey/ginkgo65/config.h
@@ -1,33 +1,5 @@
-/*
-Copyright 2021 Kyle McCreery
-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 2 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 <http://www.gnu.org/licenses/>.
-*/
+// Copyright 2023 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
#pragma once
-
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 16
- /* 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 */
-#define MATRIX_ROW_PINS { F7, B7, F5, F1, B0 }
-#define MATRIX_COL_PINS { C7, F6, B2, F4, B3, E6, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1 }
-#define DIODE_DIRECTION COL2ROW
-
-#define BACKLIGHT_PIN B6
-#define BACKLIGHT_LEVELS 6
#define BACKLIGHT_CAPS_LOCK
-#define BACKLIGHT_BREATHING
-#define BREATHING_PERIOD 5
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
diff --git a/keyboards/mokey/ginkgo65/info.json b/keyboards/mokey/ginkgo65/info.json
index 462d1869b6..220bd79ad8 100644
--- a/keyboards/mokey/ginkgo65/info.json
+++ b/keyboards/mokey/ginkgo65/info.json
@@ -8,6 +8,17 @@
"pid": "0x3365",
"device_version": "0.0.1"
},
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "cols": ["C7", "F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
+ "rows": ["B0", "B1", "B2", "B3", "F7"]
+ },
+ "backlight": {
+ "pin": "B6",
+ "levels": 6,
+ "breathing": true,
+ "breathing_period": 5
+ },
"layout_aliases": {
"LAYOUT": "LAYOUT_65_ansi_blocker"
},
From 44bcde102d7db3ff80ab01e5377cb3ff8f574afa Mon Sep 17 00:00:00 2001
From: Christian Brauner <brauner@kernel.org>
Date: Sun, 15 Jan 2023 09:03:27 +0100
Subject: [PATCH 2/2] [Keymap] Update brauner preonic layout (#19595)
---
keyboards/preonic/keymaps/brauner/keymap.c | 81 ++++++++++++----------
1 file changed, 43 insertions(+), 38 deletions(-)
diff --git a/keyboards/preonic/keymaps/brauner/keymap.c b/keyboards/preonic/keymaps/brauner/keymap.c
index d1edec002d..13b3b7b971 100644
--- a/keyboards/preonic/keymaps/brauner/keymap.c
+++ b/keyboards/preonic/keymaps/brauner/keymap.c
@@ -142,24 +142,24 @@ const key_override_t **key_overrides = (const key_override_t *[]){
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty
- * ,------------------------------------------------------------------------------------------------------------------------------------------------.
- * | Caps Lock| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Leader |
- * |----------+------+--------------------+-----------+------------+---------------+-----------+------------+------+------+------------+------------|
- * | Ctrl | Q | W | E | R | T | Copy/Y | Ü/U | I | Ö/O | Paste/P | Ctrl |
- * |----------+------+--------------------+-----------+------------+---------------------------+------------+------+------+------------+------------|
- * | Shift/Esc| Ä/A | ß/S | D | F | G | H | J | K | L | ' | Shift/Enter|
- * |----------+------+--------------------+-----------+------------+---------------|-----------+------------+------+------+------------+------------|
- * | | Z | Cut/X | C | V | B | N | M | , | . | / | |
- * |----------+------+--------------------+-----------+------------+---------------+-----------+------------+------+------+------------+------------|
- * | | |Compositor+Alt+Shift| Raise |Lower/Space | Compositor+Alt| Mouse |Lower/Space |Raise | | | Manage |
- * `------------------------------------------------------------------------------------------------------------------------------------------------'
+ * ,------------------------------------------------------------------------------------------------------------------------------------.
+ * | Caps Lock | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Leader |
+ * |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
+ * | Ctrl | Q | W | E | R | T | Y/Copy | U/Ü | I | O/Ö | P/Paste | Ctrl |
+ * |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
+ * | Shift/Esc | A/Ä | S/ß | D | F | G | H | J | K | L | ' | Shift/Enter |
+ * |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
+ * |Compositor+Alt| Z |X/Cut | C | V | B | N | M | , | . | / |Compositor+Alt|
+ * |--------------+--------------------+------+------+------+------+-----------+------+------+------+--------------------+--------------|
+ * | |Compositor+Alt+Shift| | |Raise |Lower |Lower/Space|Raise | | |Compositor+Alt+Shift| Manage |
+ * `------------------------------------------------------------------------------------------------------------------------------------'
*/
[_QWERTY] = LAYOUT_preonic_grid(
- KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LEAD,
- KC_LCTL, KC_Q, KC_W, KC_E, KC_R, KC_T, LT_COPY_Y, LT_UE_U, KC_I, LT_OE_O, LT_PASTE_P, KC_RCTL,
- MOD_TAP_LSFT_ESC, LT_AE_A, LT_SZ_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, MOD_TAP_LSFT_ENT,
- _______, KC_Z, LT_CUT_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, _______,
- _______, _______, LM_COMP_LALT_LSFT, RAISE, LOWER, LM_COMP_LALT, TG(_MOUSE), LT_LOWER_SPC, RAISE, _______, _______, MANAGE
+ KC_CAPS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LEAD,
+ KC_LCTL, KC_Q, KC_W, KC_E, KC_R, KC_T, LT_COPY_Y, LT_UE_U, KC_I, LT_OE_O, LT_PASTE_P, KC_RCTL,
+ MOD_TAP_LSFT_ESC, LT_AE_A, LT_SZ_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, MOD_TAP_LSFT_ENT,
+ LM_COMP_LALT, KC_Z, LT_CUT_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, LM_COMP_LALT,
+ _______, LM_COMP_LALT_LSFT, _______, _______, RAISE, LOWER, LT_LOWER_SPC, RAISE, _______, _______, _______, MANAGE
),
/* Lower
* ,-----------------------------------------------------------------------------------.
@@ -202,24 +202,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
),
/* Mouse
- * ,---------------------------------------------------------------------------------------------------------------------------------------.
- * | | | | | | | | | | | | |
- * |------+------+--------------+--------------+--------------+---------------+-----------+-----------+---------+------------+------+------|
- * | | | | | | |Wheel Left |Wheel Down |Wheel Up |Wheel Right | |Ctrl |
- * |------+------+--------------+--------------+--------------+---------------------------+-----------+---------+------------+------+------|
- * | | | Button 3 | Button 2 | Button 1 | |Cursor Left|Cursor Down|Cursor Up|Cursor Right| | |
- * |------+------+--------------+--------------+--------------+---------------|-----------+-----------+---------+------------+------+------|
- * | | | | | | | | | | | | |
- * |------+------+--------------+--------------+--------------+---------------+-----------+-----------+---------+------------+------+------|
- * | | |Accelaration 2|Accelaration 1|Accelaration 0| Compositor+Alt| | | | | | |
- * `---------------------------------------------------------------------------------------------------------------------------------------'
+ * ,-------------------------------------------------------------------------------------------------------------------------------------------------------.
+ * | Caps Lock | | | | | | | | | | | Leader |
+ * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
+ * | | | | | | |Wheel Left |Wheel Down |Wheel Up |Wheel Right | | Ctrl |
+ * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
+ * | | | Button 3 | Button 2 | Button 1 | |Cursor Left|Cursor Down|Cursor Up|Cursor Right| | |
+ * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
+ * |Compositor+Alt| | | | | | | | | | |Compositor+Alt|
+ * |--------------+-------+--------------+--------------+--------------+--------------+-----------+-----------+---------+------------+------+--------------|
+ * | | | |Accelaration 2|Accelaration 1|Accelaration 0| | | | | | |
+ * `-------------------------------------------------------------------------------------------------------------------------------------------------------'
*/
[_MOUSE] = LAYOUT_preonic_grid(
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, _______,
- XXXXXXX, XXXXXXX, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_RIGHT, XXXXXXX, _______,
+ XXXXXXX, XXXXXXX, KC_MS_BTN3, KC_MS_BTN2, KC_MS_BTN1, XXXXXXX, KC_MS_LEFT, KC_MS_DOWN, KC_MS_UP, KC_MS_RIGHT, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+ XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_ACCEL2, KC_MS_ACCEL1, KC_MS_ACCEL0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
),
/* Manage
* ,---------------------------------------------------------------------------------------.
@@ -251,15 +251,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |------+------+------+------+------+------+------+------+------+------+------+------|
* | | Z | X | C | V | B | N | M | , | . | / | |
* |------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | |Space | | | | |
+ * | | | | | | |Space | | | | | |
* `-----------------------------------------------------------------------------------'
*/
[_COMPOSITOR] = LAYOUT_preonic_grid(
- XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX,
- XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
- XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
- XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+ XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, XXXXXXX,
+ XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX,
+ XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
+ XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
)
};
@@ -396,6 +396,11 @@ static inline void leader_bindings(void) {
SEQ_ONE_KEY(KC_P) {
tap_code16(C(S(KC_V)));
}
+
+ /* Toggle mouse layer. */
+ SEQ_ONE_KEY(KC_CAPS) {
+ layer_invert(_MOUSE);
+ }
}
}