aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-11 08:55:41 +0000
committerQMK Bot <hello@qmk.fm>2021-01-11 08:55:41 +0000
commitf452eeb0baf595ff48f379d99aeea10d928c1730 (patch)
treea245cf961cba2fc0e005a399fe8086ab98525cd8
parent3bc436988d0a58fdd735495f07aa741660ab8e71 (diff)
parent6b2f9e3015c1cce72ca2e88eadd5a5f4b5e514e3 (diff)
downloadqmk_firmware-f452eeb0baf595ff48f379d99aeea10d928c1730.tar.gz
qmk_firmware-f452eeb0baf595ff48f379d99aeea10d928c1730.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/basketweave/basketweave.h10
-rw-r--r--keyboards/basketweave/info.json84
-rw-r--r--keyboards/basketweave/keymaps/default/keymap.c28
3 files changed, 97 insertions, 25 deletions
diff --git a/keyboards/basketweave/basketweave.h b/keyboards/basketweave/basketweave.h
index abceef76e..b08254406 100644
--- a/keyboards/basketweave/basketweave.h
+++ b/keyboards/basketweave/basketweave.h
@@ -21,11 +21,11 @@
21#include "quantum.h" 21#include "quantum.h"
22 22
23#define LAYOUT_default( \ 23#define LAYOUT_default( \
24 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ 24 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
25 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ 25 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K414, \
26 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ 26 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
27 K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ 27 K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K214, \
28 K401, K402, K404, K406, K408, K410, K411, K412, K413, K414 \ 28 K401, K402, K404, K406, K408, K410, K411, K412, K413, K314 \
29) { \ 29) { \
30 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ 30 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
31 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ 31 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
diff --git a/keyboards/basketweave/info.json b/keyboards/basketweave/info.json
index 436823b73..0a38287be 100644
--- a/keyboards/basketweave/info.json
+++ b/keyboards/basketweave/info.json
@@ -1,12 +1,82 @@
1{ 1{
2 "keyboard_name": "Basketweave", 2 "keyboard_name": "Basketweave",
3 "url": "https://github.com/null-ll/basketweave", 3 "url": "https://github.com/null-ll/basketweave",
4 "maintainer": "null-ll", 4 "maintainer": "null-ll",
5 "width": 20, 5 "width": 20,
6 "height": 5, 6 "height": 5.25,
7 "layouts": { 7 "layouts": {
8 "LAYOUT_default": { 8 "LAYOUT_default": {
9 "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}] 9 "layout": [
10 {"label":"Esc", "x":0, "y":0},
11 {"label":"~", "x":1.5, "y":0},
12 {"label":"!", "x":2.5, "y":0},
13 {"label":"@", "x":3.5, "y":0},
14 {"label":"#", "x":4.5, "y":0},
15 {"label":"$", "x":5.5, "y":0},
16 {"label":"%", "x":6.5, "y":0},
17 {"label":"^", "x":7.5, "y":0},
18 {"label":"&", "x":10.5, "y":0},
19 {"label":"*", "x":11.5, "y":0},
20 {"label":"(", "x":12.5, "y":0},
21 {"label":")", "x":13.5, "y":0},
22 {"label":"_", "x":14.5, "y":0},
23 {"label":"+", "x":15.5, "y":0},
24 {"label":"Backspace", "x":16.5, "y":0, "w":2},
25 {"label":"Insert", "x":0, "y":1},
26 {"label":"Tab", "x":1.5, "y":1, "w":1.5},
27 {"label":"Q", "x":3, "y":1},
28 {"label":"W", "x":4, "y":1},
29 {"label":"E", "x":5, "y":1},
30 {"label":"R", "x":6, "y":1},
31 {"label":"T", "x":7, "y":1},
32 {"label":"Y", "x":10, "y":1},
33 {"label":"U", "x":11, "y":1},
34 {"label":"I", "x":12, "y":1},
35 {"label":"O", "x":13, "y":1},
36 {"label":"P", "x":14, "y":1},
37 {"label":"{", "x":15, "y":1},
38 {"label":"}", "x":16, "y":1},
39 {"label":"|", "x":17, "y":1, "w":1.5},
40 {"label":"Mute", "x":19, "y":0.5},
41 {"label":"Delete", "x":0, "y":2},
42 {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
43 {"label":"A", "x":3.25, "y":2},
44 {"label":"S", "x":4.25, "y":2},
45 {"label":"D", "x":5.25, "y":2},
46 {"label":"F", "x":6.25, "y":2},
47 {"label":"G", "x":7.25, "y":2},
48 {"label":"H", "x":10.25, "y":2},
49 {"label":"J", "x":11.25, "y":2},
50 {"label":"K", "x":12.25, "y":2},
51 {"label":"L", "x":13.25, "y":2},
52 {"label":":", "x":14.25, "y":2},
53 {"label":"\"", "x":15.25, "y":2},
54 {"label":"Enter", "x":16.25, "y":2, "w":2.25},
55 {"label":"Shift", "x":1.5, "y":3, "w":2.25},
56 {"label":"Z", "x":3.75, "y":3},
57 {"label":"X", "x":4.75, "y":3},
58 {"label":"C", "x":5.75, "y":3},
59 {"label":"V", "x":6.75, "y":3},
60 {"label":"B", "x":7.75, "y":3},
61 {"label":"B", "x":9.75, "y":3},
62 {"label":"N", "x":10.75, "y":3},
63 {"label":"M", "x":11.75, "y":3},
64 {"label":"<", "x":12.75, "y":3},
65 {"label":">", "x":13.75, "y":3},
66 {"label":"?", "x":14.75, "y":3},
67 {"label":"Shift", "x":15.75, "y":3, "w":1.75},
68 {"label":"Up", "x":17.75, "y":3.25},
69 {"label":"Ctrl", "x":1.5, "y":4, "w":1.5},
70 {"label":"Alt", "x":4.5, "y":4, "w":1.5},
71 {"label":"Space", "x":6, "y":4, "w":2},
72 {"label":"Fn", "x":8, "y":4},
73 {"label":"Space", "x":9.75, "y":4, "w":2.75},
74 {"label":"Alt", "x":12.5, "y":4, "w":1.5},
75 {"label":"Ctrl", "x":15, "y":4, "w":1.5},
76 {"label":"Left", "x":16.75, "y":4.25},
77 {"label":"Down", "x":17.75, "y":4.25},
78 {"label":"Right", "x":18.75, "y":4.25}
79 ]
10 } 80 }
11 } 81 }
12} \ No newline at end of file 82}
diff --git a/keyboards/basketweave/keymaps/default/keymap.c b/keyboards/basketweave/keymaps/default/keymap.c
index 56bc4cbfd..40cf61eea 100644
--- a/keyboards/basketweave/keymaps/default/keymap.c
+++ b/keyboards/basketweave/keymaps/default/keymap.c
@@ -19,24 +19,26 @@
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 20
21 [0] = LAYOUT_default( /* base */ 21 [0] = LAYOUT_default( /* base */
22 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, 22 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,
23 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, 23 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,
24 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, 24 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,
25 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, 25 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,
26 KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_MUTE), 26 KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT
27 ),
27 28
28 29
29 [1] = LAYOUT_default( /* fn */ 30 [1] = LAYOUT_default( /* fn */
30 /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */ 31 /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */
31 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, 32 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,
32 /* ins tab Q W E R T Y U I O P [ ] \ */ 33 /* ins tab Q W E R T Y U I O P [ ] \ rotary */
33 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, 34 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,
34 /* del caps A S D F G H J K L ; ' enter up */ 35 /* del caps A S D F G H J K L ; ' enter */
35 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, 36 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,
36 /* shift Z X C V B B N M , . / shift right */ 37 /* shift Z X C V B B N M , . / shift up */
37 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, 38 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,
38 /* ctrl alt space fn space alt ctrl left down rotary */ 39 /* ctrl alt space fn space alt ctrl left down right */
39 KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_MPLY) 40 KC_LCTL, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_RALT, KC_RCTL, KC_HOME, KC_PGDN, KC_END
41 )
40}; 42};
41 43
42void encoder_update_user(uint8_t index, bool clockwise) { 44void encoder_update_user(uint8_t index, bool clockwise) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-04 11:53:34 +0000