~ruther/qmk_firmware

ba055a9c7f8b07a737a2ed885e4b2c023c343d7c — QMK Bot 2 years ago be3205f + faf560f
Merge remote-tracking branch 'origin/master' into develop
M keyboards/smithrune/iron160/iron160_h/info.json => keyboards/smithrune/iron160/iron160_h/info.json +142 -63
@@ 21,71 21,150 @@
       "led_count": 1
   },
   "diode_direction": "COL2ROW",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_60_tsangan_hhkb"
    },
    "community_layouts": [
        "60_tsangan_hhkb"
    ],
    "layouts": {
        "LAYOUT": {
        "LAYOUT_60_ansi_tsangan_split_rshift": {
            "layout": [
                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0, "w": 2},

                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},

                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},

                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},

                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
            ]
        },
        "LAYOUT_60_tsangan_hhkb": {
            "layout": [
                {"label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0},
                {"label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0},
                {"label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0},
                {"label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0},
                {"label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0},
                {"label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0},
                {"label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0},
                {"label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0},
                {"label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0},
                {"label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0},
                {"label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0},
                {"label": "_", "matrix": [0, 11], "w": 1, "x": 11, "y": 0},
                {"label": "+", "matrix": [0, 12], "w": 1, "x": 12, "y": 0},
                {"label": "Bspc", "matrix": [0, 13], "w": 1, "x": 13, "y": 0},
                {"label": "Bspc", "matrix": [4, 13], "w": 1, "x": 14, "y": 0},
                {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
                {"label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1},
                {"label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1},
                {"label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1},
                {"label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1},
                {"label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1},
                {"label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1},
                {"label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1},
                {"label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1},
                {"label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1},
                {"label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1},
                {"label": "{", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1},
                {"label": "}", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1},
                {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
                {"label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
                {"label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2},
                {"label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2},
                {"label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2},
                {"label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2},
                {"label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2},
                {"label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2},
                {"label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2},
                {"label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2},
                {"label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2},
                {"label": ":", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2},
                {"label": "\"", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2},
                {"label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 12.75, "y": 2},
                {"label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
                {"label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3},
                {"label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3},
                {"label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3},
                {"label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3},
                {"label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3},
                {"label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3},
                {"label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3},
                {"label": "<", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3},
                {"label": ">", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3},
                {"label": "?", "matrix": [3, 11], "w": 1, "x": 11.25, "y": 3},
                {"label": "Shift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
                {"label": "MO(1)", "matrix": [3, 13], "w": 1, "x": 14, "y": 3},
                {"label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
                {"label": "Win", "matrix": [4, 1], "w": 1, "x": 1.5, "y": 4},
                {"label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
                {"label": "Space", "matrix": [4, 6], "w": 7, "x": 4, "y": 4},
                {"label": "Alt", "matrix": [4, 10], "w": 1.5, "x": 11, "y": 4},
                {"label": "Win", "matrix": [4, 11], "w": 1, "x": 12.5, "y": 4},
                {"label": "Ctrl", "matrix": [4, 12], "w": 1.5, "x": 13.5, "y": 4}
                {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
                {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
                {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
                {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
                {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
                {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
                {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
                {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
                {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
                {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
                {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
                {"label": "_", "matrix": [0, 11], "x": 11, "y": 0},
                {"label": "+", "matrix": [0, 12], "x": 12, "y": 0},
                {"label": "Bspc", "matrix": [0, 13], "x": 13, "y": 0},
                {"label": "Bspc", "matrix": [4, 13], "x": 14, "y": 0},

                {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
                {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
                {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
                {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
                {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
                {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
                {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
                {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
                {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
                {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
                {"label": "{", "matrix": [1, 11], "x": 11.5, "y": 1},
                {"label": "}", "matrix": [1, 12], "x": 12.5, "y": 1},
                {"label": "|", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},

                {"label": "Caps", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
                {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
                {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
                {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
                {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
                {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
                {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
                {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
                {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
                {"label": ":", "matrix": [2, 10], "x": 10.75, "y": 2},
                {"label": "\"", "matrix": [2, 11], "x": 11.75, "y": 2},
                {"label": "Enter", "matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},

                {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
                {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
                {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
                {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
                {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
                {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
                {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
                {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
                {"label": "<", "matrix": [3, 9], "x": 9.25, "y": 3},
                {"label": ">", "matrix": [3, 10], "x": 10.25, "y": 3},
                {"label": "?", "matrix": [3, 11], "x": 11.25, "y": 3},
                {"label": "Shift", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                {"label": "MO(1)", "matrix": [3, 13], "x": 14, "y": 3},

                {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
                {"label": "Win", "matrix": [4, 1], "x": 1.5, "y": 4},
                {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
                {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7},
                {"label": "Alt", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
                {"label": "Win", "matrix": [4, 11], "x": 12.5, "y": 4},
                {"label": "Ctrl", "matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
            ]
        }
    }

M keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c => keyboards/smithrune/iron160/iron160_h/keymaps/default/keymap.c +6 -6
@@ 18,18 18,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
        QK_GESC, 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,
    [0] = LAYOUT_60_tsangan_hhkb(
        QK_GESC, 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_BSPC,
        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_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_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,
        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RWIN, MO(1)  , KC_RCTL
        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                                     KC_RALT, KC_RWIN, KC_RCTL
    ),
    [1] = LAYOUT(
        QK_BOOT  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    [1] = LAYOUT_60_tsangan_hhkb(
        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
        _______, _______, _______,                            _______,                                     _______, _______, _______
    )
};

M keyboards/smithrune/iron160/iron160_h/keymaps/via/keymap.c => keyboards/smithrune/iron160/iron160_h/keymaps/via/keymap.c +13 -13
@@ 18,32 18,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [0] = LAYOUT(
        QK_GESC, 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,
    [0] = LAYOUT_60_tsangan_hhkb(
        QK_GESC, 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_BSPC,
        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_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_LSFT,          KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,
        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                            KC_RALT, KC_RWIN, KC_RCTL, KC_BSPC
        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                                     KC_RALT, KC_RWIN, KC_RCTL
    ),
    [1] = LAYOUT(
        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    [1] = LAYOUT_60_tsangan_hhkb(
        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
        _______, _______, _______,                            _______,                                     _______, _______, _______
    ),
    [2] = LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    [2] = LAYOUT_60_tsangan_hhkb(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
        _______, _______, _______,                            _______,                                     _______, _______, _______
    ),
    [3] = LAYOUT(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
    [3] = LAYOUT_60_tsangan_hhkb(
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
        _______, _______, _______,                            _______,                            _______, _______, _______, _______
    ), 
        _______, _______, _______,                            _______,                                     _______, _______, _______
    )
};

Do not follow this link