From 55ce4a0d2424d4300da9f7b0ebc98e814879a747 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 26 Apr 2024 19:09:51 +0800 Subject: [PATCH 01/16] Create GK68 Pro keyboard. --- keyboards/skyloong/gk68/pro/config.h | 11 + keyboards/skyloong/gk68/pro/halconf.h | 7 + keyboards/skyloong/gk68/pro/keyboard.json | 381 ++++++++++++++++++ .../gk68/pro/keymaps/default/keymap.c | 31 ++ .../gk68/pro/keymaps/default/rules.mk | 1 + .../skyloong/gk68/pro/keymaps/via/keymap.c | 172 ++++++++ .../skyloong/gk68/pro/keymaps/via/rules.mk | 2 + keyboards/skyloong/gk68/pro/mcuconf.h | 11 + keyboards/skyloong/gk68/pro/pro.c | 179 ++++++++ keyboards/skyloong/gk68/pro/readme.md | 33 ++ keyboards/skyloong/gk68/pro/rules.mk | 1 + 11 files changed, 829 insertions(+) create mode 100644 keyboards/skyloong/gk68/pro/config.h create mode 100644 keyboards/skyloong/gk68/pro/halconf.h create mode 100644 keyboards/skyloong/gk68/pro/keyboard.json create mode 100644 keyboards/skyloong/gk68/pro/keymaps/default/keymap.c create mode 100644 keyboards/skyloong/gk68/pro/keymaps/default/rules.mk create mode 100644 keyboards/skyloong/gk68/pro/keymaps/via/keymap.c create mode 100644 keyboards/skyloong/gk68/pro/keymaps/via/rules.mk create mode 100644 keyboards/skyloong/gk68/pro/mcuconf.h create mode 100644 keyboards/skyloong/gk68/pro/pro.c create mode 100644 keyboards/skyloong/gk68/pro/readme.md create mode 100644 keyboards/skyloong/gk68/pro/rules.mk diff --git a/keyboards/skyloong/gk68/pro/config.h b/keyboards/skyloong/gk68/pro/config.h new file mode 100644 index 00000000000..99cabbfc29e --- /dev/null +++ b/keyboards/skyloong/gk68/pro/config.h @@ -0,0 +1,11 @@ +// Copyright 2023 linlin012 (@linlin012) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define AW20216S_EN_PIN_1 B5 +#define AW20216S_CS_PIN_1 B12 +#define CAPS_LOCK_INDEX 30 +#define WIN_MOD_INDEX 17 +#define MAC_MOD_INDEX 18 +#define SDB B5 diff --git a/keyboards/skyloong/gk68/pro/halconf.h b/keyboards/skyloong/gk68/pro/halconf.h new file mode 100644 index 00000000000..9b7fd6502e0 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/halconf.h @@ -0,0 +1,7 @@ +// Copyright 2023 linlin012 (@linlin012) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define HAL_USE_SPI TRUE + +#include_next diff --git a/keyboards/skyloong/gk68/pro/keyboard.json b/keyboards/skyloong/gk68/pro/keyboard.json new file mode 100644 index 00000000000..734c759b710 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/keyboard.json @@ -0,0 +1,381 @@ +{ + "manufacturer": "skyloong", + "keyboard_name": "qmk68 pro", + "maintainer": "NaturalZh", + "bootloader": "stm32duino", + "debounce": 10, + "diode_direction": "ROW2COL", + "encoder": { + "rotary": [ + {"pin_a": "A1", "pin_b": "A0", "resolution": 2}, + {"pin_a": "B1", "pin_b": "B0", "resolution": 2} + ] + }, + "features": { + "bootmagic": true, + "command": true, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "build": { + "debounce_type": "asym_eager_defer_pk" + }, + "matrix_pins": { + "cols": ["A7", "A8", "A9", "A10", "A15", "B3", "B4", "B6", "B7", "B8", "B9", "B10", "C13", "C14","C15"], + "rows": ["A2", "A3", "A4", "A5", "A6"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "animations": { + "breathing": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "raindrops": true, + "jellybean_raindrops": true, + "pixel_rain": true, + "typing_heatmap":true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive_multiwide": true, + "solid_reactive_multinexus": true, + "splash": true, + "solid_splash": true + }, + "driver": "aw20216s", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 15, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 30, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 45, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 60, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 75, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 89, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 104, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 119, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 134, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 149, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 164, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 179, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 201, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4}, + + {"matrix": [1, 0], "x": 4, "y": 13, "flags": 4}, + {"matrix": [1, 1], "x": 19, "y": 13, "flags": 4}, + {"matrix": [1, 2], "x": 34, "y": 13, "flags": 4}, + {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4}, + {"matrix": [1, 4], "x": 63, "y": 13, "flags": 4}, + {"matrix": [1, 5], "x": 78, "y": 13, "flags": 4}, + {"matrix": [1, 6], "x": 93, "y": 13, "flags": 4}, + {"matrix": [1, 7], "x": 108, "y": 13, "flags": 4}, + {"matrix": [1, 8], "x": 123, "y": 13, "flags": 4}, + {"matrix": [1, 9], "x": 138, "y": 13, "flags": 4}, + {"matrix": [1, 10], "x": 153, "y": 13, "flags": 4}, + {"matrix": [1, 11], "x": 168, "y": 13, "flags": 4}, + {"matrix": [1, 12], "x": 183, "y": 13, "flags": 4}, + {"matrix": [1, 13], "x": 205, "y": 13, "flags": 4}, + {"matrix": [1, 14], "x": 224, "y": 13, "flags": 4}, + + {"matrix": [2, 0], "x": 5, "y": 26, "flags": 4}, + {"matrix": [2, 1], "x": 26, "y": 26, "flags": 4}, + {"matrix": [2, 2], "x": 41, "y": 26, "flags": 4}, + {"matrix": [2, 3], "x": 56, "y": 26, "flags": 4}, + {"matrix": [2, 4], "x": 71, "y": 26, "flags": 4}, + {"matrix": [2, 5], "x": 86, "y": 26, "flags": 4}, + {"matrix": [2, 6], "x": 101, "y": 26, "flags": 4}, + {"matrix": [2, 7], "x": 115, "y": 26, "flags": 4}, + {"matrix": [2, 8], "x": 130, "y": 26, "flags": 4}, + {"matrix": [2, 9], "x": 145, "y": 26, "flags": 4}, + {"matrix": [2, 10], "x": 160, "y": 26, "flags": 4}, + {"matrix": [2, 11], "x": 175, "y": 26, "flags": 4}, + {"matrix": [2, 12], "x": 200, "y": 26, "flags": 4}, + {"matrix": [2, 14], "x": 224, "y": 26, "flags": 4}, + + {"matrix": [3, 0], "x": 9, "y": 51, "flags": 4}, + {"matrix": [3, 1], "x": 34, "y": 51, "flags": 4}, + {"matrix": [3, 2], "x": 48, "y": 51, "flags": 4}, + {"matrix": [3, 3], "x": 63, "y": 51, "flags": 4}, + {"matrix": [3, 4], "x": 78, "y": 51, "flags": 4}, + {"matrix": [3, 5], "x": 93, "y": 51, "flags": 4}, + {"matrix": [3, 6], "x": 108, "y": 51, "flags": 4}, + {"matrix": [3, 7], "x": 123, "y": 51, "flags": 4}, + {"matrix": [3, 8], "x": 138, "y": 51, "flags": 4}, + {"matrix": [3, 9], "x": 153, "y": 51, "flags": 4}, + {"matrix": [3, 10], "x": 168, "y": 51, "flags": 4}, + {"matrix": [3, 11], "x": 188, "y": 51, "flags": 4}, + {"matrix": [3, 12], "x": 209, "y": 51, "flags": 4}, + {"matrix": [3, 14], "x": 224, "y": 51, "flags": 4}, + + {"matrix": [4, 0], "x": 2, "y": 64, "flags": 4}, + {"matrix": [4, 1], "x": 20, "y": 64, "flags": 4}, + {"matrix": [4, 2], "x": 39, "y": 64, "flags": 4}, + {"matrix": [4, 4], "x": 72, "y": 64, "flags": 4}, + {"matrix": [4, 5], "x": 95, "y": 64, "flags": 4}, + {"matrix": [4, 7], "x": 118, "y": 64, "flags": 4}, + {"matrix": [4, 8], "x": 149, "y": 64, "flags": 4}, + {"matrix": [4, 9], "x": 164, "y": 64, "flags": 4}, + {"matrix": [4, 10], "x": 179, "y": 64, "flags": 4}, + {"matrix": [4, 11], "x": 194, "y": 64, "flags": 4}, + {"matrix": [4, 12], "x": 209, "y": 64, "flags": 4}, + {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} + ], + "max_brightness": 200, + "hue_steps": 20, + "sat_steps": 20, + "speed_steps": 20, + "val_steps": 20, + "sleep": true + }, + "url": "https://github.com/JZ-Skyloong", + "usb": { + "device_version": "1.0.0", + "pid": "0x6068", + "vid": "0x1EA7", + "max_power": 380 + }, + "community_layouts": ["65_ansi"], + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label":"ESC","matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label":"1","matrix": [0, 1], "x": 1, "y": 0}, + {"label":"2","matrix": [0, 2], "x": 2, "y": 0}, + {"label":"3","matrix": [0, 3], "x": 3, "y": 0}, + {"label":"4","matrix": [0, 4], "x": 4, "y": 0}, + {"label":"5","matrix": [0, 5], "x": 5, "y": 0}, + {"label":"6","matrix": [0, 6], "x": 6, "y": 0}, + {"label":"7","matrix": [0, 7], "x": 7, "y": 0}, + {"label":"8","matrix": [0, 8], "x": 8, "y": 0}, + {"label":"9","matrix": [0, 9], "x": 9, "y": 0}, + {"label":"0","matrix": [0, 10], "x": 10, "y": 0}, + {"label":"-_","matrix": [0, 11], "x": 11, "y": 0}, + {"label":"=+","matrix": [0, 12], "x": 12, "y": 0}, + {"label":"BS","matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label":"Ins","matrix": [0, 14], "x": 15, "y": 0}, + + {"label":"Tab","matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label":"Q","matrix": [1, 1], "x": 1.5, "y": 1}, + {"label":"W","matrix": [1, 2], "x": 2.5, "y": 1}, + {"label":"E","matrix": [1, 3], "x": 3.5, "y": 1}, + {"label":"R","matrix": [1, 4], "x": 4.5, "y": 1}, + {"label":"T","matrix": [1, 5], "x": 5.5, "y": 1}, + {"label":"Y","matrix": [1, 6], "x": 6.5, "y": 1}, + {"label":"U","matrix": [1, 7], "x": 7.5, "y": 1}, + {"label":"I","matrix": [1, 8], "x": 8.5, "y": 1}, + {"label":"O","matrix": [1, 9], "x": 9.5, "y": 1}, + {"label":"P","matrix": [1, 10], "x": 10.5, "y": 1}, + {"label":"[{","matrix": [1, 11], "x": 11.5, "y": 1}, + {"label":"]}","matrix": [1, 12], "x": 12.5, "y": 1}, + {"label":"|","matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label":"Del","matrix": [1, 14], "x": 15, "y": 1}, + + {"label":"Caps","matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label":"A","matrix": [2, 1], "x": 1.75, "y": 2}, + {"label":"S","matrix": [2, 2], "x": 2.75, "y": 2}, + {"label":"D","matrix": [2, 3], "x": 3.75, "y": 2}, + {"label":"F","matrix": [2, 4], "x": 4.75, "y": 2}, + {"label":"G","matrix": [2, 5], "x": 5.75, "y": 2}, + {"label":"H","matrix": [2, 6], "x": 6.75, "y": 2}, + {"label":"J","matrix": [2, 7], "x": 7.75, "y": 2}, + {"label":"K","matrix": [2, 8], "x": 8.75, "y": 2}, + {"label":"L","matrix": [2, 9], "x": 9.75, "y": 2}, + {"label":";","matrix": [2, 10], "x": 10.75, "y": 2}, + {"label":"'","matrix": [2, 11], "x": 11.75, "y": 2}, + {"label":"Ent","matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label":"PGUP","matrix": [2, 14], "x": 15, "y": 2}, + + {"label":"Shift_L","matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label":"Z","matrix": [3, 1], "x": 2.25, "y": 3}, + {"label":"X","matrix": [3, 2], "x": 3.25, "y": 3}, + {"label":"C","matrix": [3, 3], "x": 4.25, "y": 3}, + {"label":"V","matrix": [3, 4], "x": 5.25, "y": 3}, + {"label":"B","matrix": [3, 5], "x": 6.25, "y": 3}, + {"label":"N","matrix": [3, 6], "x": 7.25, "y": 3}, + {"label":"M","matrix": [3, 7], "x": 8.25, "y": 3}, + {"label":",","matrix": [3, 8], "x": 9.25, "y": 3}, + {"label":".","matrix": [3, 9], "x": 10.25, "y": 3}, + {"label":"/","matrix": [3, 10], "x": 11.25, "y": 3}, + {"label":"Shift_R","matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label":"Up","matrix": [3, 12], "x": 14, "y": 3}, + {"label":"PGDN","matrix": [3, 14], "x": 15, "y": 3}, + + {"label":"Ctrl_L","matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label":"Win_L","matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label":"Alt_L","matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label":"Space/M1","matrix": [4, 4], "x": 3.75, "y": 4.5, "w": 3.125, "h": 0.5}, + {"label":"Space","matrix": [4, 5], "x": 3.75, "y": 4, "h": 0.5, "w":6.25}, + {"label":"Space/M3","matrix": [4, 7], "x": 6.875, "y": 4.5, "h": 0.5, "w":3.125}, + {"label":"Alt_R","matrix": [4, 8], "x": 10, "y": 4}, + {"label":"Fn","matrix": [4, 9], "x": 11, "y": 4}, + {"label":"Menu","matrix": [4, 10], "x": 12, "y": 4}, + {"label":"Left","matrix": [4, 11], "x": 13, "y": 4}, + {"label":"Down","matrix": [4, 12], "x": 14, "y": 4}, + {"label":"Right","matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi": { + "layout": [ + {"label":"ESC","matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label":"1","matrix": [0, 1], "x": 1, "y": 0}, + {"label":"2","matrix": [0, 2], "x": 2, "y": 0}, + {"label":"3","matrix": [0, 3], "x": 3, "y": 0}, + {"label":"4","matrix": [0, 4], "x": 4, "y": 0}, + {"label":"5","matrix": [0, 5], "x": 5, "y": 0}, + {"label":"6","matrix": [0, 6], "x": 6, "y": 0}, + {"label":"7","matrix": [0, 7], "x": 7, "y": 0}, + {"label":"8","matrix": [0, 8], "x": 8, "y": 0}, + {"label":"9","matrix": [0, 9], "x": 9, "y": 0}, + {"label":"0","matrix": [0, 10], "x": 10, "y": 0}, + {"label":"-_","matrix": [0, 11], "x": 11, "y": 0}, + {"label":"=+","matrix": [0, 12], "x": 12, "y": 0}, + {"label":"BS","matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label":"`~","matrix": [0, 14], "x": 15, "y": 0}, + + {"label":"Tab","matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label":"Q","matrix": [1, 1], "x": 1.5, "y": 1}, + {"label":"W","matrix": [1, 2], "x": 2.5, "y": 1}, + {"label":"E","matrix": [1, 3], "x": 3.5, "y": 1}, + {"label":"R","matrix": [1, 4], "x": 4.5, "y": 1}, + {"label":"T","matrix": [1, 5], "x": 5.5, "y": 1}, + {"label":"Y","matrix": [1, 6], "x": 6.5, "y": 1}, + {"label":"U","matrix": [1, 7], "x": 7.5, "y": 1}, + {"label":"I","matrix": [1, 8], "x": 8.5, "y": 1}, + {"label":"O","matrix": [1, 9], "x": 9.5, "y": 1}, + {"label":"P","matrix": [1, 10], "x": 10.5, "y": 1}, + {"label":"[{","matrix": [1, 11], "x": 11.5, "y": 1}, + {"label":"]}","matrix": [1, 12], "x": 12.5, "y": 1}, + {"label":"|","matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label":"Del","matrix": [1, 14], "x": 15, "y": 1}, + + {"label":"Caps","matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label":"A","matrix": [2, 1], "x": 1.75, "y": 2}, + {"label":"S","matrix": [2, 2], "x": 2.75, "y": 2}, + {"label":"D","matrix": [2, 3], "x": 3.75, "y": 2}, + {"label":"F","matrix": [2, 4], "x": 4.75, "y": 2}, + {"label":"G","matrix": [2, 5], "x": 5.75, "y": 2}, + {"label":"H","matrix": [2, 6], "x": 6.75, "y": 2}, + {"label":"J","matrix": [2, 7], "x": 7.75, "y": 2}, + {"label":"K","matrix": [2, 8], "x": 8.75, "y": 2}, + {"label":"L","matrix": [2, 9], "x": 9.75, "y": 2}, + {"label":";","matrix": [2, 10], "x": 10.75, "y": 2}, + {"label":"'","matrix": [2, 11], "x": 11.75, "y": 2}, + {"label":"Ent","matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label":"PGUP","matrix": [2, 14], "x": 15, "y": 2}, + + {"label":"Shift_L","matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label":"Z","matrix": [3, 1], "x": 2.25, "y": 3}, + {"label":"X","matrix": [3, 2], "x": 3.25, "y": 3}, + {"label":"C","matrix": [3, 3], "x": 4.25, "y": 3}, + {"label":"V","matrix": [3, 4], "x": 5.25, "y": 3}, + {"label":"B","matrix": [3, 5], "x": 6.25, "y": 3}, + {"label":"N","matrix": [3, 6], "x": 7.25, "y": 3}, + {"label":"M","matrix": [3, 7], "x": 8.25, "y": 3}, + {"label":",","matrix": [3, 8], "x": 9.25, "y": 3}, + {"label":".","matrix": [3, 9], "x": 10.25, "y": 3}, + {"label":"/","matrix": [3, 10], "x": 11.25, "y": 3}, + {"label":"Shift_R","matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label":"Up","matrix": [3, 12], "x": 14, "y": 3}, + {"label":"PGDN","matrix": [3, 14], "x": 15, "y": 3}, + + {"label":"Ctrl_L","matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label":"Win_L","matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label":"Alt_L","matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label":"Space","matrix": [4, 5], "x": 3.75, "y": 4, "w":6.25}, + {"label":"Alt_R","matrix": [4, 8], "x": 10, "y": 4}, + {"label":"Fn","matrix": [4, 9], "x": 11, "y": 4}, + {"label":"Menu","matrix": [4, 10], "x": 12, "y": 4}, + {"label":"Left","matrix": [4, 11], "x": 13, "y": 4}, + {"label":"Down","matrix": [4, 12], "x": 14, "y": 4}, + {"label":"Right","matrix": [4, 14], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_split_space": { + "layout": [ + {"label":"ESC","matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label":"1","matrix": [0, 1], "x": 1, "y": 0}, + {"label":"2","matrix": [0, 2], "x": 2, "y": 0}, + {"label":"3","matrix": [0, 3], "x": 3, "y": 0}, + {"label":"4","matrix": [0, 4], "x": 4, "y": 0}, + {"label":"5","matrix": [0, 5], "x": 5, "y": 0}, + {"label":"6","matrix": [0, 6], "x": 6, "y": 0}, + {"label":"7","matrix": [0, 7], "x": 7, "y": 0}, + {"label":"8","matrix": [0, 8], "x": 8, "y": 0}, + {"label":"9","matrix": [0, 9], "x": 9, "y": 0}, + {"label":"0","matrix": [0, 10], "x": 10, "y": 0}, + {"label":"-_","matrix": [0, 11], "x": 11, "y": 0}, + {"label":"=+","matrix": [0, 12], "x": 12, "y": 0}, + {"label":"BS","matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label":"Insert","matrix": [0, 14], "x": 15, "y": 0}, + + {"label":"Tab","matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label":"Q","matrix": [1, 1], "x": 1.5, "y": 1}, + {"label":"W","matrix": [1, 2], "x": 2.5, "y": 1}, + {"label":"E","matrix": [1, 3], "x": 3.5, "y": 1}, + {"label":"R","matrix": [1, 4], "x": 4.5, "y": 1}, + {"label":"T","matrix": [1, 5], "x": 5.5, "y": 1}, + {"label":"Y","matrix": [1, 6], "x": 6.5, "y": 1}, + {"label":"U","matrix": [1, 7], "x": 7.5, "y": 1}, + {"label":"I","matrix": [1, 8], "x": 8.5, "y": 1}, + {"label":"O","matrix": [1, 9], "x": 9.5, "y": 1}, + {"label":"P","matrix": [1, 10], "x": 10.5, "y": 1}, + {"label":"[{","matrix": [1, 11], "x": 11.5, "y": 1}, + {"label":"]}","matrix": [1, 12], "x": 12.5, "y": 1}, + {"label":"|","matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label":"Del","matrix": [1, 14], "x": 15, "y": 1}, + + {"label":"Caps","matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label":"A","matrix": [2, 1], "x": 1.75, "y": 2}, + {"label":"S","matrix": [2, 2], "x": 2.75, "y": 2}, + {"label":"D","matrix": [2, 3], "x": 3.75, "y": 2}, + {"label":"F","matrix": [2, 4], "x": 4.75, "y": 2}, + {"label":"G","matrix": [2, 5], "x": 5.75, "y": 2}, + {"label":"H","matrix": [2, 6], "x": 6.75, "y": 2}, + {"label":"J","matrix": [2, 7], "x": 7.75, "y": 2}, + {"label":"K","matrix": [2, 8], "x": 8.75, "y": 2}, + {"label":"L","matrix": [2, 9], "x": 9.75, "y": 2}, + {"label":";","matrix": [2, 10], "x": 10.75, "y": 2}, + {"label":"'","matrix": [2, 11], "x": 11.75, "y": 2}, + {"label":"Ent","matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label":"PGUP","matrix": [2, 14], "x": 15, "y": 2}, + + {"label":"Shift_L","matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label":"Z","matrix": [3, 1], "x": 2.25, "y": 3}, + {"label":"X","matrix": [3, 2], "x": 3.25, "y": 3}, + {"label":"C","matrix": [3, 3], "x": 4.25, "y": 3}, + {"label":"V","matrix": [3, 4], "x": 5.25, "y": 3}, + {"label":"B","matrix": [3, 5], "x": 6.25, "y": 3}, + {"label":"N","matrix": [3, 6], "x": 7.25, "y": 3}, + {"label":"M","matrix": [3, 7], "x": 8.25, "y": 3}, + {"label":",","matrix": [3, 8], "x": 9.25, "y": 3}, + {"label":".","matrix": [3, 9], "x": 10.25, "y": 3}, + {"label":"/","matrix": [3, 10], "x": 11.25, "y": 3}, + {"label":"Shift_R","matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label":"Up","matrix": [3, 12], "x": 14, "y": 3}, + {"label":"PGDN","matrix": [3, 14], "x": 15, "y": 3}, + + {"label":"Ctrl_L","matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label":"Win_L","matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label":"Alt_L","matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label":"Space/M1","matrix": [4, 4], "x": 3.75, "y": 4, "w": 3.125}, + {"label":"Space/M3","matrix": [4, 6], "x": 6.875, "y": 4, "w":3.125}, + {"label":"Alt_R","matrix": [4, 8], "x": 10, "y": 4}, + {"label":"Fn","matrix": [4, 9], "x": 11, "y": 4}, + {"label":"Menu","matrix": [4, 10], "x": 12, "y": 4}, + {"label":"Left","matrix": [4, 11], "x": 13, "y": 4}, + {"label":"Down","matrix": [4, 12], "x": 14, "y": 4}, + {"label":"Right","matrix": [4, 14], "x": 15, "y": 4} + ] + } + } +} diff --git a/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c new file mode 100644 index 00000000000..4a11a25f5c9 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c @@ -0,0 +1,31 @@ +// Copyright 2021 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [1] = LAYOUT_all( + KC_GRV, 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, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + ) + +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} +}; +#endif + diff --git a/keyboards/skyloong/gk68/pro/keymaps/default/rules.mk b/keyboards/skyloong/gk68/pro/keymaps/default/rules.mk new file mode 100644 index 00000000000..ee325681483 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c new file mode 100644 index 00000000000..e21f577b71f --- /dev/null +++ b/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c @@ -0,0 +1,172 @@ +// Copyright 2021 JZ-Skyloong (@JZ-Skyloong) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H +_Bool FN_WIN = 0; +_Bool FN_MAC = 0; +_Bool L_WIN = 0; +_Bool L_MAC = 0; + +enum layer_names { + _WIN, + _MAC, + _WIN_INDEX, + _MAC_INDEX, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_WIN] = LAYOUT_all( + KC_ESC, KC_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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [_MAC] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, + KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT + ), + + [_WIN_INDEX] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_MUTE, + _______, _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, + _______, _______, _______, _______, _______, _______, KC_RALT, _______, KC_APP, RGB_SPD, RGB_VAD, RGB_SPI + ), + + [_MAC_INDEX] = LAYOUT_all( + KC_GRV , KC_F14, KC_F15, C(KC_UP), G(KC_D), G(KC_SPC), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE, + _______, _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, + _______, KC_LALT, KC_LGUI, _______, _______, _______, KC_RGUI, _______, KC_RALT, RGB_SPD, RGB_VAD, RGB_SPI + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, + [_WIN_INDEX] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [_MAC_INDEX] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} +}; +#endif + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { +# ifdef RGB_MATRIX_ENABLE + case RGB_TOG: + if (record->event.pressed) { + switch (rgb_matrix_get_flags()) { + case LED_FLAG_ALL: { + rgb_matrix_set_flags(LED_FLAG_NONE); + rgb_matrix_set_color_all(0, 0, 0); + } break; + default: { + rgb_matrix_set_flags(LED_FLAG_ALL); + } break; + } + } + return false; +# endif + case TO(0): + if (record->event.pressed) { + L_WIN = 1; + set_single_persistent_default_layer(0); // Save default layer 0 to eeprom + } else { + L_WIN = 0; + } + return true; // continue all further processing of this key + + case MO(2): + if (record->event.pressed) { + FN_WIN = 1; + } else { + FN_WIN = 0; + } + return true; // continue all further processing of this key + + case TO(1): + if (record->event.pressed) { + L_MAC = 1; + set_single_persistent_default_layer(1); //Save default layer 1 to eeprom + } else { + L_MAC = 0; + } + return true; // continue all further processing of this key + + case MO(3): + if (record->event.pressed) { + FN_MAC = 1; + } else { + FN_MAC = 0; + } + return true; // continue all further processing of this key + + case RGB_VAI: + rgb_matrix_set_flags(LED_FLAG_ALL); + return true; + + default: + return true; + } +}; + + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + + switch (get_highest_layer(layer_state)) { + case 2:{ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } break; + case 3:{ + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } break; + + case 0:{ + if (L_WIN) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } + } break; + + case 1:{ + if (L_MAC) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } break; + + default:{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } + return true; +} + diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk b/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk new file mode 100644 index 00000000000..f1adcab005e --- /dev/null +++ b/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk68/pro/mcuconf.h b/keyboards/skyloong/gk68/pro/mcuconf.h new file mode 100644 index 00000000000..c618796754f --- /dev/null +++ b/keyboards/skyloong/gk68/pro/mcuconf.h @@ -0,0 +1,11 @@ +// Copyright 2023 linlin012 (@linlin012) +// 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/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c new file mode 100644 index 00000000000..523c0741d95 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -0,0 +1,179 @@ +// Copyright 2023 NaturalZh (@NaturalZh) +// SPDX-License-Identifier: GPL-2.0-or-later +#include "quantum.h" + +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] = { +/* Refer to aw20216 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, CS1_SW1, CS2_SW1, CS3_SW1}, + {0, CS1_SW2, CS2_SW2, CS3_SW2}, + {0, CS1_SW3, CS2_SW3, CS3_SW3}, + {0, CS1_SW4, CS2_SW4, CS3_SW4}, + {0, CS1_SW5, CS2_SW5, CS3_SW5}, + {0, CS1_SW6, CS2_SW6, CS3_SW6}, + {0, CS1_SW7, CS2_SW7, CS3_SW7}, + {0, CS1_SW8, CS2_SW8, CS3_SW8}, + {0, CS1_SW9, CS2_SW9, CS3_SW9}, + {0, CS1_SW10, CS2_SW10, CS3_SW10}, + {0, CS1_SW11, CS2_SW11, CS3_SW11}, + {0, CS1_SW12, CS2_SW12, CS3_SW12}, + {0, CS18_SW1, CS17_SW1, CS16_SW1}, + {0, CS18_SW2, CS17_SW2, CS16_SW2}, + {0, CS18_SW3, CS17_SW3, CS16_SW3}, + + {0, CS4_SW1, CS5_SW1, CS6_SW1}, + {0, CS4_SW2, CS5_SW2, CS6_SW2}, + {0, CS4_SW3, CS5_SW3, CS6_SW3}, + {0, CS4_SW4, CS5_SW4, CS6_SW4}, + {0, CS4_SW5, CS5_SW5, CS6_SW5}, + {0, CS4_SW6, CS5_SW6, CS6_SW6}, + {0, CS4_SW7, CS5_SW7, CS6_SW7}, + {0, CS4_SW8, CS5_SW8, CS6_SW8}, + {0, CS4_SW9, CS5_SW9, CS6_SW9}, + {0, CS4_SW10, CS5_SW10, CS6_SW10}, + {0, CS4_SW11, CS5_SW11, CS6_SW11}, + {0, CS4_SW12, CS5_SW12, CS6_SW12}, + {0, CS18_SW4, CS17_SW4, CS16_SW4}, + {0, CS18_SW5, CS17_SW5, CS16_SW5}, + {0, CS18_SW6, CS17_SW6, CS16_SW6}, + + {0, CS7_SW1, CS8_SW1, CS9_SW1}, + {0, CS7_SW2, CS8_SW2, CS9_SW2}, + {0, CS7_SW3, CS8_SW3, CS9_SW3}, + {0, CS7_SW4, CS8_SW4, CS9_SW4}, + {0, CS7_SW5, CS8_SW5, CS9_SW5}, + {0, CS7_SW6, CS8_SW6, CS9_SW6}, + {0, CS7_SW7, CS8_SW7, CS9_SW7}, + {0, CS7_SW8, CS8_SW8, CS9_SW8}, + {0, CS7_SW9, CS8_SW9, CS9_SW9}, + {0, CS7_SW10, CS8_SW10, CS9_SW10}, + {0, CS7_SW11, CS8_SW11, CS9_SW11}, + {0, CS7_SW12, CS8_SW12, CS9_SW12}, + {0, CS18_SW7, CS17_SW7, CS16_SW7}, + {0, CS18_SW8, CS17_SW8, CS16_SW8}, + + {0, CS10_SW1, CS11_SW1, CS12_SW1}, + {0, CS10_SW2, CS11_SW2, CS12_SW2}, + {0, CS10_SW3, CS11_SW3, CS12_SW3}, + {0, CS10_SW4, CS11_SW4, CS12_SW4}, + {0, CS10_SW5, CS11_SW5, CS12_SW5}, + {0, CS10_SW6, CS11_SW6, CS12_SW6}, + {0, CS10_SW7, CS11_SW7, CS12_SW7}, + {0, CS10_SW8, CS11_SW8, CS12_SW8}, + {0, CS10_SW9, CS11_SW9, CS12_SW9}, + {0, CS10_SW10, CS11_SW10, CS12_SW10}, + {0, CS10_SW11, CS11_SW11, CS12_SW11}, + {0, CS10_SW12, CS11_SW12, CS12_SW12}, + {0, CS18_SW9, CS17_SW9, CS16_SW9}, + {0, CS18_SW10, CS17_SW10, CS16_SW10}, + + {0, CS13_SW1, CS14_SW1, CS15_SW1}, + {0, CS13_SW2, CS14_SW2, CS15_SW2}, + {0, CS13_SW3, CS14_SW3, CS15_SW3}, + {0, CS13_SW5, CS14_SW5, CS15_SW5}, + {0, CS13_SW6, CS14_SW6, CS15_SW6}, + {0, CS13_SW8, CS14_SW8, CS15_SW8}, + {0, CS13_SW9, CS14_SW9, CS15_SW9}, + {0, CS13_SW10, CS14_SW10, CS15_SW10}, + {0, CS13_SW11, CS14_SW11, CS15_SW11}, + {0, CS13_SW12, CS14_SW12, CS15_SW12}, + {0, CS18_SW11, CS17_SW11, CS16_SW11}, + {0, CS18_SW12, CS17_SW12, CS16_SW12} +}; + +bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { + if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 255, 255, 255); + } else { + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); + } + } + return false; +} + + +void suspend_power_down_kb(void) { + gpio_write_pin_low(SDB); + suspend_power_down_user(); +} + +void suspend_wakeup_init_kb(void) { + gpio_write_pin_high(SDB); + suspend_wakeup_init_user(); +} +bool shutdown_kb(bool jump_to_bootloader) { + gpio_write_pin_low(SDB); + return true; +} +#endif + + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { + return false; + } + switch (keycode) { + 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) { + return false; //windows key locked do nothing + } + } + if (WIN_LOCK) { + return false; //windows key locked do nothing + } + return true; // continue all further processing of this key + + default: + 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; +# ifdef RGB_MATRIX_ENABLE + gpio_set_pin_output(SDB); + gpio_write_pin_high(SDB); +# endif +} diff --git a/keyboards/skyloong/gk68/pro/readme.md b/keyboards/skyloong/gk68/pro/readme.md new file mode 100644 index 00000000000..41478e5f3f0 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/readme.md @@ -0,0 +1,33 @@ +# GK68 PRO + +![GK68 PRO](https://i.imgur.com/YAFEoq7h.jpg) + +## The PCB features: +* QMK & VIA compatibility +* RGB Matrix backlight +* The space bar position switch can be interchanged with encoder module. + + +The following is the QMK Firmware for the Destop 68 key layout - designed in Dongguan Jizhi Electronic Technology Co., Ltd + +* Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) +* Hardware Supported: DestopPCB for Skyloong keylayout 68%, STM32F103C8T6 +* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip + +Make example for this keyboard (after setting up your build environment): + + make skyloong/gk68/pro:default + +Flashing example for this keyboard: + + make skyloong/gk68/pro: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 diff --git a/keyboards/skyloong/gk68/pro/rules.mk b/keyboards/skyloong/gk68/pro/rules.mk new file mode 100644 index 00000000000..3bbd2614291 --- /dev/null +++ b/keyboards/skyloong/gk68/pro/rules.mk @@ -0,0 +1 @@ +# File intentionally blank From f4aee6e3679f742fc28d00288a7132847c89429d Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Tue, 30 Apr 2024 11:27:29 +0800 Subject: [PATCH 02/16] Update keyboards/skyloong/gk68/pro/config.h OK, I do it. Co-authored-by: Drashna Jaelre --- keyboards/skyloong/gk68/pro/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/skyloong/gk68/pro/config.h b/keyboards/skyloong/gk68/pro/config.h index 99cabbfc29e..eb8d507d075 100644 --- a/keyboards/skyloong/gk68/pro/config.h +++ b/keyboards/skyloong/gk68/pro/config.h @@ -8,4 +8,3 @@ #define CAPS_LOCK_INDEX 30 #define WIN_MOD_INDEX 17 #define MAC_MOD_INDEX 18 -#define SDB B5 From 9425398a26a6d83c4d83d79d119d3231c6a1029f Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 30 Apr 2024 13:10:16 +0800 Subject: [PATCH 03/16] update skyloong/gk68/pro/pro.c --- keyboards/skyloong/gk68/pro/pro.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index 523c0741d95..164aca6cf27 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -106,16 +106,16 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { void suspend_power_down_kb(void) { - gpio_write_pin_low(SDB); + gpio_write_pin_low(AW20216S_EN_PIN_1); suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { - gpio_write_pin_high(SDB); + gpio_write_pin_high(AW20216S_EN_PIN_1); suspend_wakeup_init_user(); } bool shutdown_kb(bool jump_to_bootloader) { - gpio_write_pin_low(SDB); + gpio_write_pin_low(AW20216S_EN_PIN_1); return true; } #endif @@ -173,7 +173,7 @@ void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; # ifdef RGB_MATRIX_ENABLE - gpio_set_pin_output(SDB); - gpio_write_pin_high(SDB); + gpio_set_pin_output(AW20216S_EN_PIN_1); + gpio_write_pin_high(AW20216S_EN_PIN_1); # endif } From 2305e578c36187d88efd17c86ed5a069dcd32c9a Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Thu, 2 May 2024 16:35:56 +0800 Subject: [PATCH 04/16] update skyloong/gk68/pro --- .../skyloong/gk68/pro/keymaps/via/keymap.c | 118 ------------------ keyboards/skyloong/gk68/pro/pro.c | 99 ++++++++++++++- 2 files changed, 96 insertions(+), 121 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c index e21f577b71f..f4c68f900ac 100644 --- a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c +++ b/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c @@ -2,11 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -_Bool FN_WIN = 0; -_Bool FN_MAC = 0; -_Bool L_WIN = 0; -_Bool L_MAC = 0; - enum layer_names { _WIN, _MAC, @@ -57,116 +52,3 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { }; #endif -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - switch (keycode) { -# ifdef RGB_MATRIX_ENABLE - case RGB_TOG: - if (record->event.pressed) { - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_set_color_all(0, 0, 0); - } break; - default: { - rgb_matrix_set_flags(LED_FLAG_ALL); - } break; - } - } - return false; -# endif - case TO(0): - if (record->event.pressed) { - L_WIN = 1; - set_single_persistent_default_layer(0); // Save default layer 0 to eeprom - } else { - L_WIN = 0; - } - return true; // continue all further processing of this key - - case MO(2): - if (record->event.pressed) { - FN_WIN = 1; - } else { - FN_WIN = 0; - } - return true; // continue all further processing of this key - - case TO(1): - if (record->event.pressed) { - L_MAC = 1; - set_single_persistent_default_layer(1); //Save default layer 1 to eeprom - } else { - L_MAC = 0; - } - return true; // continue all further processing of this key - - case MO(3): - if (record->event.pressed) { - FN_MAC = 1; - } else { - FN_MAC = 0; - } - return true; // continue all further processing of this key - - case RGB_VAI: - rgb_matrix_set_flags(LED_FLAG_ALL); - return true; - - default: - return true; - } -}; - - -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - - switch (get_highest_layer(layer_state)) { - case 2:{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } break; - case 3:{ - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } break; - - case 0:{ - if (L_WIN) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } - } break; - - case 1:{ - if (L_MAC) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } break; - - default:{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } - return true; -} - diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index 164aca6cf27..c03e69805c3 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -4,6 +4,10 @@ int FN_ON = 0; _Bool WIN_LOCK = 0; +_Bool FN_WIN = 0; +_Bool FN_MAC = 0; +_Bool L_WIN = 0; +_Bool L_MAC = 0; #if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { @@ -101,9 +105,58 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); } } - return false; + + switch (get_highest_layer(layer_state)) { + case 2:{ + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } break; + case 3:{ + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } break; + + case 0:{ + if (L_WIN) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + } + } break; + + case 1:{ + if (L_MAC) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + } + }else{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } break; + + default:{ + if (!rgb_matrix_get_flags()) { + RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); + RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); + } + } + } + return true; } +#endif void suspend_power_down_kb(void) { gpio_write_pin_low(AW20216S_EN_PIN_1); @@ -118,14 +171,45 @@ bool shutdown_kb(bool jump_to_bootloader) { gpio_write_pin_low(AW20216S_EN_PIN_1); return true; } -#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; +# endif + case TO(0): + if (record->event.pressed) { + L_WIN = 1; + set_single_persistent_default_layer(0); // Save default layer 0 to eeprom + } else { + L_WIN = 0; + } + return true; // continue all further processing of this key + + case TO(1): + if (record->event.pressed) { + L_MAC = 1; + set_single_persistent_default_layer(1); //Save default layer 1 to eeprom + } else { + L_MAC = 0; + } + return true; // continue all further processing of this key + case MO(1): if (record->event.pressed) { FN_ON = 1; @@ -136,8 +220,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case MO(2): if (record->event.pressed) { + FN_WIN = 1; FN_ON = 1; } else { + FN_WIN = 0; FN_ON = 0; } return true; @@ -145,8 +231,11 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { case MO(3): if (record->event.pressed) { FN_ON = 1; + FN_MAC = 1; } else { FN_ON = 0; + FN_MAC = 0; + } return true; @@ -164,6 +253,10 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { } return true; // continue all further processing of this key + case RGB_VAI: + rgb_matrix_set_flags(LED_FLAG_ALL); + return true; + default: return true; } From 0a8dae296e5bbc7b83d191775679e4b1104de722 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 28 May 2024 18:10:52 +0800 Subject: [PATCH 05/16] modified skyloong/gk68/pro/readme.md --- keyboards/skyloong/gk68/pro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk68/pro/readme.md b/keyboards/skyloong/gk68/pro/readme.md index 41478e5f3f0..e25f519460e 100644 --- a/keyboards/skyloong/gk68/pro/readme.md +++ b/keyboards/skyloong/gk68/pro/readme.md @@ -1,6 +1,6 @@ # GK68 PRO -![GK68 PRO](https://i.imgur.com/YAFEoq7h.jpg) +![GK68 PRO](https://i.imgur.com/YAFEoq7.jpg) ## The PCB features: * QMK & VIA compatibility From 56d67cf4f4caa44095a1857a34c68b942e43cd42 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 2 Aug 2024 17:06:25 +0800 Subject: [PATCH 06/16] delete skyloong/gk68/pro/rules.mk --- keyboards/skyloong/gk68/pro/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/skyloong/gk68/pro/rules.mk diff --git a/keyboards/skyloong/gk68/pro/rules.mk b/keyboards/skyloong/gk68/pro/rules.mk deleted file mode 100644 index 3bbd2614291..00000000000 --- a/keyboards/skyloong/gk68/pro/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# File intentionally blank From 2415ff1d1601e5310de4f0b2f62f6ef6cfd3cf02 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Fri, 30 Aug 2024 20:14:56 +0800 Subject: [PATCH 07/16] Delete skyloong/gk68/pro/keymaps/via --- keyboards/skyloong/gk68/pro/config.h | 3 +- .../skyloong/gk68/pro/keymaps/via/keymap.c | 54 ------- .../skyloong/gk68/pro/keymaps/via/rules.mk | 2 - keyboards/skyloong/gk68/pro/pro.c | 144 ------------------ 4 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 keyboards/skyloong/gk68/pro/keymaps/via/keymap.c delete mode 100644 keyboards/skyloong/gk68/pro/keymaps/via/rules.mk diff --git a/keyboards/skyloong/gk68/pro/config.h b/keyboards/skyloong/gk68/pro/config.h index eb8d507d075..a03409f2fdc 100644 --- a/keyboards/skyloong/gk68/pro/config.h +++ b/keyboards/skyloong/gk68/pro/config.h @@ -6,5 +6,4 @@ #define AW20216S_EN_PIN_1 B5 #define AW20216S_CS_PIN_1 B12 #define CAPS_LOCK_INDEX 30 -#define WIN_MOD_INDEX 17 -#define MAC_MOD_INDEX 18 + diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c deleted file mode 100644 index f4c68f900ac..00000000000 --- a/keyboards/skyloong/gk68/pro/keymaps/via/keymap.c +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright 2021 JZ-Skyloong (@JZ-Skyloong) -// 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_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_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(_WIN_INDEX), KC_APP, KC_LEFT, KC_DOWN, KC_RIGHT - ), - - [_MAC] = LAYOUT_all( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_SPC, KC_SPC, KC_RGUI, MO(_MAC_INDEX), KC_RALT, KC_LEFT, KC_DOWN, KC_RIGHT - ), - - [_WIN_INDEX] = LAYOUT_all( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_MUTE, - _______, _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, - _______, _______, _______, _______, _______, _______, KC_RALT, _______, KC_APP, RGB_SPD, RGB_VAD, RGB_SPI - ), - - [_MAC_INDEX] = LAYOUT_all( - KC_GRV , KC_F14, KC_F15, C(KC_UP), G(KC_D), G(KC_SPC), LSG(KC_4), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE, - _______, _______, TO(0), TO(1), _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, - _______, KC_LALT, KC_LGUI, _______, _______, _______, KC_RGUI, _______, KC_RALT, RGB_SPD, RGB_VAD, RGB_SPI - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [_WIN] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_MAC] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [_WIN_INDEX] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, - [_MAC_INDEX] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} -}; -#endif - diff --git a/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk b/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk deleted file mode 100644 index f1adcab005e..00000000000 --- a/keyboards/skyloong/gk68/pro/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index c03e69805c3..da3b7209017 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -2,13 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" -int FN_ON = 0; -_Bool WIN_LOCK = 0; -_Bool FN_WIN = 0; -_Bool FN_MAC = 0; -_Bool L_WIN = 0; -_Bool L_MAC = 0; - #if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { /* Refer to aw20216 manual for these locations @@ -105,57 +98,8 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_INDEX, 0, 0, 0); } } - - switch (get_highest_layer(layer_state)) { - case 2:{ - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } break; - case 3:{ - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } break; - - case 0:{ - if (L_WIN) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - } - } break; - - case 1:{ - if (L_MAC) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 255, 255, 255); - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - } - }else{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } break; - - default:{ - if (!rgb_matrix_get_flags()) { - RGB_MATRIX_INDICATOR_SET_COLOR(WIN_MOD_INDEX, 0, 0, 0); - RGB_MATRIX_INDICATOR_SET_COLOR(MAC_MOD_INDEX, 0, 0, 0); - } - } - } return true; } - #endif void suspend_power_down_kb(void) { @@ -172,95 +116,7 @@ bool shutdown_kb(bool jump_to_bootloader) { return true; } -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; -# endif - case TO(0): - if (record->event.pressed) { - L_WIN = 1; - set_single_persistent_default_layer(0); // Save default layer 0 to eeprom - } else { - L_WIN = 0; - } - return true; // continue all further processing of this key - case TO(1): - if (record->event.pressed) { - L_MAC = 1; - set_single_persistent_default_layer(1); //Save default layer 1 to eeprom - } else { - L_MAC = 0; - } - return true; // continue all further processing of this key - - case MO(1): - if (record->event.pressed) { - FN_ON = 1; - } else { - FN_ON = 0; - } - return true; - - case MO(2): - if (record->event.pressed) { - FN_WIN = 1; - FN_ON = 1; - } else { - FN_WIN = 0; - FN_ON = 0; - } - return true; - - case MO(3): - if (record->event.pressed) { - FN_ON = 1; - FN_MAC = 1; - } else { - FN_ON = 0; - FN_MAC = 0; - - } - return true; - - case KC_LGUI: - if (FN_ON){ - if ( record->event.pressed){ - WIN_LOCK = !WIN_LOCK ; //change win lock state - } - if (!WIN_LOCK) { - return false; //windows key locked do nothing - } - } - if (WIN_LOCK) { - return false; //windows key locked do nothing - } - return true; // continue all further processing of this key - - case RGB_VAI: - rgb_matrix_set_flags(LED_FLAG_ALL); - return true; - - default: - return true; - } -} void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled From 276cc1640276d191f315ea6ea17cef59081de178 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Tue, 8 Oct 2024 13:36:52 +0800 Subject: [PATCH 08/16] update skyloong/gk68/pro/readme.md --- keyboards/skyloong/gk68/pro/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/readme.md b/keyboards/skyloong/gk68/pro/readme.md index e25f519460e..c07cd9a728a 100644 --- a/keyboards/skyloong/gk68/pro/readme.md +++ b/keyboards/skyloong/gk68/pro/readme.md @@ -5,14 +5,14 @@ ## The PCB features: * QMK & VIA compatibility * RGB Matrix backlight -* The space bar position switch can be interchanged with encoder module. +* The right-top position switchs(INS and Del) can be interchanged with encoder module. The following is the QMK Firmware for the Destop 68 key layout - designed in Dongguan Jizhi Electronic Technology Co., Ltd * Keyboard Maintainer: [NaturalZh](https://github.com/NaturalZh) * Hardware Supported: DestopPCB for Skyloong keylayout 68%, STM32F103C8T6 -* Hardware Availability: http://www.skyloong.com.cn https://skyloong.vip +* Hardware Availability: http://www.skyloong.com.cn https://skyloongtech.com Make example for this keyboard (after setting up your build environment): From baef982a7aa529fd683320fba011c020478c3c84 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:33:56 +0800 Subject: [PATCH 09/16] Update keyboards/skyloong/gk68/pro/keymaps/default/keymap.c OK, I got it . Thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c index 4a11a25f5c9..30db0034d46 100644 --- a/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c @@ -24,8 +24,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI)}, - [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RGB_HUD, RGB_HUI)} + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RM_VALD, RM_VALU)}, + [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(RM_HUED, RM_HUEU)} }; #endif From 6f00fa8932970d3eca35111e1673ac9f98de4ec3 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 23 Nov 2024 08:34:29 +0800 Subject: [PATCH 10/16] Update keyboards/skyloong/gk68/pro/keymaps/default/keymap.c OK. thank you. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c b/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c index 30db0034d46..35540e30acf 100644 --- a/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c +++ b/keyboards/skyloong/gk68/pro/keymaps/default/keymap.c @@ -14,10 +14,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( KC_GRV, 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, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_MOD, RGB_TOG, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_PREV, RM_NEXT, RM_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, KC_END, - _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_VAD, RGB_SPI + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_VALU, KC_END, + _______, _______, _______, _______, _______, _______, _______, _______, _______, RM_SPDD, RM_VALD, RM_SPDU ) }; From 83a2ec3b9d61dab80b8db04edf6ffd561597a345 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 11 Jan 2025 17:27:44 +0800 Subject: [PATCH 11/16] Update keyboards/skyloong/gk68/pro/config.h OK, Thanks. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk68/pro/config.h b/keyboards/skyloong/gk68/pro/config.h index a03409f2fdc..33e0157cf93 100644 --- a/keyboards/skyloong/gk68/pro/config.h +++ b/keyboards/skyloong/gk68/pro/config.h @@ -3,7 +3,7 @@ #pragma once -#define AW20216S_EN_PIN_1 B5 +#define AW20216S_EN_PIN B5 #define AW20216S_CS_PIN_1 B12 #define CAPS_LOCK_INDEX 30 From a9f99464e6be31db097ed0ebe92b343c8d9d9c08 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 11 Jan 2025 17:28:34 +0800 Subject: [PATCH 12/16] Update keyboards/skyloong/gk68/pro/pro.c OK, Thanks. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/pro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index da3b7209017..10b72a071d7 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -103,7 +103,7 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { #endif void suspend_power_down_kb(void) { - gpio_write_pin_low(AW20216S_EN_PIN_1); + gpio_write_pin_low(AW20216S_EN_PIN); suspend_power_down_user(); } From b677e5e8be7188b2a84f46c17069a6a783bb4ac3 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 11 Jan 2025 17:29:31 +0800 Subject: [PATCH 13/16] Update keyboards/skyloong/gk68/pro/pro.c OK, Thanks. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/pro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index 10b72a071d7..c4187e3724d 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -108,7 +108,7 @@ void suspend_power_down_kb(void) { } void suspend_wakeup_init_kb(void) { - gpio_write_pin_high(AW20216S_EN_PIN_1); + gpio_write_pin_high(AW20216S_EN_PIN); suspend_wakeup_init_user(); } bool shutdown_kb(bool jump_to_bootloader) { From e46905ee79cb974a62b0cc68c0e1d547ba945277 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 11 Jan 2025 17:30:07 +0800 Subject: [PATCH 14/16] Update keyboards/skyloong/gk68/pro/pro.c OK, Thanks. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/pro.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index c4187e3724d..f72384ba281 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -112,7 +112,7 @@ void suspend_wakeup_init_kb(void) { suspend_wakeup_init_user(); } bool shutdown_kb(bool jump_to_bootloader) { - gpio_write_pin_low(AW20216S_EN_PIN_1); + gpio_write_pin_low(AW20216S_EN_PIN); return true; } From 5afa7784214415933f6f092e1481e7515363c072 Mon Sep 17 00:00:00 2001 From: JIKEDINGZHI <52481939+NaturalZh@users.noreply.github.com> Date: Sat, 11 Jan 2025 17:31:03 +0800 Subject: [PATCH 15/16] Update keyboards/skyloong/gk68/pro/pro.c OK, Thank you for your suggestion. Co-authored-by: Ryan --- keyboards/skyloong/gk68/pro/pro.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index f72384ba281..efed422078d 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -121,8 +121,4 @@ bool shutdown_kb(bool jump_to_bootloader) { void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; -# ifdef RGB_MATRIX_ENABLE - gpio_set_pin_output(AW20216S_EN_PIN_1); - gpio_write_pin_high(AW20216S_EN_PIN_1); -# endif } From 95fcbe8f7a45d0c45e33f80f833a3da616f22487 Mon Sep 17 00:00:00 2001 From: NaturalZh Date: Mon, 17 Mar 2025 18:49:38 +0800 Subject: [PATCH 16/16] Update skyloong/gk68/pro/pro.c --- keyboards/skyloong/gk68/pro/pro.c | 140 +++++++++++++++--------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/keyboards/skyloong/gk68/pro/pro.c b/keyboards/skyloong/gk68/pro/pro.c index efed422078d..890d6386a92 100644 --- a/keyboards/skyloong/gk68/pro/pro.c +++ b/keyboards/skyloong/gk68/pro/pro.c @@ -10,80 +10,80 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = { * | | G location * | | | B location * | | | | */ - {0, CS1_SW1, CS2_SW1, CS3_SW1}, - {0, CS1_SW2, CS2_SW2, CS3_SW2}, - {0, CS1_SW3, CS2_SW3, CS3_SW3}, - {0, CS1_SW4, CS2_SW4, CS3_SW4}, - {0, CS1_SW5, CS2_SW5, CS3_SW5}, - {0, CS1_SW6, CS2_SW6, CS3_SW6}, - {0, CS1_SW7, CS2_SW7, CS3_SW7}, - {0, CS1_SW8, CS2_SW8, CS3_SW8}, - {0, CS1_SW9, CS2_SW9, CS3_SW9}, - {0, CS1_SW10, CS2_SW10, CS3_SW10}, - {0, CS1_SW11, CS2_SW11, CS3_SW11}, - {0, CS1_SW12, CS2_SW12, CS3_SW12}, - {0, CS18_SW1, CS17_SW1, CS16_SW1}, - {0, CS18_SW2, CS17_SW2, CS16_SW2}, - {0, CS18_SW3, CS17_SW3, CS16_SW3}, + {0, SW1_CS1, SW1_CS2, SW1_CS3}, + {0, SW2_CS1, SW2_CS2, SW2_CS3}, + {0, SW3_CS1, SW3_CS2, SW3_CS3}, + {0, SW4_CS1, SW4_CS2, SW4_CS3}, + {0, SW5_CS1, SW5_CS2, SW5_CS3}, + {0, SW6_CS1, SW6_CS2, SW6_CS3}, + {0, SW7_CS1, SW7_CS2, SW7_CS3}, + {0, SW8_CS1, SW8_CS2, SW8_CS3}, + {0, SW9_CS1, SW9_CS2, SW9_CS3}, + {0, SW10_CS1, SW10_CS2, SW10_CS3}, + {0, SW11_CS1, SW11_CS2, SW11_CS3}, + {0, SW12_CS1, SW12_CS2, SW12_CS3}, + {0, SW1_CS18, SW1_CS17, SW1_CS16}, + {0, SW2_CS18, SW2_CS17, SW2_CS16}, + {0, SW3_CS18, SW3_CS17, SW3_CS16}, - {0, CS4_SW1, CS5_SW1, CS6_SW1}, - {0, CS4_SW2, CS5_SW2, CS6_SW2}, - {0, CS4_SW3, CS5_SW3, CS6_SW3}, - {0, CS4_SW4, CS5_SW4, CS6_SW4}, - {0, CS4_SW5, CS5_SW5, CS6_SW5}, - {0, CS4_SW6, CS5_SW6, CS6_SW6}, - {0, CS4_SW7, CS5_SW7, CS6_SW7}, - {0, CS4_SW8, CS5_SW8, CS6_SW8}, - {0, CS4_SW9, CS5_SW9, CS6_SW9}, - {0, CS4_SW10, CS5_SW10, CS6_SW10}, - {0, CS4_SW11, CS5_SW11, CS6_SW11}, - {0, CS4_SW12, CS5_SW12, CS6_SW12}, - {0, CS18_SW4, CS17_SW4, CS16_SW4}, - {0, CS18_SW5, CS17_SW5, CS16_SW5}, - {0, CS18_SW6, CS17_SW6, CS16_SW6}, + {0, SW1_CS4, SW1_CS5, SW1_CS6}, + {0, SW2_CS4, SW2_CS5, SW2_CS6}, + {0, SW3_CS4, SW3_CS5, SW3_CS6}, + {0, SW4_CS4, SW4_CS5, SW4_CS6}, + {0, SW5_CS4, SW5_CS5, SW5_CS6}, + {0, SW6_CS4, SW6_CS5, SW6_CS6}, + {0, SW7_CS4, SW7_CS5, SW7_CS6}, + {0, SW8_CS4, SW8_CS5, SW8_CS6}, + {0, SW9_CS4, SW9_CS5, SW9_CS6}, + {0, SW10_CS4, SW10_CS5, SW10_CS6}, + {0, SW11_CS4, SW11_CS5, SW11_CS6}, + {0, SW12_CS4, SW12_CS5, SW12_CS6}, + {0, SW4_CS18, SW4_CS17, SW4_CS16}, + {0, SW5_CS18, SW5_CS17, SW5_CS16}, + {0, SW6_CS18, SW6_CS17, SW6_CS16}, - {0, CS7_SW1, CS8_SW1, CS9_SW1}, - {0, CS7_SW2, CS8_SW2, CS9_SW2}, - {0, CS7_SW3, CS8_SW3, CS9_SW3}, - {0, CS7_SW4, CS8_SW4, CS9_SW4}, - {0, CS7_SW5, CS8_SW5, CS9_SW5}, - {0, CS7_SW6, CS8_SW6, CS9_SW6}, - {0, CS7_SW7, CS8_SW7, CS9_SW7}, - {0, CS7_SW8, CS8_SW8, CS9_SW8}, - {0, CS7_SW9, CS8_SW9, CS9_SW9}, - {0, CS7_SW10, CS8_SW10, CS9_SW10}, - {0, CS7_SW11, CS8_SW11, CS9_SW11}, - {0, CS7_SW12, CS8_SW12, CS9_SW12}, - {0, CS18_SW7, CS17_SW7, CS16_SW7}, - {0, CS18_SW8, CS17_SW8, CS16_SW8}, + {0, SW1_CS7, SW1_CS8, SW1_CS9}, + {0, SW2_CS7, SW2_CS8, SW2_CS9}, + {0, SW3_CS7, SW3_CS8, SW3_CS9}, + {0, SW4_CS7, SW4_CS8, SW4_CS9}, + {0, SW5_CS7, SW5_CS8, SW5_CS9}, + {0, SW6_CS7, SW6_CS8, SW6_CS9}, + {0, SW7_CS7, SW7_CS8, SW7_CS9}, + {0, SW8_CS7, SW8_CS8, SW8_CS9}, + {0, SW9_CS7, SW9_CS8, SW9_CS9}, + {0, SW10_CS7, SW10_CS8, SW10_CS9}, + {0, SW11_CS7, SW11_CS8, SW11_CS9}, + {0, SW12_CS7, SW12_CS8, SW12_CS9}, + {0, SW7_CS18, SW7_CS17, SW7_CS16}, + {0, SW8_CS18, SW8_CS17, SW8_CS16}, - {0, CS10_SW1, CS11_SW1, CS12_SW1}, - {0, CS10_SW2, CS11_SW2, CS12_SW2}, - {0, CS10_SW3, CS11_SW3, CS12_SW3}, - {0, CS10_SW4, CS11_SW4, CS12_SW4}, - {0, CS10_SW5, CS11_SW5, CS12_SW5}, - {0, CS10_SW6, CS11_SW6, CS12_SW6}, - {0, CS10_SW7, CS11_SW7, CS12_SW7}, - {0, CS10_SW8, CS11_SW8, CS12_SW8}, - {0, CS10_SW9, CS11_SW9, CS12_SW9}, - {0, CS10_SW10, CS11_SW10, CS12_SW10}, - {0, CS10_SW11, CS11_SW11, CS12_SW11}, - {0, CS10_SW12, CS11_SW12, CS12_SW12}, - {0, CS18_SW9, CS17_SW9, CS16_SW9}, - {0, CS18_SW10, CS17_SW10, CS16_SW10}, + {0, SW1_CS10, SW1_CS11, SW1_CS12}, + {0, SW2_CS10, SW2_CS11, SW2_CS12}, + {0, SW3_CS10, SW3_CS11, SW3_CS12}, + {0, SW4_CS10, SW4_CS11, SW4_CS12}, + {0, SW5_CS10, SW5_CS11, SW5_CS12}, + {0, SW6_CS10, SW6_CS11, SW6_CS12}, + {0, SW7_CS10, SW7_CS11, SW7_CS12}, + {0, SW8_CS10, SW8_CS11, SW8_CS12}, + {0, SW9_CS10, SW9_CS11, SW9_CS12}, + {0, SW10_CS10, SW10_CS11, SW10_CS12}, + {0, SW11_CS10, SW11_CS11, SW11_CS12}, + {0, SW12_CS10, SW12_CS11, SW12_CS12}, + {0, SW9_CS18, SW9_CS17, SW9_CS16}, + {0, SW10_CS18, SW10_CS17, SW10_CS16}, - {0, CS13_SW1, CS14_SW1, CS15_SW1}, - {0, CS13_SW2, CS14_SW2, CS15_SW2}, - {0, CS13_SW3, CS14_SW3, CS15_SW3}, - {0, CS13_SW5, CS14_SW5, CS15_SW5}, - {0, CS13_SW6, CS14_SW6, CS15_SW6}, - {0, CS13_SW8, CS14_SW8, CS15_SW8}, - {0, CS13_SW9, CS14_SW9, CS15_SW9}, - {0, CS13_SW10, CS14_SW10, CS15_SW10}, - {0, CS13_SW11, CS14_SW11, CS15_SW11}, - {0, CS13_SW12, CS14_SW12, CS15_SW12}, - {0, CS18_SW11, CS17_SW11, CS16_SW11}, - {0, CS18_SW12, CS17_SW12, CS16_SW12} + {0, SW1_CS13, SW1_CS14, SW1_CS15}, + {0, SW2_CS13, SW2_CS14, SW2_CS15}, + {0, SW3_CS13, SW3_CS14, SW3_CS15}, + {0, SW5_CS13, SW5_CS14, SW5_CS15}, + {0, SW6_CS13, SW6_CS14, SW6_CS15}, + {0, SW8_CS13, SW8_CS14, SW8_CS15}, + {0, SW9_CS13, SW9_CS14, SW9_CS15}, + {0, SW10_CS13, SW10_CS14, SW10_CS15}, + {0, SW11_CS13, SW11_CS14, SW11_CS15}, + {0, SW12_CS13, SW12_CS14, SW12_CS15}, + {0, SW11_CS18, SW11_CS17, SW11_CS16}, + {0, SW12_CS18, SW12_CS17, SW12_CS16} }; bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {