From 3d67f869610e8e906e9d8db1497591c8c8b8607d Mon Sep 17 00:00:00 2001 From: VeyPatch <126267034+VeyPatch@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:15:58 +0100 Subject: [PATCH] Add halcyon_info.json layout --- halcyon_info.json | 72 +++++++++++++++++++ .../lily58/keymaps/default_hlc/keymap.json | 2 +- .../lily58/keymaps/vial_hlc/keymap.json | 2 +- users/halcyon_modules/splitkb/config.h | 2 +- 4 files changed, 75 insertions(+), 3 deletions(-) diff --git a/halcyon_info.json b/halcyon_info.json index 788919b8..b4433ceb 100644 --- a/halcyon_info.json +++ b/halcyon_info.json @@ -63,6 +63,78 @@ {"matrix": [9, 3], "x": 12.5, "y": 6}, {"matrix": [9, 4], "x": 11.5, "y": 6} ] + }, + "LAYOUT_lily58_hlc": { + "layout": [ + {"label": "L01", "matrix": [0, 0], "x": 0, "y": 0.5}, + {"label": "L02", "matrix": [0, 1], "x": 1, "y": 0.375}, + {"label": "L03", "matrix": [0, 2], "x": 2, "y": 0.125}, + {"label": "L04", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L05", "matrix": [0, 4], "x": 4, "y": 0.125}, + {"label": "L06", "matrix": [0, 5], "x": 5, "y": 0.25}, + {"label": "R06", "matrix": [6, 5], "x": 10.5, "y": 0.25}, + {"label": "R05", "matrix": [6, 4], "x": 11.5, "y": 0.125}, + {"label": "R04", "matrix": [6, 3], "x": 12.5, "y": 0}, + {"label": "R03", "matrix": [6, 2], "x": 13.5, "y": 0.125}, + {"label": "R02", "matrix": [6, 1], "x": 14.5, "y": 0.375}, + {"label": "R01", "matrix": [6, 0], "x": 15.5, "y": 0.5}, + {"label": "L07", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "L08", "matrix": [1, 1], "x": 1, "y": 1.375}, + {"label": "L09", "matrix": [1, 2], "x": 2, "y": 1.125}, + {"label": "L10", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L11", "matrix": [1, 4], "x": 4, "y": 1.125}, + {"label": "L12", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "R12", "matrix": [7, 5], "x": 10.5, "y": 1.25}, + {"label": "R11", "matrix": [7, 4], "x": 11.5, "y": 1.125}, + {"label": "R10", "matrix": [7, 3], "x": 12.5, "y": 1}, + {"label": "R09", "matrix": [7, 2], "x": 13.5, "y": 1.125}, + {"label": "R08", "matrix": [7, 1], "x": 14.5, "y": 1.375}, + {"label": "R07", "matrix": [7, 0], "x": 15.5, "y": 1.5}, + {"label": "L13", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "L14", "matrix": [2, 1], "x": 1, "y": 2.375}, + {"label": "L15", "matrix": [2, 2], "x": 2, "y": 2.125}, + {"label": "L16", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L17", "matrix": [2, 4], "x": 4, "y": 2.125}, + {"label": "L18", "matrix": [2, 5], "x": 5, "y": 2.25}, + {"label": "R18", "matrix": [8, 5], "x": 10.5, "y": 2.25}, + {"label": "R17", "matrix": [8, 4], "x": 11.5, "y": 2.125}, + {"label": "R16", "matrix": [8, 3], "x": 12.5, "y": 2}, + {"label": "R15", "matrix": [8, 2], "x": 13.5, "y": 2.125}, + {"label": "R14", "matrix": [8, 1], "x": 14.5, "y": 2.375}, + {"label": "R13", "matrix": [8, 0], "x": 15.5, "y": 2.5}, + {"label": "L20", "matrix": [3, 0], "x": 0, "y": 3.5}, + {"label": "L21", "matrix": [3, 1], "x": 1, "y": 3.375}, + {"label": "L22", "matrix": [3, 2], "x": 2, "y": 3.125}, + {"label": "L23", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "L24", "matrix": [3, 4], "x": 4, "y": 3.125}, + {"label": "L25", "matrix": [3, 5], "x": 5, "y": 3.25}, + {"label": "L19", "matrix": [4, 1], "x": 6, "y": 2.75}, + {"label": "R19", "matrix": [10, 1], "x": 9.5, "y": 2.75}, + {"label": "R25", "matrix": [9, 5], "x": 10.5, "y": 3.25}, + {"label": "R24", "matrix": [9, 4], "x": 11.5, "y": 3.125}, + {"label": "R23", "matrix": [9, 3], "x": 12.5, "y": 3}, + {"label": "R22", "matrix": [9, 2], "x": 13.5, "y": 3.125}, + {"label": "R21", "matrix": [9, 1], "x": 14.5, "y": 3.375}, + {"label": "R20", "matrix": [9, 0], "x": 15.5, "y": 3.5}, + {"label": "L26", "matrix": [4, 2], "x": 2.5, "y": 4.15}, + {"label": "L27", "matrix": [4, 3], "x": 3.5, "y": 4.15}, + {"label": "L28", "matrix": [4, 4], "x": 4.5, "y": 4.25}, + {"label": "L29", "matrix": [4, 5], "x": 6, "y": 4.25}, + {"label": "R29", "matrix": [10, 5], "x": 9.5, "y": 4.25}, + {"label": "R28", "matrix": [10, 4], "x": 11, "y": 4.25}, + {"label": "R27", "matrix": [10, 3], "x": 12, "y": 4.15}, + {"label": "R26", "matrix": [10, 2], "x": 13, "y": 4.15}, + {"matrix": [5, 0], "x": 0, "y": 7}, + {"matrix": [5, 1], "x": 1, "y": 7}, + {"matrix": [5, 2], "x": 2, "y": 7}, + {"matrix": [5, 3], "x": 3, "y": 7}, + {"matrix": [5, 4], "x": 4, "y": 7}, + {"matrix": [11, 0], "x": 15, "y": 7}, + {"matrix": [11, 1], "x": 14, "y": 7}, + {"matrix": [11, 2], "x": 13, "y": 7}, + {"matrix": [11, 3], "x": 12, "y": 7}, + {"matrix": [11, 4], "x": 11, "y": 7} + ] } } } diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/default_hlc/keymap.json b/keyboards/splitkb/halcyon/lily58/keymaps/default_hlc/keymap.json index c2f52626..f5812fc2 100644 --- a/keyboards/splitkb/halcyon/lily58/keymaps/default_hlc/keymap.json +++ b/keyboards/splitkb/halcyon/lily58/keymaps/default_hlc/keymap.json @@ -2,7 +2,7 @@ "keyboard": "splitkb/halcyon/lily58/rev2", "keymap": "default_hlc", "version": 1, - "layout": "LAYOUT_hlc", + "layout": "LAYOUT_lily58_hlc", "layers": [ [ "KC_ESC" , "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , "KC_6" , "KC_7" , "KC_8" , "KC_9" , "KC_0" , "KC_GRV" , diff --git a/keyboards/splitkb/halcyon/lily58/keymaps/vial_hlc/keymap.json b/keyboards/splitkb/halcyon/lily58/keymaps/vial_hlc/keymap.json index 5b726e71..c49e8602 100644 --- a/keyboards/splitkb/halcyon/lily58/keymaps/vial_hlc/keymap.json +++ b/keyboards/splitkb/halcyon/lily58/keymaps/vial_hlc/keymap.json @@ -2,7 +2,7 @@ "keyboard": "splitkb/halcyon/lily58/rev2", "keymap": "vial_hlc", "version": 1, - "layout": "LAYOUT_hlc", + "layout": "LAYOUT_lily58_hlc", "layers": [ [ "KC_ESC" , "KC_1" , "KC_2" , "KC_3" , "KC_4" , "KC_5" , "KC_6" , "KC_7" , "KC_8" , "KC_9" , "KC_0" , "KC_GRV" , diff --git a/users/halcyon_modules/splitkb/config.h b/users/halcyon_modules/splitkb/config.h index 8503cba3..d6f4a0d7 100644 --- a/users/halcyon_modules/splitkb/config.h +++ b/users/halcyon_modules/splitkb/config.h @@ -56,7 +56,7 @@ #define ENCODER_B_PINS { GP22, HLC_ENCODER_B } #undef MATRIX_ROWS #define MATRIX_ROWS 12 - #define LAYOUT_hlc(k0A, k0B, k0C, k0D, k0E, k0F, k6F, k6E, k6D, k6C, k6B, k6A, k1A, k1B, k1C, k1D, k1E, k1F, k7F, k7E, k7D, k7C, k7B, k7A, k2A, k2B, k2C, k2D, k2E, k2F, k8F, k8E, k8D, k8C, k8B, k8A, k3A, k3B, k3C, k3D, k3E, k3F, k4B, k10B, k9F, k9E, k9D, k9C, k9B, k9A, k4C, k4D, k4E, k4F, k10F, k10E, k10D, k10C, k5A, k5B, k5C, k5D, k5E, k11A, k11B, k11C, k11D, k11E) { \ + #define LAYOUT_lily58_hlc(k0A, k0B, k0C, k0D, k0E, k0F, k6F, k6E, k6D, k6C, k6B, k6A, k1A, k1B, k1C, k1D, k1E, k1F, k7F, k7E, k7D, k7C, k7B, k7A, k2A, k2B, k2C, k2D, k2E, k2F, k8F, k8E, k8D, k8C, k8B, k8A, k3A, k3B, k3C, k3D, k3E, k3F, k4B, k10B, k9F, k9E, k9D, k9C, k9B, k9A, k4C, k4D, k4E, k4F, k10F, k10E, k10D, k10C, k5A, k5B, k5C, k5D, k5E, k11A, k11B, k11C, k11D, k11E) { \ {k0A, k0B, k0C, k0D, k0E, k0F}, \ {k1A, k1B, k1C, k1D, k1E, k1F}, \ {k2A, k2B, k2C, k2D, k2E, k2F}, \