From 670b83a8c8725a2a73f05ca457424ad797236905 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 7 Jan 2025 10:53:40 +0100 Subject: [PATCH 1/5] Add Halcyon Corne rev2 --- .../corne/keymaps/default_hlc/keymap.json | 43 ++++++++++++ .../corne/keymaps/default_hlc/rules.mk | 2 + .../halcyon/corne/keymaps/vial_hlc/config.h | 14 ++++ .../corne/keymaps/vial_hlc/keymap.json | 42 ++++++++++++ .../halcyon/corne/keymaps/vial_hlc/rules.mk | 8 +++ .../halcyon/corne/keymaps/vial_hlc/vial.json | 49 ++++++++++++++ qmk.json | 66 ++++++++++++++++++- users/halcyon_modules/config.h | 22 +++++++ users/halcyon_modules/halcyon.c | 38 +++++++++++ 9 files changed, 283 insertions(+), 1 deletion(-) create mode 100644 keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json create mode 100644 keyboards/splitkb/halcyon/corne/keymaps/default_hlc/rules.mk create mode 100644 keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h create mode 100644 keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json create mode 100644 keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/rules.mk create mode 100644 keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/vial.json diff --git a/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json new file mode 100644 index 00000000..bf6578ee --- /dev/null +++ b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json @@ -0,0 +1,43 @@ +{ + "keyboard": "splitkb/halcyon/corne/rev2", + "keymap": "default_hlc", + "version": 1, + "layout": "LAYOUT_split_3x6_3_hlc", + "layers": [ + [ + "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P" , "KC_BSPC" , + "KC_LCTL" , "KC_A" , "KC_S" , "KC_D" , "KC_F" , "KC_G" , "KC_H" , "KC_J" , "KC_K" , "KC_L" , "KC_SCLN" , "KC_QUOT" , + "KC_LSFT" , "KC_Z" , "KC_X" , "KC_C" , "KC_V" , "KC_B" , "KC_N" , "KC_M" , "KC_COMM" , "KC_DOT" , "KC_SLSH" , "KC_ESC" , + "KC_LGUI" , "MO(1)" , "KC_SPC" , "KC_ENT" , "MO(2)" , "KC_RALT" , + "KC_MUTE" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_MUTE" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" + ], + [ + "KC_TAB" , "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , "KC_6" , "KC_7" , "KC_8" , "KC_9" , "KC_0" , "KC_BSPC" , + "KC_LCTL" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_LEFT" , "KC_DOWN" , "KC_UP" , "KC_RIGHT", "XXXXXXX" , "XXXXXXX" , + "KC_LSFT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "KC_LGUI" , "_______" , "KC_SPC" , "KC_ENT" , "MO(3)" , "KC_RALT" , + "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" + ], + [ + "KC_TAB" , "KC_EXLM" , "KC_AT" , "KC_HASH" , "KC_DLR" , "KC_PERC" , "KC_CIRC" , "KC_AMPR" , "KC_ASTR" , "KC_LPRN" , "KC_RPRN" , "KC_BSPC" , + "KC_LCTL" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_MINS" , "KC_EQL" , "KC_LBRC" , "KC_RBRC" , "KC_BSLS" , "KC_GRV" , + "KC_LSFT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_UNDS" , "KC_PLUS" , "KC_LCBR" , "KC_RCBR" , "KC_PIPE" , "KC_TILD" , + "KC_LGUI" , "MO(3)" , "KC_SPC" , "KC_ENT" , "_______" , "KC_RALT" , + "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" + ], + [ + "QK_BOOT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "RGB_TOG" , "RGB_HUI" , "RGB_SAI" , "RGB_VAI" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "RGB_MOD" , "RGB_HUD" , "RGB_SAD" , "RGB_VAD" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "KC_LGUI" , "_______" , "KC_SPC" , "KC_ENT" , "_______" , "KC_RALT" , + "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" + ] + + ], + "encoders": [ + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}] + ] +} diff --git a/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/rules.mk b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/rules.mk new file mode 100644 index 00000000..54a02a4c --- /dev/null +++ b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/rules.mk @@ -0,0 +1,2 @@ +# This adds module functionality to your keyboard (files found in users/halcyon_modules) +USER_NAME := halcyon_modules diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h new file mode 100644 index 00000000..cf4936d1 --- /dev/null +++ b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* Copyright 2024 splitkb.com */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0xF8, 0x7A, 0x1D, 0x23, 0x53, 0x9B, 0x54, 0xB9} + +#define VIAL_UNLOCK_COMBO_ROWS { 0, 4 } +#define VIAL_UNLOCK_COMBO_COLS { 5, 5 } + +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES + +#define DYNAMIC_KEYMAP_LAYER_COUNT 8 diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json new file mode 100644 index 00000000..0c9be714 --- /dev/null +++ b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json @@ -0,0 +1,42 @@ +{ + "keyboard": "splitkb/halcyon/corne/rev2", + "keymap": "vial_hlc", + "version": 1, + "layout": "LAYOUT_split_3x6_3_hlc", + "layers": [ + [ + "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P" , "KC_BSPC" , + "KC_LCTL" , "KC_A" , "KC_S" , "KC_D" , "KC_F" , "KC_G" , "KC_H" , "KC_J" , "KC_K" , "KC_L" , "KC_SCLN" , "KC_QUOT" , + "KC_LSFT" , "KC_Z" , "KC_X" , "KC_C" , "KC_V" , "KC_B" , "KC_N" , "KC_M" , "KC_COMM" , "KC_DOT" , "KC_SLSH" , "KC_ESC" , + "KC_LGUI" , "MO(1)" , "KC_SPC" , "KC_ENT" , "MO(2)" , "KC_RALT" , + "KC_MUTE" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_MUTE" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" + ], + [ + "KC_TAB" , "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , "KC_6" , "KC_7" , "KC_8" , "KC_9" , "KC_0" , "KC_BSPC" , + "KC_LCTL" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_LEFT" , "KC_DOWN" , "KC_UP" , "KC_RIGHT", "XXXXXXX" , "XXXXXXX" , + "KC_LSFT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "KC_LGUI" , "_______" , "KC_SPC" , "KC_ENT" , "MO(3)" , "KC_RALT" , + "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" + ], + [ + "KC_TAB" , "KC_EXLM" , "KC_AT" , "KC_HASH" , "KC_DLR" , "KC_PERC" , "KC_CIRC" , "KC_AMPR" , "KC_ASTR" , "KC_LPRN" , "KC_RPRN" , "KC_BSPC" , + "KC_LCTL" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_MINS" , "KC_EQL" , "KC_LBRC" , "KC_RBRC" , "KC_BSLS" , "KC_GRV" , + "KC_LSFT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "KC_UNDS" , "KC_PLUS" , "KC_LCBR" , "KC_RCBR" , "KC_PIPE" , "KC_TILD" , + "KC_LGUI" , "MO(3)" , "KC_SPC" , "KC_ENT" , "_______" , "KC_RALT" , + "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" + ], + [ + "QK_BOOT" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "RGB_TOG" , "RGB_HUI" , "RGB_SAI" , "RGB_VAI" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "RGB_MOD" , "RGB_HUD" , "RGB_SAD" , "RGB_VAD" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , "XXXXXXX" , + "KC_LGUI" , "_______" , "KC_SPC" , "KC_ENT" , "_______" , "KC_RALT" , + "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" , "_______" + ] + ], + "encoders": [ + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}], + [{"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_VOLD", "cw": "KC_VOLU"}, {"ccw": "KC_PGUP", "cw": "KC_PGDN"} ,{"ccw": "KC_PGUP", "cw": "KC_PGDN"}] + ] +} diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/rules.mk b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/rules.mk new file mode 100644 index 00000000..27f651ed --- /dev/null +++ b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/rules.mk @@ -0,0 +1,8 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes +VIALRGB_ENABLE = yes + +ENCODER_MAP_ENABLE = yes + +# This adds module functionality to your keyboard (files found in users/halcyon_modules) +USER_NAME := halcyon_modules diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/vial.json b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/vial.json new file mode 100644 index 00000000..c478b4f9 --- /dev/null +++ b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/vial.json @@ -0,0 +1,49 @@ +{ + "lighting": "vialrgb", + "matrix": { + "rows": 10, + "cols": 6 + }, + "layouts": { + "labels": [ + "Soldered encoder left", + [ + "Halcyon module left", + "None", + "Encoder" + ], + "Soldered encoder right", + [ + "Halcyon module right", + "None", + "Encoder" + ] + ], + "keymap": [ + [{"x":3},"0,3",{"x":7},"5,3"], + [{"y":-0.9,"x":2},"0,2"], + [{"y":-1,"x":4},"0,4",{"x":5},"5,4",{"x":1},"5,2"], + [{"y":-0.9,"x":5},"0,5",{"x":3},"5,5"], + [{"y":-0.9},"0,0","0,1",{"x":11},"5,1","5,0"], + [{"y":-0.3,"x":3},"1,3",{"x":7},"6,3"], + [{"y":-0.9,"x":2},"1,2",{"x":1},"1,4",{"x":5},"6,4",{"x":1},"6,2"], + [{"y":-0.9,"x":5},"1,5",{"x":3},"6,5"], + [{"y":-0.9},"1,0","1,1",{"x":11},"6,1","6,0"], + [{"y":-0.3,"x":3},"2,3",{"x":7},"7,3"], + [{"y":-0.9,"x":2},"2,2",{"x":1},"2,4",{"x":5},"7,4",{"x":1},"7,2"], + [{"y":-0.9,"x":5},"2,5",{"x":3},"7,5"], + [{"y":-0.9},"2,0","2,1",{"x":11},"7,1","7,0"], + [{"y":-0.2,"x":3.5},"3,3",{"x":6},"8,3"], + [{"r":15,"rx":4.5,"ry":4.1,"y":-1},"3,4"], + [{"r":30,"rx":5.4,"ry":4.3,"y":-1.5,"x":0.1,"h":1.5},"3,5"], + [{"r":-30,"rx":9.6,"y":-1.5,"x":-1.1,"h":1.5},"8,5"], + [{"r":-15,"rx":10.5,"ry":4.1,"y":-1,"x":-1},"8,4"], + [{"r":0,"rx":0,"y":1,"d":true},"1,0\n\n\n1,0\n\n\n\n\n\ne",{"d":true},"4,2\n\n\n1,0",{"d":true},"1,1\n\n\n1,0\n\n\n\n\n\ne",{"x":1,"d":true},"0,0\n\n\n0,0\n\n\n\n\n\ne",{"d":true},"0,1\n\n\n0,0\n\n\n\n\n\ne",{"x":3.25,"d":true},"2,0\n\n\n2,0\n\n\n\n\n\ne",{"d":true},"2,1\n\n\n2,0\n\n\n\n\n\ne",{"x":0.75,"d":true},"3,0\n\n\n3,0\n\n\n\n\n\ne",{"d":true},"9,2\n\n\n3,0",{"d":true},"3,1\n\n\n3,0\n\n\n\n\n\ne"], + [{"d":true},"4,1\n\n\n1,0",{"d":true},"4,0\n\n\n1,0",{"d":true},"4,3\n\n\n1,0",{"x":1},"0,0\n\n\n0,1\n\n\n\n\n\ne","0,1\n\n\n0,1\n\n\n\n\n\ne",{"x":3.25},"2,0\n\n\n2,1\n\n\n\n\n\ne","2,1\n\n\n2,1\n\n\n\n\n\ne",{"x":0.75,"d":true},"9,1\n\n\n3,0",{"d":true},"9,0\n\n\n3,0",{"d":true},"9,3\n\n\n3,0"], + [{"x":1,"d":true},"4,4\n\n\n1,0",{"x":11,"d":true},"9,4\n\n\n3,0"], + [{"y":0.5},"1,0\n\n\n1,1\n\n\n\n\n\ne",{"d":true},"4,2\n\n\n1,1","1,1\n\n\n1,1\n\n\n\n\n\ne",{"x":9},"3,0\n\n\n3,1\n\n\n\n\n\ne",{"d":true},"9,2\n\n\n3,1","3,1\n\n\n3,1\n\n\n\n\n\ne"], + [{"d":true},"4,1\n\n\n1,1","4,0\n\n\n1,1",{"d":true},"4,3\n\n\n1,1",{"x":9,"d":true},"9,1\n\n\n3,1","9,0\n\n\n3,1",{"d":true},"9,3\n\n\n3,1"], + [{"x":1,"d":true},"4,4\n\n\n1,1",{"x":11,"d":true},"9,4\n\n\n3,1"] + ] + } +} diff --git a/qmk.json b/qmk.json index efa87965..272b7b97 100644 --- a/qmk.json +++ b/qmk.json @@ -64,6 +64,70 @@ "HLC_NONE": "1", "TARGET": "splitkb_halcyon_kyria_rev4_default_hlc" } + ], + [ + "splitkb/halcyon/corne/rev2", + "vial_hlc", + { + "HLC_TFT_DISPLAY": "1", + "TARGET": "splitkb_halcyon_corne_rev2_vial_hlc_display" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "vial_hlc", + { + "HLC_ENCODER": "1", + "TARGET": "splitkb_halcyon_corne_rev2_vial_hlc_encoder" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "vial_hlc", + { + "HLC_CIRQUE_TRACKPAD": "1", + "TARGET": "splitkb_halcyon_corne_rev2_vial_hlc_cirque_trackpad" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "vial_hlc", + { + "HLC_NONE": "1", + "TARGET": "splitkb_halcyon_corne_rev2_vial_hlc" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "default_hlc", + { + "HLC_TFT_DISPLAY": "1", + "TARGET": "splitkb_halcyon_corne_rev2_default_hlc_display" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "default_hlc", + { + "HLC_ENCODER": "1", + "TARGET": "splitkb_halcyon_corne_rev2_default_hlc_encoder" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "default_hlc", + { + "HLC_CIRQUE_TRACKPAD": "1", + "TARGET": "splitkb_halcyon_corne_rev2_default_hlc_cirque_trackpad" + } + ], + [ + "splitkb/halcyon/corne/rev2", + "default_hlc", + { + "HLC_NONE": "1", + "TARGET": "splitkb_halcyon_corne_rev2_default_hlc" + } ] ] -} \ No newline at end of file +} diff --git a/users/halcyon_modules/config.h b/users/halcyon_modules/config.h index 55499ca3..a094ce69 100644 --- a/users/halcyon_modules/config.h +++ b/users/halcyon_modules/config.h @@ -47,3 +47,25 @@ {k9A, k9B, k9C, k9D, k9E, KC_NO, KC_NO} \ } #endif + +// Corne +#if PRODUCT_ID == 0x3A07 + #undef ENCODER_A_PINS + #define ENCODER_A_PINS { GP24, HLC_ENCODER_A } + #undef ENCODER_B_PINS + #define ENCODER_B_PINS { GP23, HLC_ENCODER_B } + #undef MATRIX_ROWS + #define MATRIX_ROWS 10 + #define LAYOUT_split_3x6_3_hlc(k0A, k0B, k0C, k0D, k0E, k0F, k5F, k5E, k5D, k5C, k5B, k5A, k1A, k1B, k1C, k1D, k1E, k1F, k6F, k6E, k6D, k6C, k6B, k6A, k2A, k2B, k2C, k2D, k2E, k2F, k7F, k7E, k7D, k7C, k7B, k7A, k3D, k3E, k3F, k8F, k8E, k8D, k4A, k4B, k4C, k4D, k4E, k9A, k9B, k9C, k9D, k9E) { \ + {k0A, k0B, k0C, k0D, k0E, k0F}, \ + {k1A, k1B, k1C, k1D, k1E, k1F}, \ + {k2A, k2B, k2C, k2D, k2E, k2F}, \ + {KC_NO, KC_NO, KC_NO, k3D, k3E, k3F}, \ + {k4A, k4B, k4C, k4D, k4E, KC_NO}, \ + {k5A, k5B, k5C, k5D, k5E, k5F}, \ + {k6A, k6B, k6C, k6D, k6E, k6F}, \ + {k7A, k7B, k7C, k7D, k7E, k7F}, \ + {KC_NO, KC_NO, KC_NO, k8D, k8E, k8F}, \ + {k9A, k9B, k9C, k9D, k9E, KC_NO} \ + } +#endif diff --git a/users/halcyon_modules/halcyon.c b/users/halcyon_modules/halcyon.c index bd50a20a..0e739bd7 100644 --- a/users/halcyon_modules/halcyon.c +++ b/users/halcyon_modules/halcyon.c @@ -161,3 +161,41 @@ const matrix_row_t matrix_mask[] = { }; #endif #endif + +// Corne +#if PRODUCT_ID == 0x3A07 +#ifdef RGB_MATRIX_ENABLE +#include "rgb_matrix.h" +led_config_t g_led_config = { + { + { 24, 23, 22, 21, 20, 19 }, + { 25, 18, 17, 16, 15, 14 }, + { 26, 13, 12, 11, 10, 9 }, + { 8, 7, 6, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { 51, 50, 49, 48, 47, 46 }, + { 52, 45, 44, 43, 42, 41 }, + { 53, 40, 39, 38, 37, 36 }, + { 35, 34, 33, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + }, + { {93, 17}, {59, 3}, {25, 7}, {29, 49}, {70, 51}, {104, 55}, {95, 63}, {80, 58}, {60, 55}, {85, 39}, {68, 37}, {50, 35}, {33, 37}, {16, 42}, {85, 21}, {68, 19}, {50, 13}, {33, 20}, {16, 24}, {85, 4}, {68, 2}, {50, 0}, {33, 3}, {16, 7}, {0, 7}, {0, 24}, {0, 41}, {131, 17}, {165, 3}, {199, 7}, {195, 49}, {154, 51}, {120, 55}, {129, 63}, {144, 58}, {164, 55}, {139, 39}, {156, 37}, {174, 35}, {191, 37}, {208, 42}, {139, 21}, {156, 19}, {174, 13}, {191, 20}, {208, 24}, {139, 4}, {156, 2}, {174, 0}, {191, 3}, {208, 7}, {224, 7}, {224, 24}, {224, 41} }, + { 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 }, +}; +#endif + +#ifdef MATRIX_MASKED +const matrix_row_t matrix_mask[] = { + 0b111111, + 0b111111, + 0b111111, + 0b111000, + 0b011111, + 0b111111, + 0b111111, + 0b111111, + 0b111000, + 0b011111, +}; +#endif +#endif From 05cd5b7434397392e24e93a9fd4b5b7a3379eb6f Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:18:15 +0100 Subject: [PATCH 2/5] [fix] readability --- users/halcyon_modules/rules.mk | 3 ++- users/halcyon_modules/splitkb/config.h | 2 +- users/halcyon_modules/splitkb/halcyon.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/users/halcyon_modules/rules.mk b/users/halcyon_modules/rules.mk index a8c7c54c..b2131b5b 100644 --- a/users/halcyon_modules/rules.mk +++ b/users/halcyon_modules/rules.mk @@ -1,4 +1,5 @@ # Add this to your existing rules.mk if you have one -ifneq ($(filter $(strip $(KEYBOARD)), splitkb/halcyon/kyria/rev4),) +ifneq ($(filter $(strip $(KEYBOARD)), splitkb/halcyon/kyria/rev4 \ + splitkb/halcyon/corne/rev2),) include $(USER_PATH)/splitkb/rules.mk endif diff --git a/users/halcyon_modules/splitkb/config.h b/users/halcyon_modules/splitkb/config.h index daab4a44..ea7c76a3 100644 --- a/users/halcyon_modules/splitkb/config.h +++ b/users/halcyon_modules/splitkb/config.h @@ -49,7 +49,7 @@ #endif // Corne -#if PRODUCT_ID == 0x3A07 +#if defined(KEYBOARD_splitkb_halcyon_corne_rev2) #undef ENCODER_A_PINS #define ENCODER_A_PINS { GP24, HLC_ENCODER_A } #undef ENCODER_B_PINS diff --git a/users/halcyon_modules/splitkb/halcyon.c b/users/halcyon_modules/splitkb/halcyon.c index 36b9f355..cb11b91d 100644 --- a/users/halcyon_modules/splitkb/halcyon.c +++ b/users/halcyon_modules/splitkb/halcyon.c @@ -179,7 +179,7 @@ const matrix_row_t matrix_mask[] = { #endif // Corne -#if PRODUCT_ID == 0x3A07 +#if defined(KEYBOARD_splitkb_halcyon_corne_rev2) #ifdef RGB_MATRIX_ENABLE #include "rgb_matrix.h" led_config_t g_led_config = { From 26dc6d7996bc72e45b50070093a9b9a36444588f Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:12:35 +0100 Subject: [PATCH 3/5] Add halcyon_info.json layout --- halcyon_info.json | 56 +++++++++++++++++++ .../corne/keymaps/default_hlc/keymap.json | 2 +- .../corne/keymaps/vial_hlc/keymap.json | 2 +- users/halcyon_modules/splitkb/config.h | 2 +- 4 files changed, 59 insertions(+), 3 deletions(-) diff --git a/halcyon_info.json b/halcyon_info.json index 788919b8..244944ad 100644 --- a/halcyon_info.json +++ b/halcyon_info.json @@ -63,6 +63,62 @@ {"matrix": [9, 3], "x": 12.5, "y": 6}, {"matrix": [9, 4], "x": 11.5, "y": 6} ] + }, + "LAYOUT_corne_hlc": { + "layout": [ + {"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3}, + {"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3}, + {"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1}, + {"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2}, + {"label": "R01", "matrix": [5, 5], "x": 9, "y": 0.2}, + {"label": "R02", "matrix": [5, 4], "x": 10, "y": 0.1}, + {"label": "R03", "matrix": [5, 3], "x": 11, "y": 0}, + {"label": "R04", "matrix": [5, 2], "x": 12, "y": 0.1}, + {"label": "R05", "matrix": [5, 1], "x": 13, "y": 0.3}, + {"label": "R06", "matrix": [5, 0], "x": 14, "y": 0.3}, + {"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3}, + {"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1}, + {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1}, + {"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2}, + {"label": "R07", "matrix": [6, 5], "x": 9, "y": 1.2}, + {"label": "R08", "matrix": [6, 4], "x": 10, "y": 1.1}, + {"label": "R09", "matrix": [6, 3], "x": 11, "y": 1}, + {"label": "R10", "matrix": [6, 2], "x": 12, "y": 1.1}, + {"label": "R11", "matrix": [6, 1], "x": 13, "y": 1.3}, + {"label": "R12", "matrix": [6, 0], "x": 14, "y": 1.3}, + {"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3}, + {"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3}, + {"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1}, + {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1}, + {"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2}, + {"label": "R13", "matrix": [7, 5], "x": 9, "y": 2.2}, + {"label": "R14", "matrix": [7, 4], "x": 10, "y": 2.1}, + {"label": "R15", "matrix": [7, 3], "x": 11, "y": 2}, + {"label": "R16", "matrix": [7, 2], "x": 12, "y": 2.1}, + {"label": "R17", "matrix": [7, 1], "x": 13, "y": 2.3}, + {"label": "R18", "matrix": [7, 0], "x": 14, "y": 2.3}, + {"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7}, + {"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7}, + {"label": "L19", "matrix": [3, 5], "w": 1.5, "x": 6, "y": 3.2}, + {"label": "R19", "matrix": [8, 5], "w": 1.5, "x": 8, "y": 3.2}, + {"label": "R20", "matrix": [8, 4], "x": 9, "y": 3.7}, + {"label": "R21", "matrix": [8, 3], "x": 10, "y": 3.7}, + {"matrix": [4, 0], "x": 0, "y": 6}, + {"matrix": [4, 1], "x": 1, "y": 6}, + {"matrix": [4, 2], "x": 2, "y": 6}, + {"matrix": [4, 3], "x": 3, "y": 6}, + {"matrix": [4, 4], "x": 4, "y": 6}, + {"matrix": [9, 0], "x": 14, "y": 6}, + {"matrix": [9, 1], "x": 13, "y": 6}, + {"matrix": [9, 2], "x": 12, "y": 6}, + {"matrix": [9, 3], "x": 11, "y": 6}, + {"matrix": [9, 4], "x": 10, "y": 6} + ] } } } diff --git a/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json index bf6578ee..82797b47 100644 --- a/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json +++ b/keyboards/splitkb/halcyon/corne/keymaps/default_hlc/keymap.json @@ -2,7 +2,7 @@ "keyboard": "splitkb/halcyon/corne/rev2", "keymap": "default_hlc", "version": 1, - "layout": "LAYOUT_split_3x6_3_hlc", + "layout": "LAYOUT_corne_hlc", "layers": [ [ "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P" , "KC_BSPC" , diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json index 0c9be714..18ef0522 100644 --- a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json +++ b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/keymap.json @@ -2,7 +2,7 @@ "keyboard": "splitkb/halcyon/corne/rev2", "keymap": "vial_hlc", "version": 1, - "layout": "LAYOUT_split_3x6_3_hlc", + "layout": "LAYOUT_corne_hlc", "layers": [ [ "KC_TAB" , "KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T" , "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P" , "KC_BSPC" , diff --git a/users/halcyon_modules/splitkb/config.h b/users/halcyon_modules/splitkb/config.h index ea7c76a3..48a778b3 100644 --- a/users/halcyon_modules/splitkb/config.h +++ b/users/halcyon_modules/splitkb/config.h @@ -56,7 +56,7 @@ #define ENCODER_B_PINS { GP23, HLC_ENCODER_B } #undef MATRIX_ROWS #define MATRIX_ROWS 10 - #define LAYOUT_split_3x6_3_hlc(k0A, k0B, k0C, k0D, k0E, k0F, k5F, k5E, k5D, k5C, k5B, k5A, k1A, k1B, k1C, k1D, k1E, k1F, k6F, k6E, k6D, k6C, k6B, k6A, k2A, k2B, k2C, k2D, k2E, k2F, k7F, k7E, k7D, k7C, k7B, k7A, k3D, k3E, k3F, k8F, k8E, k8D, k4A, k4B, k4C, k4D, k4E, k9A, k9B, k9C, k9D, k9E) { \ + #define LAYOUT_corne_hlc(k0A, k0B, k0C, k0D, k0E, k0F, k5F, k5E, k5D, k5C, k5B, k5A, k1A, k1B, k1C, k1D, k1E, k1F, k6F, k6E, k6D, k6C, k6B, k6A, k2A, k2B, k2C, k2D, k2E, k2F, k7F, k7E, k7D, k7C, k7B, k7A, k3D, k3E, k3F, k8F, k8E, k8D, k4A, k4B, k4C, k4D, k4E, k9A, k9B, k9C, k9D, k9E) { \ {k0A, k0B, k0C, k0D, k0E, k0F}, \ {k1A, k1B, k1C, k1D, k1E, k1F}, \ {k2A, k2B, k2C, k2D, k2E, k2F}, \ From 69398c868933185d3558d1122cad209b61a073c7 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:29:57 +0100 Subject: [PATCH 4/5] [fix] move hlc layout to seperate file --- halcyon_info.json | 124 --------------------------------------------- layouts/corne.json | 60 ++++++++++++++++++++++ 2 files changed, 60 insertions(+), 124 deletions(-) delete mode 100644 halcyon_info.json create mode 100644 layouts/corne.json diff --git a/halcyon_info.json b/halcyon_info.json deleted file mode 100644 index 244944ad..00000000 --- a/halcyon_info.json +++ /dev/null @@ -1,124 +0,0 @@ -{ - "layouts": { - "LAYOUT_split_3x6_5_hlc": { - "layout": [ - {"label": "L06", "matrix": [0, 6], "x": 0, "y": 0.75}, - {"label": "L05", "matrix": [0, 5], "x": 1, "y": 0.75}, - {"label": "L04", "matrix": [0, 4], "x": 2, "y": 0.25}, - {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "L02", "matrix": [0, 2], "x": 4, "y": 0.25}, - {"label": "L01", "matrix": [0, 1], "x": 5, "y": 0.5}, - {"label": "R01", "matrix": [5, 1], "x": 10.5, "y": 0.5}, - {"label": "R02", "matrix": [5, 2], "x": 11.5, "y": 0.25}, - {"label": "R03", "matrix": [5, 3], "x": 12.5, "y": 0}, - {"label": "R04", "matrix": [5, 4], "x": 13.5, "y": 0.25}, - {"label": "R05", "matrix": [5, 5], "x": 14.5, "y": 0.75}, - {"label": "R06", "matrix": [5, 6], "x": 15.5, "y": 0.75}, - {"label": "L12", "matrix": [1, 6], "x": 0, "y": 1.75}, - {"label": "L11", "matrix": [1, 5], "x": 1, "y": 1.75}, - {"label": "L10", "matrix": [1, 4], "x": 2, "y": 1.25}, - {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "L08", "matrix": [1, 2], "x": 4, "y": 1.25}, - {"label": "L07", "matrix": [1, 1], "x": 5, "y": 1.5}, - {"label": "R07", "matrix": [6, 1], "x": 10.5, "y": 1.5}, - {"label": "R08", "matrix": [6, 2], "x": 11.5, "y": 1.25}, - {"label": "R09", "matrix": [6, 3], "x": 12.5, "y": 1}, - {"label": "R10", "matrix": [6, 4], "x": 13.5, "y": 1.25}, - {"label": "R11", "matrix": [6, 5], "x": 14.5, "y": 1.75}, - {"label": "R12", "matrix": [6, 6], "x": 15.5, "y": 1.75}, - {"label": "L20", "matrix": [2, 6], "x": 0, "y": 2.75}, - {"label": "L19", "matrix": [2, 5], "x": 1, "y": 2.75}, - {"label": "L18", "matrix": [2, 4], "x": 2, "y": 2.25}, - {"label": "L17", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "L16", "matrix": [2, 2], "x": 4, "y": 2.25}, - {"label": "L15", "matrix": [2, 1], "x": 5, "y": 2.5}, - {"label": "L14", "matrix": [3, 3], "x": 6, "y": 3}, - {"label": "L13", "matrix": [2, 0], "x": 7, "y": 3.25}, - {"label": "R13", "matrix": [7, 0], "x": 8.5, "y": 3.25}, - {"label": "R14", "matrix": [8, 3], "x": 9.5, "y": 3}, - {"label": "R15", "matrix": [7, 1], "x": 10.5, "y": 2.5}, - {"label": "R16", "matrix": [7, 2], "x": 11.5, "y": 2.25}, - {"label": "R17", "matrix": [7, 3], "x": 12.5, "y": 2}, - {"label": "R18", "matrix": [7, 4], "x": 13.5, "y": 2.25}, - {"label": "R19", "matrix": [7, 5], "x": 14.5, "y": 2.75}, - {"label": "R20", "matrix": [7, 6], "x": 15.5, "y": 2.75}, - {"label": "L25", "matrix": [3, 4], "x": 2.5, "y": 3.25}, - {"label": "L24", "matrix": [3, 2], "x": 3.5, "y": 3.25}, - {"label": "L23", "matrix": [3, 1], "x": 4.5, "y": 3.5}, - {"label": "L22", "matrix": [3, 5], "x": 5.5, "y": 4}, - {"label": "L21", "matrix": [3, 0], "x": 6.5, "y": 4.25}, - {"label": "R21", "matrix": [8, 0], "x": 9, "y": 4.25}, - {"label": "R22", "matrix": [8, 5], "x": 10, "y": 4}, - {"label": "R23", "matrix": [8, 1], "x": 11, "y": 3.5}, - {"label": "R24", "matrix": [8, 2], "x": 12, "y": 3.25}, - {"label": "R25", "matrix": [8, 4], "x": 13, "y": 3.25}, - {"matrix": [4, 0], "x": 0, "y": 6}, - {"matrix": [4, 1], "x": 1, "y": 6}, - {"matrix": [4, 2], "x": 2, "y": 6}, - {"matrix": [4, 3], "x": 3, "y": 6}, - {"matrix": [4, 4], "x": 4, "y": 6}, - {"matrix": [9, 0], "x": 15.5, "y": 6}, - {"matrix": [9, 1], "x": 14.5, "y": 6}, - {"matrix": [9, 2], "x": 13.5, "y": 6}, - {"matrix": [9, 3], "x": 12.5, "y": 6}, - {"matrix": [9, 4], "x": 11.5, "y": 6} - ] - }, - "LAYOUT_corne_hlc": { - "layout": [ - {"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3}, - {"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3}, - {"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1}, - {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1}, - {"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2}, - {"label": "R01", "matrix": [5, 5], "x": 9, "y": 0.2}, - {"label": "R02", "matrix": [5, 4], "x": 10, "y": 0.1}, - {"label": "R03", "matrix": [5, 3], "x": 11, "y": 0}, - {"label": "R04", "matrix": [5, 2], "x": 12, "y": 0.1}, - {"label": "R05", "matrix": [5, 1], "x": 13, "y": 0.3}, - {"label": "R06", "matrix": [5, 0], "x": 14, "y": 0.3}, - {"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3}, - {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3}, - {"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1}, - {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1}, - {"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2}, - {"label": "R07", "matrix": [6, 5], "x": 9, "y": 1.2}, - {"label": "R08", "matrix": [6, 4], "x": 10, "y": 1.1}, - {"label": "R09", "matrix": [6, 3], "x": 11, "y": 1}, - {"label": "R10", "matrix": [6, 2], "x": 12, "y": 1.1}, - {"label": "R11", "matrix": [6, 1], "x": 13, "y": 1.3}, - {"label": "R12", "matrix": [6, 0], "x": 14, "y": 1.3}, - {"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3}, - {"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3}, - {"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1}, - {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2}, - {"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1}, - {"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2}, - {"label": "R13", "matrix": [7, 5], "x": 9, "y": 2.2}, - {"label": "R14", "matrix": [7, 4], "x": 10, "y": 2.1}, - {"label": "R15", "matrix": [7, 3], "x": 11, "y": 2}, - {"label": "R16", "matrix": [7, 2], "x": 12, "y": 2.1}, - {"label": "R17", "matrix": [7, 1], "x": 13, "y": 2.3}, - {"label": "R18", "matrix": [7, 0], "x": 14, "y": 2.3}, - {"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7}, - {"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7}, - {"label": "L19", "matrix": [3, 5], "w": 1.5, "x": 6, "y": 3.2}, - {"label": "R19", "matrix": [8, 5], "w": 1.5, "x": 8, "y": 3.2}, - {"label": "R20", "matrix": [8, 4], "x": 9, "y": 3.7}, - {"label": "R21", "matrix": [8, 3], "x": 10, "y": 3.7}, - {"matrix": [4, 0], "x": 0, "y": 6}, - {"matrix": [4, 1], "x": 1, "y": 6}, - {"matrix": [4, 2], "x": 2, "y": 6}, - {"matrix": [4, 3], "x": 3, "y": 6}, - {"matrix": [4, 4], "x": 4, "y": 6}, - {"matrix": [9, 0], "x": 14, "y": 6}, - {"matrix": [9, 1], "x": 13, "y": 6}, - {"matrix": [9, 2], "x": 12, "y": 6}, - {"matrix": [9, 3], "x": 11, "y": 6}, - {"matrix": [9, 4], "x": 10, "y": 6} - ] - } - } -} diff --git a/layouts/corne.json b/layouts/corne.json new file mode 100644 index 00000000..6f9836fc --- /dev/null +++ b/layouts/corne.json @@ -0,0 +1,60 @@ +{ + "layouts": { + "LAYOUT_corne_hlc": { + "layout": [ + {"label": "L06", "matrix": [0, 0], "x": 0, "y": 0.3}, + {"label": "L05", "matrix": [0, 1], "x": 1, "y": 0.3}, + {"label": "L04", "matrix": [0, 2], "x": 2, "y": 0.1}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L02", "matrix": [0, 4], "x": 4, "y": 0.1}, + {"label": "L01", "matrix": [0, 5], "x": 5, "y": 0.2}, + {"label": "R01", "matrix": [5, 5], "x": 9, "y": 0.2}, + {"label": "R02", "matrix": [5, 4], "x": 10, "y": 0.1}, + {"label": "R03", "matrix": [5, 3], "x": 11, "y": 0}, + {"label": "R04", "matrix": [5, 2], "x": 12, "y": 0.1}, + {"label": "R05", "matrix": [5, 1], "x": 13, "y": 0.3}, + {"label": "R06", "matrix": [5, 0], "x": 14, "y": 0.3}, + {"label": "L12", "matrix": [1, 0], "x": 0, "y": 1.3}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.3}, + {"label": "L10", "matrix": [1, 2], "x": 2, "y": 1.1}, + {"label": "L09", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L08", "matrix": [1, 4], "x": 4, "y": 1.1}, + {"label": "L07", "matrix": [1, 5], "x": 5, "y": 1.2}, + {"label": "R07", "matrix": [6, 5], "x": 9, "y": 1.2}, + {"label": "R08", "matrix": [6, 4], "x": 10, "y": 1.1}, + {"label": "R09", "matrix": [6, 3], "x": 11, "y": 1}, + {"label": "R10", "matrix": [6, 2], "x": 12, "y": 1.1}, + {"label": "R11", "matrix": [6, 1], "x": 13, "y": 1.3}, + {"label": "R12", "matrix": [6, 0], "x": 14, "y": 1.3}, + {"label": "L18", "matrix": [2, 0], "x": 0, "y": 2.3}, + {"label": "L17", "matrix": [2, 1], "x": 1, "y": 2.3}, + {"label": "L16", "matrix": [2, 2], "x": 2, "y": 2.1}, + {"label": "L15", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L14", "matrix": [2, 4], "x": 4, "y": 2.1}, + {"label": "L13", "matrix": [2, 5], "x": 5, "y": 2.2}, + {"label": "R13", "matrix": [7, 5], "x": 9, "y": 2.2}, + {"label": "R14", "matrix": [7, 4], "x": 10, "y": 2.1}, + {"label": "R15", "matrix": [7, 3], "x": 11, "y": 2}, + {"label": "R16", "matrix": [7, 2], "x": 12, "y": 2.1}, + {"label": "R17", "matrix": [7, 1], "x": 13, "y": 2.3}, + {"label": "R18", "matrix": [7, 0], "x": 14, "y": 2.3}, + {"label": "L21", "matrix": [3, 3], "x": 4, "y": 3.7}, + {"label": "L20", "matrix": [3, 4], "x": 5, "y": 3.7}, + {"label": "L19", "matrix": [3, 5], "w": 1.5, "x": 6, "y": 3.2}, + {"label": "R19", "matrix": [8, 5], "w": 1.5, "x": 8, "y": 3.2}, + {"label": "R20", "matrix": [8, 4], "x": 9, "y": 3.7}, + {"label": "R21", "matrix": [8, 3], "x": 10, "y": 3.7}, + {"matrix": [4, 0], "x": 0, "y": 6}, + {"matrix": [4, 1], "x": 1, "y": 6}, + {"matrix": [4, 2], "x": 2, "y": 6}, + {"matrix": [4, 3], "x": 3, "y": 6}, + {"matrix": [4, 4], "x": 4, "y": 6}, + {"matrix": [9, 0], "x": 14, "y": 6}, + {"matrix": [9, 1], "x": 13, "y": 6}, + {"matrix": [9, 2], "x": 12, "y": 6}, + {"matrix": [9, 3], "x": 11, "y": 6}, + {"matrix": [9, 4], "x": 10, "y": 6} + ] + } + } +} From 9952cda26db5b6e2c01e4d4dd5ad0fd354149fb7 Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Tue, 21 Jan 2025 12:12:56 +0100 Subject: [PATCH 5/5] [fix] update rows --- keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h index cf4936d1..b5ea3157 100644 --- a/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h +++ b/keyboards/splitkb/halcyon/corne/keymaps/vial_hlc/config.h @@ -5,7 +5,7 @@ #define VIAL_KEYBOARD_UID {0xF8, 0x7A, 0x1D, 0x23, 0x53, 0x9B, 0x54, 0xB9} -#define VIAL_UNLOCK_COMBO_ROWS { 0, 4 } +#define VIAL_UNLOCK_COMBO_ROWS { 0, 5 } #define VIAL_UNLOCK_COMBO_COLS { 5, 5 } #define RGB_MATRIX_FRAMEBUFFER_EFFECTS