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}, \