From f0c8d8c77d042354b8fe442aaf3597560132d906 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 21 May 2024 15:18:08 +0800 Subject: [PATCH 01/32] Create gk75_q2_ansi keyboard. --- keyboards/skyloong/gk75/q2/ansi/keyboard.json | 374 ++++++++++++++++++ .../gk75/q2/ansi/keymaps/default/keymap.c | 32 ++ .../gk75/q2/ansi/keymaps/default/rules.mk | 1 + .../gk75/q2/ansi/keymaps/via/keymap.c | 58 +++ .../gk75/q2/ansi/keymaps/via/rules.mk | 2 + keyboards/skyloong/gk75/q2/ansi/rules.mk | 2 + keyboards/skyloong/gk75/q2/config.h | 22 ++ keyboards/skyloong/gk75/q2/halconf.h | 9 + keyboards/skyloong/gk75/q2/info.json | 79 ++++ keyboards/skyloong/gk75/q2/matrix.c | 154 ++++++++ keyboards/skyloong/gk75/q2/mcuconf.h | 12 + keyboards/skyloong/gk75/q2/q2.c | 294 ++++++++++++++ keyboards/skyloong/gk75/q2/readme.md | 33 ++ 13 files changed, 1072 insertions(+) create mode 100644 keyboards/skyloong/gk75/q2/ansi/keyboard.json create mode 100644 keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c create mode 100644 keyboards/skyloong/gk75/q2/ansi/keymaps/default/rules.mk create mode 100644 keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c create mode 100644 keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk create mode 100644 keyboards/skyloong/gk75/q2/ansi/rules.mk create mode 100644 keyboards/skyloong/gk75/q2/config.h create mode 100644 keyboards/skyloong/gk75/q2/halconf.h create mode 100644 keyboards/skyloong/gk75/q2/info.json create mode 100644 keyboards/skyloong/gk75/q2/matrix.c create mode 100644 keyboards/skyloong/gk75/q2/mcuconf.h create mode 100644 keyboards/skyloong/gk75/q2/q2.c create mode 100644 keyboards/skyloong/gk75/q2/readme.md diff --git a/keyboards/skyloong/gk75/q2/ansi/keyboard.json b/keyboards/skyloong/gk75/q2/ansi/keyboard.json new file mode 100644 index 00000000000..c3e61a6996a --- /dev/null +++ b/keyboards/skyloong/gk75/q2/ansi/keyboard.json @@ -0,0 +1,374 @@ +{ + "keyboard_name": "GK75 Q2_ANSI_1.0.0", + + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 29, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 44, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 59, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 74, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 125, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 140, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 162, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 176, "y": 0, "flags": 4}, + {"matrix": [5, 3], "x": 176, "y": 0, "flags": 4}, + {"matrix": [5, 4], "x": 191, "y": 0, "flags": 4}, + + {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4}, + {"matrix": [1, 1], "x": 15, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 29, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 44, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 59, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 74, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 88, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 103, "y": 13, "flags": 8}, + {"matrix": [1, 8], "x": 118, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 132, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 147, "y": 13, "flags": 4}, + {"matrix": [6, 3], "x": 162, "y": 13, "flags": 4}, + {"matrix": [6, 4], "x": 176, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 191, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 224, "y": 13, "flags": 4}, + + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 22, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 37, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 51, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 66, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 81, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 96, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 110, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 125, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 140, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 154, "y": 26, "flags": 4}, + {"matrix": [6, 5], "x": 169, "y": 26, "flags": 4}, + {"matrix": [6, 6], "x": 184, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 198, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 224, "y": 26, "flags": 4}, + + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 26, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 40, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 55, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 70, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 86, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 99, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 114, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 129, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 143, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 158, "y": 38, "flags": 4}, + {"matrix": [6, 7], "x": 173, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 209, "y": 26, "flags": 4}, + {"matrix": [3, 12], "x": 224, "y": 38, "flags": 4}, + + {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4}, + {"matrix": [4, 1], "x": 33, "y": 51, "flags": 4}, + {"matrix": [4, 2], "x": 48, "y": 51, "flags": 4}, + {"matrix": [4, 3], "x": 62, "y": 51, "flags": 4}, + {"matrix": [4, 4], "x": 77, "y": 51, "flags": 4}, + {"matrix": [4, 5], "x": 92, "y": 51, "flags": 4}, + {"matrix": [4, 6], "x": 106, "y": 51, "flags": 4}, + {"matrix": [4, 7], "x": 121, "y": 51, "flags": 4}, + {"matrix": [4, 8], "x": 136, "y": 51, "flags": 4}, + {"matrix": [4, 9], "x": 151, "y": 51, "flags": 4}, + {"matrix": [4, 10], "x": 165, "y": 51, "flags": 4}, + {"matrix": [6, 8], "x": 180, "y": 51, "flags": 4}, + {"matrix": [4, 11], "x": 209, "y": 51, "flags": 4}, + + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 18.4, "y": 64, "flags": 4}, + {"matrix": [6, 1], "x": 37, "y": 64, "flags": 4}, + {"matrix": [6, 0], "x": 55, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 92, "y": 64, "flags": 4}, + {"matrix": [5, 6], "x": 103, "y": 64, "flags": 4}, + {"matrix": [5, 9], "x": 129, "y": 64, "flags": 4}, + {"matrix": [5, 7], "x": 147, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 162, "y": 64, "flags": 4}, + {"matrix": [6, 9], "x": 195, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 209, "y": 64, "flags": 4}, + {"matrix": [6, 11], "x": 224, "y": 64, "flags": 4} + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x6077" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [5, 3], "x": 13, "y": 0}, + {"label": "F12", "matrix": [5, 4], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 12], "x": 15.25, "y": 0}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "-_", "matrix": [6, 3], "x": 11, "y": 1}, + {"label": "=+", "matrix": [6, 4], "x": 12, "y": 1}, + {"label": "BS", "matrix": [1, 11], "x": 13, "y": 1, "w": 2}, + {"label": "Home", "matrix": [1, 12], "x": 15.25, "y": 1}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2}, + {"label": "[", "matrix": [6, 5], "x": 11.5, "y": 2}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 2}, + {"label": "|", "matrix": [2, 11], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "Del", "matrix": [2, 12], "x": 15.25, "y": 2}, + + {"label": "Cap", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "'", "matrix": [6, 7], "x": 11.75, "y": 3}, + {"label": "Ent", "matrix": [3, 11], "x": 12.75, "y": 3, "w": 2.25}, + {"label": "PgUp", "matrix": [3, 12], "x": 15.25, "y": 3}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4}, + {"label": "Shift", "matrix": [6, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "Up", "matrix": [4, 11], "x": 14.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"label": "Com", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"label": "Alt", "matrix": [6, 1], "x": 2.5, "y": 5, "w": 1.25}, + {"label": "SPAC1", "matrix": [6, 0], "x": 3.75, "y": 5, "w": 3.125,"h":0.5}, + {"label": "SPAC", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25,"h":0.5}, + {"label": "SPAC2", "matrix": [5, 6], "x":6.875, "y": 5, "w": 3.125,"h":0.5}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5}, + {"label": "Fn", "matrix": [5, 7], "x": 11, "y": 5}, + {"label": "Menu", "matrix": [5, 10], "x": 12, "y": 5}, + {"label": "Left", "matrix": [6, 9], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [6, 11], "x": 15.25, "y": 5.25} + ] + }, + "LAYOUT_ansi_80": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [5, 3], "x": 13, "y": 0}, + {"label": "F12", "matrix": [5, 4], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 12], "x": 15.25, "y": 0}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "-_", "matrix": [6, 3], "x": 11, "y": 1}, + {"label": "=+", "matrix": [6, 4], "x": 12, "y": 1}, + {"label": "BS", "matrix": [1, 11], "x": 13, "y": 1, "w": 2}, + {"label": "Home", "matrix": [1, 12], "x": 15.25, "y": 1}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2}, + {"label": "[", "matrix": [6, 5], "x": 11.5, "y": 2}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 2}, + {"label": "|", "matrix": [2, 11], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "Del", "matrix": [2, 12], "x": 15.25, "y": 2}, + + {"label": "Cap", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "'", "matrix": [6, 7], "x": 11.75, "y": 3}, + {"label": "Ent", "matrix": [3, 11], "x": 12.75, "y": 3, "w": 2.25}, + {"label": "PgUp", "matrix": [3, 12], "x": 15.25, "y": 3}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4}, + {"label": "Shift", "matrix": [6, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "Up", "matrix": [4, 11], "x": 14.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"label": "Com", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"label": "Alt", "matrix": [6, 1], "x": 2.5, "y": 5, "w": 1.25}, + {"label": "SPAC", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5}, + {"label": "Fn", "matrix": [5, 7], "x": 11, "y": 5}, + {"label": "Menu", "matrix": [5, 10], "x": 12, "y": 5}, + {"label": "Left", "matrix": [6, 9], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [6, 11], "x": 15.25, "y": 5.25} + ] + }, + "LAYOUT_ansi_split_space": { + "layout":[ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0}, + {"label": "F11", "matrix": [5, 3], "x": 13, "y": 0}, + {"label": "F12", "matrix": [5, 4], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 12], "x": 15.25, "y": 0}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1}, + {"label": "-_", "matrix": [6, 3], "x": 11, "y": 1}, + {"label": "=+", "matrix": [6, 4], "x": 12, "y": 1}, + {"label": "BS", "matrix": [1, 11], "x": 13, "y": 1, "w": 2}, + {"label": "Home", "matrix": [1, 12], "x": 15.25, "y": 1}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2}, + {"label": "[", "matrix": [6, 5], "x": 11.5, "y": 2}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 2}, + {"label": "|", "matrix": [2, 11], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "Del", "matrix": [2, 12], "x": 15.25, "y": 2}, + + {"label": "Cap", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "'", "matrix": [6, 7], "x": 11.75, "y": 3}, + {"label": "Ent", "matrix": [3, 11], "x": 12.75, "y": 3, "w": 2.25}, + {"label": "PgUp", "matrix": [3, 12], "x": 15.25, "y": 3}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4}, + {"label": "Shift", "matrix": [6, 8], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "Up", "matrix": [4, 11], "x": 14.25, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"label": "Com", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"label": "Alt", "matrix": [6, 1], "x": 2.5, "y": 5, "w": 1.25}, + {"label": "SPAC1", "matrix": [6, 0], "x": 3.75, "y": 5, "w": 3.125}, + {"label": "SPAC2", "matrix": [5, 6], "x": 6.875, "y": 5, "w": 3.125}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5}, + {"label": "Fn", "matrix": [5, 7], "x": 11, "y": 5}, + {"label": "Menu", "matrix": [5, 10], "x": 12, "y": 5}, + {"label": "Left", "matrix": [6, 9], "x": 13.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.25}, + {"label": "Right", "matrix": [6, 11], "x": 15.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c new file mode 100644 index 00000000000..da373c24a9c --- /dev/null +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -0,0 +1,32 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, KC_MUTE, + KC_GRV, 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_BSPC, KC_DEL, + 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_BSLS, KC_PGUP, + 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_PGDN, + 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_F11, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_all( + _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ), +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } +}; +#endif diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/rules.mk b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c new file mode 100644 index 00000000000..ae55081e935 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c @@ -0,0 +1,58 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later + + +#include QMK_KEYBOARD_H +enum layer_names { + _WIN, + _MAC, + _WIN_INDEX, + _MAC_INDEX +}; +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_WIN] = LAYOUT_all( + KC_ESC, 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_MUTE, + KC_GRV, 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_BSPC, KC_DEL, + 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_BSLS, KC_PGUP, + 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_PGDN, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_MAC] = LAYOUT_all( + _______, KC_F14, KC_F15, C(KC_UP), KC_WSCH, G(C(KC_Q)), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, + KC_GRV, 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_BSPC, KC_DEL, + 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_BSLS, KC_PGUP, + 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_PGDN, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_WIN_INDEX] = LAYOUT_all( + _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(KC_L), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ), + + [_MAC_INDEX] = 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_PAUS, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, + [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_F14, KC_F15), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL)), ENCODER_CCW_CW(C(KC_UP), C(KC_DOWN)) }, + [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } +}; +#endif diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk new file mode 100644 index 00000000000..715838ecc5d --- /dev/null +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes diff --git a/keyboards/skyloong/gk75/q2/ansi/rules.mk b/keyboards/skyloong/gk75/q2/ansi/rules.mk new file mode 100644 index 00000000000..6aebeff05a8 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/ansi/rules.mk @@ -0,0 +1,2 @@ + CUSTOM_MATRIX = lite + SRC += matrix.c diff --git a/keyboards/skyloong/gk75/q2/config.h b/keyboards/skyloong/gk75/q2/config.h new file mode 100644 index 00000000000..882f106aad0 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/config.h @@ -0,0 +1,22 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#ifdef ENCODER_ENABLE +# define ENCODER_MAP_KEY_DELAY 10 +#endif + +#ifdef RGB_MATRIX_ENABLE +# define AW20216S_CS_PIN_1 B12 +# define AW20216S_CS_PIN_2 B11 +// Hardware enable lines may be connected to the same pin +# define AW20216S_EN_PIN B5 + +# define WIN_MOD_INDEX 19 +# define MAC_MOD_INDEX 20 +# define WIN_LOCK_INDEX 71 +# define CAPS_LOCK_INDEX 43 +#endif // RGB_MATRIX_ENABLE + + diff --git a/keyboards/skyloong/gk75/q2/halconf.h b/keyboards/skyloong/gk75/q2/halconf.h new file mode 100644 index 00000000000..d13f22eaf73 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/halconf.h @@ -0,0 +1,9 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/skyloong/gk75/q2/info.json b/keyboards/skyloong/gk75/q2/info.json new file mode 100644 index 00000000000..19e99e60575 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/info.json @@ -0,0 +1,79 @@ +{ + "manufacturer": "skyloong", + "maintainer": "NaturalZh", + "bootloader": "stm32duino", + "debounce": 10, + "build": { + "debounce_type": "asym_eager_defer_pk" + }, + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "encoder": { + "rotary": [ + {"pin_a": "A1", "pin_b": "A0"}, + {"pin_a": "A3", "pin_b": "A2", "resolution": 2}, + {"pin_a": "A4", "pin_b": "B0", "resolution": 2}, + {"pin_a": "B3", "pin_b": "B1", "resolution": 2} + ] + }, + "features": { + "bootmagic": true, + "command": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "indicators": { + "on_state": 0, + "caps_lock": "C15" + }, + + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null], + "rows": ["A8", "A9", "A10", "A15", "B6", "B7","B9"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "animations": { + "band_spiral_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "rainbow_moving_chevron": true, + "raindrops": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_simple": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "driver": "aw20216s", + "hue_steps": 20, + "max_brightness": 200, + "sat_steps": 20, + "speed_steps": 20, + "val_steps": 20, + "sleep": true + }, + "url": "https://www.skyloong.vip", + "usb": { + "max_power": 380, + "vid": "0x1EA7" + } + +} diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c new file mode 100644 index 00000000000..ac28c1c8cb0 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -0,0 +1,154 @@ +// Copyright 2023 NaturaZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +//Matrix read rows set col:DIODE_DIRECTION == ROW2COL + +#include +#include "atomic_util.h" +#include "debounce.h" + +#define ClOCK_TIME 15 +#define MATRIX_INPUT_PRESSED_STATE 0 + +#define HC595_ST_PIN A6 +#define HC595_SH_PIN A5 +#define HC595_DS_PIN A7 //定义74HC595的串口数据输入端 + +/* matrix state(1:on, 0:off) */ +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; + +// user-defined overridable functions +__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter); + +static inline void select_delay(uint16_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + }; +} + +static inline void setPinOutput_writeLow(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); + } +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); + } +} + +static inline void setPinInputHigh_atomic(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + gpio_set_pin_input_high(pin); + } +} + +static inline uint8_t readMatrixPin(pin_t pin) { + if (pin != NO_PIN) { + return (gpio_read_pin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1; + } else { + return 1; + } +} + +static inline void clockPulse(uint16_t n) { + gpio_write_pin_high(HC595_SH_PIN); + gpio_write_pin_high(HC595_ST_PIN); + select_delay(n); + gpio_write_pin_low(HC595_SH_PIN); + gpio_write_pin_low(HC595_ST_PIN); +} + +// matrix code + +static bool select_col(uint8_t col) { + setPinOutput_writeHigh(HC595_DS_PIN); + for (uint8_t m = 0; m <= col; m++) { + if(m == 0){ + gpio_write_pin_low(HC595_DS_PIN); + }else{ + gpio_write_pin_high(HC595_DS_PIN); + } + clockPulse(ClOCK_TIME); + } + return true; + +} + +static void unselect_col(uint8_t col) { + uint8_t x = (MATRIX_COLS - col); + setPinOutput_writeHigh(HC595_DS_PIN); + for (uint8_t y = 0; y < x ; y++) { + clockPulse(ClOCK_TIME); + } +} + +static void unselect_cols(void) { + setPinOutput_writeLow(HC595_SH_PIN); + setPinOutput_writeLow(HC595_ST_PIN); + setPinOutput_writeHigh(HC595_DS_PIN); + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + clockPulse(ClOCK_TIME); + } +} + +__attribute__((weak)) void matrix_init_pins(void) { + unselect_cols(); + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + if (row_pins[x] != NO_PIN) { + setPinInputHigh_atomic(row_pins[x]); + } + } +} + +__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + bool key_pressed = false; + + // Select col + if (!select_col(current_col)) { // select col + return; // skip NO_PIN col + } + matrix_output_select_delay(); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Check row pin state + if (readMatrixPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_matrix[row_index] |= row_shifter; + key_pressed = true; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // Unselect col + unselect_col(current_col); + matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH +} + +void matrix_init_custom(void) { + matrix_init_pins(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t temp_matrix[MATRIX_ROWS] = {0}; + + // Set col, read rows + matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) { + matrix_read_rows_on_col(temp_matrix, current_col, row_shifter); + } + + bool changed = memcmp(raw_matrix, temp_matrix, sizeof(temp_matrix)) != 0; + if (changed) memcpy(raw_matrix, temp_matrix, sizeof(temp_matrix)); + + return changed; +} diff --git a/keyboards/skyloong/gk75/q2/mcuconf.h b/keyboards/skyloong/gk75/q2/mcuconf.h new file mode 100644 index 00000000000..49455f9c3d7 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/mcuconf.h @@ -0,0 +1,12 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE + +#undef STM32_SPI_USE_DMA +#define STM32_SPI_USE_DMA TRUE + diff --git a/keyboards/skyloong/gk75/q2/q2.c b/keyboards/skyloong/gk75/q2/q2.c new file mode 100644 index 00000000000..1f71657e943 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/q2.c @@ -0,0 +1,294 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +int FN_ON = 0; +bool WIN_LOCK = 0; +bool FN_WIN = 0; +bool FN_MAC = 0; +bool L_WIN = 0; +bool L_MAC = 0; + +#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ +const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { +/* Each AW20216 channel is controlled by a register at some offset between 0x00 + * and 0xD7 inclusive. + * See drivers/awinic/aw20216.h for the mapping between register offsets and + * driver pin locations. + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, CS1_SW1, CS2_SW1, CS3_SW1}, //ESC + {0, CS1_SW3, CS2_SW3, CS3_SW3}, //F1 + {0, CS1_SW4, CS2_SW4, CS3_SW4}, + {0, CS1_SW5, CS2_SW5, CS3_SW5}, //F3 + {0, CS1_SW6, CS2_SW6, CS3_SW6}, + {0, CS1_SW7, CS2_SW7, CS3_SW7}, //F5 + {0, CS1_SW8, CS2_SW8, CS3_SW8}, + {0, CS1_SW9, CS2_SW9, CS3_SW9}, //F7 + {0, CS1_SW10, CS2_SW10, CS3_SW10}, + {0, CS1_SW11, CS2_SW11, CS3_SW11}, //F9 + {0, CS1_SW12, CS2_SW12, CS3_SW12}, //F10 + {0, CS10_SW2, CS11_SW2, CS12_SW2}, + {0, CS10_SW3, CS11_SW3, CS12_SW3}, //F12 + //encoder no led + + {0, CS4_SW1, CS5_SW1, CS6_SW1}, //`~ + {0, CS4_SW2, CS5_SW2, CS6_SW2}, //1 + {0, CS4_SW3, CS5_SW3, CS6_SW3}, //2 + {0, CS4_SW4, CS5_SW4, CS6_SW4}, + {0, CS4_SW5, CS5_SW5, CS6_SW5}, //4 + {0, CS4_SW6, CS5_SW6, CS6_SW6}, + {0, CS4_SW7, CS5_SW7, CS6_SW7}, //6 + {0, CS4_SW8, CS5_SW8, CS6_SW8}, + {0, CS4_SW9, CS5_SW9, CS6_SW9}, //8 + {0, CS4_SW10, CS5_SW10, CS6_SW10}, + {0, CS4_SW11, CS5_SW11, CS6_SW11}, //0 + {0, CS4_SW12, CS5_SW12, CS6_SW12}, //-_ + {0, CS13_SW2, CS14_SW2, CS15_SW2}, //=+ + {0, CS13_SW3, CS14_SW3, CS15_SW3}, //BS + {0, CS13_SW4, CS14_SW4, CS15_SW4}, //Home + + {0, CS7_SW1, CS8_SW1, CS9_SW1}, //Tab + {0, CS7_SW2, CS8_SW2, CS9_SW2}, //Q + {0, CS7_SW3, CS8_SW3, CS9_SW3}, //W + {0, CS7_SW4, CS8_SW4, CS9_SW4}, //E + {0, CS7_SW5, CS8_SW5, CS9_SW5}, //R + {0, CS7_SW6, CS8_SW6, CS9_SW6}, //T + {0, CS7_SW7, CS8_SW7, CS9_SW7}, //Y + {0, CS7_SW8, CS8_SW8, CS9_SW8}, //U + {0, CS7_SW9, CS8_SW9, CS9_SW9}, //I + {0, CS7_SW10, CS8_SW10, CS9_SW10}, //O + {0, CS7_SW11, CS8_SW11, CS9_SW11}, //P + {0, CS7_SW12, CS8_SW12, CS9_SW12}, //[ + {0, CS16_SW2, CS17_SW2, CS18_SW2}, //] + {0, CS16_SW3, CS17_SW3, CS18_SW3}, //| + {0, CS16_SW4, CS17_SW4, CS18_SW4}, //DEL + + {1, CS1_SW1, CS2_SW1, CS3_SW1}, //Cap + {1, CS1_SW2, CS2_SW2, CS3_SW2}, //A + {1, CS1_SW3, CS2_SW3, CS3_SW3}, //S + {1, CS1_SW4, CS2_SW4, CS3_SW4}, //D + {1, CS1_SW5, CS2_SW5, CS3_SW5}, //F + {1, CS1_SW6, CS2_SW6, CS3_SW6}, //G + {1, CS1_SW7, CS2_SW7, CS3_SW7}, //H + {1, CS1_SW8, CS2_SW8, CS3_SW8}, //J + {1, CS1_SW9, CS2_SW9, CS3_SW9}, //K + {1, CS1_SW10, CS2_SW10, CS3_SW10}, //L + {1, CS1_SW11, CS2_SW11, CS3_SW11}, //; + {1, CS1_SW12, CS2_SW12, CS3_SW12}, //. + {1, CS10_SW3, CS11_SW3, CS12_SW3}, //Ent + {1, CS10_SW4, CS11_SW4, CS12_SW4}, //PgUp + + {1, CS4_SW1, CS5_SW1, CS6_SW1}, //Shift + {1, CS4_SW2, CS5_SW2, CS6_SW2}, //Z + {1, CS4_SW3, CS5_SW3, CS6_SW3}, //X + {1, CS4_SW4, CS5_SW4, CS6_SW4}, //C + {1, CS4_SW5, CS5_SW5, CS6_SW5}, //V + {1, CS4_SW6, CS5_SW6, CS6_SW6}, //B + {1, CS4_SW7, CS5_SW7, CS6_SW7}, //N + {1, CS4_SW8, CS5_SW8, CS6_SW8}, //M + {1, CS4_SW9, CS5_SW9, CS6_SW9}, //, + {1, CS4_SW10, CS5_SW10, CS6_SW10}, //. + {1, CS4_SW11, CS5_SW11, CS6_SW11}, //? + {1, CS13_SW2, CS14_SW2, CS15_SW2}, //Shift + {1, CS13_SW3, CS14_SW3, CS15_SW3}, //Up + + {1, CS7_SW1, CS8_SW1, CS9_SW1}, //Ctrl + {1, CS7_SW2, CS8_SW2, CS9_SW2}, //Com + {1, CS7_SW3, CS8_SW3, CS9_SW3}, //Alt + {1, CS7_SW5, CS8_SW5, CS9_SW5}, //SPAC1 + {1, CS7_SW6, CS8_SW6, CS9_SW6}, //SPAC + {1, CS7_SW8, CS8_SW8, CS9_SW8}, //SPAC2 + {1, CS7_SW10, CS8_SW10, CS9_SW10}, //Alt + {1, CS7_SW11, CS8_SW11, CS9_SW11}, //Fn + {1, CS7_SW12, CS8_SW12, CS9_SW12}, //Menu + {1, CS16_SW2, CS17_SW2, CS18_SW2}, //Left + {1, CS16_SW3, CS17_SW3, CS18_SW3}, //Down + {1, CS16_SW4, CS17_SW4, CS18_SW4}, //Right +}; + +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); + } + } + + if (WIN_LOCK) { + if(IS_LAYER_ON(1)){ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 255, 255, 255); + }else{ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 255, 255, 255); + } + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 0, 0, 0); + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 0, 0, 0); + } + } + + switch (get_highest_layer(layer_state)) { + case 2:{ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } break; + case 3:{ + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } break; + + case 0:{ + if (L_WIN) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } + } break; + + case 1:{ + if (L_MAC) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } break; + + default:{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } + return false; +} +#endif + + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { +# ifdef RGB_MATRIX_ENABLE + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + return false; + + case RGB_VAI: + rgb_matrix_set_flags(LED_FLAG_ALL); + return true; +# endif + case MO(1): + if (record->event.pressed) { + FN_ON = 1; + } else { + FN_ON = 0; + } + return true; + + case MO(2): + if (record->event.pressed) { + FN_WIN = 1; + } else { + FN_WIN = 0; + } + return true; + + case MO(3): + if (record->event.pressed) { + FN_MAC = 1; + } else { + FN_MAC = 0; + } + return true; + + case KC_LGUI: + if (FN_WIN | FN_MAC | FN_ON){ + if ( record->event.pressed){ + WIN_LOCK = !WIN_LOCK ; //change win lock state + } + if (!WIN_LOCK) { + return false; //windows key locked do nothing + } + } + if (WIN_LOCK) { + return false; //windows key locked do nothing + } + return true; // continue all further processing of this key + + case TO(0): + if (record->event.pressed) { + L_WIN = 1; + set_single_persistent_default_layer(0); // Save default layer 0 to eeprom + } else { + L_WIN = 0; + } + return true; // continue all further processing of this key + + case TO(1): + if (record->event.pressed) { + L_MAC = 1; + set_single_persistent_default_layer(1); //Save default layer 1 to eeprom + } else { + L_MAC = 0; + } + return true; + + default: + return true; + } +} + +void suspend_power_down_kb() { + gpio_write_pin_low(AW20216S_EN_PIN); + suspend_power_down_user(); +} + +void suspend_wakeup_init_kb() { + gpio_write_pin_high(AW20216S_EN_PIN); + suspend_wakeup_init_user(); +} + +bool shutdown_kb(bool jump_to_bootloader) { + return true; +} + +void board_init(void) { + // JTAG-DP Disabled and SW-DP Disabled + AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; +} + diff --git a/keyboards/skyloong/gk75/q2/readme.md b/keyboards/skyloong/gk75/q2/readme.md new file mode 100644 index 00000000000..bd497d9cc21 --- /dev/null +++ b/keyboards/skyloong/gk75/q2/readme.md @@ -0,0 +1,33 @@ +# The GK75 Q2 is an RGB matrix Keyboard with an encoder. + +![GK75 Q2 ansi](https://i.imgur.com/G9PrQtth.png) + +## The PCB features: +* QMK & VIA compatibility +* RGB Matrix backlight +* Mechanical switches Keyboard with LED display. + + +The following is the QMK Firmware for the Destop 75% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd + +* Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) +* Hardware Supported: DestopPCB for Skyloong keylayout 87%, STM32F103C8T6 +* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip + +Make example for this keyboard (after setting up your build environment): + + make skyloong/gk75/q2/ansi:default + +Flashing example for this keyboard: + + make skyloong/gk75/q2/ansi:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From b868d6b5a6e80e4a0f01b05a9122cd156741b5b1 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 24 May 2024 15:59:18 +0800 Subject: [PATCH 02/32] update skyloong/gk75/q2/ansi/via/keymap.c --- .../gk75/q2/ansi/keymaps/via/keymap.c | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c index ae55081e935..ccb7fee3807 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c @@ -13,36 +13,36 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_WIN] = LAYOUT_all( KC_ESC, 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_MUTE, - KC_GRV, 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_BSPC, KC_DEL, - 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_BSLS, KC_PGUP, - 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_PGDN, + KC_GRV, 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_BSPC, 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_BSLS, KC_DEL, + 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_MAC] = LAYOUT_all( - _______, KC_F14, KC_F15, C(KC_UP), KC_WSCH, G(C(KC_Q)), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, - KC_GRV, 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_BSPC, KC_DEL, - 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_BSLS, KC_PGUP, - 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_PGDN, + _______, KC_F14, KC_F15, C(KC_UP), KC_WSCH, G(KC_SPC), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, + KC_GRV, 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_BSPC, 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_BSLS, KC_DEL, + 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), [_WIN_INDEX] = LAYOUT_all( - _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(KC_L), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ), [_MAC_INDEX] = 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_PAUS, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ) From 62f6196d0dc311bc768184bfaf4e0f6300b55b64 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 5 Aug 2024 10:42:17 +0800 Subject: [PATCH 03/32] movied skyloong/gk75/q2 readme.md to skyloong/gk75/q2/ansi --- keyboards/skyloong/gk75/q2/{ => ansi}/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename keyboards/skyloong/gk75/q2/{ => ansi}/readme.md (95%) diff --git a/keyboards/skyloong/gk75/q2/readme.md b/keyboards/skyloong/gk75/q2/ansi/readme.md similarity index 95% rename from keyboards/skyloong/gk75/q2/readme.md rename to keyboards/skyloong/gk75/q2/ansi/readme.md index bd497d9cc21..8a7a5b9d915 100644 --- a/keyboards/skyloong/gk75/q2/readme.md +++ b/keyboards/skyloong/gk75/q2/ansi/readme.md @@ -1,4 +1,4 @@ -# The GK75 Q2 is an RGB matrix Keyboard with an encoder. +# The GK75 Q2 ansi is an RGB matrix Keyboard with an encoder. ![GK75 Q2 ansi](https://i.imgur.com/G9PrQtth.png) From 1de828cbfa4d18b2e9126560f1eefefe6b238ab5 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 9 Aug 2024 19:45:07 +0800 Subject: [PATCH 04/32] update skyloong/gk75/q2/ansi/readme.md --- keyboards/skyloong/gk75/q2/ansi/keyboard.json | 2 +- keyboards/skyloong/gk75/q2/ansi/readme.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keyboard.json b/keyboards/skyloong/gk75/q2/ansi/keyboard.json index c3e61a6996a..3992934cda4 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keyboard.json +++ b/keyboards/skyloong/gk75/q2/ansi/keyboard.json @@ -79,7 +79,7 @@ {"matrix": [4, 11], "x": 209, "y": 51, "flags": 4}, {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, - {"matrix": [5, 1], "x": 18.4, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 18, "y": 64, "flags": 4}, {"matrix": [6, 1], "x": 37, "y": 64, "flags": 4}, {"matrix": [6, 0], "x": 55, "y": 64, "flags": 4}, {"matrix": [5, 5], "x": 92, "y": 64, "flags": 4}, diff --git a/keyboards/skyloong/gk75/q2/ansi/readme.md b/keyboards/skyloong/gk75/q2/ansi/readme.md index 8a7a5b9d915..11b90d0b8db 100644 --- a/keyboards/skyloong/gk75/q2/ansi/readme.md +++ b/keyboards/skyloong/gk75/q2/ansi/readme.md @@ -4,15 +4,15 @@ ## The PCB features: * QMK & VIA compatibility -* RGB Matrix backlight -* Mechanical switches Keyboard with LED display. +* RGB Matrix effect backlight +* Mechanical switches Keyboard and supporting up to 4 encoders which are can be replaced with switches. The following is the QMK Firmware for the Destop 75% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) -* Hardware Supported: DestopPCB for Skyloong keylayout 87%, STM32F103C8T6 -* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip +* Hardware Supported: DestopPCB for Skyloong keylayout 75%, STM32F103C8T6 +* Hardware Availability: http://www.skyloong.com.cn https://skyloongtech.com Make example for this keyboard (after setting up your build environment): From 1d1412ebec3630f4162e692250aa92d5cd75407b Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 9 Aug 2024 20:09:37 +0800 Subject: [PATCH 05/32] Modified skyloong/gk75/q2/ansi/keymaps/default/keymap.c --- keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c index da373c24a9c..046de88e66c 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -11,7 +11,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_BSLS, KC_PGUP, 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_PGDN, 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_F11, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [1] = LAYOUT_all( @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ), }; From 0ef93b4a5918f363c11ec241a4232c986a498f9d Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:09:27 +0800 Subject: [PATCH 06/32] Update keyboards/skyloong/gk75/q2/q2.c OK, Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk75/q2/q2.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/q2.c b/keyboards/skyloong/gk75/q2/q2.c index 1f71657e943..59795d48656 100644 --- a/keyboards/skyloong/gk75/q2/q2.c +++ b/keyboards/skyloong/gk75/q2/q2.c @@ -282,11 +282,6 @@ void suspend_wakeup_init_kb() { gpio_write_pin_high(AW20216S_EN_PIN); suspend_wakeup_init_user(); } - -bool shutdown_kb(bool jump_to_bootloader) { - return true; -} - void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; From d295f206106828d3a51dd80b40af2b43443079f3 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:16:27 +0800 Subject: [PATCH 07/32] Update keyboards/skyloong/gk75/q2/matrix.c OK, Thank you very much. Co-authored-by: Joel Challis --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index ac28c1c8cb0..82f51378933 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -6,7 +6,7 @@ #include "atomic_util.h" #include "debounce.h" -#define ClOCK_TIME 15 +#define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 #define HC595_ST_PIN A6 From b201f2f10476ac90864c2af23324032a5c94237e Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:17:07 +0800 Subject: [PATCH 08/32] Update keyboards/skyloong/gk75/q2/matrix.c OK,Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 82f51378933..6d32cbd8699 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -75,7 +75,7 @@ static bool select_col(uint8_t col) { }else{ gpio_write_pin_high(HC595_DS_PIN); } - clockPulse(ClOCK_TIME); + clockPulse(CLOCK_TIME); } return true; From bab1e4e83c163a7ea80b7cef7890938ebac5b2fa Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:17:36 +0800 Subject: [PATCH 09/32] Update keyboards/skyloong/gk75/q2/matrix.c OK,Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 6d32cbd8699..7349dc7e2bf 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -85,7 +85,7 @@ static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); setPinOutput_writeHigh(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clockPulse(ClOCK_TIME); + clockPulse(CLOCK_TIME); } } From 70cdae46d2f44e4ecf382a505e007053b62ea219 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 10 Aug 2024 08:18:03 +0800 Subject: [PATCH 10/32] Update keyboards/skyloong/gk75/q2/matrix.c OK,Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 7349dc7e2bf..51727613c99 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -94,7 +94,7 @@ static void unselect_cols(void) { setPinOutput_writeLow(HC595_ST_PIN); setPinOutput_writeHigh(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clockPulse(ClOCK_TIME); + clockPulse(CLOCK_TIME); } } From 2f4d2aad745fc3ab910072d1372e78190b4f3fab Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 10 Aug 2024 13:33:59 +0800 Subject: [PATCH 11/32] Update skyloong/gk75/q2 --- .../gk75/q2/ansi/keymaps/default/keymap.c | 2 +- .../gk75/q2/ansi/keymaps/via/keymap.c | 184 +++++++++- keyboards/skyloong/gk75/q2/q2.c | 335 +++++------------- 3 files changed, 261 insertions(+), 260 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c index 046de88e66c..f817ec673e9 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -27,6 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, - [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } + [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } }; #endif diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c index ccb7fee3807..3a0ec0b770d 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c @@ -9,6 +9,14 @@ enum layer_names { _WIN_INDEX, _MAC_INDEX }; + +int FN_ON = 0; +bool WIN_LOCK = 0; +bool FN_WIN = 0; +bool FN_MAC = 0; +bool L_WIN = 0; +bool L_MAC = 0; + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_WIN] = LAYOUT_all( @@ -30,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_WIN_INDEX] = LAYOUT_all( - _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, + _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, + _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, @@ -39,8 +47,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_MAC_INDEX] = 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_PAUS, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, + _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, @@ -52,7 +60,171 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_F14, KC_F15), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL)), ENCODER_CCW_CW(C(KC_UP), C(KC_DOWN)) }, - [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, - [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } + [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } }; #endif + +#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); + } + } + + if (WIN_LOCK) { + if(IS_LAYER_ON(1)){ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 255, 255, 255); + }else{ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 255, 255, 255); + } + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 0, 0, 0); + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 0, 0, 0); + } + } + + switch (get_highest_layer(layer_state)) { + case 2:{ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } break; + case 3:{ + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } break; + + case 0:{ + if (L_WIN) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } + } break; + + case 1:{ + if (L_MAC) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } break; + + default:{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } + return false; +} +#endif + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { +# ifdef RGB_MATRIX_ENABLE + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + return false; + + case RGB_VAI: + rgb_matrix_set_flags(LED_FLAG_ALL); + return true; +# endif + case MO(1): + if (record->event.pressed) { + FN_ON = 1; + } else { + FN_ON = 0; + } + return true; + + case MO(2): + if (record->event.pressed) { + FN_WIN = 1; + } else { + FN_WIN = 0; + } + return true; + + case MO(3): + if (record->event.pressed) { + FN_MAC = 1; + } else { + FN_MAC = 0; + } + return true; + + case KC_LGUI: + if (FN_WIN | FN_MAC | FN_ON){ + if ( record->event.pressed){ + WIN_LOCK = !WIN_LOCK ; //change win lock state + } + if (!WIN_LOCK) { + return false; //windows key locked do nothing + } + } + if (WIN_LOCK) { + return false; //windows key locked do nothing + } + return true; // continue all further processing of this key + + case DF(0): + if (record->event.pressed) { + L_WIN = 1; + L_MAC = 0; + layer_move(0); + set_single_persistent_default_layer(0); // Save default layer 0 to eeprom + } else { + L_WIN = 0; + } + return false; // cancel all further processing of this key + + case DF(1): + if (record->event.pressed) { + L_MAC = 1; + L_WIN = 0; + layer_move(1); + set_single_persistent_default_layer(1); //Save default layer 1 to eeprom + } else { + L_MAC = 0; + } + return false; // cancel all further processing of this key + + default: + L_MAC = 0; + L_WIN = 0; + return true; + } +} diff --git a/keyboards/skyloong/gk75/q2/q2.c b/keyboards/skyloong/gk75/q2/q2.c index 59795d48656..b268d541558 100644 --- a/keyboards/skyloong/gk75/q2/q2.c +++ b/keyboards/skyloong/gk75/q2/q2.c @@ -2,14 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" -int FN_ON = 0; -bool WIN_LOCK = 0; -bool FN_WIN = 0; -bool FN_MAC = 0; -bool L_WIN = 0; -bool L_MAC = 0; - -#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Each AW20216 channel is controlled by a register at some offset between 0x00 * and 0xD7 inclusive. @@ -20,259 +12,96 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, //ESC - {0, CS1_SW3, CS2_SW3, CS3_SW3}, //F1 - {0, CS1_SW4, CS2_SW4, CS3_SW4}, - {0, CS1_SW5, CS2_SW5, CS3_SW5}, //F3 - {0, CS1_SW6, CS2_SW6, CS3_SW6}, - {0, CS1_SW7, CS2_SW7, CS3_SW7}, //F5 - {0, CS1_SW8, CS2_SW8, CS3_SW8}, - {0, CS1_SW9, CS2_SW9, CS3_SW9}, //F7 - {0, CS1_SW10, CS2_SW10, CS3_SW10}, - {0, CS1_SW11, CS2_SW11, CS3_SW11}, //F9 - {0, CS1_SW12, CS2_SW12, CS3_SW12}, //F10 - {0, CS10_SW2, CS11_SW2, CS12_SW2}, - {0, CS10_SW3, CS11_SW3, CS12_SW3}, //F12 + {0, SW1_CS1, SW1_CS2, SW1_CS3}, //ESC + {0, SW3_CS1, SW3_CS2, SW3_CS3}, //F1 + {0, SW4_CS1, SW4_CS2, SW4_CS3}, + {0, SW5_CS1, SW5_CS2, SW5_CS3}, //F3 + {0, SW6_CS1, SW6_CS2, SW6_CS3}, + {0, SW7_CS1, SW7_CS2, SW7_CS3}, //F5 + {0, SW8_CS1, SW8_CS2, SW8_CS3}, + {0, SW9_CS1, SW9_CS2, SW9_CS3}, //F7 + {0, SW10_CS1, SW10_CS2, SW10_CS3}, + {0, SW11_CS1, SW11_CS2, SW11_CS3}, //F9 + {0, SW12_CS1, SW12_CS2, SW12_CS3}, //F10 + {0, SW2_CS10, SW2_CS11, SW2_CS12}, + {0, SW3_CS10, SW3_CS11, SW3_CS12}, //F12 //encoder no led - {0, CS4_SW1, CS5_SW1, CS6_SW1}, //`~ - {0, CS4_SW2, CS5_SW2, CS6_SW2}, //1 - {0, CS4_SW3, CS5_SW3, CS6_SW3}, //2 - {0, CS4_SW4, CS5_SW4, CS6_SW4}, - {0, CS4_SW5, CS5_SW5, CS6_SW5}, //4 - {0, CS4_SW6, CS5_SW6, CS6_SW6}, - {0, CS4_SW7, CS5_SW7, CS6_SW7}, //6 - {0, CS4_SW8, CS5_SW8, CS6_SW8}, - {0, CS4_SW9, CS5_SW9, CS6_SW9}, //8 - {0, CS4_SW10, CS5_SW10, CS6_SW10}, - {0, CS4_SW11, CS5_SW11, CS6_SW11}, //0 - {0, CS4_SW12, CS5_SW12, CS6_SW12}, //-_ - {0, CS13_SW2, CS14_SW2, CS15_SW2}, //=+ - {0, CS13_SW3, CS14_SW3, CS15_SW3}, //BS - {0, CS13_SW4, CS14_SW4, CS15_SW4}, //Home + {0, SW1_CS4, SW1_CS5, SW1_CS6}, //`~ + {0, SW2_CS4, SW2_CS5, SW2_CS6}, //1 + {0, SW3_CS4, SW3_CS5, SW3_CS6}, //2 + {0, SW4_CS4, SW4_CS5, SW4_CS6}, + {0, SW5_CS4, SW5_CS5, SW5_CS6}, //4 + {0, SW6_CS4, SW6_CS5, SW6_CS6}, + {0, SW7_CS4, SW7_CS5, SW7_CS6}, //6 + {0, SW8_CS4, SW8_CS5, SW8_CS6}, + {0, SW9_CS4, SW9_CS5, SW9_CS6}, //8 + {0, SW10_CS4, SW10_CS5, SW10_CS6}, + {0, SW11_CS4, SW11_CS5, SW11_CS6}, //0 + {0, SW12_CS4, SW12_CS5, SW12_CS6}, //-_ + {0, SW2_CS13, SW2_CS14, SW2_CS15}, //=+ + {0, SW3_CS13, SW3_CS14, SW3_CS15}, //BS + {0, SW4_CS13, SW4_CS14, SW4_CS15}, //Home - {0, CS7_SW1, CS8_SW1, CS9_SW1}, //Tab - {0, CS7_SW2, CS8_SW2, CS9_SW2}, //Q - {0, CS7_SW3, CS8_SW3, CS9_SW3}, //W - {0, CS7_SW4, CS8_SW4, CS9_SW4}, //E - {0, CS7_SW5, CS8_SW5, CS9_SW5}, //R - {0, CS7_SW6, CS8_SW6, CS9_SW6}, //T - {0, CS7_SW7, CS8_SW7, CS9_SW7}, //Y - {0, CS7_SW8, CS8_SW8, CS9_SW8}, //U - {0, CS7_SW9, CS8_SW9, CS9_SW9}, //I - {0, CS7_SW10, CS8_SW10, CS9_SW10}, //O - {0, CS7_SW11, CS8_SW11, CS9_SW11}, //P - {0, CS7_SW12, CS8_SW12, CS9_SW12}, //[ - {0, CS16_SW2, CS17_SW2, CS18_SW2}, //] - {0, CS16_SW3, CS17_SW3, CS18_SW3}, //| - {0, CS16_SW4, CS17_SW4, CS18_SW4}, //DEL + {0, SW1_CS7, SW1_CS8, SW1_CS9}, //Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9}, //Q + {0, SW3_CS7, SW3_CS8, SW3_CS9}, //W + {0, SW4_CS7, SW4_CS8, SW4_CS9}, //E + {0, SW5_CS7, SW5_CS8, SW5_CS9}, //R + {0, SW6_CS7, SW6_CS8, SW6_CS9}, //T + {0, SW7_CS7, SW7_CS8, SW7_CS9}, //Y + {0, SW8_CS7, SW8_CS8, SW8_CS9}, //U + {0, SW9_CS7, SW9_CS8, SW9_CS9}, //I + {0, SW10_CS7, SW10_CS8, SW10_CS9}, //O + {0, SW11_CS7, SW11_CS8, SW11_CS9}, //P + {0, SW12_CS7, SW12_CS8, SW12_CS9}, //[ + {0, SW2_CS16, SW2_CS17, SW2_CS18}, //] + {0, SW3_CS16, SW3_CS17, SW3_CS18}, //| + {0, SW4_CS16, SW4_CS17, SW4_CS18}, //DEL - {1, CS1_SW1, CS2_SW1, CS3_SW1}, //Cap - {1, CS1_SW2, CS2_SW2, CS3_SW2}, //A - {1, CS1_SW3, CS2_SW3, CS3_SW3}, //S - {1, CS1_SW4, CS2_SW4, CS3_SW4}, //D - {1, CS1_SW5, CS2_SW5, CS3_SW5}, //F - {1, CS1_SW6, CS2_SW6, CS3_SW6}, //G - {1, CS1_SW7, CS2_SW7, CS3_SW7}, //H - {1, CS1_SW8, CS2_SW8, CS3_SW8}, //J - {1, CS1_SW9, CS2_SW9, CS3_SW9}, //K - {1, CS1_SW10, CS2_SW10, CS3_SW10}, //L - {1, CS1_SW11, CS2_SW11, CS3_SW11}, //; - {1, CS1_SW12, CS2_SW12, CS3_SW12}, //. - {1, CS10_SW3, CS11_SW3, CS12_SW3}, //Ent - {1, CS10_SW4, CS11_SW4, CS12_SW4}, //PgUp + {1, SW1_CS1, SW1_CS2, SW1_CS3}, //Cap + {1, SW2_CS1, SW2_CS2, SW2_CS3}, //A + {1, SW3_CS1, SW3_CS2, SW3_CS3}, //S + {1, SW4_CS1, SW4_CS2, SW4_CS3}, //D + {1, SW5_CS1, SW5_CS2, SW5_CS3}, //F + {1, SW6_CS1, SW6_CS2, SW6_CS3}, //G + {1, SW7_CS1, SW7_CS2, SW7_CS3}, //H + {1, SW8_CS1, SW8_CS2, SW8_CS3}, //J + {1, SW9_CS1, SW9_CS2, SW9_CS3}, //K + {1, SW10_CS1, SW10_CS2, SW10_CS3}, //L + {1, SW11_CS1, SW11_CS2, SW11_CS3}, //; + {1, SW12_CS1, SW12_CS2, SW12_CS3}, //. + {1, SW3_CS10, SW3_CS11, SW3_CS12}, //Ent + {1, SW4_CS10, SW4_CS11, SW4_CS12}, //PgUp - {1, CS4_SW1, CS5_SW1, CS6_SW1}, //Shift - {1, CS4_SW2, CS5_SW2, CS6_SW2}, //Z - {1, CS4_SW3, CS5_SW3, CS6_SW3}, //X - {1, CS4_SW4, CS5_SW4, CS6_SW4}, //C - {1, CS4_SW5, CS5_SW5, CS6_SW5}, //V - {1, CS4_SW6, CS5_SW6, CS6_SW6}, //B - {1, CS4_SW7, CS5_SW7, CS6_SW7}, //N - {1, CS4_SW8, CS5_SW8, CS6_SW8}, //M - {1, CS4_SW9, CS5_SW9, CS6_SW9}, //, - {1, CS4_SW10, CS5_SW10, CS6_SW10}, //. - {1, CS4_SW11, CS5_SW11, CS6_SW11}, //? - {1, CS13_SW2, CS14_SW2, CS15_SW2}, //Shift - {1, CS13_SW3, CS14_SW3, CS15_SW3}, //Up + {1, SW1_CS4, SW1_CS5, SW1_CS6}, //Shift + {1, SW2_CS4, SW2_CS5, SW2_CS6}, //Z + {1, SW3_CS4, SW3_CS5, SW3_CS6}, //X + {1, SW4_CS4, SW4_CS5, SW4_CS6}, //C + {1, SW5_CS4, SW5_CS5, SW5_CS6}, //V + {1, SW6_CS4, SW6_CS5, SW6_CS6}, //B + {1, SW7_CS4, SW7_CS5, SW7_CS6}, //N + {1, SW8_CS4, SW8_CS5, SW8_CS6}, //M + {1, SW9_CS4, SW9_CS5, SW9_CS6}, //, + {1, SW10_CS4, SW10_CS5, SW10_CS6}, //. + {1, SW11_CS4, SW11_CS5, SW11_CS6}, //? + {1, SW2_CS13, SW2_CS14, SW2_CS15}, //Shift + {1, SW3_CS13, SW3_CS14, SW3_CS15}, //Up - {1, CS7_SW1, CS8_SW1, CS9_SW1}, //Ctrl - {1, CS7_SW2, CS8_SW2, CS9_SW2}, //Com - {1, CS7_SW3, CS8_SW3, CS9_SW3}, //Alt - {1, CS7_SW5, CS8_SW5, CS9_SW5}, //SPAC1 - {1, CS7_SW6, CS8_SW6, CS9_SW6}, //SPAC - {1, CS7_SW8, CS8_SW8, CS9_SW8}, //SPAC2 - {1, CS7_SW10, CS8_SW10, CS9_SW10}, //Alt - {1, CS7_SW11, CS8_SW11, CS9_SW11}, //Fn - {1, CS7_SW12, CS8_SW12, CS9_SW12}, //Menu - {1, CS16_SW2, CS17_SW2, CS18_SW2}, //Left - {1, CS16_SW3, CS17_SW3, CS18_SW3}, //Down - {1, CS16_SW4, CS17_SW4, CS18_SW4}, //Right + {1, SW1_CS7, SW1_CS8, SW1_CS9}, //Ctrl + {1, SW2_CS7, SW2_CS8, SW2_CS9}, //Com + {1, SW3_CS7, SW3_CS8, SW3_CS9}, //Alt + {1, SW5_CS7, SW5_CS8, SW5_CS9}, //SPAC1 + {1, SW6_CS7, SW6_CS8, SW6_CS9}, //SPAC + {1, SW8_CS7, SW8_CS8, SW8_CS9}, //SPAC2 + {1, SW10_CS7, SW10_CS8, SW10_CS9}, //Alt + {1, SW11_CS7, SW11_CS8, SW11_CS9}, //Fn + {1, SW12_CS7, SW12_CS8, SW12_CS9}, //Menu + {1, SW2_CS16, SW2_CS17, SW2_CS18}, //Left + {1, SW3_CS16, SW3_CS17, SW3_CS18}, //Down + {1, SW4_CS16, SW4_CS17, SW4_CS18}, //Right }; -bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { - if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { - return false; - } - - if (host_keyboard_led_state().caps_lock) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); - } else { - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); - } - } - - if (WIN_LOCK) { - if(IS_LAYER_ON(1)){ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 255, 255, 255); - }else{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 255, 255, 255); - } - } else { - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 0, 0, 0); - } - } - - switch (get_highest_layer(layer_state)) { - case 2:{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } break; - case 3:{ - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } break; - - case 0:{ - if (L_WIN) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } - } break; - - case 1:{ - if (L_MAC) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } break; - - default:{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } - return false; -} -#endif - - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { - return false; - } - switch (keycode) { -# ifdef RGB_MATRIX_ENABLE - case RGB_TOG: - if (record->event.pressed) { - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_set_color_all(0, 0, 0); - } break; - default: { - rgb_matrix_set_flags(LED_FLAG_ALL); - } break; - } - } - return false; - - case RGB_VAI: - rgb_matrix_set_flags(LED_FLAG_ALL); - return true; -# endif - case MO(1): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; - - case MO(2): - if (record->event.pressed) { - FN_WIN = 1; - } else { - FN_WIN = 0; - } - return true; - - case MO(3): - if (record->event.pressed) { - FN_MAC = 1; - } else { - FN_MAC = 0; - } - return true; - - case KC_LGUI: - if (FN_WIN | FN_MAC | FN_ON){ - if ( record->event.pressed){ - WIN_LOCK = !WIN_LOCK ; //change win lock state - } - if (!WIN_LOCK) { - return false; //windows key locked do nothing - } - } - if (WIN_LOCK) { - return false; //windows key locked do nothing - } - return true; // continue all further processing of this key - - case TO(0): - if (record->event.pressed) { - L_WIN = 1; - set_single_persistent_default_layer(0); // Save default layer 0 to eeprom - } else { - L_WIN = 0; - } - return true; // continue all further processing of this key - - case TO(1): - if (record->event.pressed) { - L_MAC = 1; - set_single_persistent_default_layer(1); //Save default layer 1 to eeprom - } else { - L_MAC = 0; - } - return true; - - default: - return true; - } -} - void suspend_power_down_kb() { gpio_write_pin_low(AW20216S_EN_PIN); suspend_power_down_user(); From ef80d8ee01cf45f428a5ea8e3d140cdccfd7cb57 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 30 Aug 2024 13:04:05 +0800 Subject: [PATCH 12/32] Delete skyloong/gk75/q2/ansi/keymaps/via --- .../gk75/q2/ansi/keymaps/default/keymap.c | 14 ++ .../gk75/q2/ansi/keymaps/via/keymap.c | 230 ------------------ .../gk75/q2/ansi/keymaps/via/rules.mk | 2 - keyboards/skyloong/gk75/q2/config.h | 4 - 4 files changed, 14 insertions(+), 236 deletions(-) delete mode 100644 keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c delete mode 100644 keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c index f817ec673e9..680d0df1ddc 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -30,3 +30,17 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } }; #endif + +#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); + } + } + return false; +}; +#endif diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c deleted file mode 100644 index 3a0ec0b770d..00000000000 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/keymap.c +++ /dev/null @@ -1,230 +0,0 @@ -// Copyright 2023 NaturalZh (@NaturalZh) -// SPDX-License-Identifier: GPL-2.0-or-later - - -#include QMK_KEYBOARD_H -enum layer_names { - _WIN, - _MAC, - _WIN_INDEX, - _MAC_INDEX -}; - -int FN_ON = 0; -bool WIN_LOCK = 0; -bool FN_WIN = 0; -bool FN_MAC = 0; -bool L_WIN = 0; -bool L_MAC = 0; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_WIN] = LAYOUT_all( - KC_ESC, 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_MUTE, - KC_GRV, 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_BSPC, 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_BSLS, KC_DEL, - 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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [_MAC] = LAYOUT_all( - _______, KC_F14, KC_F15, C(KC_UP), KC_WSCH, G(KC_SPC), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, - KC_GRV, 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_BSPC, 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_BSLS, KC_DEL, - 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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [_WIN_INDEX] = LAYOUT_all( - _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, - _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ), - - [_MAC_INDEX] = 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, RGB_TOG, - _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, - [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_F14, KC_F15), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL)), ENCODER_CCW_CW(C(KC_UP), C(KC_DOWN)) }, - [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, - [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } -}; -#endif - -#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - - if (host_keyboard_led_state().caps_lock) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); - } else { - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); - } - } - - if (WIN_LOCK) { - if(IS_LAYER_ON(1)){ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 255, 255, 255); - }else{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 255, 255, 255); - } - } else { - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_LOCK_INDEX+1, 0, 0, 0); - } - } - - switch (get_highest_layer(layer_state)) { - case 2:{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } break; - case 3:{ - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } break; - - case 0:{ - if (L_WIN) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } - } break; - - case 1:{ - if (L_MAC) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } break; - - default:{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } - return false; -} -#endif - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { -# ifdef RGB_MATRIX_ENABLE - case RGB_TOG: - if (record->event.pressed) { - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_set_color_all(0, 0, 0); - } break; - default: { - rgb_matrix_set_flags(LED_FLAG_ALL); - } break; - } - } - return false; - - case RGB_VAI: - rgb_matrix_set_flags(LED_FLAG_ALL); - return true; -# endif - case MO(1): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; - - case MO(2): - if (record->event.pressed) { - FN_WIN = 1; - } else { - FN_WIN = 0; - } - return true; - - case MO(3): - if (record->event.pressed) { - FN_MAC = 1; - } else { - FN_MAC = 0; - } - return true; - - case KC_LGUI: - if (FN_WIN | FN_MAC | FN_ON){ - if ( record->event.pressed){ - WIN_LOCK = !WIN_LOCK ; //change win lock state - } - if (!WIN_LOCK) { - return false; //windows key locked do nothing - } - } - if (WIN_LOCK) { - return false; //windows key locked do nothing - } - return true; // continue all further processing of this key - - case DF(0): - if (record->event.pressed) { - L_WIN = 1; - L_MAC = 0; - layer_move(0); - set_single_persistent_default_layer(0); // Save default layer 0 to eeprom - } else { - L_WIN = 0; - } - return false; // cancel all further processing of this key - - case DF(1): - if (record->event.pressed) { - L_MAC = 1; - L_WIN = 0; - layer_move(1); - set_single_persistent_default_layer(1); //Save default layer 1 to eeprom - } else { - L_MAC = 0; - } - return false; // cancel all further processing of this key - - default: - L_MAC = 0; - L_WIN = 0; - return true; - } -} diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk b/keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk deleted file mode 100644 index 715838ecc5d..00000000000 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -ENCODER_MAP_ENABLE = yes -VIA_ENABLE = yes diff --git a/keyboards/skyloong/gk75/q2/config.h b/keyboards/skyloong/gk75/q2/config.h index 882f106aad0..7c5adc90567 100644 --- a/keyboards/skyloong/gk75/q2/config.h +++ b/keyboards/skyloong/gk75/q2/config.h @@ -12,10 +12,6 @@ # define AW20216S_CS_PIN_2 B11 // Hardware enable lines may be connected to the same pin # define AW20216S_EN_PIN B5 - -# define WIN_MOD_INDEX 19 -# define MAC_MOD_INDEX 20 -# define WIN_LOCK_INDEX 71 # define CAPS_LOCK_INDEX 43 #endif // RGB_MATRIX_ENABLE From d1e9160e84877c57054dd04cddbeecc6dc7dc37e Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:03:42 +0800 Subject: [PATCH 13/32] Update keyboards/skyloong/gk75/q2/mcuconf.h OK, Thank you. Co-authored-by: Drashna Jaelre --- keyboards/skyloong/gk75/q2/mcuconf.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/mcuconf.h b/keyboards/skyloong/gk75/q2/mcuconf.h index 49455f9c3d7..5e9b2972832 100644 --- a/keyboards/skyloong/gk75/q2/mcuconf.h +++ b/keyboards/skyloong/gk75/q2/mcuconf.h @@ -6,7 +6,3 @@ #undef STM32_SPI_USE_SPI2 #define STM32_SPI_USE_SPI2 TRUE - -#undef STM32_SPI_USE_DMA -#define STM32_SPI_USE_DMA TRUE - From dc0e71ca99036ef4d7633d4902d1abf61a85a29f Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:06:22 +0800 Subject: [PATCH 14/32] Update keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c OK, I see . Thank you for your advice. Co-authored-by: Drashna Jaelre --- .../skyloong/gk75/q2/ansi/keymaps/default/keymap.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c index 680d0df1ddc..13d43f67868 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -31,16 +31,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { }; #endif -#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - - if (host_keyboard_led_state().caps_lock) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); - } else { - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); - } - } - return false; -}; -#endif From 004c5583bf69ba6e117ad5a29027e7d591e70873 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:07:01 +0800 Subject: [PATCH 15/32] Update keyboards/skyloong/gk75/q2/q2.c OK. Thank you. Co-authored-by: Drashna Jaelre --- keyboards/skyloong/gk75/q2/q2.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/skyloong/gk75/q2/q2.c b/keyboards/skyloong/gk75/q2/q2.c index b268d541558..4228c8bb070 100644 --- a/keyboards/skyloong/gk75/q2/q2.c +++ b/keyboards/skyloong/gk75/q2/q2.c @@ -116,3 +116,18 @@ void board_init(void) { AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; } +#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); + } + } + return true; +}; +#endif From 8d55830a3c801762669cbf6ac86d41c8a4fe5e27 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:06:12 +0800 Subject: [PATCH 16/32] Update keyboards/skyloong/gk75/q2/matrix.c Ok.Thank you for your advice. Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 51727613c99..c93e07423b3 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -29,7 +29,7 @@ static inline void select_delay(uint16_t n) { }; } -static inline void setPinOutput_writeLow(pin_t pin) { +static inline void gpio_atomic_set_pin_output_low(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_low(pin); From 36bcd820c3418e5de09cf73c5d169455a8008db4 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:06:46 +0800 Subject: [PATCH 17/32] Update keyboards/skyloong/gk75/q2/matrix.c OK,thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index c93e07423b3..52e5f78039b 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -36,7 +36,7 @@ static inline void gpio_atomic_set_pin_output_low(pin_t pin) { } } -static inline void setPinOutput_writeHigh(pin_t pin) { +static inline void gpio_atomic_set_pin_output_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_high(pin); From ad02eb44801af97760d20fdc22f031d88b731ba4 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:07:01 +0800 Subject: [PATCH 18/32] Update keyboards/skyloong/gk75/q2/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 52e5f78039b..a139714fee3 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -43,7 +43,7 @@ static inline void gpio_atomic_set_pin_output_high(pin_t pin) { } } -static inline void setPinInputHigh_atomic(pin_t pin) { +static inline void gpio_atomic_set_pin_input_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } From 746e46e0f33babc1b8e06138b3a4ade4f4225d7d Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:07:21 +0800 Subject: [PATCH 19/32] Update keyboards/skyloong/gk75/q2/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index a139714fee3..12b16753af8 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -68,7 +68,7 @@ static inline void clockPulse(uint16_t n) { // matrix code static bool select_col(uint8_t col) { - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ gpio_write_pin_low(HC595_DS_PIN); From 3fdf5a7201e2249e43a0cfbdb0aec2ac4f5da9c8 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:07:41 +0800 Subject: [PATCH 20/32] Update keyboards/skyloong/gk75/q2/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 12b16753af8..0cda1c60a17 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -83,7 +83,7 @@ static bool select_col(uint8_t col) { static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { clockPulse(CLOCK_TIME); } From 68fc01d9c330f55e697f0145227049ef22fab769 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:07:58 +0800 Subject: [PATCH 21/32] Update keyboards/skyloong/gk75/q2/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index 0cda1c60a17..a9f7f7004b5 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -90,9 +90,9 @@ static void unselect_col(uint8_t col) { } static void unselect_cols(void) { - setPinOutput_writeLow(HC595_SH_PIN); - setPinOutput_writeLow(HC595_ST_PIN); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_atomic_set_pin_output_low(HC595_SH_PIN); + gpio_atomic_set_pin_output_low(HC595_ST_PIN); + gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { clockPulse(CLOCK_TIME); } From 8a286dd8d09a14b65232d1ed843f474626dcbbc2 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:08:21 +0800 Subject: [PATCH 22/32] Update keyboards/skyloong/gk75/q2/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index a9f7f7004b5..a602575dc2a 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -102,7 +102,7 @@ __attribute__((weak)) void matrix_init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { if (row_pins[x] != NO_PIN) { - setPinInputHigh_atomic(row_pins[x]); + gpio_atomic_set_pin_input_high(row_pins[x]); } } } From 6d0e5bc0dd616c0969cf803b68669c10acdfe6d1 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:09:51 +0800 Subject: [PATCH 23/32] Update keyboards/skyloong/gk75/q2/config.h OK.Thanks for your suggestion. Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/config.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/config.h b/keyboards/skyloong/gk75/q2/config.h index 7c5adc90567..50a5c059810 100644 --- a/keyboards/skyloong/gk75/q2/config.h +++ b/keyboards/skyloong/gk75/q2/config.h @@ -3,16 +3,10 @@ #pragma once -#ifdef ENCODER_ENABLE -# define ENCODER_MAP_KEY_DELAY 10 -#endif +#define ENCODER_MAP_KEY_DELAY 10 -#ifdef RGB_MATRIX_ENABLE -# define AW20216S_CS_PIN_1 B12 -# define AW20216S_CS_PIN_2 B11 +#define AW20216S_CS_PIN_1 B12 +#define AW20216S_CS_PIN_2 B11 // Hardware enable lines may be connected to the same pin -# define AW20216S_EN_PIN B5 -# define CAPS_LOCK_INDEX 43 -#endif // RGB_MATRIX_ENABLE - - +#define AW20216S_EN_PIN B5 +#define CAPS_LOCK_INDEX 43 From fd2b77fb71e6f7e6bd4dfad767a482551ba985fe Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Wed, 9 Oct 2024 15:40:34 +0800 Subject: [PATCH 24/32] update skyloong/gk75/q2 --- keyboards/skyloong/gk75/q2/config.h | 7 +++++++ keyboards/skyloong/gk75/q2/info.json | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/config.h b/keyboards/skyloong/gk75/q2/config.h index 50a5c059810..bbdc21573e1 100644 --- a/keyboards/skyloong/gk75/q2/config.h +++ b/keyboards/skyloong/gk75/q2/config.h @@ -10,3 +10,10 @@ // Hardware enable lines may be connected to the same pin #define AW20216S_EN_PIN B5 #define CAPS_LOCK_INDEX 43 + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 13 +#define MATRIX_ROW_PINS {A8, A9, A10, A15, B6, B7,B9} +#define MATRIX_COL_PINS {} + + diff --git a/keyboards/skyloong/gk75/q2/info.json b/keyboards/skyloong/gk75/q2/info.json index 19e99e60575..0c27da7bc34 100644 --- a/keyboards/skyloong/gk75/q2/info.json +++ b/keyboards/skyloong/gk75/q2/info.json @@ -32,11 +32,6 @@ "on_state": 0, "caps_lock": "C15" }, - - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null], - "rows": ["A8", "A9", "A10", "A15", "B6", "B7","B9"] - }, "processor": "STM32F103", "rgb_matrix": { "animations": { From dbe1b20fab6f8f25430fa0b34781bfdcc8a1e904 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:50:28 +0800 Subject: [PATCH 25/32] Update keyboards/skyloong/gk75/q2/config.h Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/config.h b/keyboards/skyloong/gk75/q2/config.h index bbdc21573e1..c5e6ba24fcb 100644 --- a/keyboards/skyloong/gk75/q2/config.h +++ b/keyboards/skyloong/gk75/q2/config.h @@ -14,6 +14,3 @@ #define MATRIX_ROWS 7 #define MATRIX_COLS 13 #define MATRIX_ROW_PINS {A8, A9, A10, A15, B6, B7,B9} -#define MATRIX_COL_PINS {} - - From c6609d0253abfb3170d77a58664c1015c5f5c5dc Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:50:46 +0800 Subject: [PATCH 26/32] Update keyboards/skyloong/gk75/q2/matrix.c Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index a602575dc2a..bc7eda0365f 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -18,7 +18,6 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; // user-defined overridable functions __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter); From 3185fef285efa5bf9a438c28ec73d18bed522edc Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:20:16 +0800 Subject: [PATCH 27/32] Update keyboards/skyloong/gk75/q2/matrix.c Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index bc7eda0365f..bfdb39dd056 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later //Matrix read rows set col:DIODE_DIRECTION == ROW2COL +#include "matrix.h" #include #include "atomic_util.h" -#include "debounce.h" #define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 From 9c9e3a9d27e289d7f939619f3790344add25f40c Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 11 Nov 2024 10:16:18 +0800 Subject: [PATCH 28/32] update skyloong/gk75/q2/ansi/readme.md --- keyboards/skyloong/gk75/q2/ansi/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/readme.md b/keyboards/skyloong/gk75/q2/ansi/readme.md index 11b90d0b8db..9b6b72927e3 100644 --- a/keyboards/skyloong/gk75/q2/ansi/readme.md +++ b/keyboards/skyloong/gk75/q2/ansi/readme.md @@ -8,11 +8,11 @@ * Mechanical switches Keyboard and supporting up to 4 encoders which are can be replaced with switches. -The following is the QMK Firmware for the Destop 75% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd +The following is the QMK Firmware for the Desktop 75% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) -* Hardware Supported: DestopPCB for Skyloong keylayout 75%, STM32F103C8T6 -* Hardware Availability: http://www.skyloong.com.cn https://skyloongtech.com +* Hardware Supported: Desktop PCB for Skyloong key layout 75%, STM32F103C8T6 +* Hardware Availability:[Skyloong_CN]( http://www.skyloong.com.cn) OR [Skyloong_HK](https://skyloongtech.com) Make example for this keyboard (after setting up your build environment): From 4d9ed547c9fe1df209b640ef07913bca2a4d4e27 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:27:16 +0800 Subject: [PATCH 29/32] Update keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c OK, I got it. Thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c index 13d43f67868..4d0cedbdeda 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -16,11 +16,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), LSG(KC_S), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_PAUS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, RM_PREV, RM_NEXT, KC_DEL, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU ), }; From e07b267f5a956bd3a9cacbcc19d0f36865603826 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:28:39 +0800 Subject: [PATCH 30/32] Update keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c OK, Thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c index 4d0cedbdeda..a0a3e395c65 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk75/q2/ansi/keymaps/default/keymap.c @@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, - [1] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) } + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(C(MS_WHLD), C(MS_WHLU)), ENCODER_CCW_CW(G(C(KC_LEFT)),G(C(KC_RGHT))) }, + [1] = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_HUED, RM_HUEU), ENCODER_CCW_CW(RM_SPDD, RM_SPDU), ENCODER_CCW_CW(RM_SATD, RM_SATU) } }; #endif From 3ef6ac1542c9ae467591d74d5ff747fa8e7b558a Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 15 Mar 2025 17:34:34 +0800 Subject: [PATCH 31/32] Corrected the flags in skyloong/gk75/q2/ansi/keyboard.json --- keyboards/skyloong/gk75/q2/ansi/keyboard.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/ansi/keyboard.json b/keyboards/skyloong/gk75/q2/ansi/keyboard.json index 3992934cda4..5b054064aa7 100644 --- a/keyboards/skyloong/gk75/q2/ansi/keyboard.json +++ b/keyboards/skyloong/gk75/q2/ansi/keyboard.json @@ -6,10 +6,10 @@ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 29, "y": 0, "flags": 4}, {"matrix": [0, 2], "x": 44, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 59, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 59, "y": 0, "flags": 1}, {"matrix": [0, 4], "x": 74, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 96, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 110, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 96, "y": 0, "flags": 1}, + {"matrix": [0, 6], "x": 110, "y": 0, "flags": 1}, {"matrix": [0, 7], "x": 125, "y": 0, "flags": 4}, {"matrix": [0, 8], "x": 140, "y": 0, "flags": 4}, {"matrix": [0, 9], "x": 162, "y": 0, "flags": 4}, From 7974bb17c55b3bf3c30ac5b40b5afc7a9db8457e Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 10 May 2025 16:28:53 +0800 Subject: [PATCH 32/32] update skyloong/gk75/q2/matrix.c --- keyboards/skyloong/gk75/q2/matrix.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/keyboards/skyloong/gk75/q2/matrix.c b/keyboards/skyloong/gk75/q2/matrix.c index bfdb39dd056..bd8699cf73e 100644 --- a/keyboards/skyloong/gk75/q2/matrix.c +++ b/keyboards/skyloong/gk75/q2/matrix.c @@ -9,9 +9,9 @@ #define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 -#define HC595_ST_PIN A6 -#define HC595_SH_PIN A5 -#define HC595_DS_PIN A7 //定义74HC595的串口数据输入端 +#define MATRIX_HC595_ST_PIN A6 +#define MATRIX_HC595_SH_PIN A5 +#define MATRIX_HC595_DS_PIN A7 //定义74HC595的串口数据输入端 /* matrix state(1:on, 0:off) */ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values @@ -57,22 +57,22 @@ static inline uint8_t readMatrixPin(pin_t pin) { } static inline void clockPulse(uint16_t n) { - gpio_write_pin_high(HC595_SH_PIN); - gpio_write_pin_high(HC595_ST_PIN); + gpio_write_pin_high(MATRIX_HC595_SH_PIN); + gpio_write_pin_high(MATRIX_HC595_ST_PIN); select_delay(n); - gpio_write_pin_low(HC595_SH_PIN); - gpio_write_pin_low(HC595_ST_PIN); + gpio_write_pin_low(MATRIX_HC595_SH_PIN); + gpio_write_pin_low(MATRIX_HC595_ST_PIN); } // matrix code static bool select_col(uint8_t col) { - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ - gpio_write_pin_low(HC595_DS_PIN); + gpio_write_pin_low(MATRIX_HC595_DS_PIN); }else{ - gpio_write_pin_high(HC595_DS_PIN); + gpio_write_pin_high(MATRIX_HC595_DS_PIN); } clockPulse(CLOCK_TIME); } @@ -82,16 +82,16 @@ static bool select_col(uint8_t col) { static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { clockPulse(CLOCK_TIME); } } static void unselect_cols(void) { - gpio_atomic_set_pin_output_low(HC595_SH_PIN); - gpio_atomic_set_pin_output_low(HC595_ST_PIN); - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_low(MATRIX_HC595_SH_PIN); + gpio_atomic_set_pin_output_low(MATRIX_HC595_ST_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { clockPulse(CLOCK_TIME); }