Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
f452eeb0ba
@ -21,11 +21,11 @@
|
||||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT_default( \
|
||||
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
|
||||
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
|
||||
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
|
||||
K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
|
||||
K401, K402, K404, K406, K408, K410, K411, K412, K413, K414 \
|
||||
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
|
||||
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K414, \
|
||||
K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
|
||||
K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \
|
||||
K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
|
||||
) { \
|
||||
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
|
||||
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
|
||||
|
||||
@ -1,12 +1,82 @@
|
||||
{
|
||||
"keyboard_name": "Basketweave",
|
||||
"url": "https://github.com/null-ll/basketweave",
|
||||
"maintainer": "null-ll",
|
||||
"width": 20,
|
||||
"height": 5,
|
||||
"keyboard_name": "Basketweave",
|
||||
"url": "https://github.com/null-ll/basketweave",
|
||||
"maintainer": "null-ll",
|
||||
"width": 20,
|
||||
"height": 5.25,
|
||||
"layouts": {
|
||||
"LAYOUT_default": {
|
||||
"layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.5, "y":0}, {"label":"!", "x":2.5, "y":0}, {"label":"@", "x":3.5, "y":0}, {"label":"#", "x":4.5, "y":0}, {"label":"$", "x":5.5, "y":0}, {"label":"%", "x":6.5, "y":0}, {"label":"^", "x":7.5, "y":0}, {"label":"&", "x":10.5, "y":0}, {"label":"*", "x":11.5, "y":0}, {"label":"(", "x":12.5, "y":0}, {"label":")", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"label":"Backspace", "x":16.5, "y":0, "w":2}, {"label":"Mute", "x":19, "y":0.5}, {"label":"Delete", "x":0, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Insert", "x":0, "y":2}, {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, {"label":"A", "x":3.25, "y":2}, {"label":"S", "x":4.25, "y":2}, {"label":"D", "x":5.25, "y":2}, {"label":"F", "x":6.25, "y":2}, {"label":"G", "x":7.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"Enter", "x":16.25, "y":2, "w":2.25}, {"label":"Shift", "x":1.5, "y":3, "w":2.25}, {"label":"Z", "x":3.75, "y":3}, {"label":"X", "x":4.75, "y":3}, {"label":"C", "x":5.75, "y":3}, {"label":"V", "x":6.75, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"B", "x":9.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"\u2191", "x":17.75, "y":3}, {"label":"Ctrl", "x":1.5, "y":4, "w":1.5}, {"label":"Alt", "x":4.5, "y":4, "w":1.5}, {"x":6, "y":4, "w":2}, {"label":"Fn", "x":8, "y":4, "w":1.25}, {"x":9.75, "y":4, "w":2.75}, {"label":"Alt", "x":12.5, "y":4, "w":1.5}, {"label":"Ctrl", "x":15, "y":4, "w":1.5}, {"label":"\u2190", "x":16.75, "y":4}, {"label":"\u2193", "x":17.75, "y":4}, {"label":"\u2192", "x":18.75, "y":4}]
|
||||
"layout": [
|
||||
{"label":"Esc", "x":0, "y":0},
|
||||
{"label":"~", "x":1.5, "y":0},
|
||||
{"label":"!", "x":2.5, "y":0},
|
||||
{"label":"@", "x":3.5, "y":0},
|
||||
{"label":"#", "x":4.5, "y":0},
|
||||
{"label":"$", "x":5.5, "y":0},
|
||||
{"label":"%", "x":6.5, "y":0},
|
||||
{"label":"^", "x":7.5, "y":0},
|
||||
{"label":"&", "x":10.5, "y":0},
|
||||
{"label":"*", "x":11.5, "y":0},
|
||||
{"label":"(", "x":12.5, "y":0},
|
||||
{"label":")", "x":13.5, "y":0},
|
||||
{"label":"_", "x":14.5, "y":0},
|
||||
{"label":"+", "x":15.5, "y":0},
|
||||
{"label":"Backspace", "x":16.5, "y":0, "w":2},
|
||||
{"label":"Insert", "x":0, "y":1},
|
||||
{"label":"Tab", "x":1.5, "y":1, "w":1.5},
|
||||
{"label":"Q", "x":3, "y":1},
|
||||
{"label":"W", "x":4, "y":1},
|
||||
{"label":"E", "x":5, "y":1},
|
||||
{"label":"R", "x":6, "y":1},
|
||||
{"label":"T", "x":7, "y":1},
|
||||
{"label":"Y", "x":10, "y":1},
|
||||
{"label":"U", "x":11, "y":1},
|
||||
{"label":"I", "x":12, "y":1},
|
||||
{"label":"O", "x":13, "y":1},
|
||||
{"label":"P", "x":14, "y":1},
|
||||
{"label":"{", "x":15, "y":1},
|
||||
{"label":"}", "x":16, "y":1},
|
||||
{"label":"|", "x":17, "y":1, "w":1.5},
|
||||
{"label":"Mute", "x":19, "y":0.5},
|
||||
{"label":"Delete", "x":0, "y":2},
|
||||
{"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
|
||||
{"label":"A", "x":3.25, "y":2},
|
||||
{"label":"S", "x":4.25, "y":2},
|
||||
{"label":"D", "x":5.25, "y":2},
|
||||
{"label":"F", "x":6.25, "y":2},
|
||||
{"label":"G", "x":7.25, "y":2},
|
||||
{"label":"H", "x":10.25, "y":2},
|
||||
{"label":"J", "x":11.25, "y":2},
|
||||
{"label":"K", "x":12.25, "y":2},
|
||||
{"label":"L", "x":13.25, "y":2},
|
||||
{"label":":", "x":14.25, "y":2},
|
||||
{"label":"\"", "x":15.25, "y":2},
|
||||
{"label":"Enter", "x":16.25, "y":2, "w":2.25},
|
||||
{"label":"Shift", "x":1.5, "y":3, "w":2.25},
|
||||
{"label":"Z", "x":3.75, "y":3},
|
||||
{"label":"X", "x":4.75, "y":3},
|
||||
{"label":"C", "x":5.75, "y":3},
|
||||
{"label":"V", "x":6.75, "y":3},
|
||||
{"label":"B", "x":7.75, "y":3},
|
||||
{"label":"B", "x":9.75, "y":3},
|
||||
{"label":"N", "x":10.75, "y":3},
|
||||
{"label":"M", "x":11.75, "y":3},
|
||||
{"label":"<", "x":12.75, "y":3},
|
||||
{"label":">", "x":13.75, "y":3},
|
||||
{"label":"?", "x":14.75, "y":3},
|
||||
{"label":"Shift", "x":15.75, "y":3, "w":1.75},
|
||||
{"label":"Up", "x":17.75, "y":3.25},
|
||||
{"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
|
||||
{"label":"Alt", "x":4.5, "y":4, "w":1.5},
|
||||
{"label":"Space", "x":6, "y":4, "w":2},
|
||||
{"label":"Fn", "x":8, "y":4},
|
||||
{"label":"Space", "x":9.75, "y":4, "w":2.75},
|
||||
{"label":"Alt", "x":12.5, "y":4, "w":1.5},
|
||||
{"label":"Ctrl", "x":15, "y":4, "w":1.5},
|
||||
{"label":"Left", "x":16.75, "y":4.25},
|
||||
{"label":"Down", "x":17.75, "y":4.25},
|
||||
{"label":"Right", "x":18.75, "y":4.25}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -19,24 +19,26 @@
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
[0] = LAYOUT_default( /* base */
|
||||
KC_GESC, 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_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_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_UP,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RIGHT,
|
||||
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_MUTE),
|
||||
KC_GESC, 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_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_MUTE,
|
||||
KC_DEL, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
|
||||
KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
|
||||
),
|
||||
|
||||
|
||||
[1] = LAYOUT_default( /* fn */
|
||||
/* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */
|
||||
KC_TRNS, KC_TRNS, 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_TRNS,
|
||||
/* ins tab Q W E R T Y U I O P [ ] \ */
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
/* del caps A S D F G H J K L ; ' enter up */
|
||||
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_INS, KC_TRNS, KC_PGUP,
|
||||
/* shift Z X C V B B N M , . / shift right */
|
||||
KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_END,
|
||||
/* ctrl alt space fn space alt ctrl left down rotary */
|
||||
KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_MPLY)
|
||||
/* ins tab Q W E R T Y U I O P [ ] \ rotary */
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
|
||||
/* del caps A S D F G H J K L ; ' enter */
|
||||
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_INS, KC_TRNS,
|
||||
/* shift Z X C V B B N M , . / shift up */
|
||||
KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP,
|
||||
/* ctrl alt space fn space alt ctrl left down right */
|
||||
KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_END
|
||||
)
|
||||
};
|
||||
|
||||
void encoder_update_user(uint8_t index, bool clockwise) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user