From 54867cf5805e6ed4b970e0fed3980247ca22a3c9 Mon Sep 17 00:00:00 2001 From: Alexis St-Pierre Cadieux Date: Sat, 19 Jul 2025 13:35:40 -0400 Subject: [PATCH] fixing the layout macro and keymap --- keyboards/hnk/hnk65/keyboard.json | 76 ++++++++++---------- keyboards/hnk/hnk65/keymaps/default/keymap.c | 13 ++-- 2 files changed, 44 insertions(+), 45 deletions(-) diff --git a/keyboards/hnk/hnk65/keyboard.json b/keyboards/hnk/hnk65/keyboard.json index c7088566624..2a81173f427 100644 --- a/keyboards/hnk/hnk65/keyboard.json +++ b/keyboards/hnk/hnk65/keyboard.json @@ -142,21 +142,21 @@ "layouts": { "LAYOUT_65_ansi": { "layout": [ - {"matrix": [0, 14], "x": 0, "y": 0}, - {"matrix": [0, 13], "x": 1, "y": 0}, - {"matrix": [0, 12], "x": 2, "y": 0}, - {"matrix": [0, 11], "x": 3, "y": 0}, - {"matrix": [0, 10], "x": 4, "y": 0}, - {"matrix": [0, 9], "x": 5, "y": 0}, - {"matrix": [0, 8], "x": 6, "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, 6], "x": 8, "y": 0}, - {"matrix": [0, 5], "x": 9, "y": 0}, - {"matrix": [0, 4], "x": 10, "y": 0}, - {"matrix": [0, 3], "x": 11, "y": 0}, - {"matrix": [0, 2], "x": 12, "y": 0}, - {"matrix": [0, 1], "x": 13, "y": 0, "w": 2}, - {"matrix": [0, 0], "x": 15, "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}, {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, {"matrix": [1, 1], "x": 1.5, "y": 1}, {"matrix": [1, 2], "x": 2.5, "y": 1}, @@ -172,20 +172,20 @@ {"matrix": [1, 12], "x": 12.5, "y": 1}, {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, {"matrix": [1, 14], "x": 15, "y": 1}, - {"matrix": [2, 14], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 13], "x": 1.75, "y": 2}, - {"matrix": [2, 11], "x": 2.75, "y": 2}, - {"matrix": [2, 10], "x": 3.75, "y": 2}, - {"matrix": [2, 9], "x": 4.75, "y": 2}, - {"matrix": [2, 8], "x": 5.75, "y": 2}, - {"matrix": [2, 7], "x": 6.75, "y": 2}, - {"matrix": [2, 6], "x": 7.75, "y": 2}, - {"matrix": [2, 5], "x": 8.75, "y": 2}, - {"matrix": [2, 4], "x": 9.75, "y": 2}, - {"matrix": [2, 3], "x": 10.75, "y": 2}, - {"matrix": [2, 2], "x": 11.75, "y": 2}, - {"matrix": [2, 1], "x": 12.75, "y": 2, "w": 2.25}, - {"matrix": [2, 0], "x": 15, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, {"matrix": [3, 1], "x": 2.25, "y": 3}, {"matrix": [3, 2], "x": 3.25, "y": 3}, @@ -200,16 +200,16 @@ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, {"matrix": [3, 13], "x": 14, "y": 3}, {"matrix": [3, 14], "x": 15, "y": 3}, - {"matrix": [4, 14], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 13], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 10], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 9], "x": 10, "y": 4}, - {"matrix": [4, 8], "x": 11, "y": 4}, - {"matrix": [4, 5], "x": 12, "y": 4}, - {"matrix": [4, 2], "x": 13, "y": 4}, - {"matrix": [4, 1], "x": 14, "y": 4}, - {"matrix": [4, 0], "x": 15, "y": 4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} ] } } diff --git a/keyboards/hnk/hnk65/keymaps/default/keymap.c b/keyboards/hnk/hnk65/keymaps/default/keymap.c index a1d5a546a3c..c52be1d0c39 100644 --- a/keyboards/hnk/hnk65/keymaps/default/keymap.c +++ b/keyboards/hnk/hnk65/keymaps/default/keymap.c @@ -21,11 +21,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_65_ansi( - KC_HOME, KC_BSPC, KC_EQL, KC_MINS, KC_0, KC_9, KC_8, KC_7, KC_6, KC_5, KC_4, KC_3, KC_2, KC_1, KC_ESC, + 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_HOME, 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_PGUP, - KC_PGDN, KC_ENT, KC_QUOT, KC_SCLN, KC_L, KC_K, KC_J, KC_H, KC_G, KC_F, KC_D, KC_S, KC_A, KC_CAPS, + 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_PGDN, 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_END, - KC_RGHT, KC_DOWN, KC_LEFT,KC_RCTL, MO(1), KC_RALT, KC_SPC, KC_LALT, KC_LGUI, KC_LCTL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT,KC_DOWN, KC_RGHT ), @@ -44,12 +44,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ - [1] = LAYOUT_65_ansi( - KC_DEL, KC_INS, KC_F12, KC_F11, KC_F10, KC_F9, KC_F8, KC_F7, KC_F6, KC_F5, KC_F4, KC_F3, KC_F2, KC_F1, KC_GRV, + 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_INS, KC_DEL, _______, _______, KC_VOLU, _______, _______, _______, _______, KC_SCRL, _______, KC_7, KC_8, KC_9, KC_BSLS, RM_SATU, RM_HUEU, - RM_HUED, RM_SATD, KC_6, KC_5, KC_4, _______, _______, _______, _______, _______, KC_PAUS, KC_VOLD, KC_MUTE, _______, + _______, KC_MUTE, KC_VOLD, KC_PAUS, _______, _______, _______, _______, _______, KC_4, KC_5, KC_6, RM_SATD, RM_HUED, _______, KC_PIPE, _______, _______, _______, _______, _______, _______, _______, KC_1, KC_2, KC_3, RM_VALU, RM_TOGG, - RM_NEXT, RM_VALD, RM_PREV, RM_SPDU, _______, RM_SPDD, KC_PSCR, _______, _______, _______ + _______, _______, _______, KC_PSCR, RM_SPDD, _______, RM_SPDU, RM_PREV, RM_VALD, RM_NEXT ) }; \ No newline at end of file