From bb0cab451e4f35135a729595571842572eba9e6a Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Thu, 9 May 2024 16:30:35 +0800 Subject: [PATCH 01/42] Create gk87 q1 keyboard --- keyboards/skyloong/gk87/q1/ansi/keyboard.json | 391 ++++++++++++++++++ .../gk87/q1/ansi/keymaps/default/keymap.c | 89 ++++ .../gk87/q1/ansi/keymaps/default/rules.mk | 2 + .../gk87/q1/ansi/keymaps/via/keymap.c | 64 +++ .../gk87/q1/ansi/keymaps/via/rules.mk | 3 + keyboards/skyloong/gk87/q1/ansi/rules.mk | 2 + keyboards/skyloong/gk87/q1/config.h | 26 ++ keyboards/skyloong/gk87/q1/halconf.h | 9 + keyboards/skyloong/gk87/q1/info.json | 81 ++++ keyboards/skyloong/gk87/q1/led_hc595.c | 80 ++++ keyboards/skyloong/gk87/q1/matrix.c | 154 +++++++ keyboards/skyloong/gk87/q1/mcuconf.h | 12 + keyboards/skyloong/gk87/q1/q1.c | 294 +++++++++++++ keyboards/skyloong/gk87/q1/readme.md | 34 ++ 14 files changed, 1241 insertions(+) create mode 100644 keyboards/skyloong/gk87/q1/ansi/keyboard.json create mode 100644 keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c create mode 100644 keyboards/skyloong/gk87/q1/ansi/keymaps/default/rules.mk create mode 100644 keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c create mode 100644 keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk create mode 100644 keyboards/skyloong/gk87/q1/ansi/rules.mk create mode 100644 keyboards/skyloong/gk87/q1/config.h create mode 100644 keyboards/skyloong/gk87/q1/halconf.h create mode 100644 keyboards/skyloong/gk87/q1/info.json create mode 100644 keyboards/skyloong/gk87/q1/led_hc595.c create mode 100644 keyboards/skyloong/gk87/q1/matrix.c create mode 100644 keyboards/skyloong/gk87/q1/mcuconf.h create mode 100644 keyboards/skyloong/gk87/q1/q1.c create mode 100644 keyboards/skyloong/gk87/q1/readme.md diff --git a/keyboards/skyloong/gk87/q1/ansi/keyboard.json b/keyboards/skyloong/gk87/q1/ansi/keyboard.json new file mode 100644 index 00000000000..79a298ae8c1 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/ansi/keyboard.json @@ -0,0 +1,391 @@ +{ + "keyboard_name": "GK87 Q1_ANSI_1.0.0", + + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 84.5, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 97.5, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 110.5, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 123.5, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4}, + + {"matrix": [1, 0], "x": 0, "y": 15.2, "flags": 4}, + {"matrix": [1, 1], "x": 13, "y": 15.2, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 15.2, "flags": 4}, + {"matrix": [1, 3], "x": 39, "y": 15.2, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 15.2, "flags": 4}, + {"matrix": [1, 5], "x": 65, "y": 15.2, "flags": 4}, + {"matrix": [1, 6], "x": 78, "y": 15.2, "flags": 4}, + {"matrix": [1, 7], "x": 91, "y": 15.2, "flags": 8}, + {"matrix": [1, 8], "x": 103, "y": 15.2, "flags": 4}, + {"matrix": [1, 9], "x": 116, "y": 15.2, "flags": 4}, + {"matrix": [1, 10], "x": 129, "y": 15.2, "flags": 4}, + {"matrix": [1, 11], "x": 142, "y": 15.2, "flags": 4}, + {"matrix": [1, 12], "x": 155, "y": 15.2, "flags": 4}, + {"matrix": [1, 13], "x": 168, "y": 15.2, "flags": 4}, + {"matrix": [1, 14], "x": 198.3, "y": 15.2, "flags": 4}, + {"matrix": [1, 15], "x": 211.3, "y": 15.2, "flags": 4}, + {"matrix": [3, 15], "x": 224, "y": 15.2, "flags": 4}, + + {"matrix": [2, 0], "x": 0, "y": 27.4, "flags": 4}, + {"matrix": [2, 1], "x": 19.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 2], "x": 32.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 3], "x": 45.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 4], "x": 58.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 5], "x": 71.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 6], "x": 84.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 7], "x": 97.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 8], "x": 110.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 9], "x": 123.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 10], "x": 136.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 11], "x": 149.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 12], "x": 162.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 13], "x": 175.5, "y": 27.4, "flags": 4}, + {"matrix": [2, 14], "x": 198.3, "y": 27.4, "flags": 4}, + {"matrix": [2, 15], "x": 211.3, "y": 27.4, "flags": 4}, + {"matrix": [4, 15], "x": 224, "y": 27.4, "flags": 4}, + + {"matrix": [3, 0], "x": 0, "y": 39.6, "flags": 4}, + {"matrix": [3, 1], "x": 22.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 2], "x": 35.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 3], "x": 48.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 4], "x": 61.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 5], "x": 74.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 6], "x": 87.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 7], "x": 100.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 8], "x": 113.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 9], "x": 126.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 10], "x": 139.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 11], "x": 152.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 12], "x": 165.8, "y": 39.6, "flags": 4}, + + {"matrix": [4, 0], "x": 0, "y": 51.8, "flags": 4}, + {"matrix": [4, 1], "x": 29.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 2], "x": 42.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 3], "x": 55.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 4], "x": 68.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 5], "x": 81.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 6], "x": 94.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 7], "x": 107.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 8], "x": 120.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 9], "x": 133.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 10], "x": 146.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 12], "x": 159.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 14], "x": 211.3, "y": 51.8, "flags": 4}, + + {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 16.3, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 32.5, "y": 64, "flags": 4}, + {"matrix": [5, 4], "x": 48.8, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 81.3, "y": 64, "flags": 4}, + {"matrix": [5, 7], "x": 97.5, "y": 64, "flags": 4}, + {"matrix": [5, 9], "x": 130, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 146.3, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 162.5, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 178.8, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 198.3, "y": 64, "flags": 4}, + {"matrix": [5, 14], "x": 211.3, "y": 64, "flags": 4}, + {"matrix": [5, 15], "x": 224, "y": 64, "flags": 4} + ] + }, + "usb": { + "device_version": "1.0.0", + "pid": "0x6B87" + }, + "community_layouts": ["tkl_ansi"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 14], "x": 15.25, "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": [1, 11], "x": 11, "y": 1.25}, + {"label": "=+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "BS", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [3, 15], "x": 17.25, "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": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [4, 15], "x": 17.25, "y": 2.25}, + + {"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": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Ent", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.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": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "Up", "matrix": [4, 14], "x": 16.25, "y": 4.25}, + + {"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": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPAC1", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 2.5}, + {"label": "SPAC", "matrix": [5, 5], "x": 6.25, "y": 5.25, "w": 1.25}, + {"label": "SPAC2", "matrix": [5, 8], "x": 7.5, "y": 5.25, "w": 2.5}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 14], "x": 16.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_tkl_ansi": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "PrtSc", "matrix": [0, 14], "x": 15.25, "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": [1, 11], "x": 11, "y": 1.25}, + {"label": "=+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "BS", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [3, 15], "x": 17.25, "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": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [4, 15], "x": 17.25, "y": 2.25}, + + {"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": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Ent", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.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": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "Up", "matrix": [4, 14], "x": 16.25, "y": 4.25}, + + {"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": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPAC", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 14], "x": 16.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + }, + "LAYOUT_ansi_split_space": { + "layout": [ + {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0}, + {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0}, + {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0}, + {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0}, + {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0}, + {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0}, + {"label": "Mute", "matrix": [0, 14], "x": 15.25, "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": [1, 11], "x": 11, "y": 1.25}, + {"label": "=+", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "BS", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25}, + {"label": "PgUp", "matrix": [3, 15], "x": 17.25, "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": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25}, + {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25}, + {"label": "PgDn", "matrix": [4, 15], "x": 17.25, "y": 2.25}, + + {"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": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Ent", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.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": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, + {"label": "Up", "matrix": [4, 14], "x": 16.25, "y": 4.25}, + + {"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": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "SPAC1", "matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 3.25}, + {"label": "SPAC2", "matrix": [5, 8], "x": 7, "y": 5.25, "w": 3}, + {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"label": "Menu", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"label": "Ctrl", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"label": "Fn", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25}, + {"label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"label": "Down", "matrix": [5, 14], "x": 16.25, "y": 5.25}, + {"label": "Right", "matrix": [5, 15], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c new file mode 100644 index 00000000000..cbf59a9a2c3 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -0,0 +1,89 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +enum layer_names { + _WIN, + _MAC, + _WIN_INDEX, + _MAC_INDEX +}; +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_WIN] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, RGB_TOG, + 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_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_APP, 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_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, RGB_TOG, + 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_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_RCTL, 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), RCS(KC_SPC), G(RCS(KC_4)), KC_MUTE, RGB_TOG, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, 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), RCS(KC_SPC), G(RCS(KC_4)), KC_MUTE, RGB_TOG, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, 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(C(KC_MINS), C(KC_EQL))}, + [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL))}, + [_WIN_INDEX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL))}, + [_MAC_INDEX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL))} +}; +#endif + +#if defined(DIP_SWITCH_MAP_ENABLE) +const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = { + DIP_SWITCH_OFF_ON(TO(0), TO(1)), +}; +#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; + + 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; +} diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/rules.mk b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/rules.mk new file mode 100644 index 00000000000..d64aefdfb83 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +DIP_SWITCH_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c new file mode 100644 index 00000000000..70bdb86b6e7 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c @@ -0,0 +1,64 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +enum layer_names { + _WIN, + _MAC, + _WIN_INDEX, + _MAC_INDEX +}; +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_WIN] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_MAC] = LAYOUT_all( + _______, 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_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_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RCMD, MO(_MAC_INDEX), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [_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, KC_PSCR, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ), + + [_MAC_INDEX] = LAYOUT_all( + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} +}; +#endif + +#if defined(DIP_SWITCH_MAP_ENABLE) +const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = { + DIP_SWITCH_OFF_ON(TO(0), TO(1)), +}; +#endif + diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk new file mode 100644 index 00000000000..8dfffa9d795 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +ENCODER_MAP_ENABLE = yes +DIP_SWITCH_MAP_ENABLE = yes +VIA_ENABLE = yes diff --git a/keyboards/skyloong/gk87/q1/ansi/rules.mk b/keyboards/skyloong/gk87/q1/ansi/rules.mk new file mode 100644 index 00000000000..6aebeff05a8 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/ansi/rules.mk @@ -0,0 +1,2 @@ + CUSTOM_MATRIX = lite + SRC += matrix.c diff --git a/keyboards/skyloong/gk87/q1/config.h b/keyboards/skyloong/gk87/q1/config.h new file mode 100644 index 00000000000..43245571877 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/config.h @@ -0,0 +1,26 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define WIN_LOCK_PIN C13 + +#ifdef ENCODER_ENABLE +# define ENCODER_MAP_KEY_DELAY 10 +#endif + +#ifdef RGB_MATRIX_ENABLE +# define AW20216S_CS_PIN_1 B12 +# define AW20216S_CS_PIN_2 B11 +// Hardware enable lines may be connected to the same pin +# define AW20216S_EN_PIN B10 + +# define NUM_LOCK_INDEX 33 +# define WIN_MOD_INDEX 22 +# define MAC_MOD_INDEX 23 +# define WIN_LOCK_INDEX 93 +# define CAPS_LOCK_INDEX 58 +# define SCR_LOCK_INDEX 14 +#endif // RGB_MATRIX_ENABLE + + diff --git a/keyboards/skyloong/gk87/q1/halconf.h b/keyboards/skyloong/gk87/q1/halconf.h new file mode 100644 index 00000000000..d13f22eaf73 --- /dev/null +++ b/keyboards/skyloong/gk87/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/gk87/q1/info.json b/keyboards/skyloong/gk87/q1/info.json new file mode 100644 index 00000000000..947fbc380aa --- /dev/null +++ b/keyboards/skyloong/gk87/q1/info.json @@ -0,0 +1,81 @@ +{ + "manufacturer": "skyloong", + "maintainer": "NaturalZh", + "bootloader": "stm32duino", + "debounce": 10, + "build": { + "debounce_type": "asym_eager_defer_pk" + }, + "eeprom": { + "wear_leveling": { + "backing_size": 4096 + } + }, + "encoder": { + "rotary": [ + {"pin_a": "B6", "pin_b": "B7"} + ] + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "dip_switch": true, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "indicators": { + "scroll_lock": "C14", + "on_state": 0, + "caps_lock": "C15" + }, + "dip_switch":{ + "pins":["A15"] + }, + "matrix_pins": { + "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null], + "rows": ["A0", "A1", "A2", "A3", "A4", "B0"] + }, + "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/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c new file mode 100644 index 00000000000..a8b16be089a --- /dev/null +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -0,0 +1,80 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +#ifndef HC595_ST_PIN +# error hc595: no storage register clock pins defined! +#endif + +#ifndef HC595_SH_PIN +# error hc595: no shift register clock pins defined! +#endif + +#ifndef HC595_DS +# error hc595: no serial data input pins defined! +#endif + +/* + *LED display driver.74HC595 Serial to parallel control LED field on/off. + * data(default):1-on/0-off (left low bit) + * bit0 --- NUM indicator + * bit1 --- CAPS indicator + * bit2 --- SCR indicator + * bit3 --- WinLock indicator + * bit4 --- Skyloong LOGO display + * bit5 --- Win layer indicator + * bit6 --- MAC layer indicator + */ +#define NUM_ON 0b10000000 +#define CAPS_ON 0b01000000 +#define SCR_ON 0b00100000 +#define WINLK_ON 0b00010000 +#define SKYLOONG 0b00001000 +#define WIN_ON 0b00000010 +#define MAC_ON 0b00000100 + +#define CLOCK_TIME 15 + +static inline void setPinOutput_writeLow(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + setPinOutput(pin); + writePinLow(pin); + } +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + setPinOutput(pin); + writePinHigh(pin); + } +} + +static inline void select_delay(uint16_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + }; +} + +static inline void clockPulse(uint16_t n) { + writePinHigh(HC595_SH_PIN); + writePinHigh(HC595_ST_PIN); + select_delay(n); + writePinLow(HC595_SH_PIN); + writePinLow(HC595_ST_PIN); +} + +static void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function + setPinOutput_writeLow(HC595_DS); + setPinOutput_writeLow(HC595_SH_PIN); + setPinOutput_writeLow(HC595_ST_PIN); + for(uint8_t i = 0; i < 8; i++) { + if(data & 0x01){ + writePinHigh(HC595_DS); + }else{ + writePinLow(HC595_DS); + } + clockPulse(CLOCK_TIME); + data >>= 1; // Move the data one digit to the right + } +} + diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c new file mode 100644 index 00000000000..ac28c1c8cb0 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -0,0 +1,154 @@ +// Copyright 2023 NaturaZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +//Matrix read rows set col:DIODE_DIRECTION == ROW2COL + +#include +#include "atomic_util.h" +#include "debounce.h" + +#define ClOCK_TIME 15 +#define MATRIX_INPUT_PRESSED_STATE 0 + +#define HC595_ST_PIN A6 +#define HC595_SH_PIN A5 +#define HC595_DS_PIN A7 //定义74HC595的串口数据输入端 + +/* matrix state(1:on, 0:off) */ +extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values +extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values + +pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; +pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; + +// user-defined overridable functions +__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter); + +static inline void select_delay(uint16_t n) { + while (n-- > 0) { + asm volatile("nop" ::: "memory"); + }; +} + +static inline void setPinOutput_writeLow(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); + } +} + +static inline void setPinOutput_writeHigh(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); + } +} + +static inline void setPinInputHigh_atomic(pin_t pin) { + ATOMIC_BLOCK_FORCEON { + gpio_set_pin_input_high(pin); + } +} + +static inline uint8_t readMatrixPin(pin_t pin) { + if (pin != NO_PIN) { + return (gpio_read_pin(pin) == MATRIX_INPUT_PRESSED_STATE) ? 0 : 1; + } else { + return 1; + } +} + +static inline void clockPulse(uint16_t n) { + gpio_write_pin_high(HC595_SH_PIN); + gpio_write_pin_high(HC595_ST_PIN); + select_delay(n); + gpio_write_pin_low(HC595_SH_PIN); + gpio_write_pin_low(HC595_ST_PIN); +} + +// matrix code + +static bool select_col(uint8_t col) { + setPinOutput_writeHigh(HC595_DS_PIN); + for (uint8_t m = 0; m <= col; m++) { + if(m == 0){ + gpio_write_pin_low(HC595_DS_PIN); + }else{ + gpio_write_pin_high(HC595_DS_PIN); + } + clockPulse(ClOCK_TIME); + } + return true; + +} + +static void unselect_col(uint8_t col) { + uint8_t x = (MATRIX_COLS - col); + setPinOutput_writeHigh(HC595_DS_PIN); + for (uint8_t y = 0; y < x ; y++) { + clockPulse(ClOCK_TIME); + } +} + +static void unselect_cols(void) { + setPinOutput_writeLow(HC595_SH_PIN); + setPinOutput_writeLow(HC595_ST_PIN); + setPinOutput_writeHigh(HC595_DS_PIN); + for (uint8_t x = 0; x < MATRIX_COLS; x++) { + clockPulse(ClOCK_TIME); + } +} + +__attribute__((weak)) void matrix_init_pins(void) { + unselect_cols(); + for (uint8_t x = 0; x < MATRIX_ROWS; x++) { + if (row_pins[x] != NO_PIN) { + setPinInputHigh_atomic(row_pins[x]); + } + } +} + +__attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) { + bool key_pressed = false; + + // Select col + if (!select_col(current_col)) { // select col + return; // skip NO_PIN col + } + matrix_output_select_delay(); + + // For each row... + for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { + // Check row pin state + if (readMatrixPin(row_pins[row_index]) == 0) { + // Pin LO, set col bit + current_matrix[row_index] |= row_shifter; + key_pressed = true; + } else { + // Pin HI, clear col bit + current_matrix[row_index] &= ~row_shifter; + } + } + + // Unselect col + unselect_col(current_col); + matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH +} + +void matrix_init_custom(void) { + matrix_init_pins(); +} + +bool matrix_scan_custom(matrix_row_t current_matrix[]) { + matrix_row_t temp_matrix[MATRIX_ROWS] = {0}; + + // Set col, read rows + matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; + for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) { + matrix_read_rows_on_col(temp_matrix, current_col, row_shifter); + } + + bool changed = memcmp(raw_matrix, temp_matrix, sizeof(temp_matrix)) != 0; + if (changed) memcpy(raw_matrix, temp_matrix, sizeof(temp_matrix)); + + return changed; +} diff --git a/keyboards/skyloong/gk87/q1/mcuconf.h b/keyboards/skyloong/gk87/q1/mcuconf.h new file mode 100644 index 00000000000..49455f9c3d7 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/mcuconf.h @@ -0,0 +1,12 @@ +// Copyright 2023 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI2 +#define STM32_SPI_USE_SPI2 TRUE + +#undef STM32_SPI_USE_DMA +#define STM32_SPI_USE_DMA TRUE + diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c new file mode 100644 index 00000000000..697361e5a7d --- /dev/null +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -0,0 +1,294 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +#define HC595_ST_PIN B5 //74HC595 storage register clock input +#define HC595_SH_PIN B4 //74HC595 shift register clock input +#define HC595_DS B3 // 74HC595 serial data input +#include "led_hc595.c" +uint8_t IND = 0; //buffer of LED Display + +int FN_ON = 0; +_Bool WIN_LOCK = 0; + +#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ +const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { +/* Each AW20216 channel is controlled by a register at some offset between 0x00 + * and 0xD7 inclusive. + * See drivers/awinic/aw20216.h for the mapping between register offsets and + * driver pin locations. + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, SW1_CS1, SW1_CS2, SW1_CS3}, //ESC + {0, SW3_CS1, SW3_CS2, SW3_CS3}, //F1 + {0, SW4_CS1, SW4_CS2, SW4_CS3}, + {0, SW5_CS1, SW5_CS2, SW5_CS3}, //F3 + {0, SW6_CS1, SW6_CS2, SW6_CS3}, + {0, SW7_CS1, SW7_CS2, SW7_CS3}, //F5 + {0, SW8_CS1, SW8_CS2, SW8_CS3}, + {0, SW9_CS1, SW9_CS2, SW9_CS3}, //F7 + {0, SW10_CS1, SW10_CS2, SW10_CS3}, + {0, SW11_CS1, SW11_CS2, SW11_CS3}, //F9 + {0, SW12_CS1, SW12_CS2, SW12_CS3}, //F10 + {0, SW2_CS10, SW2_CS11, SW2_CS12}, + {0, SW3_CS10, SW3_CS11, SW3_CS12}, //F12 + //encoder no led + + {0, SW1_CS4, SW1_CS5, SW1_CS6}, //`~ + {0, SW2_CS4, SW2_CS5, SW2_CS6}, //1 + {0, SW3_CS4, SW3_CS5, SW3_CS6}, //2 + {0, SW4_CS4, SW4_CS5, SW4_CS6}, + {0, SW5_CS4, SW5_CS5, SW5_CS6}, //4 + {0, SW6_CS4, SW6_CS5, SW6_CS6}, + {0, SW7_CS4, SW7_CS5, SW7_CS6}, //6 + {0, SW8_CS4, SW8_CS5, SW8_CS6}, + {0, SW9_CS4, SW9_CS5, SW9_CS6}, //8 + {0, SW10_CS4, SW10_CS5, SW10_CS6}, + {0, SW11_CS4, SW11_CS5, SW11_CS6}, //0 + {0, SW12_CS4, SW12_CS5, SW12_CS6}, //-_ + {0, SW2_CS13, CS14_SW2, CS15_SW2}, //=+ + {0, SW3_CS13, SW3_CS14, SW3_CS15}, //BS + {0, SW4_CS13, SW4_CS14, SW4_CS15}, //INS + {0, SW5_CS13, SW5_CS14, SW5_CS15}, //Home + {0, SW6_CS13, SW6_CS14, SW6_CS15}, //PgUp + + {0, SW1_CS7, SW1_CS8, SW1_CS9}, //Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9}, //Q + {0, SW3_CS7, SW3_CS8, SW3_CS9}, //W + {0, SW4_CS7, SW4_CS8, SW4_CS9}, //E + {0, SW5_CS7, SW5_CS8, SW5_CS9}, //R + {0, SW6_CS7, SW6_CS8, SW6_CS9}, //T + {0, SW7_CS7, SW7_CS8, SW7_CS9}, //Y + {0, SW8_CS7, SW8_CS8, SW8_CS9}, //U + {0, SW9_CS7, SW9_CS8, SW9_CS9}, //I + {0, SW10_CS7, SW10_CS8, SW10_CS9}, //O + {0, SW11_CS7, SW11_CS8, SW11_CS9}, //P + {0, SW12_CS7, SW12_CS8, SW12_CS9}, //[ + {0, SW2_CS16, SW2_CS17, SW2_CS18}, //] + {0, SW3_CS16, SW3_CS17, SW3_CS18}, //| + {0, SW4_CS16, SW4_CS17, SW4_CS18}, //DEL + {0, SW5_CS16, SW5_CS17, SW5_CS18}, //END + {0, SW6_CS16, SW6_CS17, SW6_CS18}, //PgDn + + {1, SW1_CS1, SW1_CS2, SW1_CS3}, //Cap + {1, SW2_CS1, SW2_CS2, SW2_CS3}, //A + {1, SW3_CS1, SW3_CS2, SW3_CS3}, //S + {1, SW4_CS1, SW4_CS2, SW4_CS3}, //D + {1, SW5_CS1, SW5_CS2, SW5_CS3}, //F + {1, SW6_CS1, SW6_CS2, SW6_CS3}, //G + {1, SW7_CS1, SW7_CS2, SW7_CS3}, //H + {1, SW8_CS1, SW8_CS2, SW8_CS3}, //J + {1, SW9_CS1, SW9_CS2, SW9_CS3}, //K + {1, SW10_CS1, SW10_CS2, SW10_CS3}, //L + {1, SW11_CS1, SW11_CS2, SW11_CS3}, //; + {1, SW12_CS1, SW12_CS2, SW12_CS3}, //. + {1, SW2_CS10, SW2_CS11, SW2_CS12}, //Ent + + {1, SW1_CS4, SW1_CS5, SW1_CS6}, //Shift + {1, SW2_CS4, SW2_CS5, SW2_CS6}, //Z + {1, SW3_CS4, SW3_CS5, SW3_CS6}, //X + {1, SW4_CS4, SW4_CS5, SW4_CS6}, //C + {1, SW5_CS4, SW5_CS5, SW5_CS6}, //V + {1, SW6_CS4, SW6_CS5, SW6_CS6}, //B + {1, SW7_CS4, SW7_CS5, SW7_CS6}, //N + {1, SW8_CS4, SW8_CS5, SW8_CS6}, //M + {1, SW9_CS4, SW9_CS5, SW9_CS6}, //, + {1, SW10_CS4, SW10_CS5, SW10_CS6}, //. + {1, SW11_CS4, SW11_CS5, SW11_CS6}, //? + {1, SW3_CS10, SW3_CS11, SW3_CS12}, //Shift + {1, SW4_CS13, SW4_CS14, SW4_CS15}, //Up + + {1, SW1_CS7, SW1_CS8, SW1_CS9}, //Ctrl + {1, SW2_CS7, SW2_CS8, SW2_CS9}, //Com + {1, SW3_CS7, SW3_CS8, SW3_CS9}, //Alt + {1, SW4_CS7, SW4_CS8, SW4_CS9}, //SPAC1 + {1, SW6_CS7, SW6_CS8, SW6_CS9}, //SPAC + {1, SW8_CS7, SW8_CS8, SW8_CS9}, //SPAC2 + {1, SW10_CS7, SW10_CS8, SW10_CS9}, //Alt + {1, SW11_CS7, SW11_CS8, SW11_CS9}, //Fn + {1, SW12_CS7, SW12_CS8, SW12_CS9}, //Menu + {1, SW2_CS16, SW2_CS17, SW2_CS18}, //Ctrl + {1, SW3_CS16, SW3_CS17, SW3_CS18}, //Left + {1, SW4_CS16, SW4_CS17, SW4_CS18}, //Down + {1, SW5_CS16, SW5_CS17, SW5_CS18}, //Right +}; +#endif + + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { +# ifdef RGB_MATRIX_ENABLE + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + return false; + case RGB_VAI: + rgb_matrix_set_flags(LED_FLAG_ALL); + return true; +# endif + + case MO(1): + if (record->event.pressed) { + FN_ON = 1; + } else { + FN_ON = 0; + } + return true; + + case MO(2): + if (record->event.pressed) { + FN_ON = 1; + } else { + FN_ON = 0; + } + return true; + + case MO(3): + if (record->event.pressed) { + FN_ON = 1; + } else { + FN_ON = 0; + } + return true; + + case KC_LGUI: + if (FN_ON){ + if ( record->event.pressed){ + WIN_LOCK = !WIN_LOCK ; //change win lock state + } + if (!WIN_LOCK) { + IND = IND & (~WINLK_ON); //Close win lock display + s_serial_to_parallel(IND); + writePinHigh(WIN_LOCK_PIN); + return false; //windows key locked do nothing + } + s_serial_to_parallel(IND); + } + if (WIN_LOCK) { + IND = IND | WINLK_ON; //Open win lock display + s_serial_to_parallel(IND); + writePinLow(WIN_LOCK_PIN); + return false; //windows key locked do nothing + } + return true; // continue all further processing of this key + + case TO(0): + set_single_persistent_default_layer(0); + return true; + + case TO(1): + set_single_persistent_default_layer(1); + return true; + + default: + return true; + } + s_serial_to_parallel(IND); +} + +void suspend_power_down_kb() { + writePinHigh(WIN_LOCK_PIN); + s_serial_to_parallel(0); + suspend_power_down_user(); +} + +void suspend_wakeup_init_kb() { + s_serial_to_parallel(IND); + suspend_wakeup_init_user(); +} + +bool shutdown_kb(bool jump_to_bootloader) { + writePinHigh(WIN_LOCK_PIN); + s_serial_to_parallel(0); + return true; +} + +layer_state_t default_layer_state_set_kb(layer_state_t state) { + switch (get_highest_layer(state)) { + case 0: + //switch to win layer display + IND = IND & (~MAC_ON); + IND = IND | WIN_ON; + break; + case 1: + //switch to mac layer display + IND = IND & (~WIN_ON); + IND = IND | MAC_ON; + break; + } + s_serial_to_parallel(IND); + return state; +} + + +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + + //caps lock display + if (host_keyboard_led_state().caps_lock) { + // RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); + IND = IND | CAPS_ON; + } else { + /* + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); + } + */ + IND = IND & (~CAPS_ON); + } + //number lock display + if (host_keyboard_led_state().num_lock) { + // RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_INDEX, 255, 255, 255); + IND = IND | NUM_ON; + } else { + /* + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_INDEX, 0, 0, 0); + } + */ + IND = IND & (~NUM_ON); + } + //scroll lock display + if (host_keyboard_led_state().scroll_lock) { + // RGB_MATRIX_INDICATOR_SET_COLOR(SCR_LOCK_INDEX, 255, 255, 255); + IND = IND | SCR_ON; + } else { + /* + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(SCR_LOCK_INDEX, 0, 0, 0); + } + */ + IND = IND & (~SCR_ON); + } + + s_serial_to_parallel(IND); + return true; +} + + +void board_init(void) { + // JTAG-DP Disabled and SW-DP Disabled + AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; + setPinOutput(WIN_LOCK_PIN); + writePinHigh(WIN_LOCK_PIN); + s_serial_to_parallel(0xFF); + IND = SKYLOONG; +} + diff --git a/keyboards/skyloong/gk87/q1/readme.md b/keyboards/skyloong/gk87/q1/readme.md new file mode 100644 index 00000000000..dc0414f5952 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/readme.md @@ -0,0 +1,34 @@ +# GK104 Q1 Digital Indicator Keyboard + +![GK104 Q1 PCBAS](https://i.imgur.com/EPuSVUAh.jpeg) +![GK104 Q1 keyboard](https://i.imgur.com/fuswwLph.png) + +## The PCB features: +* QMK & VIA compatibility +* RGB Matrix backlight +* Mechanical switches Keyboard with LED display. + + +The following is the QMK Firmware for the Destop 100% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd + +* Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) +* Hardware Supported: DestopPCB for Skyloong keylayout 100%, STM32F103C8T6 +* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip + +Make example for this keyboard (after setting up your build environment): + + make skyloong/gk104/q1/ansi:default + +Flashing example for this keyboard: + + make skyloong/gk104/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). + +## 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 a22f8a1523d3a3eff229af9441cdad2c6bbfafb1 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 10 May 2024 15:34:07 +0800 Subject: [PATCH 02/42] update skyloong/gk87/q1 --- .../gk87/q1/ansi/keymaps/default/keymap.c | 82 +++++++------------ .../gk87/q1/ansi/keymaps/via/keymap.c | 8 +- keyboards/skyloong/gk87/q1/q1.c | 12 +-- 3 files changed, 38 insertions(+), 64 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c index cbf59a9a2c3..54bfcf45dc4 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -11,48 +11,48 @@ enum layer_names { 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_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, RGB_TOG, - 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_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_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_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, RGB_TOG, - 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_INS, KC_HOME, KC_PGUP, 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_DEL, KC_END, KC_PGDN, 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_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT + _______, 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_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_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RCMD, MO(_MAC_INDEX), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_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), RCS(KC_SPC), G(RCS(KC_4)), KC_MUTE, RGB_TOG, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, 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 + _______, 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, RGB_TOG, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ), [_MAC_INDEX] = LAYOUT_all( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, G(KC_SPC), RCS(KC_SPC), G(RCS(KC_4)), KC_MUTE, RGB_TOG, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, 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 + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, + _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL))}, - [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL))}, - [_WIN_INDEX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL))}, - [_MAC_INDEX] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(G(KC_MINS), G(KC_EQL))} + [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} }; #endif @@ -61,29 +61,3 @@ const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = { DIP_SWITCH_OFF_ON(TO(0), TO(1)), }; #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; - - 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; -} diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c index 70bdb86b6e7..a30c95d9714 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c @@ -29,7 +29,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, KC_PSCR, + _______, 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, RGB_TOG, _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -38,7 +38,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, KC_PSCR, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, - [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} + [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} }; #endif diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index 697361e5a7d..e0680dde37c 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -174,7 +174,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!WIN_LOCK) { IND = IND & (~WINLK_ON); //Close win lock display s_serial_to_parallel(IND); - writePinHigh(WIN_LOCK_PIN); + gpio_write_pin_high(WIN_LOCK_PIN); return false; //windows key locked do nothing } s_serial_to_parallel(IND); @@ -182,7 +182,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (WIN_LOCK) { IND = IND | WINLK_ON; //Open win lock display s_serial_to_parallel(IND); - writePinLow(WIN_LOCK_PIN); + gpio_write_pin_low(WIN_LOCK_PIN); return false; //windows key locked do nothing } return true; // continue all further processing of this key @@ -202,7 +202,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } void suspend_power_down_kb() { - writePinHigh(WIN_LOCK_PIN); + gpio_write_pin_high(WIN_LOCK_PIN); s_serial_to_parallel(0); suspend_power_down_user(); } @@ -213,7 +213,7 @@ void suspend_wakeup_init_kb() { } bool shutdown_kb(bool jump_to_bootloader) { - writePinHigh(WIN_LOCK_PIN); + gpio_write_pin_high(WIN_LOCK_PIN); s_serial_to_parallel(0); return true; } @@ -286,8 +286,8 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { 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; - setPinOutput(WIN_LOCK_PIN); - writePinHigh(WIN_LOCK_PIN); + gpio_set_pin_output(WIN_LOCK_PIN); + gpio_write_pin_high(WIN_LOCK_PIN); s_serial_to_parallel(0xFF); IND = SKYLOONG; } From 75d35fb4771d54dd3b535c549d88a78a19c53a0f Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 14 May 2024 09:44:55 +0800 Subject: [PATCH 03/42] modified skyloong/gk87/q1/q1.c --- keyboards/skyloong/gk87/q1/q1.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index e0680dde37c..edc411f96fd 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -202,12 +202,15 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } void suspend_power_down_kb() { + gpio_write_pin_low(AW20216S_EN_PIN); gpio_write_pin_high(WIN_LOCK_PIN); s_serial_to_parallel(0); suspend_power_down_user(); } void suspend_wakeup_init_kb() { + gpio_write_pin_high(AW20216S_EN_PIN); + gpio_write_pin(WIN_LOCK_PIN,!WIN_LOCK); s_serial_to_parallel(IND); suspend_wakeup_init_user(); } @@ -235,7 +238,6 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) { return state; } - bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { return false; @@ -246,11 +248,7 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { // RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); IND = IND | CAPS_ON; } else { - /* - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); - } - */ + IND = IND & (~CAPS_ON); } //number lock display @@ -258,11 +256,7 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { // RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_INDEX, 255, 255, 255); IND = IND | NUM_ON; } else { - /* - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(NUM_LOCK_INDEX, 0, 0, 0); - } - */ + IND = IND & (~NUM_ON); } //scroll lock display @@ -270,11 +264,7 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { // RGB_MATRIX_INDICATOR_SET_COLOR(SCR_LOCK_INDEX, 255, 255, 255); IND = IND | SCR_ON; } else { - /* - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(SCR_LOCK_INDEX, 0, 0, 0); - } - */ + IND = IND & (~SCR_ON); } @@ -282,7 +272,6 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { return true; } - void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; From 2824632694524595ebdfb89cc111ecc4efabea34 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 14 May 2024 14:19:11 +0800 Subject: [PATCH 04/42] Correct description in skyloong/gk87/q1/readme.md --- keyboards/skyloong/gk87/q1/readme.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/readme.md b/keyboards/skyloong/gk87/q1/readme.md index dc0414f5952..5385d05b813 100644 --- a/keyboards/skyloong/gk87/q1/readme.md +++ b/keyboards/skyloong/gk87/q1/readme.md @@ -1,7 +1,6 @@ -# GK104 Q1 Digital Indicator Keyboard +# GK87 Q1 Digital Indicator Keyboard -![GK104 Q1 PCBAS](https://i.imgur.com/EPuSVUAh.jpeg) -![GK104 Q1 keyboard](https://i.imgur.com/fuswwLph.png) +![GK87 Q1 PCBAS](https://i.imgur.com/ckupRBGh.jpeg) ## The PCB features: * QMK & VIA compatibility @@ -9,19 +8,19 @@ * Mechanical switches Keyboard with LED display. -The following is the QMK Firmware for the Destop 100% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd +The following is the QMK Firmware for the Destop 87% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) -* Hardware Supported: DestopPCB for Skyloong keylayout 100%, STM32F103C8T6 +* Hardware Supported: DestopPCB for Skyloong keylayout 87%, STM32F103C8T6 * Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip Make example for this keyboard (after setting up your build environment): - make skyloong/gk104/q1/ansi:default + make skyloong/gk87/q1/ansi:default Flashing example for this keyboard: - make skyloong/gk104/q1/ansi:default:flash + make skyloong/gk87/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). From 0f1b2012ba31686a5b17048580efc9da4ea4d50d Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 14 May 2024 15:06:08 +0800 Subject: [PATCH 05/42] modified skyloong/gk87/q1/ansi/keyboard.json --- keyboards/skyloong/gk87/q1/ansi/keyboard.json | 95 ------------------- 1 file changed, 95 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keyboard.json b/keyboards/skyloong/gk87/q1/ansi/keyboard.json index 79a298ae8c1..c6e72bbb56f 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keyboard.json +++ b/keyboards/skyloong/gk87/q1/ansi/keyboard.json @@ -100,7 +100,6 @@ "device_version": "1.0.0", "pid": "0x6B87" }, - "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_all": { "layout": [ @@ -198,100 +197,6 @@ {"label": "Right", "matrix": [5, 15], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_ansi": { - "layout": [ - {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "F1", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "F2", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "F3", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "F4", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0}, - {"label": "F6", "matrix": [0, 7], "x": 7.5, "y": 0}, - {"label": "F7", "matrix": [0, 8], "x": 8.5, "y": 0}, - {"label": "F8", "matrix": [0, 9], "x": 9.5, "y": 0}, - {"label": "F9", "matrix": [0, 10], "x": 11, "y": 0}, - {"label": "F10", "matrix": [0, 11], "x": 12, "y": 0}, - {"label": "F11", "matrix": [0, 12], "x": 13, "y": 0}, - {"label": "F12", "matrix": [0, 13], "x": 14, "y": 0}, - {"label": "PrtSc", "matrix": [0, 14], "x": 15.25, "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": [1, 11], "x": 11, "y": 1.25}, - {"label": "=+", "matrix": [1, 12], "x": 12, "y": 1.25}, - {"label": "BS", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, - {"label": "Ins", "matrix": [1, 14], "x": 15.25, "y": 1.25}, - {"label": "Home", "matrix": [1, 15], "x": 16.25, "y": 1.25}, - {"label": "PgUp", "matrix": [3, 15], "x": 17.25, "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": [2, 11], "x": 11.5, "y": 2.25}, - {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"label": "|", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, - {"label": "Del", "matrix": [2, 14], "x": 15.25, "y": 2.25}, - {"label": "End", "matrix": [2, 15], "x": 16.25, "y": 2.25}, - {"label": "PgDn", "matrix": [4, 15], "x": 17.25, "y": 2.25}, - - {"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": [3, 11], "x": 11.75, "y": 3.25}, - {"label": "Ent", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.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": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75}, - {"label": "Up", "matrix": [4, 14], "x": 16.25, "y": 4.25}, - - {"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": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, - {"label": "SPAC", "matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, - {"label": "Alt", "matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, - {"label": "Menu", "matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, - {"label": "Ctrl", "matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, - {"label": "Fn", "matrix": [5, 12], "x": 13.75, "y": 5.25, "w": 1.25}, - {"label": "Left", "matrix": [5, 13], "x": 15.25, "y": 5.25}, - {"label": "Down", "matrix": [5, 14], "x": 16.25, "y": 5.25}, - {"label": "Right", "matrix": [5, 15], "x": 17.25, "y": 5.25} - ] - }, "LAYOUT_ansi_split_space": { "layout": [ {"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0}, From 333afa645885367249f9586fe959f1ccef14a4b1 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 17 May 2024 15:55:13 +0800 Subject: [PATCH 06/42] update skyloong/gk87/q1/q1.c --- keyboards/skyloong/gk87/q1/q1.c | 172 ++++++++++++++++---------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index edc411f96fd..62d4c17d89a 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -22,98 +22,98 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, SW1_CS1, SW1_CS2, SW1_CS3}, //ESC - {0, SW3_CS1, SW3_CS2, SW3_CS3}, //F1 - {0, SW4_CS1, SW4_CS2, SW4_CS3}, - {0, SW5_CS1, SW5_CS2, SW5_CS3}, //F3 - {0, SW6_CS1, SW6_CS2, SW6_CS3}, - {0, SW7_CS1, SW7_CS2, SW7_CS3}, //F5 - {0, SW8_CS1, SW8_CS2, SW8_CS3}, - {0, SW9_CS1, SW9_CS2, SW9_CS3}, //F7 - {0, SW10_CS1, SW10_CS2, SW10_CS3}, - {0, SW11_CS1, SW11_CS2, SW11_CS3}, //F9 - {0, SW12_CS1, SW12_CS2, SW12_CS3}, //F10 - {0, SW2_CS10, SW2_CS11, SW2_CS12}, - {0, SW3_CS10, SW3_CS11, SW3_CS12}, //F12 + {0, CS1_SW1, CS2_SW1, CS3_SW1}, //ESC + {0, CS1_SW3, CS2_SW3, CS3_SW3}, //F1 + {0, CS1_SW4, CS2_SW4, CS3_SW4}, + {0, CS1_SW5, CS2_SW5, CS3_SW5}, //F3 + {0, CS1_SW6, CS2_SW6, CS3_SW6}, + {0, CS1_SW7, CS2_SW7, CS3_SW7}, //F5 + {0, CS1_SW8, CS2_SW8, CS3_SW8}, + {0, CS1_SW9, CS2_SW9, CS3_SW9}, //F7 + {0, CS1_SW10, CS2_SW10, CS3_SW10}, + {0, CS1_SW11, CS2_SW11, CS3_SW11}, //F9 + {0, CS1_SW12, CS2_SW12, CS3_SW12}, //F10 + {0, CS10_SW2, CS11_SW2, CS12_SW2}, + {0, CS10_SW3, CS11_SW3, CS12_SW3}, //F12 //encoder no led - {0, SW1_CS4, SW1_CS5, SW1_CS6}, //`~ - {0, SW2_CS4, SW2_CS5, SW2_CS6}, //1 - {0, SW3_CS4, SW3_CS5, SW3_CS6}, //2 - {0, SW4_CS4, SW4_CS5, SW4_CS6}, - {0, SW5_CS4, SW5_CS5, SW5_CS6}, //4 - {0, SW6_CS4, SW6_CS5, SW6_CS6}, - {0, SW7_CS4, SW7_CS5, SW7_CS6}, //6 - {0, SW8_CS4, SW8_CS5, SW8_CS6}, - {0, SW9_CS4, SW9_CS5, SW9_CS6}, //8 - {0, SW10_CS4, SW10_CS5, SW10_CS6}, - {0, SW11_CS4, SW11_CS5, SW11_CS6}, //0 - {0, SW12_CS4, SW12_CS5, SW12_CS6}, //-_ - {0, SW2_CS13, CS14_SW2, CS15_SW2}, //=+ - {0, SW3_CS13, SW3_CS14, SW3_CS15}, //BS - {0, SW4_CS13, SW4_CS14, SW4_CS15}, //INS - {0, SW5_CS13, SW5_CS14, SW5_CS15}, //Home - {0, SW6_CS13, SW6_CS14, SW6_CS15}, //PgUp + {0, CS4_SW1, CS5_SW1, CS6_SW1}, //`~ + {0, CS4_SW2, CS5_SW2, CS6_SW2}, //1 + {0, CS4_SW3, CS5_SW3, CS6_SW3}, //2 + {0, CS4_SW4, CS5_SW4, CS6_SW4}, + {0, CS4_SW5, CS5_SW5, CS6_SW5}, //4 + {0, CS4_SW6, CS5_SW6, CS6_SW6}, + {0, CS4_SW7, CS5_SW7, CS6_SW7}, //6 + {0, CS4_SW8, CS5_SW8, CS6_SW8}, + {0, CS4_SW9, CS5_SW9, CS6_SW9}, //8 + {0, CS4_SW10, CS5_SW10, CS6_SW10}, + {0, CS4_SW11, CS5_SW11, CS6_SW11}, //0 + {0, CS4_SW12, CS5_SW12, CS6_SW12}, //-_ + {0, CS13_SW2, CS14_SW2, CS15_SW2}, //=+ + {0, CS13_SW3, CS14_SW3, CS15_SW3}, //BS + {0, CS13_SW4, CS14_SW4, CS15_SW4}, //INS + {0, CS13_SW5, CS14_SW5, CS15_SW5}, //Home + {0, CS13_SW6, CS14_SW6, CS15_SW6}, //PgUp - {0, SW1_CS7, SW1_CS8, SW1_CS9}, //Tab - {0, SW2_CS7, SW2_CS8, SW2_CS9}, //Q - {0, SW3_CS7, SW3_CS8, SW3_CS9}, //W - {0, SW4_CS7, SW4_CS8, SW4_CS9}, //E - {0, SW5_CS7, SW5_CS8, SW5_CS9}, //R - {0, SW6_CS7, SW6_CS8, SW6_CS9}, //T - {0, SW7_CS7, SW7_CS8, SW7_CS9}, //Y - {0, SW8_CS7, SW8_CS8, SW8_CS9}, //U - {0, SW9_CS7, SW9_CS8, SW9_CS9}, //I - {0, SW10_CS7, SW10_CS8, SW10_CS9}, //O - {0, SW11_CS7, SW11_CS8, SW11_CS9}, //P - {0, SW12_CS7, SW12_CS8, SW12_CS9}, //[ - {0, SW2_CS16, SW2_CS17, SW2_CS18}, //] - {0, SW3_CS16, SW3_CS17, SW3_CS18}, //| - {0, SW4_CS16, SW4_CS17, SW4_CS18}, //DEL - {0, SW5_CS16, SW5_CS17, SW5_CS18}, //END - {0, SW6_CS16, SW6_CS17, SW6_CS18}, //PgDn + {0, CS7_SW1, CS8_SW1, CS9_SW1}, //Tab + {0, CS7_SW2, CS8_SW2, CS9_SW2}, //Q + {0, CS7_SW3, CS8_SW3, CS9_SW3}, //W + {0, CS7_SW4, CS8_SW4, CS9_SW4}, //E + {0, CS7_SW5, CS8_SW5, CS9_SW5}, //R + {0, CS7_SW6, CS8_SW6, CS9_SW6}, //T + {0, CS7_SW7, CS8_SW7, CS9_SW7}, //Y + {0, CS7_SW8, CS8_SW8, CS9_SW8}, //U + {0, CS7_SW9, CS8_SW9, CS9_SW9}, //I + {0, CS7_SW10, CS8_SW10, CS9_SW10}, //O + {0, CS7_SW11, CS8_SW11, CS9_SW11}, //P + {0, CS7_SW12, CS8_SW12, CS9_SW12}, //[ + {0, CS16_SW2, CS17_SW2, CS18_SW2}, //] + {0, CS16_SW3, CS17_SW3, CS18_SW3}, //| + {0, CS16_SW4, CS17_SW4, CS18_SW4}, //DEL + {0, CS16_SW5, CS17_SW5, CS18_SW5}, //END + {0, CS16_SW6, CS17_SW6, CS18_SW6}, //PgDn - {1, SW1_CS1, SW1_CS2, SW1_CS3}, //Cap - {1, SW2_CS1, SW2_CS2, SW2_CS3}, //A - {1, SW3_CS1, SW3_CS2, SW3_CS3}, //S - {1, SW4_CS1, SW4_CS2, SW4_CS3}, //D - {1, SW5_CS1, SW5_CS2, SW5_CS3}, //F - {1, SW6_CS1, SW6_CS2, SW6_CS3}, //G - {1, SW7_CS1, SW7_CS2, SW7_CS3}, //H - {1, SW8_CS1, SW8_CS2, SW8_CS3}, //J - {1, SW9_CS1, SW9_CS2, SW9_CS3}, //K - {1, SW10_CS1, SW10_CS2, SW10_CS3}, //L - {1, SW11_CS1, SW11_CS2, SW11_CS3}, //; - {1, SW12_CS1, SW12_CS2, SW12_CS3}, //. - {1, SW2_CS10, SW2_CS11, SW2_CS12}, //Ent + {1, CS1_SW1, CS2_SW1, CS3_SW1}, //Cap + {1, CS1_SW2, CS2_SW2, CS3_SW2}, //A + {1, CS1_SW3, CS2_SW3, CS3_SW3}, //S + {1, CS1_SW4, CS2_SW4, CS3_SW4}, //D + {1, CS1_SW5, CS2_SW5, CS3_SW5}, //F + {1, CS1_SW6, CS2_SW6, CS3_SW6}, //G + {1, CS1_SW7, CS2_SW7, CS3_SW7}, //H + {1, CS1_SW8, CS2_SW8, CS3_SW8}, //J + {1, CS1_SW9, CS2_SW9, CS3_SW9}, //K + {1, CS1_SW10, CS2_SW10, CS3_SW10}, //L + {1, CS1_SW11, CS2_SW11, CS3_SW11}, //; + {1, CS1_SW12, CS2_SW12, CS3_SW12}, //. + {1, CS10_SW2, CS11_SW2, CS12_SW2}, //Ent - {1, SW1_CS4, SW1_CS5, SW1_CS6}, //Shift - {1, SW2_CS4, SW2_CS5, SW2_CS6}, //Z - {1, SW3_CS4, SW3_CS5, SW3_CS6}, //X - {1, SW4_CS4, SW4_CS5, SW4_CS6}, //C - {1, SW5_CS4, SW5_CS5, SW5_CS6}, //V - {1, SW6_CS4, SW6_CS5, SW6_CS6}, //B - {1, SW7_CS4, SW7_CS5, SW7_CS6}, //N - {1, SW8_CS4, SW8_CS5, SW8_CS6}, //M - {1, SW9_CS4, SW9_CS5, SW9_CS6}, //, - {1, SW10_CS4, SW10_CS5, SW10_CS6}, //. - {1, SW11_CS4, SW11_CS5, SW11_CS6}, //? - {1, SW3_CS10, SW3_CS11, SW3_CS12}, //Shift - {1, SW4_CS13, SW4_CS14, SW4_CS15}, //Up + {1, CS4_SW1, CS5_SW1, CS6_SW1}, //Shift + {1, CS4_SW2, CS5_SW2, CS6_SW2}, //Z + {1, CS4_SW3, CS5_SW3, CS6_SW3}, //X + {1, CS4_SW4, CS5_SW4, CS6_SW4}, //C + {1, CS4_SW5, CS5_SW5, CS6_SW5}, //V + {1, CS4_SW6, CS5_SW6, CS6_SW6}, //B + {1, CS4_SW7, CS5_SW7, CS6_SW7}, //N + {1, CS4_SW8, CS5_SW8, CS6_SW8}, //M + {1, CS4_SW9, CS5_SW9, CS6_SW9}, //, + {1, CS4_SW10, CS5_SW10, CS6_SW10}, //. + {1, CS4_SW11, CS5_SW11, CS6_SW11}, //? + {1, CS10_SW3, CS11_SW3, CS12_SW3}, //Shift + {1, CS13_SW4, CS14_SW4, CS15_SW4}, //Up - {1, SW1_CS7, SW1_CS8, SW1_CS9}, //Ctrl - {1, SW2_CS7, SW2_CS8, SW2_CS9}, //Com - {1, SW3_CS7, SW3_CS8, SW3_CS9}, //Alt - {1, SW4_CS7, SW4_CS8, SW4_CS9}, //SPAC1 - {1, SW6_CS7, SW6_CS8, SW6_CS9}, //SPAC - {1, SW8_CS7, SW8_CS8, SW8_CS9}, //SPAC2 - {1, SW10_CS7, SW10_CS8, SW10_CS9}, //Alt - {1, SW11_CS7, SW11_CS8, SW11_CS9}, //Fn - {1, SW12_CS7, SW12_CS8, SW12_CS9}, //Menu - {1, SW2_CS16, SW2_CS17, SW2_CS18}, //Ctrl - {1, SW3_CS16, SW3_CS17, SW3_CS18}, //Left - {1, SW4_CS16, SW4_CS17, SW4_CS18}, //Down - {1, SW5_CS16, SW5_CS17, SW5_CS18}, //Right + {1, CS7_SW1, CS8_SW1, CS9_SW1}, //Ctrl + {1, CS7_SW2, CS8_SW2, CS9_SW2}, //Com + {1, CS7_SW3, CS8_SW3, CS9_SW3}, //Alt + {1, CS7_SW4, CS8_SW4, CS9_SW4}, //SPAC1 + {1, CS7_SW6, CS8_SW6, CS9_SW6}, //SPAC + {1, CS7_SW8, CS8_SW8, CS9_SW8}, //SPAC2 + {1, CS7_SW10, CS8_SW10, CS9_SW10}, //Alt + {1, CS7_SW11, CS8_SW11, CS9_SW11}, //Fn + {1, CS7_SW12, CS8_SW12, CS9_SW12}, //Menu + {1, CS16_SW2, CS17_SW2, CS18_SW2}, //Ctrl + {1, CS16_SW3, CS17_SW3, CS18_SW3}, //Left + {1, CS16_SW4, CS17_SW4, CS18_SW4}, //Down + {1, CS16_SW5, CS17_SW5, CS18_SW5}, //Right }; #endif From bf8f59e74803ff1cb908384b0e625e92c2ba6ae7 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 28 May 2024 19:49:06 +0800 Subject: [PATCH 07/42] modified skyloong/gk87/q1/readme.md --- keyboards/skyloong/gk87/q1/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/readme.md b/keyboards/skyloong/gk87/q1/readme.md index 5385d05b813..d67e74eb52c 100644 --- a/keyboards/skyloong/gk87/q1/readme.md +++ b/keyboards/skyloong/gk87/q1/readme.md @@ -1,6 +1,6 @@ # GK87 Q1 Digital Indicator Keyboard -![GK87 Q1 PCBAS](https://i.imgur.com/ckupRBGh.jpeg) +![GK87 Q1 PCBAS](https://i.imgur.com/ckupRBG.jpeg) ## The PCB features: * QMK & VIA compatibility From 95ad8160d040d276c8867045166e92b740054171 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 13 Jul 2024 13:57:43 +0800 Subject: [PATCH 08/42] Update keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c OK, Thank you for your suggestion. Co-authored-by: Drashna Jaelre --- keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c index 54bfcf45dc4..eeec3ea5204 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -58,6 +58,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #if defined(DIP_SWITCH_MAP_ENABLE) const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = { - DIP_SWITCH_OFF_ON(TO(0), TO(1)), + DIP_SWITCH_OFF_ON(DF(0), DF(1)), }; #endif From dc40ebeb0959b9dbfc482d70381b0598a8a055f0 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 13 Jul 2024 14:44:00 +0800 Subject: [PATCH 09/42] update skyloong/gk87/q1 keyboard --- .../gk87/q1/ansi/keymaps/default/keymap.c | 4 ++-- .../gk87/q1/ansi/keymaps/via/keymap.c | 6 +++--- keyboards/skyloong/gk87/q1/led_hc595.c | 20 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c index eeec3ea5204..24939c4462c 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -30,7 +30,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, RGB_TOG, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, @@ -39,7 +39,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, RGB_TOG, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c index a30c95d9714..0be6b923ada 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c @@ -30,7 +30,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, RGB_TOG, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, @@ -39,7 +39,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, RGB_TOG, - _______, _______, _______, _______, _______, _______, TO(_WIN), TO(_MAC), _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, @@ -58,7 +58,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { #if defined(DIP_SWITCH_MAP_ENABLE) const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = { - DIP_SWITCH_OFF_ON(TO(0), TO(1)), + DIP_SWITCH_OFF_ON(DF(0), DF(1)), }; #endif diff --git a/keyboards/skyloong/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c index a8b16be089a..bb45a9d822c 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.c +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -37,15 +37,15 @@ static inline void setPinOutput_writeLow(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinLow(pin); + gpio_set_pin_output(pin); + gpio_write_pin_low(pin); } } static inline void setPinOutput_writeHigh(pin_t pin) { ATOMIC_BLOCK_FORCEON { - setPinOutput(pin); - writePinHigh(pin); + gpio_set_pin_output(pin); + gpio_write_pin_high(pin); } } @@ -56,11 +56,11 @@ static inline void select_delay(uint16_t n) { } static inline void clockPulse(uint16_t n) { - writePinHigh(HC595_SH_PIN); - writePinHigh(HC595_ST_PIN); + gpio_write_pin_high(HC595_SH_PIN); + gpio_write_pin_high(HC595_ST_PIN); select_delay(n); - writePinLow(HC595_SH_PIN); - writePinLow(HC595_ST_PIN); + gpio_write_pin_low(HC595_SH_PIN); + gpio_write_pin_low(HC595_ST_PIN); } static void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function @@ -69,9 +69,9 @@ static void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port setPinOutput_writeLow(HC595_ST_PIN); for(uint8_t i = 0; i < 8; i++) { if(data & 0x01){ - writePinHigh(HC595_DS); + gpio_write_pin_high(HC595_DS); }else{ - writePinLow(HC595_DS); + gpio_write_pin_low(HC595_DS); } clockPulse(CLOCK_TIME); data >>= 1; // Move the data one digit to the right From 0b01391370e776a37ec173bffa4d6670fefc1754 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 13 Jul 2024 15:26:29 +0800 Subject: [PATCH 10/42] Correct skyloong/gk87/q1/ansi/keyboard.json --- keyboards/skyloong/gk87/q1/ansi/keyboard.json | 148 +++++++++--------- 1 file changed, 74 insertions(+), 74 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keyboard.json b/keyboards/skyloong/gk87/q1/ansi/keyboard.json index c6e72bbb56f..48823c1b858 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keyboard.json +++ b/keyboards/skyloong/gk87/q1/ansi/keyboard.json @@ -8,91 +8,91 @@ {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4}, {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4}, {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 84.5, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 97.5, "y": 0, "flags": 4}, - {"matrix": [0, 8], "x": 110.5, "y": 0, "flags": 4}, - {"matrix": [0, 9], "x": 123.5, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 85, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 98, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 111, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 124, "y": 0, "flags": 4}, {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4}, {"matrix": [0, 11], "x": 156, "y": 0, "flags": 4}, {"matrix": [0, 12], "x": 169, "y": 0, "flags": 4}, {"matrix": [0, 13], "x": 182, "y": 0, "flags": 4}, - {"matrix": [1, 0], "x": 0, "y": 15.2, "flags": 4}, - {"matrix": [1, 1], "x": 13, "y": 15.2, "flags": 4}, - {"matrix": [1, 2], "x": 26, "y": 15.2, "flags": 4}, - {"matrix": [1, 3], "x": 39, "y": 15.2, "flags": 4}, - {"matrix": [1, 4], "x": 52, "y": 15.2, "flags": 4}, - {"matrix": [1, 5], "x": 65, "y": 15.2, "flags": 4}, - {"matrix": [1, 6], "x": 78, "y": 15.2, "flags": 4}, - {"matrix": [1, 7], "x": 91, "y": 15.2, "flags": 8}, - {"matrix": [1, 8], "x": 103, "y": 15.2, "flags": 4}, - {"matrix": [1, 9], "x": 116, "y": 15.2, "flags": 4}, - {"matrix": [1, 10], "x": 129, "y": 15.2, "flags": 4}, - {"matrix": [1, 11], "x": 142, "y": 15.2, "flags": 4}, - {"matrix": [1, 12], "x": 155, "y": 15.2, "flags": 4}, - {"matrix": [1, 13], "x": 168, "y": 15.2, "flags": 4}, - {"matrix": [1, 14], "x": 198.3, "y": 15.2, "flags": 4}, - {"matrix": [1, 15], "x": 211.3, "y": 15.2, "flags": 4}, - {"matrix": [3, 15], "x": 224, "y": 15.2, "flags": 4}, + {"matrix": [1, 0], "x": 0, "y": 15, "flags": 4}, + {"matrix": [1, 1], "x": 13, "y": 15, "flags": 4}, + {"matrix": [1, 2], "x": 26, "y": 15, "flags": 4}, + {"matrix": [1, 3], "x": 39, "y": 15, "flags": 4}, + {"matrix": [1, 4], "x": 52, "y": 15, "flags": 4}, + {"matrix": [1, 5], "x": 65, "y": 15, "flags": 4}, + {"matrix": [1, 6], "x": 78, "y": 15, "flags": 4}, + {"matrix": [1, 7], "x": 91, "y": 15, "flags": 8}, + {"matrix": [1, 8], "x": 103, "y": 15, "flags": 4}, + {"matrix": [1, 9], "x": 116, "y": 15, "flags": 4}, + {"matrix": [1, 10], "x": 129, "y": 15, "flags": 4}, + {"matrix": [1, 11], "x": 142, "y": 15, "flags": 4}, + {"matrix": [1, 12], "x": 155, "y": 15, "flags": 4}, + {"matrix": [1, 13], "x": 168, "y": 15, "flags": 4}, + {"matrix": [1, 14], "x": 198, "y": 15, "flags": 4}, + {"matrix": [1, 15], "x": 211, "y": 15, "flags": 4}, + {"matrix": [3, 15], "x": 224, "y": 15, "flags": 4}, - {"matrix": [2, 0], "x": 0, "y": 27.4, "flags": 4}, - {"matrix": [2, 1], "x": 19.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 2], "x": 32.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 3], "x": 45.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 4], "x": 58.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 5], "x": 71.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 6], "x": 84.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 7], "x": 97.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 8], "x": 110.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 9], "x": 123.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 10], "x": 136.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 11], "x": 149.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 12], "x": 162.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 13], "x": 175.5, "y": 27.4, "flags": 4}, - {"matrix": [2, 14], "x": 198.3, "y": 27.4, "flags": 4}, - {"matrix": [2, 15], "x": 211.3, "y": 27.4, "flags": 4}, - {"matrix": [4, 15], "x": 224, "y": 27.4, "flags": 4}, + {"matrix": [2, 0], "x": 0, "y": 27, "flags": 4}, + {"matrix": [2, 1], "x": 20, "y": 27, "flags": 4}, + {"matrix": [2, 2], "x": 33, "y": 27, "flags": 4}, + {"matrix": [2, 3], "x": 46, "y": 27, "flags": 4}, + {"matrix": [2, 4], "x": 59, "y": 27, "flags": 4}, + {"matrix": [2, 5], "x": 72, "y": 27, "flags": 4}, + {"matrix": [2, 6], "x": 85, "y": 27, "flags": 4}, + {"matrix": [2, 7], "x": 98, "y": 27, "flags": 4}, + {"matrix": [2, 8], "x": 111, "y": 27, "flags": 4}, + {"matrix": [2, 9], "x": 124, "y": 27, "flags": 4}, + {"matrix": [2, 10], "x": 137, "y": 27, "flags": 4}, + {"matrix": [2, 11], "x": 150, "y": 27, "flags": 4}, + {"matrix": [2, 12], "x": 163, "y": 27, "flags": 4}, + {"matrix": [2, 13], "x": 176, "y": 27, "flags": 4}, + {"matrix": [2, 14], "x": 199, "y": 27, "flags": 4}, + {"matrix": [2, 15], "x": 212, "y": 27, "flags": 4}, + {"matrix": [4, 15], "x": 224, "y": 27, "flags": 4}, - {"matrix": [3, 0], "x": 0, "y": 39.6, "flags": 4}, - {"matrix": [3, 1], "x": 22.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 2], "x": 35.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 3], "x": 48.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 4], "x": 61.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 5], "x": 74.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 6], "x": 87.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 7], "x": 100.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 8], "x": 113.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 9], "x": 126.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 10], "x": 139.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 11], "x": 152.8, "y": 39.6, "flags": 4}, - {"matrix": [3, 12], "x": 165.8, "y": 39.6, "flags": 4}, + {"matrix": [3, 0], "x": 0, "y": 40, "flags": 4}, + {"matrix": [3, 1], "x": 23, "y": 40, "flags": 4}, + {"matrix": [3, 2], "x": 36, "y": 40, "flags": 4}, + {"matrix": [3, 3], "x": 49, "y": 40, "flags": 4}, + {"matrix": [3, 4], "x": 62, "y": 40, "flags": 4}, + {"matrix": [3, 5], "x": 75, "y": 40, "flags": 4}, + {"matrix": [3, 6], "x": 88, "y": 40, "flags": 4}, + {"matrix": [3, 7], "x": 101, "y": 40, "flags": 4}, + {"matrix": [3, 8], "x": 114, "y": 40, "flags": 4}, + {"matrix": [3, 9], "x": 127, "y": 40, "flags": 4}, + {"matrix": [3, 10], "x": 140, "y": 40, "flags": 4}, + {"matrix": [3, 11], "x": 153, "y": 40, "flags": 4}, + {"matrix": [3, 12], "x": 166, "y": 40, "flags": 4}, - {"matrix": [4, 0], "x": 0, "y": 51.8, "flags": 4}, - {"matrix": [4, 1], "x": 29.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 2], "x": 42.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 3], "x": 55.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 4], "x": 68.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 5], "x": 81.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 6], "x": 94.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 7], "x": 107.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 8], "x": 120.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 9], "x": 133.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 10], "x": 146.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 12], "x": 159.3, "y": 51.8, "flags": 4}, - {"matrix": [4, 14], "x": 211.3, "y": 51.8, "flags": 4}, + {"matrix": [4, 0], "x": 0, "y": 52, "flags": 4}, + {"matrix": [4, 1], "x": 29, "y": 52, "flags": 4}, + {"matrix": [4, 2], "x": 42, "y": 52, "flags": 4}, + {"matrix": [4, 3], "x": 55, "y": 52, "flags": 4}, + {"matrix": [4, 4], "x": 68, "y": 52, "flags": 4}, + {"matrix": [4, 5], "x": 81, "y": 52, "flags": 4}, + {"matrix": [4, 6], "x": 94, "y": 52, "flags": 4}, + {"matrix": [4, 7], "x": 107, "y": 52, "flags": 4}, + {"matrix": [4, 8], "x": 120, "y": 52, "flags": 4}, + {"matrix": [4, 9], "x": 133, "y": 52, "flags": 4}, + {"matrix": [4, 10], "x": 146, "y": 52, "flags": 4}, + {"matrix": [4, 12], "x": 159, "y": 52, "flags": 4}, + {"matrix": [4, 14], "x": 211, "y": 52, "flags": 4}, {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4}, - {"matrix": [5, 1], "x": 16.3, "y": 64, "flags": 4}, - {"matrix": [5, 2], "x": 32.5, "y": 64, "flags": 4}, - {"matrix": [5, 4], "x": 48.8, "y": 64, "flags": 4}, - {"matrix": [5, 5], "x": 81.3, "y": 64, "flags": 4}, - {"matrix": [5, 7], "x": 97.5, "y": 64, "flags": 4}, + {"matrix": [5, 1], "x": 16, "y": 64, "flags": 4}, + {"matrix": [5, 2], "x": 33, "y": 64, "flags": 4}, + {"matrix": [5, 4], "x": 49, "y": 64, "flags": 4}, + {"matrix": [5, 5], "x": 81, "y": 64, "flags": 4}, + {"matrix": [5, 7], "x": 98, "y": 64, "flags": 4}, {"matrix": [5, 9], "x": 130, "y": 64, "flags": 4}, - {"matrix": [5, 10], "x": 146.3, "y": 64, "flags": 4}, - {"matrix": [5, 11], "x": 162.5, "y": 64, "flags": 4}, - {"matrix": [5, 12], "x": 178.8, "y": 64, "flags": 4}, - {"matrix": [5, 13], "x": 198.3, "y": 64, "flags": 4}, - {"matrix": [5, 14], "x": 211.3, "y": 64, "flags": 4}, + {"matrix": [5, 10], "x": 146, "y": 64, "flags": 4}, + {"matrix": [5, 11], "x": 163, "y": 64, "flags": 4}, + {"matrix": [5, 12], "x": 179, "y": 64, "flags": 4}, + {"matrix": [5, 13], "x": 198, "y": 64, "flags": 4}, + {"matrix": [5, 14], "x": 211, "y": 64, "flags": 4}, {"matrix": [5, 15], "x": 224, "y": 64, "flags": 4} ] }, From 3e38f9bf9b9f38d97e219602334432ce58f06aa8 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 15 Jul 2024 16:11:35 +0800 Subject: [PATCH 11/42] update skyloong/gk87/q1/led_hc595.c --- keyboards/skyloong/gk87/q1/led_hc595.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c index bb45a9d822c..040e3f3d209 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.c +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -35,14 +35,14 @@ #define CLOCK_TIME 15 -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 sgpio_set_pin_output_write_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_high(pin); @@ -64,9 +64,9 @@ static inline void clockPulse(uint16_t n) { } static void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function - setPinOutput_writeLow(HC595_DS); - setPinOutput_writeLow(HC595_SH_PIN); - setPinOutput_writeLow(HC595_ST_PIN); + gpio_set_pin_output_write_low(HC595_DS); + gpio_set_pin_output_write_low(HC595_SH_PIN); + gpio_set_pin_output_write_low(HC595_ST_PIN); for(uint8_t i = 0; i < 8; i++) { if(data & 0x01){ gpio_write_pin_high(HC595_DS); From 1d2cd27e8e200e09eb1fb16ddd1a30ab8b67520c Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Thu, 8 Aug 2024 11:19:45 +0800 Subject: [PATCH 12/42] movied skyloong/gk87/q1/readme.md to skyloong/gk87/q1/ansi folder --- keyboards/skyloong/gk87/q1/{ => ansi}/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename keyboards/skyloong/gk87/q1/{ => ansi}/readme.md (95%) diff --git a/keyboards/skyloong/gk87/q1/readme.md b/keyboards/skyloong/gk87/q1/ansi/readme.md similarity index 95% rename from keyboards/skyloong/gk87/q1/readme.md rename to keyboards/skyloong/gk87/q1/ansi/readme.md index d67e74eb52c..5fec2f08c28 100644 --- a/keyboards/skyloong/gk87/q1/readme.md +++ b/keyboards/skyloong/gk87/q1/ansi/readme.md @@ -1,6 +1,6 @@ # GK87 Q1 Digital Indicator Keyboard -![GK87 Q1 PCBAS](https://i.imgur.com/ckupRBG.jpeg) +![GK87 Q1 ansi PCBAS](https://i.imgur.com/ckupRBG.jpeg) ## The PCB features: * QMK & VIA compatibility From d34e8cc656da90d40d988c4ba1fbdacd6d32c78c Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 30 Aug 2024 15:28:16 +0800 Subject: [PATCH 13/42] Delete skyloong/gk87/q1/ansi/keymaps/via --- .../gk87/q1/ansi/keymaps/via/keymap.c | 64 ------------------- .../gk87/q1/ansi/keymaps/via/rules.mk | 3 - 2 files changed, 67 deletions(-) delete mode 100644 keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c delete mode 100644 keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c deleted file mode 100644 index 0be6b923ada..00000000000 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/keymap.c +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright 2023 NaturalZh (@NaturalZh) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H -enum layer_names { - _WIN, - _MAC, - _WIN_INDEX, - _MAC_INDEX -}; -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_WIN] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [_MAC] = LAYOUT_all( - _______, 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_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_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, - 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RCMD, MO(_MAC_INDEX), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [_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, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ), - - [_MAC_INDEX] = LAYOUT_all( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} -}; -#endif - -#if defined(DIP_SWITCH_MAP_ENABLE) -const uint16_t PROGMEM dip_switch_map[NUM_DIP_SWITCHES][NUM_DIP_STATES] = { - DIP_SWITCH_OFF_ON(DF(0), DF(1)), -}; -#endif - diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk b/keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk deleted file mode 100644 index 8dfffa9d795..00000000000 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/via/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -ENCODER_MAP_ENABLE = yes -DIP_SWITCH_MAP_ENABLE = yes -VIA_ENABLE = yes From 9be4060947faba2df61844cfdf3bc3f9bb271d7b Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 8 Oct 2024 10:55:19 +0800 Subject: [PATCH 14/42] update skyloong/gk87/q1/ansi/readme.md --- keyboards/skyloong/gk87/q1/ansi/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/readme.md b/keyboards/skyloong/gk87/q1/ansi/readme.md index 5fec2f08c28..2fa82f728af 100644 --- a/keyboards/skyloong/gk87/q1/ansi/readme.md +++ b/keyboards/skyloong/gk87/q1/ansi/readme.md @@ -12,7 +12,7 @@ The following is the QMK Firmware for the Destop 87% keylayout - designed by Do * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) * Hardware Supported: DestopPCB for Skyloong keylayout 87%, STM32F103C8T6 -* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip +* Hardware Availability: https://skyloongtech.com Make example for this keyboard (after setting up your build environment): From b937c9b5f86e68af763a3215a25da8876373848c Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:51:08 +0800 Subject: [PATCH 15/42] Update keyboards/skyloong/gk87/q1/matrix.c OK. Thank you for your advice. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index ac28c1c8cb0..b5d6c129cf6 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -29,7 +29,7 @@ static inline void select_delay(uint16_t n) { }; } -static inline void setPinOutput_writeLow(pin_t pin) { +static inline void gpio_atomic_set_pin_output_low(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_low(pin); From dd3e084ac7ecfadfaa6f930865a1da381035332b Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:51:34 +0800 Subject: [PATCH 16/42] Update keyboards/skyloong/gk87/q1/matrix.c OK. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index b5d6c129cf6..5fcb13528cf 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -36,7 +36,7 @@ static inline void gpio_atomic_set_pin_output_low(pin_t pin) { } } -static inline void setPinOutput_writeHigh(pin_t pin) { +static inline void gpio_atomic_set_pin_output_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_output(pin); gpio_write_pin_high(pin); From 54c1e58c7149995fc95caf105b837dde1826386e Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:52:04 +0800 Subject: [PATCH 17/42] Update keyboards/skyloong/gk87/q1/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index 5fcb13528cf..084acdc1fc9 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -43,7 +43,7 @@ static inline void gpio_atomic_set_pin_output_high(pin_t pin) { } } -static inline void setPinInputHigh_atomic(pin_t pin) { +static inline void gpio_atomic_set_pin_input_high(pin_t pin) { ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); } From addb5b68743d7e0d525d67a2162ea751b1907d81 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:52:21 +0800 Subject: [PATCH 18/42] Update keyboards/skyloong/gk87/q1/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index 084acdc1fc9..8fd5e42d3e0 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -68,7 +68,7 @@ static inline void clockPulse(uint16_t n) { // matrix code static bool select_col(uint8_t col) { - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ gpio_write_pin_low(HC595_DS_PIN); From 26fc14e41fd46a86aa6a6f2e718afd3c5825df7e Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:52:38 +0800 Subject: [PATCH 19/42] Update keyboards/skyloong/gk87/q1/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index 8fd5e42d3e0..3a9ea965e48 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -83,7 +83,7 @@ static bool select_col(uint8_t col) { static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { clockPulse(ClOCK_TIME); } From b811782c70f44def069058797917575677bf16e3 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:53:02 +0800 Subject: [PATCH 20/42] Update keyboards/skyloong/gk87/q1/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index 3a9ea965e48..d2f56a3c8a9 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -90,9 +90,9 @@ static void unselect_col(uint8_t col) { } static void unselect_cols(void) { - setPinOutput_writeLow(HC595_SH_PIN); - setPinOutput_writeLow(HC595_ST_PIN); - setPinOutput_writeHigh(HC595_DS_PIN); + gpio_atomic_set_pin_output_low(HC595_SH_PIN); + gpio_atomic_set_pin_output_low(HC595_ST_PIN); + gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { clockPulse(ClOCK_TIME); } From 7a59071c0d68bf88d30a159316f06a3fe7b6e509 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:53:18 +0800 Subject: [PATCH 21/42] Update keyboards/skyloong/gk87/q1/matrix.c OK Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index d2f56a3c8a9..347f24638c5 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -102,7 +102,7 @@ __attribute__((weak)) void matrix_init_pins(void) { unselect_cols(); for (uint8_t x = 0; x < MATRIX_ROWS; x++) { if (row_pins[x] != NO_PIN) { - setPinInputHigh_atomic(row_pins[x]); + gpio_atomic_set_pin_input_high(row_pins[x]); } } } From 7ecb950612bb32b0b6cebf5e87470e8c211707a9 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:54:47 +0800 Subject: [PATCH 22/42] Update keyboards/skyloong/gk87/q1/config.h OK. I agree with you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/config.h | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/config.h b/keyboards/skyloong/gk87/q1/config.h index 43245571877..efe6c64d803 100644 --- a/keyboards/skyloong/gk87/q1/config.h +++ b/keyboards/skyloong/gk87/q1/config.h @@ -5,22 +5,16 @@ #define WIN_LOCK_PIN C13 -#ifdef ENCODER_ENABLE -# define ENCODER_MAP_KEY_DELAY 10 -#endif +#define ENCODER_MAP_KEY_DELAY 10 -#ifdef RGB_MATRIX_ENABLE -# define AW20216S_CS_PIN_1 B12 -# define AW20216S_CS_PIN_2 B11 +#define AW20216S_CS_PIN_1 B12 +#define AW20216S_CS_PIN_2 B11 // Hardware enable lines may be connected to the same pin -# define AW20216S_EN_PIN B10 - -# define NUM_LOCK_INDEX 33 -# define WIN_MOD_INDEX 22 -# define MAC_MOD_INDEX 23 -# define WIN_LOCK_INDEX 93 -# define CAPS_LOCK_INDEX 58 -# define SCR_LOCK_INDEX 14 -#endif // RGB_MATRIX_ENABLE - +#define AW20216S_EN_PIN B10 +#define NUM_LOCK_INDEX 33 +#define WIN_MOD_INDEX 22 +#define MAC_MOD_INDEX 23 +#define WIN_LOCK_INDEX 93 +#define CAPS_LOCK_INDEX 58 +#define SCR_LOCK_INDEX 14 From bcdd2490ed25de407fcc173ce030d6c0e5e18307 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Wed, 9 Oct 2024 16:19:59 +0800 Subject: [PATCH 23/42] update skyloong/gk87/q1 --- keyboards/skyloong/gk87/q1/config.h | 5 +++++ keyboards/skyloong/gk87/q1/info.json | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/config.h b/keyboards/skyloong/gk87/q1/config.h index efe6c64d803..54a70bb7dec 100644 --- a/keyboards/skyloong/gk87/q1/config.h +++ b/keyboards/skyloong/gk87/q1/config.h @@ -18,3 +18,8 @@ #define WIN_LOCK_INDEX 93 #define CAPS_LOCK_INDEX 58 #define SCR_LOCK_INDEX 14 + +#define MATRIX_ROWS 6 +#define MATRIX_COLS 16 +#define MATRIX_ROW_PINS {A0, A1, A2, A3, A4, B0} +#define MATRIX_COL_PINS {} diff --git a/keyboards/skyloong/gk87/q1/info.json b/keyboards/skyloong/gk87/q1/info.json index 947fbc380aa..1f866b6972f 100644 --- a/keyboards/skyloong/gk87/q1/info.json +++ b/keyboards/skyloong/gk87/q1/info.json @@ -35,10 +35,6 @@ "dip_switch":{ "pins":["A15"] }, - "matrix_pins": { - "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null], - "rows": ["A0", "A1", "A2", "A3", "A4", "B0"] - }, "processor": "STM32F103", "rgb_matrix": { "animations": { From 8de92e8b61c3494c2422d10baf0aee385fc5a787 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:23:55 +0800 Subject: [PATCH 24/42] Update keyboards/skyloong/gk87/q1/matrix.c I agree with you . Thanks. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index 347f24638c5..e4ec34bfcc4 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -18,7 +18,6 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; -pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; // user-defined overridable functions __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter); From 2382c08e953609c71decf975c36aaa9699130d04 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 16:25:55 +0800 Subject: [PATCH 25/42] Update keyboards/skyloong/gk87/q1/matrix.c Thank you for your careful discovery. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index e4ec34bfcc4..de4e98734ec 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -6,7 +6,7 @@ #include "atomic_util.h" #include "debounce.h" -#define ClOCK_TIME 15 +#define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 #define HC595_ST_PIN A6 From 3e9abb67cfce28a5c9d97c6462cdc99492ce6711 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Wed, 9 Oct 2024 16:47:43 +0800 Subject: [PATCH 26/42] update skyloong/gk87/q1/matrix.c --- keyboards/skyloong/gk87/q1/config.h | 1 - keyboards/skyloong/gk87/q1/matrix.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/config.h b/keyboards/skyloong/gk87/q1/config.h index 54a70bb7dec..ea2f7bfc449 100644 --- a/keyboards/skyloong/gk87/q1/config.h +++ b/keyboards/skyloong/gk87/q1/config.h @@ -22,4 +22,3 @@ #define MATRIX_ROWS 6 #define MATRIX_COLS 16 #define MATRIX_ROW_PINS {A0, A1, A2, A3, A4, B0} -#define MATRIX_COL_PINS {} diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index de4e98734ec..bc7eda0365f 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -74,7 +74,7 @@ static bool select_col(uint8_t col) { }else{ gpio_write_pin_high(HC595_DS_PIN); } - clockPulse(ClOCK_TIME); + clockPulse(CLOCK_TIME); } return true; @@ -84,7 +84,7 @@ static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clockPulse(ClOCK_TIME); + clockPulse(CLOCK_TIME); } } @@ -93,7 +93,7 @@ static void unselect_cols(void) { gpio_atomic_set_pin_output_low(HC595_ST_PIN); gpio_atomic_set_pin_output_high(HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clockPulse(ClOCK_TIME); + clockPulse(CLOCK_TIME); } } From a66e01964ebb31bc550879cf2bca79b903f08a89 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:31:40 +0800 Subject: [PATCH 27/42] Update keyboards/skyloong/gk87/q1/matrix.c Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/matrix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index bc7eda0365f..bfdb39dd056 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -2,9 +2,9 @@ // SPDX-License-Identifier: GPL-2.0-or-later //Matrix read rows set col:DIODE_DIRECTION == ROW2COL +#include "matrix.h" #include #include "atomic_util.h" -#include "debounce.h" #define CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 From 3824cf08f852a6eabbe571cda480395f951bb889 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:32:14 +0800 Subject: [PATCH 28/42] Update keyboards/skyloong/gk87/q1/led_hc595.c Thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/led_hc595.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c index 040e3f3d209..10665695027 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.c +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -1,6 +1,7 @@ // Copyright 2023 NaturalZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" +#include "gpio.h" +#include "atomic_util.h" #ifndef HC595_ST_PIN # error hc595: no storage register clock pins defined! From 4ab02f101c799053e48c0bdcc5af9a90998ca303 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 26 Oct 2024 17:02:16 +0800 Subject: [PATCH 29/42] update skyloong/gk87/q1 --- keyboards/skyloong/gk87/q1/ansi/readme.md | 2 +- keyboards/skyloong/gk87/q1/ansi/rules.mk | 1 + keyboards/skyloong/gk87/q1/led_hc595.c | 27 +++----------------- keyboards/skyloong/gk87/q1/led_hc595.h | 31 +++++++++++++++++++++++ keyboards/skyloong/gk87/q1/q1.c | 5 +--- 5 files changed, 38 insertions(+), 28 deletions(-) create mode 100644 keyboards/skyloong/gk87/q1/led_hc595.h diff --git a/keyboards/skyloong/gk87/q1/ansi/readme.md b/keyboards/skyloong/gk87/q1/ansi/readme.md index 2fa82f728af..c044277d471 100644 --- a/keyboards/skyloong/gk87/q1/ansi/readme.md +++ b/keyboards/skyloong/gk87/q1/ansi/readme.md @@ -12,7 +12,7 @@ The following is the QMK Firmware for the Destop 87% keylayout - designed by Do * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) * Hardware Supported: DestopPCB for Skyloong keylayout 87%, STM32F103C8T6 -* Hardware Availability: https://skyloongtech.com +* Hardware Availability: [Skyloong CN](http://www.skyloong.com.cn) & [Skyloong HK](https://skyloongtech.com/product-category/keyboards/qmkvia-keyboard/) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/skyloong/gk87/q1/ansi/rules.mk b/keyboards/skyloong/gk87/q1/ansi/rules.mk index 6aebeff05a8..a937045e0d0 100644 --- a/keyboards/skyloong/gk87/q1/ansi/rules.mk +++ b/keyboards/skyloong/gk87/q1/ansi/rules.mk @@ -1,2 +1,3 @@ CUSTOM_MATRIX = lite SRC += matrix.c + SRC += led_hc595.c diff --git a/keyboards/skyloong/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c index 10665695027..0a68b4e0f1a 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.c +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -1,7 +1,6 @@ // Copyright 2023 NaturalZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later -#include "gpio.h" -#include "atomic_util.h" +#include "led_hc595.h" #ifndef HC595_ST_PIN # error hc595: no storage register clock pins defined! @@ -15,25 +14,6 @@ # error hc595: no serial data input pins defined! #endif -/* - *LED display driver.74HC595 Serial to parallel control LED field on/off. - * data(default):1-on/0-off (left low bit) - * bit0 --- NUM indicator - * bit1 --- CAPS indicator - * bit2 --- SCR indicator - * bit3 --- WinLock indicator - * bit4 --- Skyloong LOGO display - * bit5 --- Win layer indicator - * bit6 --- MAC layer indicator - */ -#define NUM_ON 0b10000000 -#define CAPS_ON 0b01000000 -#define SCR_ON 0b00100000 -#define WINLK_ON 0b00010000 -#define SKYLOONG 0b00001000 -#define WIN_ON 0b00000010 -#define MAC_ON 0b00000100 - #define CLOCK_TIME 15 static inline void gpio_set_pin_output_write_low(pin_t pin) { @@ -43,7 +23,7 @@ static inline void gpio_set_pin_output_write_low(pin_t pin) { } } -static inline void sgpio_set_pin_output_write_high(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); @@ -64,7 +44,8 @@ static inline void clockPulse(uint16_t n) { gpio_write_pin_low(HC595_ST_PIN); } -static void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function +void s_serial_to_parallel(uint8_t data) __attribute__((unused)); +void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function gpio_set_pin_output_write_low(HC595_DS); gpio_set_pin_output_write_low(HC595_SH_PIN); gpio_set_pin_output_write_low(HC595_ST_PIN); diff --git a/keyboards/skyloong/gk87/q1/led_hc595.h b/keyboards/skyloong/gk87/q1/led_hc595.h new file mode 100644 index 00000000000..9e47f41a4e9 --- /dev/null +++ b/keyboards/skyloong/gk87/q1/led_hc595.h @@ -0,0 +1,31 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once +//#include "quantum.h" +#include "atomic_util.h" +#include "gpio.h" + +#define HC595_ST_PIN B1 //74HC595 storage register clock input +#define HC595_SH_PIN B0 //74HC595 shift register clock input +#define HC595_DS B3 // 74HC595 serial data input + +/* + *LED display driver.74HC595 Serial to parallel control LED field on/off. + * data(default):1-on/0-off (left low bit) + * bit0 --- NUM indicator + * bit1 --- CAPS indicator + * bit2 --- SCR indicator + * bit3 --- WinLock indicator + * bit4 --- Skyloong LOGO display + * bit5 --- Win layer indicator + * bit6 --- MAC layer indicator + */ +#define NUM_ON 0b10000000 +#define CAPS_ON 0b01000000 +#define SCR_ON 0b00100000 +#define WINLK_ON 0b00010000 +#define SKYLOONG 0b00001000 +#define WIN_ON 0b00000010 +#define MAC_ON 0b00000100 + +void s_serial_to_parallel(uint8_t data); diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index 62d4c17d89a..596de08e475 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -1,11 +1,8 @@ // Copyright 2023 NaturalZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" +#include "led_hc595.h" -#define HC595_ST_PIN B5 //74HC595 storage register clock input -#define HC595_SH_PIN B4 //74HC595 shift register clock input -#define HC595_DS B3 // 74HC595 serial data input -#include "led_hc595.c" uint8_t IND = 0; //buffer of LED Display int FN_ON = 0; From e32b98973a7189c91774de87a1fe2b75a3f3f891 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 11 Nov 2024 14:52:17 +0800 Subject: [PATCH 30/42] update skyloong/gk87/q1/ansi/readme.md --- keyboards/skyloong/gk87/q1/ansi/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/readme.md b/keyboards/skyloong/gk87/q1/ansi/readme.md index c044277d471..9d2114c2401 100644 --- a/keyboards/skyloong/gk87/q1/ansi/readme.md +++ b/keyboards/skyloong/gk87/q1/ansi/readme.md @@ -8,10 +8,10 @@ * Mechanical switches Keyboard with LED display. -The following is the QMK Firmware for the Destop 87% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd +The following is the QMK Firmware for the Desktop 87% keylayout - designed by Dongguan Jizhi Electronic Technology Co., Ltd * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) -* Hardware Supported: DestopPCB for Skyloong keylayout 87%, STM32F103C8T6 +* Hardware Supported: DesktopPCB for Skyloong keylayout 87%, STM32F103C8T6 * Hardware Availability: [Skyloong CN](http://www.skyloong.com.cn) & [Skyloong HK](https://skyloongtech.com/product-category/keyboards/qmkvia-keyboard/) Make example for this keyboard (after setting up your build environment): From 0ae7533c2a40a5b0e0d5007748ac086e12eafced Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 12 Nov 2024 19:21:40 +0800 Subject: [PATCH 31/42] update skyloong/gk87/q1/led_hc595.h --- keyboards/skyloong/gk87/q1/led_hc595.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/led_hc595.h b/keyboards/skyloong/gk87/q1/led_hc595.h index 9e47f41a4e9..88f09da78f0 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.h +++ b/keyboards/skyloong/gk87/q1/led_hc595.h @@ -1,7 +1,7 @@ // Copyright 2023 NaturalZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -//#include "quantum.h" + #include "atomic_util.h" #include "gpio.h" From ef6c23b0b9a21de0f71efb540cdadc6064798899 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:30:45 +0800 Subject: [PATCH 32/42] Update keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c OK, I got it . Thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c index 24939c4462c..8f7633d4430 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -29,12 +29,12 @@ 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, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, 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, RM_TOGG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, RM_PREV, RM_NEXT, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU ), [_MAC_INDEX] = LAYOUT_all( From 7fc25930a4bfb33aecc75550f04609afa9f8873b Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:31:30 +0800 Subject: [PATCH 33/42] Update keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c index 8f7633d4430..0e9c8f51710 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -38,12 +38,12 @@ 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, RGB_TOG, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_RMOD, RGB_MOD, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RM_TOGG, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_TOGG, RM_PREV, RM_NEXT, KC_DEL, KC_INS, KC_HOME, KC_PGUP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, KC_END, KC_PGDN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU ) }; From 28be157f781ce146434afa318ae8f43b1b887e5d Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:32:04 +0800 Subject: [PATCH 34/42] Update keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c index 0e9c8f51710..ebca24f2efa 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk87/q1/ansi/keymaps/default/keymap.c @@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [_WIN_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_MAC_INDEX] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)} + [_WIN_INDEX] = { ENCODER_CCW_CW(RM_VALD, RM_VALU)}, + [_MAC_INDEX] = { ENCODER_CCW_CW(RM_VALD, RM_VALU)} }; #endif From 788e4f5bca2c0a6fc14f726b4416fefc48067458 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:32:35 +0800 Subject: [PATCH 35/42] Update keyboards/skyloong/gk87/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index 596de08e475..9f28288a222 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -121,7 +121,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } switch (keycode) { # ifdef RGB_MATRIX_ENABLE - case RGB_TOG: + case RM_TOGG: if (record->event.pressed) { switch (rgb_matrix_get_flags()) { case LED_FLAG_ALL: { From 5e46328749f220bb18b3e5119c9cadf3edccda82 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:33:00 +0800 Subject: [PATCH 36/42] Update keyboards/skyloong/gk87/q1/q1.c OK, thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk87/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index 9f28288a222..ca7ded56a3c 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -134,7 +134,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } } return false; - case RGB_VAI: + case RM_VALU: rgb_matrix_set_flags(LED_FLAG_ALL); return true; # endif From 0c4634660022cf2877e02049247dcc2f83bb64bc Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 23 Nov 2024 14:56:39 +0800 Subject: [PATCH 37/42] update skyloong/gk87/q1 --- keyboards/skyloong/gk87/q1/led_hc595.c | 28 ++++++++++---------- keyboards/skyloong/gk87/q1/led_hc595.h | 6 ++--- keyboards/skyloong/gk87/q1/matrix.c | 36 +++++++++++++------------- keyboards/skyloong/gk87/q1/q1.c | 8 ------ 4 files changed, 35 insertions(+), 43 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c index 0a68b4e0f1a..eb8fa903e9f 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.c +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -2,19 +2,19 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "led_hc595.h" -#ifndef HC595_ST_PIN +#ifndef LED_HC595_ST_PIN # error hc595: no storage register clock pins defined! #endif -#ifndef HC595_SH_PIN +#ifndef LED_HC595_SH_PIN # error hc595: no shift register clock pins defined! #endif -#ifndef HC595_DS +#ifndef LED_HC595_DS # error hc595: no serial data input pins defined! #endif -#define CLOCK_TIME 15 +#define LED_CLOCK_TIME 15 static inline void gpio_set_pin_output_write_low(pin_t pin) { ATOMIC_BLOCK_FORCEON { @@ -37,25 +37,25 @@ static inline void select_delay(uint16_t n) { } static inline void clockPulse(uint16_t n) { - gpio_write_pin_high(HC595_SH_PIN); - gpio_write_pin_high(HC595_ST_PIN); + gpio_write_pin_high(LED_HC595_SH_PIN); + gpio_write_pin_high(LED_HC595_ST_PIN); select_delay(n); - gpio_write_pin_low(HC595_SH_PIN); - gpio_write_pin_low(HC595_ST_PIN); + gpio_write_pin_low(LED_HC595_SH_PIN); + gpio_write_pin_low(LED_HC595_ST_PIN); } void s_serial_to_parallel(uint8_t data) __attribute__((unused)); void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function - gpio_set_pin_output_write_low(HC595_DS); - gpio_set_pin_output_write_low(HC595_SH_PIN); - gpio_set_pin_output_write_low(HC595_ST_PIN); + gpio_set_pin_output_write_low(LED_HC595_DS); + gpio_set_pin_output_write_low(LED_HC595_SH_PIN); + gpio_set_pin_output_write_low(LED_HC595_ST_PIN); for(uint8_t i = 0; i < 8; i++) { if(data & 0x01){ - gpio_write_pin_high(HC595_DS); + gpio_write_pin_high(LED_HC595_DS); }else{ - gpio_write_pin_low(HC595_DS); + gpio_write_pin_low(LED_HC595_DS); } - clockPulse(CLOCK_TIME); + clockPulse(LED_CLOCK_TIME); data >>= 1; // Move the data one digit to the right } } diff --git a/keyboards/skyloong/gk87/q1/led_hc595.h b/keyboards/skyloong/gk87/q1/led_hc595.h index 88f09da78f0..2b7c59c6ebc 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.h +++ b/keyboards/skyloong/gk87/q1/led_hc595.h @@ -5,9 +5,9 @@ #include "atomic_util.h" #include "gpio.h" -#define HC595_ST_PIN B1 //74HC595 storage register clock input -#define HC595_SH_PIN B0 //74HC595 shift register clock input -#define HC595_DS B3 // 74HC595 serial data input +#define LED_HC595_ST_PIN B1 //74HC595 storage register clock input +#define LED_HC595_SH_PIN B0 //74HC595 shift register clock input +#define LED_HC595_DS B3 // 74HC595 serial data input /* *LED display driver.74HC595 Serial to parallel control LED field on/off. diff --git a/keyboards/skyloong/gk87/q1/matrix.c b/keyboards/skyloong/gk87/q1/matrix.c index bfdb39dd056..778b3ec7441 100644 --- a/keyboards/skyloong/gk87/q1/matrix.c +++ b/keyboards/skyloong/gk87/q1/matrix.c @@ -6,12 +6,12 @@ #include #include "atomic_util.h" -#define CLOCK_TIME 15 +#define MATRIX_CLOCK_TIME 15 #define MATRIX_INPUT_PRESSED_STATE 0 -#define HC595_ST_PIN A6 -#define HC595_SH_PIN A5 -#define HC595_DS_PIN A7 //定义74HC595的串口数据输入端 +#define MATRIX_HC595_ST_PIN A6 +#define MATRIX_HC595_SH_PIN A5 +#define MATRIX_HC595_DS_PIN A7 //定义74HC595的串口数据输入端 /* matrix state(1:on, 0:off) */ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values @@ -57,24 +57,24 @@ static inline uint8_t readMatrixPin(pin_t pin) { } static inline void clockPulse(uint16_t n) { - gpio_write_pin_high(HC595_SH_PIN); - gpio_write_pin_high(HC595_ST_PIN); + gpio_write_pin_high(MATRIX_HC595_SH_PIN); + gpio_write_pin_high(MATRIX_HC595_ST_PIN); select_delay(n); - gpio_write_pin_low(HC595_SH_PIN); - gpio_write_pin_low(HC595_ST_PIN); + gpio_write_pin_low(MATRIX_HC595_SH_PIN); + gpio_write_pin_low(MATRIX_HC595_ST_PIN); } // matrix code static bool select_col(uint8_t col) { - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t m = 0; m <= col; m++) { if(m == 0){ - gpio_write_pin_low(HC595_DS_PIN); + gpio_write_pin_low(MATRIX_HC595_DS_PIN); }else{ - gpio_write_pin_high(HC595_DS_PIN); + gpio_write_pin_high(MATRIX_HC595_DS_PIN); } - clockPulse(CLOCK_TIME); + clockPulse(MATRIX_CLOCK_TIME); } return true; @@ -82,18 +82,18 @@ static bool select_col(uint8_t col) { static void unselect_col(uint8_t col) { uint8_t x = (MATRIX_COLS - col); - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t y = 0; y < x ; y++) { - clockPulse(CLOCK_TIME); + clockPulse(MATRIX_CLOCK_TIME); } } static void unselect_cols(void) { - gpio_atomic_set_pin_output_low(HC595_SH_PIN); - gpio_atomic_set_pin_output_low(HC595_ST_PIN); - gpio_atomic_set_pin_output_high(HC595_DS_PIN); + gpio_atomic_set_pin_output_low(MATRIX_HC595_SH_PIN); + gpio_atomic_set_pin_output_low(MATRIX_HC595_ST_PIN); + gpio_atomic_set_pin_output_high(MATRIX_HC595_DS_PIN); for (uint8_t x = 0; x < MATRIX_COLS; x++) { - clockPulse(CLOCK_TIME); + clockPulse(MATRIX_CLOCK_TIME); } } diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index ca7ded56a3c..1cb7a86b50a 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -184,14 +184,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return true; // continue all further processing of this key - case TO(0): - set_single_persistent_default_layer(0); - return true; - - case TO(1): - set_single_persistent_default_layer(1); - return true; - default: return true; } From e50fb4a2f60677ce479b01675eb4fc7413727578 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 26 Nov 2024 16:15:22 +0800 Subject: [PATCH 38/42] update skyloong/gk87/q1 --- keyboards/skyloong/gk87/q1/led_hc595.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/led_hc595.h b/keyboards/skyloong/gk87/q1/led_hc595.h index 2b7c59c6ebc..134de3fa86b 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.h +++ b/keyboards/skyloong/gk87/q1/led_hc595.h @@ -1,12 +1,11 @@ // Copyright 2023 NaturalZh (@NaturalZh) // SPDX-License-Identifier: GPL-2.0-or-later -#pragma once #include "atomic_util.h" #include "gpio.h" -#define LED_HC595_ST_PIN B1 //74HC595 storage register clock input -#define LED_HC595_SH_PIN B0 //74HC595 shift register clock input +#define LED_HC595_ST_PIN B5 //74HC595 storage register clock input +#define LED_HC595_SH_PIN B4 //74HC595 shift register clock input #define LED_HC595_DS B3 // 74HC595 serial data input /* From bd2ae91412be1f89f3f2a6574cda349c4d85da31 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Mon, 13 Jan 2025 11:38:18 +0800 Subject: [PATCH 39/42] Update keyboards/skyloong/gk87/q1/q1.c OK, Thank you for your suggestion. Co-authored-by: Drashna Jaelre --- keyboards/skyloong/gk87/q1/q1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index 1cb7a86b50a..bdd42c94f63 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -224,7 +224,7 @@ layer_state_t default_layer_state_set_kb(layer_state_t state) { break; } s_serial_to_parallel(IND); - return state; + return default_layer_state_set_user(state); } bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { From 54db8e6c171d4036917bc4e8a911d41ad67cea8b Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Sat, 15 Mar 2025 17:17:28 +0800 Subject: [PATCH 40/42] Corrected the flags values in skyloong/gk87/q1/ansi/keyboard.json --- keyboards/skyloong/gk87/q1/ansi/keyboard.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/ansi/keyboard.json b/keyboards/skyloong/gk87/q1/ansi/keyboard.json index 48823c1b858..ceec0362b29 100644 --- a/keyboards/skyloong/gk87/q1/ansi/keyboard.json +++ b/keyboards/skyloong/gk87/q1/ansi/keyboard.json @@ -6,10 +6,10 @@ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, {"matrix": [0, 2], "x": 26, "y": 0, "flags": 4}, {"matrix": [0, 3], "x": 39, "y": 0, "flags": 4}, - {"matrix": [0, 4], "x": 52, "y": 0, "flags": 4}, - {"matrix": [0, 5], "x": 65, "y": 0, "flags": 4}, - {"matrix": [0, 6], "x": 85, "y": 0, "flags": 4}, - {"matrix": [0, 7], "x": 98, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 52, "y": 0, "flags": 1}, + {"matrix": [0, 5], "x": 65, "y": 0, "flags": 1}, + {"matrix": [0, 6], "x": 85, "y": 0, "flags": 1}, + {"matrix": [0, 7], "x": 98, "y": 0, "flags": 1}, {"matrix": [0, 8], "x": 111, "y": 0, "flags": 4}, {"matrix": [0, 9], "x": 124, "y": 0, "flags": 4}, {"matrix": [0, 10], "x": 143, "y": 0, "flags": 4}, From 429032b558ca9b7f27d7ba0ea58f7bc8e6ecd6ad Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 17 Mar 2025 15:03:22 +0800 Subject: [PATCH 41/42] Update skyloong/gk87/q1/q1.c --- keyboards/skyloong/gk87/q1/q1.c | 172 ++++++++++++++++---------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index bdd42c94f63..df38b4026e6 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -19,98 +19,98 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, //ESC - {0, CS1_SW3, CS2_SW3, CS3_SW3}, //F1 - {0, CS1_SW4, CS2_SW4, CS3_SW4}, - {0, CS1_SW5, CS2_SW5, CS3_SW5}, //F3 - {0, CS1_SW6, CS2_SW6, CS3_SW6}, - {0, CS1_SW7, CS2_SW7, CS3_SW7}, //F5 - {0, CS1_SW8, CS2_SW8, CS3_SW8}, - {0, CS1_SW9, CS2_SW9, CS3_SW9}, //F7 - {0, CS1_SW10, CS2_SW10, CS3_SW10}, - {0, CS1_SW11, CS2_SW11, CS3_SW11}, //F9 - {0, CS1_SW12, CS2_SW12, CS3_SW12}, //F10 - {0, CS10_SW2, CS11_SW2, CS12_SW2}, - {0, CS10_SW3, CS11_SW3, CS12_SW3}, //F12 + {0, SW1_CS1, SW1_CS2, SW1_CS3}, //ESC + {0, SW3_CS1, SW3_CS2, SW3_CS3}, //F1 + {0, SW4_CS1, SW4_CS2, SW4_CS3}, + {0, SW5_CS1, SW5_CS2, SW5_CS3}, //F3 + {0, SW6_CS1, SW6_CS2, SW6_CS3}, + {0, SW7_CS1, SW7_CS2, SW7_CS3}, //F5 + {0, SW8_CS1, SW8_CS2, SW8_CS3}, + {0, SW9_CS1, SW9_CS2, SW9_CS3}, //F7 + {0, SW10_CS1, SW10_CS2, SW10_CS3}, + {0, SW11_CS1, SW11_CS2, SW11_CS3}, //F9 + {0, SW12_CS1, SW12_CS2, SW12_CS3}, //F10 + {0, SW2_CS10, SW2_CS11, SW2_CS12}, + {0, SW3_CS10, SW3_CS11, SW3_CS12}, //F12 //encoder no led - {0, CS4_SW1, CS5_SW1, CS6_SW1}, //`~ - {0, CS4_SW2, CS5_SW2, CS6_SW2}, //1 - {0, CS4_SW3, CS5_SW3, CS6_SW3}, //2 - {0, CS4_SW4, CS5_SW4, CS6_SW4}, - {0, CS4_SW5, CS5_SW5, CS6_SW5}, //4 - {0, CS4_SW6, CS5_SW6, CS6_SW6}, - {0, CS4_SW7, CS5_SW7, CS6_SW7}, //6 - {0, CS4_SW8, CS5_SW8, CS6_SW8}, - {0, CS4_SW9, CS5_SW9, CS6_SW9}, //8 - {0, CS4_SW10, CS5_SW10, CS6_SW10}, - {0, CS4_SW11, CS5_SW11, CS6_SW11}, //0 - {0, CS4_SW12, CS5_SW12, CS6_SW12}, //-_ - {0, CS13_SW2, CS14_SW2, CS15_SW2}, //=+ - {0, CS13_SW3, CS14_SW3, CS15_SW3}, //BS - {0, CS13_SW4, CS14_SW4, CS15_SW4}, //INS - {0, CS13_SW5, CS14_SW5, CS15_SW5}, //Home - {0, CS13_SW6, CS14_SW6, CS15_SW6}, //PgUp + {0, SW1_CS4, SW1_CS5, SW1_CS6}, //`~ + {0, SW2_CS4, SW2_CS5, SW2_CS6}, //1 + {0, SW3_CS4, SW3_CS5, SW3_CS6}, //2 + {0, SW4_CS4, SW4_CS5, SW4_CS6}, + {0, SW5_CS4, SW5_CS5, SW5_CS6}, //4 + {0, SW6_CS4, SW6_CS5, SW6_CS6}, + {0, SW7_CS4, SW7_CS5, SW7_CS6}, //6 + {0, SW8_CS4, SW8_CS5, SW8_CS6}, + {0, SW9_CS4, SW9_CS5, SW9_CS6}, //8 + {0, SW10_CS4, SW10_CS5, SW10_CS6}, + {0, SW11_CS4, SW11_CS5, SW11_CS6}, //0 + {0, SW12_CS4, SW12_CS5, SW12_CS6}, //-_ + {0, SW2_CS13, SW2_CS14, SW2_CS15}, //=+ + {0, SW3_CS13, SW3_CS14, SW3_CS15}, //BS + {0, SW4_CS13, SW4_CS14, SW4_CS15}, //INS + {0, SW5_CS13, SW5_CS14, SW5_CS15}, //Home + {0, SW6_CS13, SW6_CS14, SW6_CS15}, //PgUp - {0, CS7_SW1, CS8_SW1, CS9_SW1}, //Tab - {0, CS7_SW2, CS8_SW2, CS9_SW2}, //Q - {0, CS7_SW3, CS8_SW3, CS9_SW3}, //W - {0, CS7_SW4, CS8_SW4, CS9_SW4}, //E - {0, CS7_SW5, CS8_SW5, CS9_SW5}, //R - {0, CS7_SW6, CS8_SW6, CS9_SW6}, //T - {0, CS7_SW7, CS8_SW7, CS9_SW7}, //Y - {0, CS7_SW8, CS8_SW8, CS9_SW8}, //U - {0, CS7_SW9, CS8_SW9, CS9_SW9}, //I - {0, CS7_SW10, CS8_SW10, CS9_SW10}, //O - {0, CS7_SW11, CS8_SW11, CS9_SW11}, //P - {0, CS7_SW12, CS8_SW12, CS9_SW12}, //[ - {0, CS16_SW2, CS17_SW2, CS18_SW2}, //] - {0, CS16_SW3, CS17_SW3, CS18_SW3}, //| - {0, CS16_SW4, CS17_SW4, CS18_SW4}, //DEL - {0, CS16_SW5, CS17_SW5, CS18_SW5}, //END - {0, CS16_SW6, CS17_SW6, CS18_SW6}, //PgDn + {0, SW1_CS7, SW1_CS8, SW1_CS9}, //Tab + {0, SW2_CS7, SW2_CS8, SW2_CS9}, //Q + {0, SW3_CS7, SW3_CS8, SW3_CS9}, //W + {0, SW4_CS7, SW4_CS8, SW4_CS9}, //E + {0, SW5_CS7, SW5_CS8, SW5_CS9}, //R + {0, SW6_CS7, SW6_CS8, SW6_CS9}, //T + {0, SW7_CS7, SW7_CS8, SW7_CS9}, //Y + {0, SW8_CS7, SW8_CS8, SW8_CS9}, //U + {0, SW9_CS7, SW9_CS8, SW9_CS9}, //I + {0, SW10_CS7, SW10_CS8, SW10_CS9}, //O + {0, SW11_CS7, SW11_CS8, SW11_CS9}, //P + {0, SW12_CS7, SW12_CS8, SW12_CS9}, //[ + {0, SW2_CS16, SW2_CS17, SW2_CS18}, //] + {0, SW3_CS16, SW3_CS17, SW3_CS18}, //| + {0, SW4_CS16, SW4_CS17, SW4_CS18}, //DEL + {0, SW5_CS16, SW5_CS17, SW5_CS18}, //END + {0, SW6_CS16, SW6_CS17, SW6_CS18}, //PgDn - {1, CS1_SW1, CS2_SW1, CS3_SW1}, //Cap - {1, CS1_SW2, CS2_SW2, CS3_SW2}, //A - {1, CS1_SW3, CS2_SW3, CS3_SW3}, //S - {1, CS1_SW4, CS2_SW4, CS3_SW4}, //D - {1, CS1_SW5, CS2_SW5, CS3_SW5}, //F - {1, CS1_SW6, CS2_SW6, CS3_SW6}, //G - {1, CS1_SW7, CS2_SW7, CS3_SW7}, //H - {1, CS1_SW8, CS2_SW8, CS3_SW8}, //J - {1, CS1_SW9, CS2_SW9, CS3_SW9}, //K - {1, CS1_SW10, CS2_SW10, CS3_SW10}, //L - {1, CS1_SW11, CS2_SW11, CS3_SW11}, //; - {1, CS1_SW12, CS2_SW12, CS3_SW12}, //. - {1, CS10_SW2, CS11_SW2, CS12_SW2}, //Ent + {1, SW1_CS1, SW1_CS2, SW1_CS3}, //Cap + {1, SW2_CS1, SW2_CS2, SW2_CS3}, //A + {1, SW3_CS1, SW3_CS2, SW3_CS3}, //S + {1, SW4_CS1, SW4_CS2, SW4_CS3}, //D + {1, SW5_CS1, SW5_CS2, SW5_CS3}, //F + {1, SW6_CS1, SW6_CS2, SW6_CS3}, //G + {1, SW7_CS1, SW7_CS2, SW7_CS3}, //H + {1, SW8_CS1, SW8_CS2, SW8_CS3}, //J + {1, SW9_CS1, SW9_CS2, SW9_CS3}, //K + {1, SW10_CS1, SW10_CS2, SW10_CS3}, //L + {1, SW11_CS1, SW11_CS2, SW11_CS3}, //; + {1, SW12_CS1, SW12_CS2, SW12_CS3}, //. + {1, SW2_CS10, SW2_CS11, SW2_CS12}, //Ent - {1, CS4_SW1, CS5_SW1, CS6_SW1}, //Shift - {1, CS4_SW2, CS5_SW2, CS6_SW2}, //Z - {1, CS4_SW3, CS5_SW3, CS6_SW3}, //X - {1, CS4_SW4, CS5_SW4, CS6_SW4}, //C - {1, CS4_SW5, CS5_SW5, CS6_SW5}, //V - {1, CS4_SW6, CS5_SW6, CS6_SW6}, //B - {1, CS4_SW7, CS5_SW7, CS6_SW7}, //N - {1, CS4_SW8, CS5_SW8, CS6_SW8}, //M - {1, CS4_SW9, CS5_SW9, CS6_SW9}, //, - {1, CS4_SW10, CS5_SW10, CS6_SW10}, //. - {1, CS4_SW11, CS5_SW11, CS6_SW11}, //? - {1, CS10_SW3, CS11_SW3, CS12_SW3}, //Shift - {1, CS13_SW4, CS14_SW4, CS15_SW4}, //Up + {1, SW1_CS4, SW1_CS5, SW1_CS6}, //Shift + {1, SW2_CS4, SW2_CS5, SW2_CS6}, //Z + {1, SW3_CS4, SW3_CS5, SW3_CS6}, //X + {1, SW4_CS4, SW4_CS5, SW4_CS6}, //C + {1, SW5_CS4, SW5_CS5, SW5_CS6}, //V + {1, SW6_CS4, SW6_CS5, SW6_CS6}, //B + {1, SW7_CS4, SW7_CS5, SW7_CS6}, //N + {1, SW8_CS4, SW8_CS5, SW8_CS6}, //M + {1, SW9_CS4, SW9_CS5, SW9_CS6}, //, + {1, SW10_CS4, SW10_CS5, SW10_CS6}, //. + {1, SW11_CS4, SW11_CS5, SW11_CS6}, //? + {1, SW3_CS10, SW3_CS11, SW3_CS12}, //Shift + {1, SW4_CS13, SW4_CS14, SW4_CS15}, //Up - {1, CS7_SW1, CS8_SW1, CS9_SW1}, //Ctrl - {1, CS7_SW2, CS8_SW2, CS9_SW2}, //Com - {1, CS7_SW3, CS8_SW3, CS9_SW3}, //Alt - {1, CS7_SW4, CS8_SW4, CS9_SW4}, //SPAC1 - {1, CS7_SW6, CS8_SW6, CS9_SW6}, //SPAC - {1, CS7_SW8, CS8_SW8, CS9_SW8}, //SPAC2 - {1, CS7_SW10, CS8_SW10, CS9_SW10}, //Alt - {1, CS7_SW11, CS8_SW11, CS9_SW11}, //Fn - {1, CS7_SW12, CS8_SW12, CS9_SW12}, //Menu - {1, CS16_SW2, CS17_SW2, CS18_SW2}, //Ctrl - {1, CS16_SW3, CS17_SW3, CS18_SW3}, //Left - {1, CS16_SW4, CS17_SW4, CS18_SW4}, //Down - {1, CS16_SW5, CS17_SW5, CS18_SW5}, //Right + {1, SW1_CS7, SW1_CS8, SW1_CS9}, //Ctrl + {1, SW2_CS7, SW2_CS8, SW2_CS9}, //Com + {1, SW3_CS7, SW3_CS8, SW3_CS9}, //Alt + {1, SW4_CS7, SW4_CS8, SW4_CS9}, //SPAC1 + {1, SW6_CS7, SW6_CS8, SW6_CS9}, //SPAC + {1, SW8_CS7, SW8_CS8, SW8_CS9}, //SPAC2 + {1, SW10_CS7, SW10_CS8, SW10_CS9}, //Alt + {1, SW11_CS7, SW11_CS8, SW11_CS9}, //Fn + {1, SW12_CS7, SW12_CS8, SW12_CS9}, //Menu + {1, SW2_CS16, SW2_CS17, SW2_CS18}, //Ctrl + {1, SW3_CS16, SW3_CS17, SW3_CS18}, //Left + {1, SW4_CS16, SW4_CS17, SW4_CS18}, //Down + {1, SW5_CS16, SW5_CS17, SW5_CS18}, //Right }; #endif From aec4246a88ef1a076f9a5f0ea9ae83bf647839dc Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Wed, 7 May 2025 17:27:33 +0800 Subject: [PATCH 42/42] update skyloong/gk87/q1 --- keyboards/skyloong/gk87/q1/led_hc595.c | 8 ++++---- keyboards/skyloong/gk87/q1/led_hc595.h | 2 +- keyboards/skyloong/gk87/q1/q1.c | 28 ++++---------------------- 3 files changed, 9 insertions(+), 29 deletions(-) diff --git a/keyboards/skyloong/gk87/q1/led_hc595.c b/keyboards/skyloong/gk87/q1/led_hc595.c index eb8fa903e9f..54ea626cacd 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.c +++ b/keyboards/skyloong/gk87/q1/led_hc595.c @@ -10,7 +10,7 @@ # error hc595: no shift register clock pins defined! #endif -#ifndef LED_HC595_DS +#ifndef LED_HC595_DS_PIN # error hc595: no serial data input pins defined! #endif @@ -46,14 +46,14 @@ static inline void clockPulse(uint16_t n) { void s_serial_to_parallel(uint8_t data) __attribute__((unused)); void s_serial_to_parallel(uint8_t data) { // Serial port to parallel port function - gpio_set_pin_output_write_low(LED_HC595_DS); + gpio_set_pin_output_write_low(LED_HC595_DS_PIN); gpio_set_pin_output_write_low(LED_HC595_SH_PIN); gpio_set_pin_output_write_low(LED_HC595_ST_PIN); for(uint8_t i = 0; i < 8; i++) { if(data & 0x01){ - gpio_write_pin_high(LED_HC595_DS); + gpio_write_pin_high(LED_HC595_DS_PIN); }else{ - gpio_write_pin_low(LED_HC595_DS); + gpio_write_pin_low(LED_HC595_DS_PIN); } clockPulse(LED_CLOCK_TIME); data >>= 1; // Move the data one digit to the right diff --git a/keyboards/skyloong/gk87/q1/led_hc595.h b/keyboards/skyloong/gk87/q1/led_hc595.h index 134de3fa86b..3c3e706bc5d 100644 --- a/keyboards/skyloong/gk87/q1/led_hc595.h +++ b/keyboards/skyloong/gk87/q1/led_hc595.h @@ -6,7 +6,7 @@ #define LED_HC595_ST_PIN B5 //74HC595 storage register clock input #define LED_HC595_SH_PIN B4 //74HC595 shift register clock input -#define LED_HC595_DS B3 // 74HC595 serial data input +#define LED_HC595_DS_PIN B3 // 74HC595 serial data input /* *LED display driver.74HC595 Serial to parallel control LED field on/off. diff --git a/keyboards/skyloong/gk87/q1/q1.c b/keyboards/skyloong/gk87/q1/q1.c index df38b4026e6..a7a43492ac5 100644 --- a/keyboards/skyloong/gk87/q1/q1.c +++ b/keyboards/skyloong/gk87/q1/q1.c @@ -114,6 +114,9 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { }; #endif +static bool is_function_layer_on(void) { + return (layer_state_is(2) || layer_state_is(3)); +} bool process_record_kb(uint16_t keycode, keyrecord_t *record) { if (!process_record_user(keycode, record)) { @@ -139,32 +142,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; # endif - case MO(1): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; - - case MO(2): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; - - case MO(3): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; case KC_LGUI: - if (FN_ON){ + if (is_function_layer_on()){ if ( record->event.pressed){ WIN_LOCK = !WIN_LOCK ; //change win lock state }