From a0a6b93de1bb71a0651da5da8a5838f775f7d582 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 27 Apr 2024 10:42:50 +0800 Subject: [PATCH 01/28] Create skyloong gk980 q1 ansi keyboard. --- .../skyloong/gk980/q1/ansi/keyboard.json | 341 ++++++++++++++++++ .../gk980/q1/ansi/keymaps/default/keymap.c | 33 ++ .../gk980/q1/ansi/keymaps/default/rules.mk | 1 + .../gk980/q1/ansi/keymaps/via/keymap.c | 172 +++++++++ .../gk980/q1/ansi/keymaps/via/rules.mk | 2 + keyboards/skyloong/gk980/q1/ansi/rules.mk | 2 + keyboards/skyloong/gk980/q1/config.h | 29 ++ keyboards/skyloong/gk980/q1/halconf.h | 9 + keyboards/skyloong/gk980/q1/info.json | 80 ++++ keyboards/skyloong/gk980/q1/matrix.c | 149 ++++++++ keyboards/skyloong/gk980/q1/mcuconf.h | 16 + keyboards/skyloong/gk980/q1/q1.c | 170 +++++++++ keyboards/skyloong/gk980/q1/readme.md | 33 ++ 13 files changed, 1037 insertions(+) create mode 100644 keyboards/skyloong/gk980/q1/ansi/keyboard.json create mode 100644 keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c create mode 100644 keyboards/skyloong/gk980/q1/ansi/keymaps/default/rules.mk create mode 100644 keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c create mode 100644 keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk create mode 100644 keyboards/skyloong/gk980/q1/ansi/rules.mk create mode 100644 keyboards/skyloong/gk980/q1/config.h create mode 100644 keyboards/skyloong/gk980/q1/halconf.h create mode 100644 keyboards/skyloong/gk980/q1/info.json create mode 100644 keyboards/skyloong/gk980/q1/matrix.c create mode 100644 keyboards/skyloong/gk980/q1/mcuconf.h create mode 100644 keyboards/skyloong/gk980/q1/q1.c create mode 100644 keyboards/skyloong/gk980/q1/readme.md diff --git a/keyboards/skyloong/gk980/q1/ansi/keyboard.json b/keyboards/skyloong/gk980/q1/ansi/keyboard.json new file mode 100644 index 00000000000..45dd6cb1fe1 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/ansi/keyboard.json @@ -0,0 +1,341 @@ +{ + "keyboard_name": "GK980 Q1_ANSI_1.0.0", + + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 18.2, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 30.3, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 42.4, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 69.6, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 81.7, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 93.9, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 106, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 121.1, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 133.2, "y": 0, "flags": 4}, + {"matrix": [5, 3], "x": 145.3, "y": 0, "flags": 4}, + {"matrix": [5, 4], "x": 157.4, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 187.7, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 199.8, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 211.9, "y": 0, "flags": 4}, + {"matrix": [6, 13], "x": 224, "y": 0, "flags": 4}, + + {"matrix": [1, 0], "x": 0, "y": 14.5, "flags": 4}, + {"matrix": [1, 1], "x": 12.1, "y": 14.5, "flags": 4}, + {"matrix": [1, 2], "x": 24.2, "y": 14.5, "flags": 4}, + {"matrix": [1, 3], "x": 36.3, "y": 14.5, "flags": 4}, + {"matrix": [1, 4], "x": 48.4, "y": 14.5, "flags": 4}, + {"matrix": [1, 5], "x": 60.6, "y": 14.5, "flags": 4}, + {"matrix": [1, 6], "x": 72.7, "y": 14.5, "flags": 4}, + {"matrix": [1, 7], "x": 84.8, "y": 14.5, "flags": 8}, + {"matrix": [1, 8], "x": 96.9, "y": 14.5, "flags": 4}, + {"matrix": [1, 9], "x": 109, "y": 14.5, "flags": 4}, + {"matrix": [1, 10], "x": 121.1, "y": 14.5, "flags": 4}, + {"matrix": [6, 3], "x": 133.2, "y": 14.5, "flags": 4}, + {"matrix": [6, 4], "x": 145.3, "y": 14.5, "flags": 4}, + {"matrix": [1, 11], "x": 157.4, "y": 14.5, "flags": 4}, + {"matrix": [1, 12], "x": 187.7, "y": 14.5, "flags": 4}, + {"matrix": [1, 13], "x": 199.8, "y": 14.5, "flags": 4}, + {"matrix": [1, 14], "x": 211.9, "y": 14.5, "flags": 4}, + {"matrix": [6, 14], "x": 224, "y": 14.5, "flags": 4}, + + {"matrix": [2, 0], "x": 0, "y": 26.2, "flags": 4}, + {"matrix": [2, 1], "x": 18.2, "y": 26.2, "flags": 4}, + {"matrix": [2, 2], "x": 30.3, "y": 26.2, "flags": 4}, + {"matrix": [2, 3], "x": 42.4, "y": 26.2, "flags": 4}, + {"matrix": [2, 4], "x": 54.5, "y": 26.2, "flags": 4}, + {"matrix": [2, 5], "x": 66.6, "y": 26.2, "flags": 4}, + {"matrix": [2, 6], "x": 78.7, "y": 26.2, "flags": 4}, + {"matrix": [2, 7], "x": 90.8, "y": 26.2, "flags": 4}, + {"matrix": [2, 8], "x": 102.9, "y": 26.2, "flags": 4}, + {"matrix": [2, 9], "x": 115, "y": 26.2, "flags": 4}, + {"matrix": [2, 10], "x": 127.2, "y": 26.2, "flags": 4}, + {"matrix": [6, 5], "x": 139.3, "y": 26.2, "flags": 4}, + {"matrix": [6, 6], "x": 151.4, "y": 26.2, "flags": 4}, + {"matrix": [2, 11], "x": 163.5, "y": 26.2, "flags": 4}, + {"matrix": [2, 12], "x": 187.7, "y": 26.2, "flags": 4}, + {"matrix": [2, 13], "x": 199.8, "y": 26.2, "flags": 4}, + {"matrix": [2, 14], "x": 211.9, "y": 26.2, "flags": 4}, + {"matrix": [6, 11], "x": 224, "y": 32, "flags": 4}, + + {"matrix": [3, 0], "x": 0, "y": 37.8, "flags": 4}, + {"matrix": [3, 1], "x": 21.2, "y": 37.8, "flags": 4}, + {"matrix": [3, 2], "x": 33.3, "y": 37.8, "flags": 4}, + {"matrix": [3, 3], "x": 45.4, "y": 37.8, "flags": 4}, + {"matrix": [3, 4], "x": 57.5, "y": 37.8, "flags": 4}, + {"matrix": [3, 5], "x": 69.6, "y": 37.8, "flags": 4}, + {"matrix": [3, 6], "x": 81.7, "y": 37.8, "flags": 4}, + {"matrix": [3, 7], "x": 93.9, "y": 37.8, "flags": 4}, + {"matrix": [3, 8], "x": 106, "y": 37.8, "flags": 4}, + {"matrix": [3, 9], "x": 118.1, "y": 37.8, "flags": 4}, + {"matrix": [3, 10], "x": 130.2, "y": 37.8, "flags": 4}, + {"matrix": [6, 7], "x": 142.3, "y": 37.8, "flags": 4}, + {"matrix": [3, 11], "x": 154.4, "y": 37.8, "flags": 4}, + {"matrix": [3, 12], "x": 187.7, "y": 37.8, "flags": 4}, + {"matrix": [3, 13], "x": 199.8, "y": 37.8, "flags": 4}, + {"matrix": [3, 14], "x": 211.9, "y": 37.8, "flags": 4}, + + {"matrix": [4, 0], "x": 0, "y": 49.5, "flags": 4}, + {"matrix": [4, 1], "x": 27.2, "y": 49.5, "flags": 4}, + {"matrix": [4, 2], "x": 39.4, "y": 49.5, "flags": 4}, + {"matrix": [4, 3], "x": 51.5, "y": 49.5, "flags": 4}, + {"matrix": [4, 4], "x": 63.6, "y": 49.5, "flags": 4}, + {"matrix": [4, 5], "x": 75.7, "y": 49.5, "flags": 4}, + {"matrix": [4, 6], "x": 87.8, "y": 49.5, "flags": 4}, + {"matrix": [4, 7], "x": 99.9, "y": 49.5, "flags": 4}, + {"matrix": [4, 8], "x": 112, "y": 49.5, "flags": 4}, + {"matrix": [4, 9], "x": 124.1, "y": 49.5, "flags": 4}, + {"matrix": [4, 10], "x": 136.2, "y": 49.5, "flags": 4}, + {"matrix": [6, 8], "x": 148.3, "y": 49.5, "flags": 4}, + {"matrix": [4, 11], "x": 172.6, "y": 49.5, "flags": 4}, + {"matrix": [4, 12], "x": 187.7, "y": 49.5, "flags": 4}, + {"matrix": [4, 13], "x": 199.8, "y": 49.5, "flags": 4}, + {"matrix": [4, 14], "x": 211.9, "y": 49.5, "flags": 4}, + {"matrix": [6, 12], "x": 224, "y": 55.3, "flags": 4}, + + {"matrix": [5, 0], "x": 0, "y": 61.1, "flags": 4}, + {"matrix": [5, 1], "x": 15.1, "y": 61.1, "flags": 4}, + {"matrix": [6, 1], "x": 30.3, "y": 61.1, "flags": 4}, + {"matrix": [6, 0], "x": 45.4, "y": 61.1, "flags": 4}, + {"matrix": [5, 5], "x": 68.1, "y": 61.1, "flags": 4}, + {"matrix": [5, 6], "x": 90.8, "y": 61.1, "flags": 4}, + {"matrix": [5, 9], "x": 121.1, "y": 61.1, "flags": 4}, + {"matrix": [5, 7], "x": 133.2, "y": 61.1, "flags": 4}, + {"matrix": [5, 10], "x": 145.3, "y": 61.1, "flags": 4}, + {"matrix": [6, 9], "x": 160.5, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 172.6, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 184.7, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 199.8, "y": 61.1, "flags": 4}, + {"matrix": [5, 14], "x": 211.9, "y": 61.1, "flags": 4} + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x6098" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "F11", "matrix": [5, 3], "x": 12, "y": 0}, + {"label": "F12", "matrix": [5, 4], "x": 13, "y": 0}, + {"label": "Mute", "matrix": [0, 11], "x": 14.25, "y": 0}, + {"label": "PgUp", "matrix": [0, 12], "x": 15.5, "y": 0}, + {"label": "PgDn", "matrix": [0, 13], "x": 16.5, "y": 0}, + {"label": "PB", "matrix": [0, 14], "x": 17.5, "y": 0}, + {"label": "PrtSc", "matrix": [6, 13], "x": 18.5, "y": 0}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-_", "matrix": [6, 3], "x": 11, "y": 1.25}, + {"label": "=+", "matrix": [6, 4], "x": 12, "y": 1.25}, + {"label": "BS", "matrix": [1, 11], "x": 13, "y": 1.25, "w": 2}, + {"label": "NumLk", "matrix": [1, 12], "x": 15.5, "y": 1.25}, + {"label": "P/", "matrix": [1, 13], "x": 16.5, "y": 1.25}, + {"label": "P*", "matrix": [1, 14], "x": 17.5, "y": 1.25}, + {"label": "P-", "matrix": [6, 14], "x": 18.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [6, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "P7", "matrix": [2, 12], "x": 15.5, "y": 2.25}, + {"label": "P8", "matrix": [2, 13], "x": 16.5, "y": 2.25}, + {"label": "P9", "matrix": [2, 14], "x": 17.5, "y": 2.25}, + {"label": "P+", "matrix": [6, 11], "x": 18.5, "y": 2.25, "h": 2.0}, + + {"label": "Cap", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 7], "x": 11.75, "y": 3.25}, + {"label": "Ent", "matrix": [3, 11], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "P4", "matrix": [3, 12], "x": 15.5, "y": 3.25}, + {"label": "P5", "matrix": [3, 13], "x": 16.5, "y": 3.25}, + {"label": "P6", "matrix": [3, 14], "x": 17.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [6, 8], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 11], "x": 14.25, "y": 4.5}, + {"label": "P1", "matrix": [4, 12], "x": 15.5, "y": 4.25}, + {"label": "P2", "matrix": [4, 13], "x": 16.5, "y": 4.25}, + {"label": "P3", "matrix": [4, 14], "x": 17.5, "y": 4.25}, + {"label": "PENT", "matrix": [6, 12], "x": 18.5, "y": 4.25, "h": 2.0}, + + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Com", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [6, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPAC1", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 3.125, "h": 0.5}, + {"label": "SPAC", "matrix": [5, 5], "x": 3.75, "y": 5.75, "w": 6.25, "h":0.5}, + {"label": "SPAC2", "matrix": [5, 6], "x": 6.875, "y": 5.25, "w": 3.125, "h":0.5}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25}, + {"label": "Fn", "matrix": [5, 7], "x": 11, "y": 5.25}, + {"label": "Menu", "matrix": [5, 10], "x": 12, "y": 5.25}, + {"label": "Left", "matrix": [6, 9], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [5, 12], "x": 15.25, "y": 5.5}, + {"label": "P0", "matrix": [5, 13], "x": 16.5, "y": 5.25}, + {"label": "PDOT", "matrix": [5, 14], "x": 17.5, "y": 5.25} + ] + }, + "LAYOUT_980_ansi_split_space": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "F5", "matrix": [0, 5], "x": 5.75, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.75, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.75, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.75, "y": 0}, + {"label": "F9", "matrix": [0, 9], "x": 10, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "F11", "matrix": [5, 3], "x": 12, "y": 0}, + {"label": "F12", "matrix": [5, 4], "x": 13, "y": 0}, + {"label": "Mute", "matrix": [0, 11], "x": 14.25, "y": 0}, + {"label": "PgUp", "matrix": [0, 12], "x": 15.5, "y": 0}, + {"label": "PgDn", "matrix": [0, 13], "x": 16.5, "y": 0}, + {"label": "PB", "matrix": [0, 14], "x": 17.5, "y": 0}, + {"label": "PrtSc", "matrix": [6, 13], "x": 18.5, "y": 0}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-_", "matrix": [6, 3], "x": 11, "y": 1.25}, + {"label": "=+", "matrix": [6, 4], "x": 12, "y": 1.25}, + {"label": "BS", "matrix": [1, 11], "x": 13, "y": 1.25, "w": 2}, + {"label": "NumLk", "matrix": [1, 12], "x": 15.5, "y": 1.25}, + {"label": "P/", "matrix": [1, 13], "x": 16.5, "y": 1.25}, + {"label": "P*", "matrix": [1, 14], "x": 17.5, "y": 1.25}, + {"label": "P-", "matrix": [6, 14], "x": 18.5, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [6, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "P7", "matrix": [2, 12], "x": 15.5, "y": 2.25}, + {"label": "P8", "matrix": [2, 13], "x": 16.5, "y": 2.25}, + {"label": "P9", "matrix": [2, 14], "x": 17.5, "y": 2.25}, + {"label": "P+", "matrix": [6, 11], "x": 18.5, "y": 2.25, "h": 2.0}, + + {"label": "Cap", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [6, 7], "x": 11.75, "y": 3.25}, + {"label": "Ent", "matrix": [3, 11], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "P4", "matrix": [3, 12], "x": 15.5, "y": 3.25}, + {"label": "P5", "matrix": [3, 13], "x": 16.5, "y": 3.25}, + {"label": "P6", "matrix": [3, 14], "x": 17.5, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "?", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [6, 8], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "Up", "matrix": [4, 11], "x": 14.25, "y": 4.5}, + {"label": "P1", "matrix": [4, 12], "x": 15.5, "y": 4.25}, + {"label": "P2", "matrix": [4, 13], "x": 16.5, "y": 4.25}, + {"label": "P3", "matrix": [4, 14], "x": 17.5, "y": 4.25}, + {"label": "PENT", "matrix": [6, 12], "x": 18.5, "y": 4.25, "h": 2.0}, + + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "Com", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [6, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPAC1", "matrix": [6, 0], "x": 3.75, "y": 5.25, "w": 3.125}, + {"label": "SPAC2", "matrix": [5, 6], "x": 6.875, "y": 5.25, "w": 3.125}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25}, + {"label": "Fn", "matrix": [5, 7], "x": 11, "y": 5.25}, + {"label": "Menu", "matrix": [5, 10], "x": 12, "y": 5.25}, + {"label": "Left", "matrix": [6, 9], "x": 13.25, "y": 5.5}, + {"label": "Down", "matrix": [5, 11], "x": 14.25, "y": 5.5}, + {"label": "Right", "matrix": [5, 12], "x": 15.25, "y": 5.5}, + {"label": "P0", "matrix": [5, 13], "x": 16.5, "y": 5.25}, + {"label": "PDOT", "matrix": [5, 14], "x": 17.5, "y": 5.25} + ] + } + + } +} diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c new file mode 100644 index 00000000000..6d820d1d350 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// 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_F11, KC_F12, KC_MUTE, KC_SCRL, KC_PAUS, KC_HOME, KC_END, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + + [1] = LAYOUT_all( + _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, G(KC_SPC), RCS(KC_SPC), G(RCS(KC_4)), KC_PGUP, KC_PGDN, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI, KC_P0, KC_PDOT + ), +}; + +#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(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U))}, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U))} +}; +#endif + diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/default/rules.mk b/keyboards/skyloong/gk980/q1/ansi/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c new file mode 100644 index 00000000000..44a21610018 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c @@ -0,0 +1,172 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +int FN_WIN = 0; +int FN_MAC = 0; +int L_WIN = 0; +int L_MAC = 0; + +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_DEL, KC_PGUP, KC_PGDN, KC_PSCR, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + 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, KC_P0, KC_PDOT + ), + + [_MAC] = LAYOUT_all( + KC_ESC, KC_F14, KC_F15, C(KC_UP), G(KC_D), G(KC_SPC), LAG(KC_EJCT), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL, KC_PGUP, KC_PGDN, KC_PSCR, + 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + 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_P4, KC_P5, KC_P6, + 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_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RCMD, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + ), + + [_WIN_INDEX] = LAYOUT_all( + _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, G(KC_SPC), KC_INS, KC_HOME, KC_END, KC_PAUSE, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LGUI, KC_LALT, _______, _______, _______, KC_RALT, _______, KC_APP, RGB_SPD, RGB_VAD, RGB_SPI, KC_P0, KC_PDOT + ), + + [_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, G(KC_SPC), KC_INS, KC_HOME, KC_END, KC_PAUSE, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, + KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, KC_RCMD, _______, KC_RALT, RGB_SPD, RGB_VAD, RGB_SPI, KC_P0, KC_PDOT + ) +}; + +#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(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_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(KC_VOLD, KC_VOLU), 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(KC_VOLD, KC_VOLU), 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 + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + + 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 true; +} + +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 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 MO(2): + if (record->event.pressed) { + FN_WIN = 1; + } else { + FN_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; // continue all further processing of this key + + case MO(3): + if (record->event.pressed) { + FN_MAC = 1; + } else { + FN_MAC = 0; + } + return true; // continue all further processing of this key + default: + return true; + } +} diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk980/q1/ansi/rules.mk b/keyboards/skyloong/gk980/q1/ansi/rules.mk new file mode 100644 index 00000000000..6aebeff05a8 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/ansi/rules.mk @@ -0,0 +1,2 @@ + CUSTOM_MATRIX = lite + SRC += matrix.c diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h new file mode 100644 index 00000000000..134473ed4fc --- /dev/null +++ b/keyboards/skyloong/gk980/q1/config.h @@ -0,0 +1,29 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define MAC_PIN C13 +#define DEBOUNCE 10 + +#ifdef ENCODER_ENABLE +# define ENCODER_MAP_KEY_DELAY 20 +#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_1 B5 +# define AW20216S_EN_PIN_2 B5 + +# define NUM_LOCK_INDEX 31 +# define WIN_MOD_INDEX 23 +# define MAC_MOD_INDEX 24 +# define WIN_LOCK_INDEX 75 +# define SCR_LOCK_INDEX 14 +# define SDB B5 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#endif // RGB_MATRIX_ENABLE + diff --git a/keyboards/skyloong/gk980/q1/halconf.h b/keyboards/skyloong/gk980/q1/halconf.h new file mode 100644 index 00000000000..d13f22eaf73 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/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/gk980/q1/info.json b/keyboards/skyloong/gk980/q1/info.json new file mode 100644 index 00000000000..39c5659602c --- /dev/null +++ b/keyboards/skyloong/gk980/q1/info.json @@ -0,0 +1,80 @@ +{ + "manufacturer": "skyloong", + "maintainer": "NaturalZh", + "bootloader": "stm32duino", + "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}, + {"pin_a": "B10", "pin_b": "B4", "resolution": 2} + ] + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "indicators": { + "num_lock": "C15", + "on_state": 1, + "caps_lock": "C14" + }, + "matrix_pins": { + "cols": [null, null, 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/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c new file mode 100644 index 00000000000..4f5ecab3289 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -0,0 +1,149 @@ +// Copyright 2023 NaturaZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +//Matrix read rows set col:DIODE_DIRECTION == ROW2COL + +#include "quantum.h" + +#define ReadDelayTime 120 +#define ClockTime 15 +#define MATRIX_INPUT_PRESSED_STATE 0 + +#define HC595_ST_PIN A6 +#define HC595_SH_PIN A5 +#define HC595_DS_PIN A7 + +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){ + writePinLow(HC595_DS_PIN); + }else{ + writePinHigh(HC595_DS_PIN); + } + clockPulse(ClockTime); + } + 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(ClockTime); + } +} + +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(ClockTime); + } +} + +__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) { + // initialize key pins + matrix_init_pins(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t curr_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(curr_matrix, current_col, row_shifter); + } + + bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0; + if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix)); + return (uint8_t)changed; +} diff --git a/keyboards/skyloong/gk980/q1/mcuconf.h b/keyboards/skyloong/gk980/q1/mcuconf.h new file mode 100644 index 00000000000..af06d34b273 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/mcuconf.h @@ -0,0 +1,16 @@ +// 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 + +#undef STM32_SPI_USE_SPI1 +#define STM32_SPI_USE_SPI1 TRUE + + diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c new file mode 100644 index 00000000000..822cafa7530 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -0,0 +1,170 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +#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}, + {0, CS1_SW3, CS2_SW3, CS3_SW3}, + {0, CS1_SW4, CS2_SW4, CS3_SW4}, + {0, CS1_SW5, CS2_SW5, CS3_SW5}, + {0, CS1_SW6, CS2_SW6, CS3_SW6}, + {0, CS1_SW7, CS2_SW7, CS3_SW7}, + {0, CS1_SW8, CS2_SW8, CS3_SW8}, + {0, CS1_SW9, CS2_SW9, CS3_SW9}, + {0, CS1_SW10, CS2_SW10, CS3_SW10}, + {0, CS1_SW11, CS2_SW11, CS3_SW11}, + {0, CS1_SW12, CS2_SW12, CS3_SW12}, + {0, CS10_SW2, CS11_SW2, CS12_SW2}, + {0, CS10_SW3, CS11_SW3, CS12_SW3}, + //encoder no led + {0, CS10_SW5, CS11_SW5, CS12_SW5}, + {0, CS10_SW6, CS11_SW6, CS12_SW6}, + {0, CS10_SW7, CS11_SW7, CS12_SW7}, + {0, CS10_SW8, CS11_SW8, CS12_SW8}, + + {0, CS4_SW1, CS5_SW1, CS6_SW1}, + {0, CS4_SW2, CS5_SW2, CS6_SW2}, + {0, CS4_SW3, CS5_SW3, CS6_SW3}, + {0, CS4_SW4, CS5_SW4, CS6_SW4}, + {0, CS4_SW5, CS5_SW5, CS6_SW5}, + {0, CS4_SW6, CS5_SW6, CS6_SW6}, + {0, CS4_SW7, CS5_SW7, CS6_SW7}, + {0, CS4_SW8, CS5_SW8, CS6_SW8}, + {0, CS4_SW9, CS5_SW9, CS6_SW9}, + {0, CS4_SW10, CS5_SW10, CS6_SW10}, + {0, CS4_SW11, CS5_SW11, CS6_SW11}, + {0, CS4_SW12, CS5_SW12, CS6_SW12}, + {0, CS13_SW2, CS14_SW2, CS15_SW2}, + {0, CS13_SW3, CS14_SW3, CS15_SW3}, + {0, CS13_SW4, CS14_SW4, CS15_SW4}, + {0, CS13_SW5, CS14_SW5, CS15_SW5}, + {0, CS13_SW6, CS14_SW6, CS15_SW6}, + {0, CS13_SW7, CS14_SW7, CS15_SW7}, + + {0, CS7_SW1, CS8_SW1, CS9_SW1}, + {0, CS7_SW2, CS8_SW2, CS9_SW2}, + {0, CS7_SW3, CS8_SW3, CS9_SW3}, + {0, CS7_SW4, CS8_SW4, CS9_SW4}, + {0, CS7_SW5, CS8_SW5, CS9_SW5}, + {0, CS7_SW6, CS8_SW6, CS9_SW6}, + {0, CS7_SW7, CS8_SW7, CS9_SW7}, + {0, CS7_SW8, CS8_SW8, CS9_SW8}, + {0, CS7_SW9, CS8_SW9, CS9_SW9}, + {0, CS7_SW10, CS8_SW10, CS9_SW10}, + {0, CS7_SW11, CS8_SW11, CS9_SW11}, + {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}, + {0, CS16_SW5, CS17_SW5, CS18_SW5}, + {0, CS16_SW6, CS17_SW6, CS18_SW6}, + {0, CS16_SW7, CS17_SW7, CS18_SW7}, + + + {1, CS1_SW1, CS2_SW1, CS3_SW1}, + {1, CS1_SW2, CS2_SW2, CS3_SW2}, + {1, CS1_SW3, CS2_SW3, CS3_SW3}, + {1, CS1_SW4, CS2_SW4, CS3_SW4}, + {1, CS1_SW5, CS2_SW5, CS3_SW5}, + {1, CS1_SW6, CS2_SW6, CS3_SW6}, + {1, CS1_SW7, CS2_SW7, CS3_SW7}, + {1, CS1_SW8, CS2_SW8, CS3_SW8}, + {1, CS1_SW9, CS2_SW9, CS3_SW9}, + {1, CS1_SW10, CS2_SW10, CS3_SW10}, + {1, CS1_SW11, CS2_SW11, CS3_SW11}, + {1, CS1_SW12, CS2_SW12, CS3_SW12}, + {1, CS10_SW3, CS11_SW3, CS12_SW3}, + {1, CS10_SW4, CS11_SW4, CS12_SW4}, + {1, CS10_SW5, CS11_SW5, CS12_SW5}, + {1, CS10_SW6, CS11_SW6, CS12_SW6}, + + {1, CS4_SW1, CS5_SW1, CS6_SW1}, + {1, CS4_SW2, CS5_SW2, CS6_SW2}, + {1, CS4_SW3, CS5_SW3, CS6_SW3}, + {1, CS4_SW4, CS5_SW4, CS6_SW4}, + {1, CS4_SW5, CS5_SW5, CS6_SW5}, + {1, CS4_SW6, CS5_SW6, CS6_SW6}, + {1, CS4_SW7, CS5_SW7, CS6_SW7}, + {1, CS4_SW8, CS5_SW8, CS6_SW8}, + {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}, + {1, CS13_SW3, CS14_SW3, CS15_SW3}, + {1, CS13_SW4, CS14_SW4, CS15_SW4}, + {1, CS13_SW5, CS14_SW5, CS15_SW5}, + {1, CS13_SW6, CS14_SW6, CS15_SW6}, + {1, CS13_SW7, CS14_SW7, CS15_SW7}, + + + {1, CS7_SW1, CS8_SW1, CS9_SW1}, + {1, CS7_SW2, CS8_SW2, CS9_SW2}, + {1, CS7_SW3, CS8_SW3, CS9_SW3}, + {1, CS7_SW5, CS8_SW5, CS9_SW5}, + {1, CS7_SW6, CS8_SW6, CS9_SW6}, + {1, CS7_SW8, CS8_SW8, CS9_SW8}, + {1, CS7_SW10, CS8_SW10, CS9_SW10}, + {1, CS7_SW11, CS8_SW11, CS9_SW11}, + {1, CS7_SW12, CS8_SW12, CS9_SW12}, + {1, CS16_SW2, CS17_SW2, CS18_SW2}, + {1, CS16_SW3, CS17_SW3, CS18_SW3}, + {1, CS16_SW4, CS17_SW4, CS18_SW4}, + {1, CS16_SW5, CS17_SW5, CS18_SW5}, + {1, CS16_SW6, CS17_SW6, CS18_SW6} +}; + +#endif + +void suspend_power_down_kb() { +# ifdef RGB_MATRIX_ENABLE + writePinLow(SDB); +# endif + writePinLow(MAC_PIN); + suspend_power_down_user(); +} + +void suspend_wakeup_init_kb() { +# ifdef RGB_MATRIX_ENABLE + writePinHigh(SDB); +# endif + suspend_wakeup_init_user(); +} + +bool shutdown_kb(bool jump_to_bootloader) { + writePinLow(SDB); + return shutdown_user(jump_to_bootloader); +} + +layer_state_t default_layer_state_set_kb(layer_state_t state) { + switch (get_highest_layer(state)) { + case 0: + writePinLow(MAC_PIN); + break; + case 1: + writePinHigh(MAC_PIN); + break; + } + return state; +} + + +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; +# ifdef RGB_MATRIX_ENABLE + setPinOutput(SDB); + writePinHigh(SDB); +# endif + setPinOutput(MAC_PIN); + writePinHigh(MAC_PIN); +} diff --git a/keyboards/skyloong/gk980/q1/readme.md b/keyboards/skyloong/gk980/q1/readme.md new file mode 100644 index 00000000000..55435bf6258 --- /dev/null +++ b/keyboards/skyloong/gk980/q1/readme.md @@ -0,0 +1,33 @@ +# GK980 Q1 Keyboard + +![GK980 Q1](https://i.imgur.com/hjVObZKh.jpg) + +## The PCB features: +* QMK & VIA compatibility +* RGB Matrix backlight +* Use PTIR switches instead of mechanical switches to increase the service life and reliability of switches. + + +The following is the QMK Firmware for the Destop 96% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd + +* Keyboard Maintainer: [JZ-Skyloong](https://github.com/JZ-skyloong) +* Hardware Supported: DestopPCB for Skyloong keylayout 96%, STM32F103C8T6 +* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip + +Make example for this keyboard (after setting up your build environment): + + make skyloong/gk980/q1:default + +Flashing example for this keyboard: + + make skyloong/gk980/q1: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 d9a77925a2c3163bea0df1ed153356fd051e6b4d Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 27 Apr 2024 11:09:31 +0800 Subject: [PATCH 02/28] update skyloong/gk980/q1/readme.md --- keyboards/skyloong/gk980/q1/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/readme.md b/keyboards/skyloong/gk980/q1/readme.md index 55435bf6258..dfc62ba000b 100644 --- a/keyboards/skyloong/gk980/q1/readme.md +++ b/keyboards/skyloong/gk980/q1/readme.md @@ -1,6 +1,6 @@ # GK980 Q1 Keyboard -![GK980 Q1](https://i.imgur.com/hjVObZKh.jpg) +![GK980 Q1](https://i.imgur.com/uUVIMBOh.jpeg) ## The PCB features: * QMK & VIA compatibility From 3d2f0fefebc0a5024ccce883a3023ccfe9685be8 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 30 Apr 2024 13:55:30 +0800 Subject: [PATCH 03/28] Update skyloong/gk980/q1 --- keyboards/skyloong/gk980/q1/config.h | 1 - keyboards/skyloong/gk980/q1/q1.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h index 134473ed4fc..543d420cefe 100644 --- a/keyboards/skyloong/gk980/q1/config.h +++ b/keyboards/skyloong/gk980/q1/config.h @@ -22,7 +22,6 @@ # define MAC_MOD_INDEX 24 # define WIN_LOCK_INDEX 75 # define SCR_LOCK_INDEX 14 -# define SDB B5 # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS #endif // RGB_MATRIX_ENABLE diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 822cafa7530..c44df2d9ee8 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -127,7 +127,7 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { void suspend_power_down_kb() { # ifdef RGB_MATRIX_ENABLE - writePinLow(SDB); + writePinLow(AW20216S_EN_PIN_1); # endif writePinLow(MAC_PIN); suspend_power_down_user(); @@ -135,13 +135,13 @@ void suspend_power_down_kb() { void suspend_wakeup_init_kb() { # ifdef RGB_MATRIX_ENABLE - writePinHigh(SDB); + writePinHigh(AW20216S_EN_PIN_1); # endif suspend_wakeup_init_user(); } bool shutdown_kb(bool jump_to_bootloader) { - writePinLow(SDB); + writePinLow(AW20216S_EN_PIN_1); return shutdown_user(jump_to_bootloader); } @@ -162,8 +162,8 @@ 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; # ifdef RGB_MATRIX_ENABLE - setPinOutput(SDB); - writePinHigh(SDB); + setPinOutput(AW20216S_EN_PIN_1); + writePinHigh(AW20216S_EN_PIN_1); # endif setPinOutput(MAC_PIN); writePinHigh(MAC_PIN); From 90eda6da5ae5ed047db46ef7a3786d6050955fa4 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 23 Jul 2024 14:51:41 +0800 Subject: [PATCH 04/28] delete skyloong/gk980/q1/readme.md and add skyloong/gk980/q1/ansi/readme.md. --- .../skyloong/gk980/q1/{ => ansi}/readme.md | 4 +-- keyboards/skyloong/gk980/q1/matrix.c | 34 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) rename keyboards/skyloong/gk980/q1/{ => ansi}/readme.md (94%) diff --git a/keyboards/skyloong/gk980/q1/readme.md b/keyboards/skyloong/gk980/q1/ansi/readme.md similarity index 94% rename from keyboards/skyloong/gk980/q1/readme.md rename to keyboards/skyloong/gk980/q1/ansi/readme.md index dfc62ba000b..e76b4b1c4eb 100644 --- a/keyboards/skyloong/gk980/q1/readme.md +++ b/keyboards/skyloong/gk980/q1/ansi/readme.md @@ -16,11 +16,11 @@ The following is the QMK Firmware for the Destop 96% keylayout - designed by Do Make example for this keyboard (after setting up your build environment): - make skyloong/gk980/q1:default + make skyloong/gk980/q1/ansi:default Flashing example for this keyboard: - make skyloong/gk980/q1:default:flash + make skyloong/gk980/q1/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). diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 4f5ecab3289..2279544d8d3 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -24,27 +24,27 @@ static inline void select_delay(uint16_t n) { }; } -static inline void setPinOutput_writeLow(pin_t pin) { +static inline void gpio_set_pin_output_write_low(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_low(pin); } } -static inline void setPinOutput_writeHigh(pin_t pin) { +static inline void gpio_set_pin_output_write_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_high(pin); } } -static inline void setPinInputHigh_atomic(pin_t pin) { +static inline void gpio_set_pin_input_high_atomic(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } } -static inline uint8_t readMatrixPin(pin_t pin) { +static inline uint8_t gpio_read_matrix_pin(pin_t pin) { if (pin != NO_PIN) { return (gpio_read_pin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1; } else { @@ -52,7 +52,7 @@ static inline uint8_t readMatrixPin(pin_t pin) { } } -static inline void clockPulse(uint16_t n) { +static inline void clock_pulse(uint16_t n) { gpio_write_pin_high(HC595_SH_PIN); gpio_write_pin_high(HC595_ST_PIN); select_delay(n); @@ -63,14 +63,14 @@ static inline void clockPulse(uint16_t n) { // matrix code static bool select_col(uint8_t col) { - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ - writePinLow(HC595_DS_PIN); + gpio_write_pin_low(HC595_DS_PIN); }else{ - writePinHigh(HC595_DS_PIN); + gpio_write_pin_high(HC595_DS_PIN); } - clockPulse(ClockTime); + clock_pulse(ClockTime); } return true; @@ -78,18 +78,18 @@ 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_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clockPulse(ClockTime); + clock_pulse(ClockTime); } } static void unselect_cols(void) { - setPinOutput_writeLow(HC595_SH_PIN); - setPinOutput_writeLow(HC595_ST_PIN); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_set_pin_output_write_low(HC595_SH_PIN); + gpio_set_pin_output_write_low(HC595_ST_PIN); + gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clockPulse(ClockTime); + clock_pulse(ClockTime); } } @@ -97,7 +97,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_set_pin_input_high_atomic(row_pins[x]); } } } @@ -114,7 +114,7 @@ __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[] // 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) { + if (gpio_read_matrix_pin(row_pins[row_index]) == 0) { // Pin LO, set col bit current_matrix[row_index] |= row_shifter; key_pressed = true; From 438c2ffae36ddfdf7dc7c84af9a9ecec4eaba55b Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 23 Jul 2024 15:16:16 +0800 Subject: [PATCH 05/28] Corrected skyloong/gk980/q1/ansi/keyboard.json about rgb matrix locations. --- .../skyloong/gk980/q1/ansi/keyboard.json | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/ansi/keyboard.json b/keyboards/skyloong/gk980/q1/ansi/keyboard.json index 45dd6cb1fe1..acfda5fbdc1 100644 --- a/keyboards/skyloong/gk980/q1/ansi/keyboard.json +++ b/keyboards/skyloong/gk980/q1/ansi/keyboard.json @@ -4,110 +4,110 @@ "rgb_matrix": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, - {"matrix": [0, 1], "x": 18.2, "y": 0, "flags": 4}, - {"matrix": [0, 2], "x": 30.3, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 18, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4}, - {"matrix": [0, 4], "x": 42.4, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 69.6, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 81.7, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 93.9, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 42, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 70, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 82, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 94, "y": 0, "flags": 4}, {"matrix": [0, 8], "x": 106, "y": 0, "flags": 4}, - {"matrix": [0, 9], "x": 121.1, "y": 0, "flags": 4}, - {"matrix": [0, 10], "x": 133.2, "y": 0, "flags": 4}, - {"matrix": [5, 3], "x": 145.3, "y": 0, "flags": 4}, - {"matrix": [5, 4], "x": 157.4, "y": 0, "flags": 4}, - {"matrix": [0, 12], "x": 187.7, "y": 0, "flags": 4}, - {"matrix": [0, 13], "x": 199.8, "y": 0, "flags": 4}, - {"matrix": [0, 14], "x": 211.9, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 121, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 133, "y": 0, "flags": 4}, + {"matrix": [5, 3], "x": 145, "y": 0, "flags": 4}, + {"matrix": [5, 4], "x": 157, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 188, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 200, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 212, "y": 0, "flags": 4}, {"matrix": [6, 13], "x": 224, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 14.5, "flags": 4}, - {"matrix": [1, 1], "x": 12.1, "y": 14.5, "flags": 4}, - {"matrix": [1, 2], "x": 24.2, "y": 14.5, "flags": 4}, - {"matrix": [1, 3], "x": 36.3, "y": 14.5, "flags": 4}, - {"matrix": [1, 4], "x": 48.4, "y": 14.5, "flags": 4}, - {"matrix": [1, 5], "x": 60.6, "y": 14.5, "flags": 4}, - {"matrix": [1, 6], "x": 72.7, "y": 14.5, "flags": 4}, - {"matrix": [1, 7], "x": 84.8, "y": 14.5, "flags": 8}, - {"matrix": [1, 8], "x": 96.9, "y": 14.5, "flags": 4}, - {"matrix": [1, 9], "x": 109, "y": 14.5, "flags": 4}, - {"matrix": [1, 10], "x": 121.1, "y": 14.5, "flags": 4}, - {"matrix": [6, 3], "x": 133.2, "y": 14.5, "flags": 4}, - {"matrix": [6, 4], "x": 145.3, "y": 14.5, "flags": 4}, - {"matrix": [1, 11], "x": 157.4, "y": 14.5, "flags": 4}, - {"matrix": [1, 12], "x": 187.7, "y": 14.5, "flags": 4}, - {"matrix": [1, 13], "x": 199.8, "y": 14.5, "flags": 4}, - {"matrix": [1, 14], "x": 211.9, "y": 14.5, "flags": 4}, - {"matrix": [6, 14], "x": 224, "y": 14.5, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 12, "y": 15, "flags": 4}, + {"matrix": [1, 2], "x": 24, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 36, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 48, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 61, "y": 15, "flags": 4}, + {"matrix": [1, 6], "x": 73, "y": 15, "flags": 4}, + {"matrix": [1, 7], "x": 85, "y": 15, "flags": 8}, + {"matrix": [1, 8], "x": 97, "y": 15, "flags": 4}, + {"matrix": [1, 9], "x": 109, "y": 15, "flags": 4}, + {"matrix": [1, 10], "x": 121, "y": 15, "flags": 4}, + {"matrix": [6, 3], "x": 133, "y": 15, "flags": 4}, + {"matrix": [6, 4], "x": 145, "y": 15, "flags": 4}, + {"matrix": [1, 11], "x": 157, "y": 15, "flags": 4}, + {"matrix": [1, 12], "x": 188, "y": 15, "flags": 4}, + {"matrix": [1, 13], "x": 200, "y": 15, "flags": 4}, + {"matrix": [1, 14], "x": 212, "y": 15, "flags": 4}, + {"matrix": [6, 14], "x": 224, "y": 15, "flags": 4}, - {"matrix": [2, 0], "x": 0, "y": 26.2, "flags": 4}, - {"matrix": [2, 1], "x": 18.2, "y": 26.2, "flags": 4}, - {"matrix": [2, 2], "x": 30.3, "y": 26.2, "flags": 4}, - {"matrix": [2, 3], "x": 42.4, "y": 26.2, "flags": 4}, - {"matrix": [2, 4], "x": 54.5, "y": 26.2, "flags": 4}, - {"matrix": [2, 5], "x": 66.6, "y": 26.2, "flags": 4}, - {"matrix": [2, 6], "x": 78.7, "y": 26.2, "flags": 4}, - {"matrix": [2, 7], "x": 90.8, "y": 26.2, "flags": 4}, - {"matrix": [2, 8], "x": 102.9, "y": 26.2, "flags": 4}, - {"matrix": [2, 9], "x": 115, "y": 26.2, "flags": 4}, - {"matrix": [2, 10], "x": 127.2, "y": 26.2, "flags": 4}, - {"matrix": [6, 5], "x": 139.3, "y": 26.2, "flags": 4}, - {"matrix": [6, 6], "x": 151.4, "y": 26.2, "flags": 4}, - {"matrix": [2, 11], "x": 163.5, "y": 26.2, "flags": 4}, - {"matrix": [2, 12], "x": 187.7, "y": 26.2, "flags": 4}, - {"matrix": [2, 13], "x": 199.8, "y": 26.2, "flags": 4}, - {"matrix": [2, 14], "x": 211.9, "y": 26.2, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 18, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 30, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 42, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 55, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 67, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 79, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 91, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 103, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 115, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 127, "y": 26, "flags": 4}, + {"matrix": [6, 5], "x": 139, "y": 26, "flags": 4}, + {"matrix": [6, 6], "x": 151, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 164, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 188, "y": 26, "flags": 4}, + {"matrix": [2, 13], "x": 200, "y": 26, "flags": 4}, + {"matrix": [2, 14], "x": 212, "y": 26, "flags": 4}, {"matrix": [6, 11], "x": 224, "y": 32, "flags": 4}, - {"matrix": [3, 0], "x": 0, "y": 37.8, "flags": 4}, - {"matrix": [3, 1], "x": 21.2, "y": 37.8, "flags": 4}, - {"matrix": [3, 2], "x": 33.3, "y": 37.8, "flags": 4}, - {"matrix": [3, 3], "x": 45.4, "y": 37.8, "flags": 4}, - {"matrix": [3, 4], "x": 57.5, "y": 37.8, "flags": 4}, - {"matrix": [3, 5], "x": 69.6, "y": 37.8, "flags": 4}, - {"matrix": [3, 6], "x": 81.7, "y": 37.8, "flags": 4}, - {"matrix": [3, 7], "x": 93.9, "y": 37.8, "flags": 4}, - {"matrix": [3, 8], "x": 106, "y": 37.8, "flags": 4}, - {"matrix": [3, 9], "x": 118.1, "y": 37.8, "flags": 4}, - {"matrix": [3, 10], "x": 130.2, "y": 37.8, "flags": 4}, - {"matrix": [6, 7], "x": 142.3, "y": 37.8, "flags": 4}, - {"matrix": [3, 11], "x": 154.4, "y": 37.8, "flags": 4}, - {"matrix": [3, 12], "x": 187.7, "y": 37.8, "flags": 4}, - {"matrix": [3, 13], "x": 199.8, "y": 37.8, "flags": 4}, - {"matrix": [3, 14], "x": 211.9, "y": 37.8, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4}, + {"matrix": [3, 1], "x": 21, "y": 38, "flags": 4}, + {"matrix": [3, 2], "x": 33, "y": 38, "flags": 4}, + {"matrix": [3, 3], "x": 45, "y": 38, "flags": 4}, + {"matrix": [3, 4], "x": 58, "y": 38, "flags": 4}, + {"matrix": [3, 5], "x": 70, "y": 38, "flags": 4}, + {"matrix": [3, 6], "x": 82, "y": 38, "flags": 4}, + {"matrix": [3, 7], "x": 94, "y": 38, "flags": 4}, + {"matrix": [3, 8], "x": 106, "y": 38, "flags": 4}, + {"matrix": [3, 9], "x": 118, "y": 38, "flags": 4}, + {"matrix": [3, 10], "x": 130, "y": 38, "flags": 4}, + {"matrix": [6, 7], "x": 142, "y": 38, "flags": 4}, + {"matrix": [3, 11], "x": 154, "y": 38, "flags": 4}, + {"matrix": [3, 12], "x": 188, "y": 38, "flags": 4}, + {"matrix": [3, 13], "x": 200, "y": 38, "flags": 4}, + {"matrix": [3, 14], "x": 212, "y": 38, "flags": 4}, - {"matrix": [4, 0], "x": 0, "y": 49.5, "flags": 4}, - {"matrix": [4, 1], "x": 27.2, "y": 49.5, "flags": 4}, - {"matrix": [4, 2], "x": 39.4, "y": 49.5, "flags": 4}, - {"matrix": [4, 3], "x": 51.5, "y": 49.5, "flags": 4}, - {"matrix": [4, 4], "x": 63.6, "y": 49.5, "flags": 4}, - {"matrix": [4, 5], "x": 75.7, "y": 49.5, "flags": 4}, - {"matrix": [4, 6], "x": 87.8, "y": 49.5, "flags": 4}, - {"matrix": [4, 7], "x": 99.9, "y": 49.5, "flags": 4}, - {"matrix": [4, 8], "x": 112, "y": 49.5, "flags": 4}, - {"matrix": [4, 9], "x": 124.1, "y": 49.5, "flags": 4}, - {"matrix": [4, 10], "x": 136.2, "y": 49.5, "flags": 4}, - {"matrix": [6, 8], "x": 148.3, "y": 49.5, "flags": 4}, - {"matrix": [4, 11], "x": 172.6, "y": 49.5, "flags": 4}, - {"matrix": [4, 12], "x": 187.7, "y": 49.5, "flags": 4}, - {"matrix": [4, 13], "x": 199.8, "y": 49.5, "flags": 4}, - {"matrix": [4, 14], "x": 211.9, "y": 49.5, "flags": 4}, - {"matrix": [6, 12], "x": 224, "y": 55.3, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 50, "flags": 4}, + {"matrix": [4, 1], "x": 27, "y": 50, "flags": 4}, + {"matrix": [4, 2], "x": 39, "y": 50, "flags": 4}, + {"matrix": [4, 3], "x": 52, "y": 50, "flags": 4}, + {"matrix": [4, 4], "x": 64, "y": 50, "flags": 4}, + {"matrix": [4, 5], "x": 76, "y": 50, "flags": 4}, + {"matrix": [4, 6], "x": 88, "y": 50, "flags": 4}, + {"matrix": [4, 7], "x": 100, "y": 50, "flags": 4}, + {"matrix": [4, 8], "x": 112, "y": 50, "flags": 4}, + {"matrix": [4, 9], "x": 124, "y": 50, "flags": 4}, + {"matrix": [4, 10], "x": 136, "y": 50, "flags": 4}, + {"matrix": [6, 8], "x": 148, "y": 50, "flags": 4}, + {"matrix": [4, 11], "x": 173, "y": 50, "flags": 4}, + {"matrix": [4, 12], "x": 188, "y": 50, "flags": 4}, + {"matrix": [4, 13], "x": 200, "y": 50, "flags": 4}, + {"matrix": [4, 14], "x": 212, "y": 50, "flags": 4}, + {"matrix": [6, 12], "x": 224, "y": 55, "flags": 4}, - {"matrix": [5, 0], "x": 0, "y": 61.1, "flags": 4}, - {"matrix": [5, 1], "x": 15.1, "y": 61.1, "flags": 4}, - {"matrix": [6, 1], "x": 30.3, "y": 61.1, "flags": 4}, - {"matrix": [6, 0], "x": 45.4, "y": 61.1, "flags": 4}, - {"matrix": [5, 5], "x": 68.1, "y": 61.1, "flags": 4}, - {"matrix": [5, 6], "x": 90.8, "y": 61.1, "flags": 4}, - {"matrix": [5, 9], "x": 121.1, "y": 61.1, "flags": 4}, - {"matrix": [5, 7], "x": 133.2, "y": 61.1, "flags": 4}, - {"matrix": [5, 10], "x": 145.3, "y": 61.1, "flags": 4}, - {"matrix": [6, 9], "x": 160.5, "y": 64, "flags": 4}, - {"matrix": [5, 11], "x": 172.6, "y": 64, "flags": 4}, - {"matrix": [5, 12], "x": 184.7, "y": 64, "flags": 4}, - {"matrix": [5, 13], "x": 199.8, "y": 61.1, "flags": 4}, - {"matrix": [5, 14], "x": 211.9, "y": 61.1, "flags": 4} + {"matrix": [5, 0], "x": 0, "y": 61, "flags": 4}, + {"matrix": [5, 1], "x": 15, "y": 61, "flags": 4}, + {"matrix": [6, 1], "x": 30, "y": 61, "flags": 4}, + {"matrix": [6, 0], "x": 45, "y": 61, "flags": 4}, + {"matrix": [5, 5], "x": 68, "y": 61, "flags": 4}, + {"matrix": [5, 6], "x": 91, "y": 61, "flags": 4}, + {"matrix": [5, 9], "x": 121, "y": 61, "flags": 4}, + {"matrix": [5, 7], "x": 133, "y": 61, "flags": 4}, + {"matrix": [5, 10], "x": 145, "y": 61, "flags": 4}, + {"matrix": [6, 9], "x": 161, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 173, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 185, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 200, "y": 61, "flags": 4}, + {"matrix": [5, 14], "x": 212, "y": 61, "flags": 4} ] }, "usb": { From fd2a82051fdc4a77764b52ffcd5d0f1d2e1076d9 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Wed, 24 Jul 2024 16:59:51 +0800 Subject: [PATCH 06/28] update skyloong/gk980/q1/ansi/via/keymap.c for layer switch --- keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c index 44a21610018..aa63c52b58b 100644 --- a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c @@ -35,7 +35,7 @@ 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)), KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, G(KC_SPC), KC_INS, KC_HOME, KC_END, KC_PAUSE, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, @@ -44,7 +44,7 @@ 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, G(KC_SPC), KC_INS, KC_HOME, KC_END, KC_PAUSE, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, @@ -133,7 +133,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { rgb_matrix_set_flags(LED_FLAG_ALL); return true; # endif - case TO(0): + case DF(0): if (record->event.pressed) { L_WIN = 1; set_single_persistent_default_layer(0); // Save default layer 0 to eeprom @@ -150,7 +150,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return true; // continue all further processing of this key - case TO(1): + case DF(1): if (record->event.pressed) { L_MAC = 1; set_single_persistent_default_layer(1); //Save default layer 1 to eeprom From 43bdaefbae0b909fcec26c207531e0c33fdd702d Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 26 Jul 2024 17:44:34 +0800 Subject: [PATCH 07/28] update skyloong/gk980/q1/ansi/keymaps/via/keymap.c --- keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c index aa63c52b58b..f072b4af664 100644 --- a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c @@ -136,11 +136,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { 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 true; // continue all further processing of this key + return false; // cancel all further processing of this key case MO(2): if (record->event.pressed) { @@ -153,11 +155,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { 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 true; // continue all further processing of this key + return false; // cancel all further processing of this key case MO(3): if (record->event.pressed) { @@ -167,6 +171,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { } return true; // continue all further processing of this key default: + L_MAC = 0; + L_WIN = 0; return true; } } From c145b7a96dee911a529f147551f7e52797c525dc Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 10 Aug 2024 15:10:00 +0800 Subject: [PATCH 08/28] update skyloong/gk980/q1 --- keyboards/skyloong/gk980/q1/matrix.c | 9 +- keyboards/skyloong/gk980/q1/q1.c | 200 +++++++++++++-------------- 2 files changed, 104 insertions(+), 105 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 2279544d8d3..ced715ea439 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -4,8 +4,7 @@ #include "quantum.h" -#define ReadDelayTime 120 -#define ClockTime 15 +#define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 #define HC595_ST_PIN A6 @@ -70,7 +69,7 @@ static bool select_col(uint8_t col) { }else{ gpio_write_pin_high(HC595_DS_PIN); } - clock_pulse(ClockTime); + clock_pulse(CLOCK_TIME); } return true; @@ -80,7 +79,7 @@ static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clock_pulse(ClockTime); + clock_pulse(CLOCK_TIME); } } @@ -89,7 +88,7 @@ static void unselect_cols(void) { gpio_set_pin_output_write_low(HC595_ST_PIN); gpio_set_pin_output_write_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clock_pulse(ClockTime); + clock_pulse(CLOCK_TIME); } } diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index c44df2d9ee8..e70b1fa174e 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -13,114 +13,114 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, - {0, CS1_SW3, CS2_SW3, CS3_SW3}, - {0, CS1_SW4, CS2_SW4, CS3_SW4}, - {0, CS1_SW5, CS2_SW5, CS3_SW5}, - {0, CS1_SW6, CS2_SW6, CS3_SW6}, - {0, CS1_SW7, CS2_SW7, CS3_SW7}, - {0, CS1_SW8, CS2_SW8, CS3_SW8}, - {0, CS1_SW9, CS2_SW9, CS3_SW9}, - {0, CS1_SW10, CS2_SW10, CS3_SW10}, - {0, CS1_SW11, CS2_SW11, CS3_SW11}, - {0, CS1_SW12, CS2_SW12, CS3_SW12}, - {0, CS10_SW2, CS11_SW2, CS12_SW2}, - {0, CS10_SW3, CS11_SW3, CS12_SW3}, + {0, SW1_CS1, SW1_CS2, SW1_CS3}, + {0, SW3_CS1, SW3_CS2, SW3_CS3}, + {0, SW4_CS1, SW4_CS2, SW4_CS3}, + {0, SW5_CS1, SW5_CS2, SW5_CS3}, + {0, SW6_CS1, SW6_CS2, SW6_CS3}, + {0, SW7_CS1, SW7_CS2, SW7_CS3}, + {0, SW8_CS1, SW8_CS2, SW8_CS3}, + {0, SW9_CS1, SW9_CS2, SW9_CS3}, + {0, SW10_CS1, SW10_CS2, SW10_CS3}, + {0, SW11_CS1, SW11_CS2, SW11_CS3}, + {0, SW12_CS1, SW12_CS2, SW12_CS3}, + {0, SW2_CS10, SW2_CS11, SW2_CS12}, + {0, SW3_CS10, SW3_CS11, SW3_CS12}, //encoder no led - {0, CS10_SW5, CS11_SW5, CS12_SW5}, - {0, CS10_SW6, CS11_SW6, CS12_SW6}, - {0, CS10_SW7, CS11_SW7, CS12_SW7}, - {0, CS10_SW8, CS11_SW8, CS12_SW8}, + {0, SW5_CS10, SW5_CS11, SW5_CS12}, + {0, SW6_CS10, SW6_CS11, SW6_CS12}, + {0, SW7_CS10, SW7_CS11, SW7_CS12}, + {0, SW8_CS10, SW8_CS11, SW8_CS12}, - {0, CS4_SW1, CS5_SW1, CS6_SW1}, - {0, CS4_SW2, CS5_SW2, CS6_SW2}, - {0, CS4_SW3, CS5_SW3, CS6_SW3}, - {0, CS4_SW4, CS5_SW4, CS6_SW4}, - {0, CS4_SW5, CS5_SW5, CS6_SW5}, - {0, CS4_SW6, CS5_SW6, CS6_SW6}, - {0, CS4_SW7, CS5_SW7, CS6_SW7}, - {0, CS4_SW8, CS5_SW8, CS6_SW8}, - {0, CS4_SW9, CS5_SW9, CS6_SW9}, - {0, CS4_SW10, CS5_SW10, CS6_SW10}, - {0, CS4_SW11, CS5_SW11, CS6_SW11}, - {0, CS4_SW12, CS5_SW12, CS6_SW12}, - {0, CS13_SW2, CS14_SW2, CS15_SW2}, - {0, CS13_SW3, CS14_SW3, CS15_SW3}, - {0, CS13_SW4, CS14_SW4, CS15_SW4}, - {0, CS13_SW5, CS14_SW5, CS15_SW5}, - {0, CS13_SW6, CS14_SW6, CS15_SW6}, - {0, CS13_SW7, CS14_SW7, CS15_SW7}, + {0, SW1_CS4, SW1_CS5, SW1_CS6}, + {0, SW2_CS4, SW2_CS5, SW2_CS6}, + {0, SW3_CS4, SW3_CS5, SW3_CS6}, + {0, SW4_CS4, SW4_CS5, SW4_CS6}, + {0, SW5_CS4, SW5_CS5, SW5_CS6}, + {0, SW6_CS4, SW6_CS5, SW6_CS6}, + {0, SW7_CS4, SW7_CS5, SW7_CS6}, + {0, SW8_CS4, SW8_CS5, SW8_CS6}, + {0, SW9_CS4, SW9_CS5, SW9_CS6}, + {0, SW10_CS4, SW10_CS5, SW10_CS6}, + {0, SW11_CS4, SW11_CS5, SW11_CS6}, + {0, SW12_CS4, SW12_CS5, SW12_CS6}, + {0, SW2_CS13, SW2_CS14, SW2_CS15}, + {0, SW3_CS13, SW3_CS14, SW3_CS15}, + {0, SW4_CS13, SW4_CS14, SW4_CS15}, + {0, SW5_CS13, SW5_CS14, SW5_CS15}, + {0, SW6_CS13, SW6_CS14, SW6_CS15}, + {0, SW7_CS13, SW7_CS14, SW7_CS15}, - {0, CS7_SW1, CS8_SW1, CS9_SW1}, - {0, CS7_SW2, CS8_SW2, CS9_SW2}, - {0, CS7_SW3, CS8_SW3, CS9_SW3}, - {0, CS7_SW4, CS8_SW4, CS9_SW4}, - {0, CS7_SW5, CS8_SW5, CS9_SW5}, - {0, CS7_SW6, CS8_SW6, CS9_SW6}, - {0, CS7_SW7, CS8_SW7, CS9_SW7}, - {0, CS7_SW8, CS8_SW8, CS9_SW8}, - {0, CS7_SW9, CS8_SW9, CS9_SW9}, - {0, CS7_SW10, CS8_SW10, CS9_SW10}, - {0, CS7_SW11, CS8_SW11, CS9_SW11}, - {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}, - {0, CS16_SW5, CS17_SW5, CS18_SW5}, - {0, CS16_SW6, CS17_SW6, CS18_SW6}, - {0, CS16_SW7, CS17_SW7, CS18_SW7}, + {0, SW1_CS7, SW1_CS8, SW1_CS9}, + {0, SW2_CS7, SW2_CS8, SW2_CS9}, + {0, SW3_CS7, SW3_CS8, SW3_CS9}, + {0, SW4_CS7, SW4_CS8, SW4_CS9}, + {0, SW5_CS7, SW5_CS8, SW5_CS9}, + {0, SW6_CS7, SW6_CS8, SW6_CS9}, + {0, SW7_CS7, SW7_CS8, SW7_CS9}, + {0, SW8_CS7, SW8_CS8, SW8_CS9}, + {0, SW9_CS7, SW9_CS8, SW9_CS9}, + {0, SW10_CS7, SW10_CS8, SW10_CS9}, + {0, SW11_CS7, SW11_CS8, SW11_CS9}, + {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}, + {0, SW5_CS16, SW5_CS17, SW5_CS18}, + {0, SW6_CS16, SW6_CS17, SW6_CS18}, + {0, SW7_CS16, SW7_CS17, SW7_CS18}, - {1, CS1_SW1, CS2_SW1, CS3_SW1}, - {1, CS1_SW2, CS2_SW2, CS3_SW2}, - {1, CS1_SW3, CS2_SW3, CS3_SW3}, - {1, CS1_SW4, CS2_SW4, CS3_SW4}, - {1, CS1_SW5, CS2_SW5, CS3_SW5}, - {1, CS1_SW6, CS2_SW6, CS3_SW6}, - {1, CS1_SW7, CS2_SW7, CS3_SW7}, - {1, CS1_SW8, CS2_SW8, CS3_SW8}, - {1, CS1_SW9, CS2_SW9, CS3_SW9}, - {1, CS1_SW10, CS2_SW10, CS3_SW10}, - {1, CS1_SW11, CS2_SW11, CS3_SW11}, - {1, CS1_SW12, CS2_SW12, CS3_SW12}, - {1, CS10_SW3, CS11_SW3, CS12_SW3}, - {1, CS10_SW4, CS11_SW4, CS12_SW4}, - {1, CS10_SW5, CS11_SW5, CS12_SW5}, - {1, CS10_SW6, CS11_SW6, CS12_SW6}, + {1, SW1_CS1, SW1_CS2, SW1_CS3}, + {1, SW2_CS1, SW2_CS2, SW2_CS3}, + {1, SW3_CS1, SW3_CS2, SW3_CS3}, + {1, SW4_CS1, SW4_CS2, SW4_CS3}, + {1, SW5_CS1, SW5_CS2, SW5_CS3}, + {1, SW6_CS1, SW6_CS2, SW6_CS3}, + {1, SW7_CS1, SW7_CS2, SW7_CS3}, + {1, SW8_CS1, SW8_CS2, SW8_CS3}, + {1, SW9_CS1, SW9_CS2, SW9_CS3}, + {1, SW10_CS1, SW10_CS2, SW10_CS3}, + {1, SW11_CS1, SW11_CS2, SW11_CS3}, + {1, SW12_CS1, SW12_CS2, SW12_CS3}, + {1, SW3_CS10, SW3_CS11, SW3_CS12}, + {1, SW4_CS10, SW4_CS11, SW4_CS12}, + {1, SW5_CS10, SW5_CS11, SW5_CS12}, + {1, SW6_CS10, SW6_CS11, SW6_CS12}, - {1, CS4_SW1, CS5_SW1, CS6_SW1}, - {1, CS4_SW2, CS5_SW2, CS6_SW2}, - {1, CS4_SW3, CS5_SW3, CS6_SW3}, - {1, CS4_SW4, CS5_SW4, CS6_SW4}, - {1, CS4_SW5, CS5_SW5, CS6_SW5}, - {1, CS4_SW6, CS5_SW6, CS6_SW6}, - {1, CS4_SW7, CS5_SW7, CS6_SW7}, - {1, CS4_SW8, CS5_SW8, CS6_SW8}, - {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}, - {1, CS13_SW3, CS14_SW3, CS15_SW3}, - {1, CS13_SW4, CS14_SW4, CS15_SW4}, - {1, CS13_SW5, CS14_SW5, CS15_SW5}, - {1, CS13_SW6, CS14_SW6, CS15_SW6}, - {1, CS13_SW7, CS14_SW7, CS15_SW7}, + {1, SW1_CS4, SW1_CS5, SW1_CS6}, + {1, SW2_CS4, SW2_CS5, SW2_CS6}, + {1, SW3_CS4, SW3_CS5, SW3_CS6}, + {1, SW4_CS4, SW4_CS5, SW4_CS6}, + {1, SW5_CS4, SW5_CS5, SW5_CS6}, + {1, SW6_CS4, SW6_CS5, SW6_CS6}, + {1, SW7_CS4, SW7_CS5, SW7_CS6}, + {1, SW8_CS4, SW8_CS5, SW8_CS6}, + {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}, + {1, SW3_CS13, SW3_CS14, SW3_CS15}, + {1, SW4_CS13, SW4_CS14, SW4_CS15}, + {1, SW5_CS13, SW5_CS14, SW5_CS15}, + {1, SW6_CS13, SW6_CS14, SW6_CS15}, + {1, SW7_CS13, SW7_CS14, SW7_CS15}, - {1, CS7_SW1, CS8_SW1, CS9_SW1}, - {1, CS7_SW2, CS8_SW2, CS9_SW2}, - {1, CS7_SW3, CS8_SW3, CS9_SW3}, - {1, CS7_SW5, CS8_SW5, CS9_SW5}, - {1, CS7_SW6, CS8_SW6, CS9_SW6}, - {1, CS7_SW8, CS8_SW8, CS9_SW8}, - {1, CS7_SW10, CS8_SW10, CS9_SW10}, - {1, CS7_SW11, CS8_SW11, CS9_SW11}, - {1, CS7_SW12, CS8_SW12, CS9_SW12}, - {1, CS16_SW2, CS17_SW2, CS18_SW2}, - {1, CS16_SW3, CS17_SW3, CS18_SW3}, - {1, CS16_SW4, CS17_SW4, CS18_SW4}, - {1, CS16_SW5, CS17_SW5, CS18_SW5}, - {1, CS16_SW6, CS17_SW6, CS18_SW6} + {1, SW1_CS7, SW1_CS8, SW1_CS9}, + {1, SW2_CS7, SW2_CS8, SW2_CS9}, + {1, SW3_CS7, SW3_CS8, SW3_CS9}, + {1, SW5_CS7, SW5_CS8, SW5_CS9}, + {1, SW6_CS7, SW6_CS8, SW6_CS9}, + {1, SW8_CS7, SW8_CS8, SW8_CS9}, + {1, SW10_CS7, SW10_CS8, SW10_CS9}, + {1, SW11_CS7, SW11_CS8, SW11_CS9}, + {1, SW12_CS7, SW12_CS8, SW12_CS9}, + {1, SW2_CS16, SW2_CS17, SW2_CS18}, + {1, SW3_CS16, SW3_CS17, SW3_CS18}, + {1, SW4_CS16, SW4_CS17, SW4_CS18}, + {1, SW5_CS16, SW5_CS17, SW5_CS18}, + {1, SW6_CS16, SW6_CS17, SW6_CS18} }; #endif From 8fa865a6b6ba4ac56beb5070fc1ae953d968b903 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 31 Aug 2024 17:02:59 +0800 Subject: [PATCH 09/28] Delete skyloong/gk980/q1/ansi/keymaps/via --- .../gk980/q1/ansi/keymaps/via/keymap.c | 178 ------------------ .../gk980/q1/ansi/keymaps/via/rules.mk | 2 - keyboards/skyloong/gk980/q1/config.h | 7 +- 3 files changed, 1 insertion(+), 186 deletions(-) delete mode 100644 keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c delete mode 100644 keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c deleted file mode 100644 index f072b4af664..00000000000 --- a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/keymap.c +++ /dev/null @@ -1,178 +0,0 @@ -// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -int FN_WIN = 0; -int FN_MAC = 0; -int L_WIN = 0; -int L_MAC = 0; - -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_DEL, KC_PGUP, KC_PGDN, KC_PSCR, - 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_P7, KC_P8, KC_P9, KC_PPLS, - 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_P4, KC_P5, KC_P6, - 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_P1, KC_P2, KC_P3, KC_PENT, - 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, KC_P0, KC_PDOT - ), - - [_MAC] = LAYOUT_all( - KC_ESC, KC_F14, KC_F15, C(KC_UP), G(KC_D), G(KC_SPC), LAG(KC_EJCT), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_DEL, KC_PGUP, KC_PGDN, KC_PSCR, - 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_NUM, KC_PSLS, KC_PAST, KC_PMNS, - 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_P7, KC_P8, KC_P9, KC_PPLS, - 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_P4, KC_P5, KC_P6, - 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_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RCMD, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT - ), - - [_WIN_INDEX] = LAYOUT_all( - _______, KC_F14, KC_F15, G(KC_TAB), KC_WSCH, G(C(KC_S)), KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, G(KC_SPC), KC_INS, KC_HOME, KC_END, KC_PAUSE, - _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LGUI, KC_LALT, _______, _______, _______, KC_RALT, _______, KC_APP, RGB_SPD, RGB_VAD, RGB_SPI, KC_P0, KC_PDOT - ), - - [_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, G(KC_SPC), KC_INS, KC_HOME, KC_END, KC_PAUSE, - _______, _______, _______, _______, _______, _______, DF(_WIN), DF(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, - KC_LCTL, KC_LALT, KC_LGUI, _______, _______, _______, KC_RCMD, _______, KC_RALT, RGB_SPD, RGB_VAD, RGB_SPI, KC_P0, KC_PDOT - ) -}; - -#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(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_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(KC_VOLD, KC_VOLU), 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(KC_VOLD, KC_VOLU), 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 - -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - - 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 true; -} - -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 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 MO(2): - if (record->event.pressed) { - FN_WIN = 1; - } else { - FN_WIN = 0; - } - return true; // continue 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 - - case MO(3): - if (record->event.pressed) { - FN_MAC = 1; - } else { - FN_MAC = 0; - } - return true; // continue all further processing of this key - default: - L_MAC = 0; - L_WIN = 0; - return true; - } -} diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk b/keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk deleted file mode 100644 index f1adcab005e..00000000000 --- a/keyboards/skyloong/gk980/q1/ansi/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h index 543d420cefe..f2ada38f81f 100644 --- a/keyboards/skyloong/gk980/q1/config.h +++ b/keyboards/skyloong/gk980/q1/config.h @@ -5,6 +5,7 @@ #define MAC_PIN C13 #define DEBOUNCE 10 +#define WIN_LOCK_INDEX 75 #ifdef ENCODER_ENABLE # define ENCODER_MAP_KEY_DELAY 20 @@ -16,12 +17,6 @@ // Hardware enable lines may be connected to the same pin # define AW20216S_EN_PIN_1 B5 # define AW20216S_EN_PIN_2 B5 - -# define NUM_LOCK_INDEX 31 -# define WIN_MOD_INDEX 23 -# define MAC_MOD_INDEX 24 -# define WIN_LOCK_INDEX 75 -# define SCR_LOCK_INDEX 14 # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS #endif // RGB_MATRIX_ENABLE From b6f44413658216bd8a9e5a2d390ad424ac927891 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:37:24 +0800 Subject: [PATCH 10/28] Update keyboards/skyloong/gk980/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index e70b1fa174e..6cf4f6a99f7 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -127,7 +127,7 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { void suspend_power_down_kb() { # ifdef RGB_MATRIX_ENABLE - writePinLow(AW20216S_EN_PIN_1); + gpio_write_pin_low(AW20216S_EN_PIN); # endif writePinLow(MAC_PIN); suspend_power_down_user(); From bb3f33ed20661b2e4b90177e1fd756a57c8585b5 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:37:59 +0800 Subject: [PATCH 11/28] Update keyboards/skyloong/gk980/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 6cf4f6a99f7..01fa022ac2f 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -129,7 +129,7 @@ void suspend_power_down_kb() { # ifdef RGB_MATRIX_ENABLE gpio_write_pin_low(AW20216S_EN_PIN); # endif - writePinLow(MAC_PIN); + gpio_write_pin_low(MAC_PIN); suspend_power_down_user(); } From a934576c54402cc471539d20def00e15689aedd9 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:38:31 +0800 Subject: [PATCH 12/28] Update keyboards/skyloong/gk980/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 01fa022ac2f..3a30bc4c409 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -135,7 +135,7 @@ void suspend_power_down_kb() { void suspend_wakeup_init_kb() { # ifdef RGB_MATRIX_ENABLE - writePinHigh(AW20216S_EN_PIN_1); + gpio_write_pin_high(AW20216S_EN_PIN); # endif suspend_wakeup_init_user(); } From 3bbcd4be10ee0613c10729cc4b3f809de3b9bc0e Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:38:58 +0800 Subject: [PATCH 13/28] Update keyboards/skyloong/gk980/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 3a30bc4c409..3a6d70ba873 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -141,7 +141,7 @@ void suspend_wakeup_init_kb() { } bool shutdown_kb(bool jump_to_bootloader) { - writePinLow(AW20216S_EN_PIN_1); + gpio_write_pin_low(AW20216S_EN_PIN); return shutdown_user(jump_to_bootloader); } From d3794441c47fbf4c5984132f2aba2036ee2ce72e Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:39:35 +0800 Subject: [PATCH 14/28] Update keyboards/skyloong/gk980/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 3a6d70ba873..9723399df7b 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -148,7 +148,7 @@ bool shutdown_kb(bool jump_to_bootloader) { layer_state_t default_layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 0: - writePinLow(MAC_PIN); + gpio_write_pin_low(MAC_PIN); break; case 1: writePinHigh(MAC_PIN); From 82f16cb14966156e63d52f4504c137a54179636a Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:40:27 +0800 Subject: [PATCH 15/28] Update keyboards/skyloong/gk980/q1/matrix.c I see , thank you very much. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index ced715ea439..e81f9711c96 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later //Matrix read rows set col:DIODE_DIRECTION == ROW2COL -#include "quantum.h" +#include "matrix.h" #define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 From c0c9f641080bb3327cd15f53558304f4abb28dd7 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:41:57 +0800 Subject: [PATCH 16/28] Update keyboards/skyloong/gk980/q1/config.h OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/config.h | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h index f2ada38f81f..198c1553e60 100644 --- a/keyboards/skyloong/gk980/q1/config.h +++ b/keyboards/skyloong/gk980/q1/config.h @@ -7,17 +7,8 @@ #define DEBOUNCE 10 #define WIN_LOCK_INDEX 75 -#ifdef ENCODER_ENABLE -# define ENCODER_MAP_KEY_DELAY 20 -#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_1 B5 -# define AW20216S_EN_PIN_2 B5 -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#endif // RGB_MATRIX_ENABLE +#define ENCODER_MAP_KEY_DELAY 20 +#define AW20216S_CS_PIN_1 B12 +#define AW20216S_CS_PIN_2 B11 +#define AW20216S_EN_PIN B5 From 350f4e61f55e0ddc90b75605946d7111a83fa3b0 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:42:36 +0800 Subject: [PATCH 17/28] Update keyboards/skyloong/gk980/q1/config.h OK, thank you . Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h index 198c1553e60..aea2628d474 100644 --- a/keyboards/skyloong/gk980/q1/config.h +++ b/keyboards/skyloong/gk980/q1/config.h @@ -4,7 +4,6 @@ #pragma once #define MAC_PIN C13 -#define DEBOUNCE 10 #define WIN_LOCK_INDEX 75 #define ENCODER_MAP_KEY_DELAY 20 From 676313667c4a20cdd83742800330f4237da5c430 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:43:06 +0800 Subject: [PATCH 18/28] Update keyboards/skyloong/gk980/q1/info.json OK ,thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk980/q1/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/info.json b/keyboards/skyloong/gk980/q1/info.json index 39c5659602c..1bef3512ba3 100644 --- a/keyboards/skyloong/gk980/q1/info.json +++ b/keyboards/skyloong/gk980/q1/info.json @@ -31,7 +31,6 @@ }, "indicators": { "num_lock": "C15", - "on_state": 1, "caps_lock": "C14" }, "matrix_pins": { From 0d5c9671c14d9ce8a40706c8e55bac23682e08a6 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:45:23 +0800 Subject: [PATCH 19/28] Update keyboards/skyloong/gk980/q1/info.json OK, thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk980/q1/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/info.json b/keyboards/skyloong/gk980/q1/info.json index 1bef3512ba3..a5e4fa75c72 100644 --- a/keyboards/skyloong/gk980/q1/info.json +++ b/keyboards/skyloong/gk980/q1/info.json @@ -21,8 +21,6 @@ }, "features": { "bootmagic": true, - "command": true, - "console": false, "encoder": true, "extrakey": true, "mousekey": true, From 48cbe5c97c5e87a0a89b1ea49061b9a2000b3152 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:46:20 +0800 Subject: [PATCH 20/28] Update keyboards/skyloong/gk980/q1/matrix.c OK, thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk980/q1/matrix.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index e81f9711c96..570e32d5b19 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -1,7 +1,5 @@ // Copyright 2023 NaturaZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later -//Matrix read rows set col:DIODE_DIRECTION == ROW2COL - #include "matrix.h" #define CLOCK_TIME 15 From e4c7eddcd85db2e8b487dceeb962c06199c440f4 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:47:05 +0800 Subject: [PATCH 21/28] Update keyboards/skyloong/gk980/q1/matrix.c OK, thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk980/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 570e32d5b19..12d26e8f36f 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -99,7 +99,7 @@ __attribute__((weak)) void matrix_init_pins(void) { } } -__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { +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 From 37ab37212676be8e8f3be56b5f83cff9d5153ca0 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:48:01 +0800 Subject: [PATCH 22/28] Update keyboards/skyloong/gk980/q1/q1.c OK, I see. Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 9723399df7b..3a0e89f12f8 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" -#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ +#if defined(RGB_MATRIX_ENABLE) 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. From 06665516cdec44bda536d4e9c17c23d52d04548d Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:16:42 +0800 Subject: [PATCH 23/28] Update keyboards/skyloong/gk980/q1/q1.c OK. Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk980/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 3a0e89f12f8..4c536bf69e5 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -154,7 +154,7 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) { writePinHigh(MAC_PIN); break; } - return state; + return default_layer_state_set_user(state); } From 1f187a0eb061cebfa56f51a457926707de022cc8 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Fri, 18 Oct 2024 13:17:36 +0800 Subject: [PATCH 24/28] Update keyboards/skyloong/gk980/q1/matrix.c OK, I see. Thank you. Co-authored-by: Joel Challis --- keyboards/skyloong/gk980/q1/matrix.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 12d26e8f36f..e40354d4c30 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -12,9 +12,6 @@ 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"); From 94e3a0f74ce2f8e533b403b7a6032c2c2be3f43a Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 18 Oct 2024 13:24:45 +0800 Subject: [PATCH 25/28] update skyloong/gk980/q1 --- keyboards/skyloong/gk980/q1/matrix.c | 2 ++ keyboards/skyloong/gk980/q1/q1.c | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 12d26e8f36f..1828f91e5ac 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -1,6 +1,8 @@ // Copyright 2023 NaturaZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later #include "matrix.h" +#include +#include "atomic_util.h" #define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 diff --git a/keyboards/skyloong/gk980/q1/q1.c b/keyboards/skyloong/gk980/q1/q1.c index 3a0e89f12f8..10ce5cdf4b7 100644 --- a/keyboards/skyloong/gk980/q1/q1.c +++ b/keyboards/skyloong/gk980/q1/q1.c @@ -151,7 +151,7 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) { gpio_write_pin_low(MAC_PIN); break; case 1: - writePinHigh(MAC_PIN); + gpio_write_pin_high(MAC_PIN); break; } return state; @@ -162,9 +162,9 @@ 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; # ifdef RGB_MATRIX_ENABLE - setPinOutput(AW20216S_EN_PIN_1); - writePinHigh(AW20216S_EN_PIN_1); + gpio_set_pin_output(AW20216S_EN_PIN); + gpio_write_pin_high(AW20216S_EN_PIN); # endif - setPinOutput(MAC_PIN); - writePinHigh(MAC_PIN); + gpio_set_pin_output(MAC_PIN); + gpio_write_pin_high(MAC_PIN); } From 761ee62cadf63a3dcf7cc0d2d3115279ee2a6bd3 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 18 Oct 2024 14:39:48 +0800 Subject: [PATCH 26/28] update skyloong/gk980/q1 --- keyboards/skyloong/gk980/q1/config.h | 4 ++++ keyboards/skyloong/gk980/q1/info.json | 4 ---- keyboards/skyloong/gk980/q1/matrix.c | 1 - keyboards/skyloong/gk980/q1/mcuconf.h | 3 --- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/config.h b/keyboards/skyloong/gk980/q1/config.h index aea2628d474..21707982b21 100644 --- a/keyboards/skyloong/gk980/q1/config.h +++ b/keyboards/skyloong/gk980/q1/config.h @@ -11,3 +11,7 @@ #define AW20216S_CS_PIN_1 B12 #define AW20216S_CS_PIN_2 B11 #define AW20216S_EN_PIN B5 + +#define MATRIX_ROWS 7 +#define MATRIX_COLS 15 +#define MATRIX_ROW_PINS {A8, A9, A10, A15, B6, B7, B9} diff --git a/keyboards/skyloong/gk980/q1/info.json b/keyboards/skyloong/gk980/q1/info.json index a5e4fa75c72..08c0bebeda1 100644 --- a/keyboards/skyloong/gk980/q1/info.json +++ b/keyboards/skyloong/gk980/q1/info.json @@ -31,10 +31,6 @@ "num_lock": "C15", "caps_lock": "C14" }, - "matrix_pins": { - "cols": [null, null, 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": { diff --git a/keyboards/skyloong/gk980/q1/matrix.c b/keyboards/skyloong/gk980/q1/matrix.c index 5c799e46f25..84f1c6ef20a 100644 --- a/keyboards/skyloong/gk980/q1/matrix.c +++ b/keyboards/skyloong/gk980/q1/matrix.c @@ -12,7 +12,6 @@ #define HC595_DS_PIN A7 pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static inline void select_delay(uint16_t n) { while (n-- > 0) { diff --git a/keyboards/skyloong/gk980/q1/mcuconf.h b/keyboards/skyloong/gk980/q1/mcuconf.h index af06d34b273..8fe4b501e29 100644 --- a/keyboards/skyloong/gk980/q1/mcuconf.h +++ b/keyboards/skyloong/gk980/q1/mcuconf.h @@ -10,7 +10,4 @@ #undef STM32_SPI_USE_DMA #define STM32_SPI_USE_DMA TRUE -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE - From 4a7598ec35ff96807c18bcb48690ba144f7023ed Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 26 Nov 2024 17:12:57 +0800 Subject: [PATCH 27/28] update skyloong/gk980/q1/ansi/keymaps/default/keymap.c --- .../skyloong/gk980/q1/ansi/keymaps/default/keymap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c index 6d820d1d350..fbbb918f362 100644 --- a/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk980/q1/ansi/keymaps/default/keymap.c @@ -16,18 +16,18 @@ 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)), KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, G(KC_SPC), RCS(KC_SPC), G(RCS(KC_4)), KC_PGUP, KC_PGDN, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, RM_PREV, RM_NEXT, KC_DEL, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PPLS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI, KC_P0, KC_PDOT + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, KC_P1, KC_P2, KC_P3, KC_PENT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU, KC_P0, KC_PDOT ), }; #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(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U))}, - [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI), ENCODER_CCW_CW(C(KC_WH_D), C(KC_WH_U))} + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_HUED, RM_HUEU), ENCODER_CCW_CW(RM_SPDD, RM_SPDU), ENCODER_CCW_CW(C(MS_WHLD), C(MS_WHLU))}, + [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_HUED, RM_HUEU), ENCODER_CCW_CW(RM_SPDD, RM_SPDU), ENCODER_CCW_CW(C(MS_WHLD), C(MS_WHLU))} }; #endif From c932a266c21dd8562851c6026e58709ffc45a772 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 17 Mar 2025 16:08:28 +0800 Subject: [PATCH 28/28] Corrected the flags values in skyloong/gk980/q1/ansi/keyboard.json --- keyboards/skyloong/gk980/q1/ansi/keyboard.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk980/q1/ansi/keyboard.json b/keyboards/skyloong/gk980/q1/ansi/keyboard.json index acfda5fbdc1..2471677dad6 100644 --- a/keyboards/skyloong/gk980/q1/ansi/keyboard.json +++ b/keyboards/skyloong/gk980/q1/ansi/keyboard.json @@ -6,9 +6,9 @@ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, {"matrix": [0, 1], "x": 18, "y": 0, "flags": 4}, {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, - {"matrix": [0, 3], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 52, "y": 0, "flags": 1}, {"matrix": [0, 4], "x": 42, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 70, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 70, "y": 0, "flags": 1}, {"matrix": [0, 6], "x": 82, "y": 0, "flags": 4}, {"matrix": [0, 7], "x": 94, "y": 0, "flags": 4}, {"matrix": [0, 8], "x": 106, "y": 0, "flags": 4}, @@ -16,8 +16,8 @@ {"matrix": [0, 10], "x": 133, "y": 0, "flags": 4}, {"matrix": [5, 3], "x": 145, "y": 0, "flags": 4}, {"matrix": [5, 4], "x": 157, "y": 0, "flags": 4}, - {"matrix": [0, 12], "x": 188, "y": 0, "flags": 4}, - {"matrix": [0, 13], "x": 200, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 188, "y": 0, "flags": 1}, + {"matrix": [0, 13], "x": 200, "y": 0, "flags": 1}, {"matrix": [0, 14], "x": 212, "y": 0, "flags": 4}, {"matrix": [6, 13], "x": 224, "y": 0, "flags": 4},