diff options
Diffstat (limited to 'keyboards/keychron/k6_pro/ansi/rgb')
| -rw-r--r-- | keyboards/keychron/k6_pro/ansi/rgb/config.h | 17 | ||||
| -rw-r--r-- | keyboards/keychron/k6_pro/ansi/rgb/info.json | 143 | ||||
| -rw-r--r-- | keyboards/keychron/k6_pro/ansi/rgb/rgb.c | 4 | ||||
| -rw-r--r-- | keyboards/keychron/k6_pro/ansi/rgb/rules.mk | 1 |
4 files changed, 80 insertions, 85 deletions
diff --git a/keyboards/keychron/k6_pro/ansi/rgb/config.h b/keyboards/keychron/k6_pro/ansi/rgb/config.h index 26b0a0cf18..ca3a8cefd2 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/config.h +++ b/keyboards/keychron/k6_pro/ansi/rgb/config.h @@ -20,17 +20,21 @@ # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 -# define DRIVER_1_LED_TOTAL 30 -# define DRIVER_2_LED_TOTAL 38 -# define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +# define DRIVER_1_LED_COUNT 30 +# define DRIVER_2_LED_COUNT 38 +# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT) -/* Set to infinit, which is use in USB mode by default */ -#define RGB_DISABLE_TIMEOUT RGB_DISABLE_TIME_INFINITE +/* Set to infinit, which is use in USB mode by default + */ +#define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE /* Allow shutdown of led driver to save power */ # define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE /* Turn off backlight on low brightness to save power */ # define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32 +# define DIM_CAPS_LOCK +# define CAPS_LOCK_INDEX 30 + # ifdef VIA_ENABLE # define VIA_QMK_RGBLIGHT_ENABLE # endif @@ -94,7 +98,4 @@ /* Set LED driver current */ # define CKLED2001_CURRENT_TUNE {0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38} -# define DIM_CAPS_LOCK -# define CAPS_LOCK_INDEX 30 - #endif diff --git a/keyboards/keychron/k6_pro/ansi/rgb/info.json b/keyboards/keychron/k6_pro/ansi/rgb/info.json index 2167da9ef7..9e8a9fa87d 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/info.json +++ b/keyboards/keychron/k6_pro/ansi/rgb/info.json @@ -1,93 +1,88 @@ { "keyboard_name": "Keychron K6 Pro", + "manufacturer": "Keychron", "url": "https://github.com/Keychron", "maintainer": "lokher", "usb": { -<<<<<<< HEAD:keyboards/keychron/k6_pro/ansi/rgb/info.json "vid": "0x3434", "pid": "0x0260", "device_version": "1.0.0" -======= - "vid": "0x7516", - "pid": "0x7001", - "device_version": "0.0.1" ->>>>>>> master:keyboards/horrortroll/chinese_pcb/devil68_pro/info.json }, "layouts": { "LAYOUT_ansi_68": { "layout": [ - {"label":"Esc","x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Light", "x":15, "y":0}, + {"matrix":[0, 0], "x":0, "y":0}, + {"matrix":[0, 1], "x":1, "y":0}, + {"matrix":[0, 2], "x":2, "y":0}, + {"matrix":[0, 3], "x":3, "y":0}, + {"matrix":[0, 4], "x":4, "y":0}, + {"matrix":[0, 5], "x":5, "y":0}, + {"matrix":[0, 6], "x":6, "y":0}, + {"matrix":[0, 7], "x":7, "y":0}, + {"matrix":[0, 8], "x":8, "y":0}, + {"matrix":[0, 9], "x":9, "y":0}, + {"matrix":[0,10], "x":10, "y":0}, + {"matrix":[0,11], "x":11, "y":0}, + {"matrix":[0,12], "x":12, "y":0}, + {"matrix":[0,13], "x":13, "y":0, "w":2}, + {"matrix":[0,14], "x":15, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[{", "x":11.5, "y":1}, - {"label":"]}", "x":12.5, "y":1}, - {"label":"\\|", "x":13.5, "y":1, "w":1.5}, - {"label":"Home", "x":15, "y":1}, + {"matrix":[1, 0], "x":0, "y":2, "w":1.5}, + {"matrix":[1, 1], "x":1.5, "y":2}, + {"matrix":[1, 2], "x":2.5, "y":2}, + {"matrix":[1, 3], "x":3.5, "y":2}, + {"matrix":[1, 4], "x":4.5, "y":2}, + {"matrix":[1, 5], "x":5.5, "y":2}, + {"matrix":[1, 6], "x":6.5, "y":2}, + {"matrix":[1, 7], "x":7.5, "y":2}, + {"matrix":[1, 8], "x":8.5, "y":2}, + {"matrix":[1, 9], "x":9.5, "y":2}, + {"matrix":[1,10], "x":10.5, "y":2}, + {"matrix":[1,11], "x":11.5, "y":2}, + {"matrix":[1,12], "x":12.5, "y":2}, + {"matrix":[1,13], "x":13.5, "y":2, "w":1.5}, + {"matrix":[1,14], "x":15, "y":2}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";:", "x":10.75, "y":2}, - {"label":"'\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Page Up", "x":15, "y":2}, + {"matrix":[2, 0], "x":0, "y":3, "w":1.75}, + {"matrix":[2, 1], "x":1.75, "y":3}, + {"matrix":[2, 2], "x":2.75, "y":3}, + {"matrix":[2, 3], "x":3.75, "y":3}, + {"matrix":[2, 4], "x":4.75, "y":3}, + {"matrix":[2, 5], "x":5.75, "y":3}, + {"matrix":[2, 6], "x":6.75, "y":3}, + {"matrix":[2, 7], "x":7.75, "y":3}, + {"matrix":[2, 8], "x":8.75, "y":3}, + {"matrix":[2, 9], "x":9.75, "y":3}, + {"matrix":[2,10], "x":10.75, "y":3}, + {"matrix":[2,11], "x":11.75, "y":3}, + {"matrix":[2,13], "x":12.75, "y":3, "w":2.25}, + {"matrix":[2,14], "x":15, "y":3, "w":2.25}, - {"label":"Left Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",<", "x":9.25, "y":3}, - {"label":".>", "x":10.25, "y":3}, - {"label":"/?", "x":11.25, "y":3}, - {"label":"Right Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"Page Down", "x":15, "y":3}, + {"matrix":[3, 0], "x":0, "y":4, "w":2.25}, + {"matrix":[3, 2], "x":2.25, "y":4}, + {"matrix":[3, 3], "x":3.25, "y":4}, + {"matrix":[3, 4], "x":4.25, "y":4}, + {"matrix":[3, 5], "x":5.25, "y":4}, + {"matrix":[3, 6], "x":6.25, "y":4}, + {"matrix":[3, 7], "x":7.25, "y":4}, + {"matrix":[3, 8], "x":8.25, "y":4}, + {"matrix":[3, 9], "x":9.25, "y":4}, + {"matrix":[3,10], "x":10.25, "y":4}, + {"matrix":[3,11], "x":11.25, "y":4}, + {"matrix":[3,12], "x":11.25, "y":4, "w":1.75}, + {"matrix":[3,13], "x":14, "y":4}, + {"matrix":[3,14], "x":15, "y":4}, - {"label":"Left Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Left Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Left Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Right Win", "x":10, "y":4}, - {"label":"Fn1", "x":11, "y":4}, - {"label":"Fn2", "x":12, "y":4}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "y":4} + {"matrix":[4, 0], "x":0, "y":5, "w":1.25}, + {"matrix":[4, 1], "x":1.25, "y":5, "w":1.25}, + {"matrix":[4, 2], "x":2.5, "y":5, "w":1.25}, + {"matrix":[4, 6], "x":3.75, "y":5, "w":6.25}, + {"matrix":[4, 9], "x":10, "y":5}, + {"matrix":[4,10], "x":11, "y":5}, + {"matrix":[4,11], "x":12, "y":5}, + {"matrix":[4,12], "x":13, "y":5}, + {"matrix":[4,13], "x":14, "y":5}, + {"matrix":[4,14], "x":15, "y":5} ] } } diff --git a/keyboards/keychron/k6_pro/ansi/rgb/rgb.c b/keyboards/keychron/k6_pro/ansi/rgb/rgb.c index 98cd1ade01..9a9ed457b9 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/rgb.c +++ b/keyboards/keychron/k6_pro/ansi/rgb/rgb.c @@ -13,12 +13,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ - + #include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE -const ckled2001_led g_ckled2001_leds[DRIVER_LED_TOTAL] = { +const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = { /* Refer to IS31 manual for these locations * driver * | R location diff --git a/keyboards/keychron/k6_pro/ansi/rgb/rules.mk b/keyboards/keychron/k6_pro/ansi/rgb/rules.mk index 5975e7843e..7af34ccd60 100644 --- a/keyboards/keychron/k6_pro/ansi/rgb/rules.mk +++ b/keyboards/keychron/k6_pro/ansi/rgb/rules.mk @@ -1,3 +1,2 @@ RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = CKLED2001 - |