Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@qmk-bot
qmk-bot committed Jan 15, 2023
2 parents 5f46e29 + e7d1b21 commit d40516c
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 83 deletions.
92 changes: 91 additions & 1 deletion keyboards/handwired/split89/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,97 @@
},
"layouts": {
"LAYOUT": {
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6, "y":0}, {"label":"F6", "x":10.25, "y":0}, {"label":"F7", "x":11.25, "y":0}, {"label":"F8", "x":12.25, "y":0}, {"label":"F9", "x":13.75, "y":0}, {"label":"F10", "x":14.75, "y":0}, {"label":"F11", "x":15.75, "y":0}, {"label":"F12", "x":16.75, "y":0}, {"label":"PrtSc", "x":18, "y":0}, {"label":"Scroll Lock", "x":19, "y":0}, {"label":"Pause", "x":20, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":9.75, "y":1.5}, {"label":"*", "x":10.75, "y":1.5}, {"label":"(", "x":11.75, "y":1.5}, {"label":")", "x":12.75, "y":1.5}, {"label":"_", "x":13.75, "y":1.5}, {"label":"+", "x":14.75, "y":1.5}, {"label":"Backspace", "x":15.75, "y":1.5, "w":2}, {"label":"Insert", "x":18, "y":1.5}, {"label":"Home", "x":19, "y":1.5}, {"label":"PgUp", "x":20, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":9.25, "y":2.5}, {"label":"U", "x":10.25, "y":2.5}, {"label":"I", "x":11.25, "y":2.5}, {"label":"O", "x":12.25, "y":2.5}, {"label":"P", "x":13.25, "y":2.5}, {"label":"{", "x":14.25, "y":2.5}, {"label":"}", "x":15.25, "y":2.5}, {"label":"|", "x":16.25, "y":2.5, "w":1.5}, {"label":"Delete", "x":18, "y":2.5}, {"label":"End", "x":19, "y":2.5}, {"label":"PgDn", "x":20, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":9.5, "y":3.5}, {"label":"J", "x":10.5, "y":3.5}, {"label":"K", "x":11.5, "y":3.5}, {"label":"L", "x":12.5, "y":3.5}, {"label":":", "x":13.5, "y":3.5}, {"label":"\"", "x":14.5, "y":3.5}, {"label":"Enter", "x":15.5, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":10, "y":4.5}, {"label":"M", "x":11, "y":4.5}, {"label":"<", "x":12, "y":4.5}, {"label":">", "x":13, "y":4.5}, {"label":"?", "x":14, "y":4.5}, {"label":"Shift", "x":15, "y":4.5, "w":2.75}, {"label":"\u2191", "x":19, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Fn", "x":1.25, "y":5.5, "w":1.25}, {"label":"Win", "x":2.5, "y":5.5, "w":1.25}, {"label":"Alt", "x":3.75, "y":5.5, "w":1.25}, {"x":5, "y":5.5, "w":2.25}, {"x":10, "y":5.5, "w":2.75}, {"label":"Alt", "x":12.75, "y":5.5, "w":1.25}, {"label":"Win", "x":14, "y":5.5, "w":1.25}, {"label":"Menu", "x":15.25, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":16.5, "y":5.5, "w":1.25}, {"label":"\u2190", "x":18, "y":5.5}, {"label":"\u2193", "x":19, "y":5.5}, {"label":"\u2192", "x":20, "y":5.5}]
"layout": [
{"label":"Esc", "matrix": [0, 4], "x":0 , "y":0},
{"label":"F1" , "matrix": [0, 5], "x":2 , "y":0},
{"label":"F2" , "matrix": [0, 6], "x":3 , "y":0},
{"label":"F3" , "matrix": [0, 7], "x":4 , "y":0},
{"label":"F4" , "matrix": [0, 8], "x":5 , "y":0},
{"label":"F5" , "matrix": [0, 9], "x":6 , "y":0},
{"label":"F6" , "matrix": [6, 0], "x":10.25 , "y":0},
{"label":"F7" , "matrix": [6, 1], "x":11.25 , "y":0},
{"label":"F8" , "matrix": [6, 2], "x":12.25 , "y":0},
{"label":"F9" , "matrix": [6, 3], "x":13.75 , "y":0},
{"label":"F10" , "matrix": [6, 4], "x":14.75 , "y":0},
{"label":"F11" , "matrix": [6, 5], "x":15.75 , "y":0},
{"label":"F12" , "matrix": [6, 6], "x":16.75 , "y":0},
{"label":"PrtSc" , "matrix": [6, 7], "x":18 , "y":0},
{"label":"Scroll Lock" , "matrix": [6, 8], "x":19 , "y":0},
{"label":"Pause" , "matrix": [6, 9], "x":20 , "y":0},
{"label":"~" , "matrix": [2, 4], "x":0 , "y":1.5},
{"label":"1!" , "matrix": [1, 4], "x":1 , "y":1.5},
{"label":"2@" , "matrix": [1, 5], "x":2 , "y":1.5},
{"label":"3#" , "matrix": [1, 6], "x":3 , "y":1.5},
{"label":"4$" , "matrix": [1, 7], "x":4 , "y":1.5},
{"label":"5%" , "matrix": [1, 8], "x":5 , "y":1.5},
{"label":"6^" , "matrix": [1, 9], "x":6 , "y":1.5},
{"label":"7&" , "matrix": [7, 0], "x":9.75 , "y":1.5},
{"label":"8*" , "matrix": [7, 1], "x":10.75 , "y":1.5},
{"label":"9(" , "matrix": [7, 2], "x":11.75 , "y":1.5},
{"label":"0)" , "matrix": [7, 3], "x":12.75 , "y":1.5},
{"label":"-_" , "matrix": [7, 4], "x":13.75 , "y":1.5},
{"label":"=+" , "matrix": [7, 5], "x":14.75 , "y":1.5},
{"label":"Backspace" , "matrix": [7, 6], "x":15.75 , "y":1.5 , "w":2},
{"label":"Insert" , "matrix": [7, 7], "x":18 , "y":1.5},
{"label":"Home" , "matrix": [7, 8], "x":19 , "y":1.5},
{"label":"PgUp" , "matrix": [7, 9], "x":20 , "y":1.5},
{"label":"Tab" , "matrix": [3, 4], "x":0 , "y":2.5 , "w":1.5},
{"label":"Q" , "matrix": [2, 5], "x":1.5 , "y":2.5},
{"label":"W" , "matrix": [2, 6], "x":2.5 , "y":2.5},
{"label":"E" , "matrix": [2, 7], "x":3.5 , "y":2.5},
{"label":"R" , "matrix": [2, 8], "x":4.5 , "y":2.5},
{"label":"T" , "matrix": [2, 9], "x":5.5 , "y":2.5},
{"label":"Y" , "matrix": [9, 0], "x":9.25 , "y":2.5},
{"label":"U" , "matrix": [8, 0], "x":10.25 , "y":2.5},
{"label":"I" , "matrix": [8, 1], "x":11.25 , "y":2.5},
{"label":"O" , "matrix": [8, 2], "x":12.25 , "y":2.5},
{"label":"P" , "matrix": [8, 3], "x":13.25 , "y":2.5},
{"label":"{" , "matrix": [8, 4], "x":14.25 , "y":2.5},
{"label":"}" , "matrix": [8, 5], "x":15.25 , "y":2.5},
{"label":"|" , "matrix": [8, 6], "x":16.25 , "y":2.5 , "w":1.5},
{"label":"Delete" , "matrix": [8, 7], "x":18 , "y":2.5},
{"label":"End" , "matrix": [8, 8], "x":19 , "y":2.5},
{"label":"PgDn" , "matrix": [8, 9], "x":20 , "y":2.5},
{"label":"Caps Lock" , "matrix": [4, 4], "x":0 , "y":3.5 , "w":1.75},
{"label":"A" , "matrix": [3, 5], "x":1.75 , "y":3.5},
{"label":"S" , "matrix": [3, 6], "x":2.75 , "y":3.5},
{"label":"D" , "matrix": [3, 7], "x":3.75 , "y":3.5},
{"label":"F" , "matrix": [3, 8], "x":4.75 , "y":3.5},
{"label":"G" , "matrix": [3, 9], "x":5.75 , "y":3.5},
{"label":"H" , "matrix": [10, 0], "x":9.5 , "y":3.5},
{"label":"J" , "matrix": [9, 1], "x":10.5 , "y":3.5},
{"label":"K" , "matrix": [9, 2], "x":11.5 , "y":3.5},
{"label":"L" , "matrix": [9, 3], "x":12.5 , "y":3.5},
{"label":":" , "matrix": [9, 4], "x":13.5 , "y":3.5},
{"label":"\"" , "matrix": [9, 5], "x":14.5 , "y":3.5},
{"label":"Enter" , "matrix": [9, 6], "x":15.5 , "y":3.5 , "w":2.25},
{"label":"Shift" , "matrix": [5, 4], "x":0 , "y":4.5 , "w":2.25},
{"label":"Z" , "matrix": [4, 5], "x":2.25 , "y":4.5},
{"label":"X" , "matrix": [4, 6], "x":3.25 , "y":4.5},
{"label":"C" , "matrix": [4, 7], "x":4.25 , "y":4.5},
{"label":"V" , "matrix": [4, 8], "x":5.25 , "y":4.5},
{"label":"B" , "matrix": [4, 9], "x":6.25 , "y":4.5},
{"label":"N" , "matrix": [11, 0], "x":10 , "y":4.5},
{"label":"M" , "matrix": [10, 1], "x":11 , "y":4.5},
{"label":"<" , "matrix": [10, 2], "x":12 , "y":4.5},
{"label":">" , "matrix": [10, 3], "x":13 , "y":4.5},
{"label":"?" , "matrix": [10, 4], "x":14 , "y":4.5},
{"label":"Shift" , "matrix": [10, 6], "x":15 , "y":4.5 , "w":2.75},
{"label":"\u2191" , "matrix": [10, 8], "x":19 , "y":4.5},
{"label":"Ctrl" , "matrix": [5, 5], "x":0 , "y":5.5 , "w":1.25},
{"label":"Fn" , "matrix": [5, 6], "x":1.25 , "y":5.5 , "w":1.25},
{"label":"Win" , "matrix": [5, 7], "x":2.5 , "y":5.5 , "w":1.25},
{"label":"Alt" , "matrix": [5, 8], "x":3.75 , "y":5.5 , "w":1.25},
{"label":"Space" , "matrix": [5, 9], "x":5 , "y":5.5 , "w":2.25},
{"label":"Space" , "matrix": [11, 1], "x":10 , "y":5.5 , "w":2.75},
{"label":"Alt" , "matrix": [11, 3], "x":12.75 , "y":5.5 , "w":1.25},
{"label":"Win" , "matrix": [11, 4], "x":14 , "y":5.5 , "w":1.25},
{"label":"Menu" , "matrix": [11, 5], "x":15.25 , "y":5.5 , "w":1.25},
{"label":"Ctrl" , "matrix": [11, 6], "x":16.5 , "y":5.5 , "w":1.25},
{"label":"\u2190" , "matrix": [11, 7], "x":18 , "y":5.5},
{"label":"\u2193" , "matrix": [11, 8], "x":19 , "y":5.5},
{"label":"\u2192" , "matrix": [11, 9], "x":20 , "y":5.5}
]
}
}
}
30 changes: 15 additions & 15 deletions keyboards/handwired/split89/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ enum layer_names {
AUD,
};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
/* BASE */
[0] = LAYOUT(
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
KC_GRV,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_INS, KC_HOME, KC_PGUP,
KC_TAB,KC_Q, KC_W, KC_E, KC_R, KC_T, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_Y, 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_H, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL,MO(1),KC_LGUI,KC_LALT,KC_SPACE, KC_N, KC_SPACE, KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS,
KC_GRV, 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_INS, KC_HOME, KC_PGUP,
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_DEL, KC_END, KC_PGDN,
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, KC_UP,
KC_LCTL, MO(1), KC_LGUI,KC_LALT,KC_SPACE,KC_SPACE,KC_RALT,KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
/* Volume */
/* AUD */
[1] = LAYOUT(
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_VOLU,
KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_MEDIA_PLAY_PAUSE, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
),
KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,
KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_PLAY_PAUSE,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT
)
};
17 changes: 0 additions & 17 deletions keyboards/handwired/split89/split89.c
View file

This file was deleted.

50 changes: 0 additions & 50 deletions keyboards/handwired/split89/split89.h
View file

This file was deleted.

0 comments on commit d40516c

Please sign in to comment.