aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-19 00:38:25 +0000
committerQMK Bot <hello@qmk.fm>2021-08-19 00:38:25 +0000
commitb23a4db47aa290d73c8fcdb601bf47655bb7acfe (patch)
tree2a08fe3b865a1f9ffbfab74ee339f73698f48d45
parentc6dc1f7f8dda51a3740e7f1ddb5eff3e11047789 (diff)
parentac1309cd7529937c64cd2d1bdd7cdd20280f2701 (diff)
downloadqmk_firmware-b23a4db47aa290d73c8fcdb601bf47655bb7acfe.tar.gz
qmk_firmware-b23a4db47aa290d73c8fcdb601bf47655bb7acfe.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat
-rw-r--r--keyboards/feels/feels65/feels65.h85
-rw-r--r--keyboards/feels/feels65/info.json411
-rw-r--r--keyboards/feels/feels65/keymaps/default/keymap.c20
-rw-r--r--keyboards/feels/feels65/keymaps/via/keymap.c46
-rw-r--r--keyboards/feels/feels65/rules.mk2
5 files changed, 488 insertions, 76 deletions
diff --git a/keyboards/feels/feels65/feels65.h b/keyboards/feels/feels65/feels65.h
index be11e22cc..21f5ab718 100644
--- a/keyboards/feels/feels65/feels65.h
+++ b/keyboards/feels/feels65/feels65.h
@@ -19,32 +19,77 @@
19 19
20#define XXX KC_NO 20#define XXX KC_NO
21 21
22#define LAYOUT_all( \
23 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
24 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
25 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
26 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
27 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \
28) \
29{ \
30 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
31 {k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
32 {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
33 {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
34 {k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \
35}
36
22#define LAYOUT_65_iso_blocker( \ 37#define LAYOUT_65_iso_blocker( \
23 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ 38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
24 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \ 39 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
25 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ 40 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
26 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ 41 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
27 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \ 42 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \
43) \
44{ \
45 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
46 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
47 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
48 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
49 { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \
50}
51
52#define LAYOUT_65_iso_blocker_split_bs( \
53 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
54 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \
55 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \
56 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
57 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \
28) \ 58) \
29{ \ 59{ \
30 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ 60 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
31 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \ 61 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, XXX, k1F }, \
32 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ 62 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \
33 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ 63 { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
34 { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \ 64 { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \
35} 65}
36 66
37#define LAYOUT_65_ansi_blocker( \ 67#define LAYOUT_65_ansi_blocker( \
38 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ 68 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \
39 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ 69 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
40 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \ 70 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \
41 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ 71 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
42 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \ 72 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \
73) \
74{ \
75 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX, k0F }, \
76 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
77 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \
78 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
79 { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \
80}
81
82#define LAYOUT_65_ansi_blocker_split_bs( \
83 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \
84 k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \
85 k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \
86 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \
87 k40, k42, k43, k46, k4A, k4B, k4D, k4E, k4F \
43) \ 88) \
44{ \ 89{ \
45 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ 90 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
46 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ 91 { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
47 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \ 92 { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \
48 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ 93 { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \
49 { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \ 94 { k40, XXX, k42, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E, k4F } \
50} 95}
diff --git a/keyboards/feels/feels65/info.json b/keyboards/feels/feels65/info.json
index 29692c4c0..02cc735a2 100644
--- a/keyboards/feels/feels65/info.json
+++ b/keyboards/feels/feels65/info.json
@@ -1,26 +1,391 @@
1{ 1{
2 "keyboard_name": "Feels65", 2 "keyboard_name": "Feels65",
3 "url": "https://github.com/swiftrax", 3 "url": "https://github.com/swiftrax",
4 "maintainer": "Swiftrax", 4 "maintainer": "Swiftrax",
5 "width": 16, 5 "width": 16,
6 "height": 6, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "LAYOUT_65_iso_blocker": { 8 "LAYOUT_all": {
9 "layout": [ 9 "layout": [
10 {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, 10 {"x":0, "y":0},
11 {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"x":13.75, "y":1, "w":1.25, "h":2}, {"x":15, "y":1}, 11 {"x":1, "y":0},
12 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":15, "y":2}, 12 {"x":2, "y":0},
13 {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"x":15, "y":3}, 13 {"x":3, "y":0},
14 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4} 14 {"x":4, "y":0},
15 ] 15 {"x":5, "y":0},
16 }, 16 {"x":6, "y":0},
17 "LAYOUT_65_ansi_blocker": { 17 {"x":7, "y":0},
18 "layout": [ 18 {"x":8, "y":0},
19 {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, 19 {"x":9, "y":0},
20 {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, 20 {"x":10, "y":0},
21 {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"x":15, "y":3}, 21 {"x":11, "y":0},
22 {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4} 22 {"x":12, "y":0},
23 ] 23 {"x":13, "y":0},
24 {"x":14, "y":0},
25 {"x":15, "y":0},
26
27 {"x":0, "y":1, "w":1.5},
28 {"x":1.5, "y":1},
29 {"x":2.5, "y":1},
30 {"x":3.5, "y":1},
31 {"x":4.5, "y":1},
32 {"x":5.5, "y":1},
33 {"x":6.5, "y":1},
34 {"x":7.5, "y":1},
35 {"x":8.5, "y":1},
36 {"x":9.5, "y":1},
37 {"x":10.5, "y":1},
38 {"x":11.5, "y":1},
39 {"x":12.5, "y":1},
40 {"x":13.5, "y":1, "w":1.5},
41 {"x":15, "y":1},
42
43 {"x":0, "y":2, "w":1.75},
44 {"x":1.75, "y":2},
45 {"x":2.75, "y":2},
46 {"x":3.75, "y":2},
47 {"x":4.75, "y":2},
48 {"x":5.75, "y":2},
49 {"x":6.75, "y":2},
50 {"x":7.75, "y":2},
51 {"x":8.75, "y":2},
52 {"x":9.75, "y":2},
53 {"x":10.75, "y":2},
54 {"x":11.75, "y":2},
55 {"x":12.75, "y":2},
56 {"x":13.75, "y":2, "w":1.25},
57 {"x":15, "y":2},
58
59 {"x":0, "y":3, "w":1.25},
60 {"x":1.25, "y":3},
61 {"x":2.25, "y":3},
62 {"x":3.25, "y":3},
63 {"x":4.25, "y":3},
64 {"x":5.25, "y":3},
65 {"x":6.25, "y":3},
66 {"x":7.25, "y":3},
67 {"x":8.25, "y":3},
68 {"x":9.25, "y":3},
69 {"x":10.25, "y":3},
70 {"x":11.25, "y":3},
71 {"x":12.25, "y":3, "w":1.75},
72 {"x":14, "y":3},
73 {"x":15, "y":3},
74
75 {"x":0, "y":4, "w":1.25},
76 {"x":1.25, "y":4, "w":1.25},
77 {"x":2.5, "y":4, "w":1.25},
78 {"x":3.75, "y":4, "w":6.25},
79 {"x":10, "y":4, "w":1.25},
80 {"x":11.25, "y":4, "w":1.25},
81 {"x":13, "y":4},
82 {"x":14, "y":4},
83 {"x":15, "y":4}
84 ]
85 },
86 "LAYOUT_65_ansi_blocker": {
87 "layout": [
88 {"x":0, "y":0},
89 {"x":1, "y":0},
90 {"x":2, "y":0},
91 {"x":3, "y":0},
92 {"x":4, "y":0},
93 {"x":5, "y":0},
94 {"x":6, "y":0},
95 {"x":7, "y":0},
96 {"x":8, "y":0},
97 {"x":9, "y":0},
98 {"x":10, "y":0},
99 {"x":11, "y":0},
100 {"x":12, "y":0},
101 {"x":13, "y":0, "w":2},
102 {"x":15, "y":0},
103
104 {"x":0, "y":1, "w":1.5},
105 {"x":1.5, "y":1},
106 {"x":2.5, "y":1},
107 {"x":3.5, "y":1},
108 {"x":4.5, "y":1},
109 {"x":5.5, "y":1},
110 {"x":6.5, "y":1},
111 {"x":7.5, "y":1},
112 {"x":8.5, "y":1},
113 {"x":9.5, "y":1},
114 {"x":10.5, "y":1},
115 {"x":11.5, "y":1},
116 {"x":12.5, "y":1},
117 {"x":13.5, "y":1, "w":1.5},
118 {"x":15, "y":1},
119
120 {"x":0, "y":2, "w":1.75},
121 {"x":1.75, "y":2},
122 {"x":2.75, "y":2},
123 {"x":3.75, "y":2},
124 {"x":4.75, "y":2},
125 {"x":5.75, "y":2},
126 {"x":6.75, "y":2},
127 {"x":7.75, "y":2},
128 {"x":8.75, "y":2},
129 {"x":9.75, "y":2},
130 {"x":10.75, "y":2},
131 {"x":11.75, "y":2},
132 {"x":12.75, "y":2, "w":2.25},
133 {"x":15, "y":2},
134
135 {"x":0, "y":3, "w":2.25},
136 {"x":2.25, "y":3},
137 {"x":3.25, "y":3},
138 {"x":4.25, "y":3},
139 {"x":5.25, "y":3},
140 {"x":6.25, "y":3},
141 {"x":7.25, "y":3},
142 {"x":8.25, "y":3},
143 {"x":9.25, "y":3},
144 {"x":10.25, "y":3},
145 {"x":11.25, "y":3},
146 {"x":12.25, "y":3, "w":1.75},
147 {"x":14, "y":3},
148 {"x":15, "y":3},
149
150 {"x":0, "y":4, "w":1.25},
151 {"x":1.25, "y":4, "w":1.25},
152 {"x":2.5, "y":4, "w":1.25},
153 {"x":3.75, "y":4, "w":6.25},
154 {"x":10, "y":4, "w":1.25},
155 {"x":11.25, "y":4, "w":1.25},
156 {"x":13, "y":4},
157 {"x":14, "y":4},
158 {"x":15, "y":4}
159 ]
160 },
161 "LAYOUT_65_ansi_blocker_split_bs": {
162 "layout": [
163 {"x":0, "y":0},
164 {"x":1, "y":0},
165 {"x":2, "y":0},
166 {"x":3, "y":0},
167 {"x":4, "y":0},
168 {"x":5, "y":0},
169 {"x":6, "y":0},
170 {"x":7, "y":0},
171 {"x":8, "y":0},
172 {"x":9, "y":0},
173 {"x":10, "y":0},
174 {"x":11, "y":0},
175 {"x":12, "y":0},
176 {"x":13, "y":0},
177 {"x":14, "y":0},
178 {"x":15, "y":0},
179
180 {"x":0, "y":1, "w":1.5},
181 {"x":1.5, "y":1},
182 {"x":2.5, "y":1},
183 {"x":3.5, "y":1},
184 {"x":4.5, "y":1},
185 {"x":5.5, "y":1},
186 {"x":6.5, "y":1},
187 {"x":7.5, "y":1},
188 {"x":8.5, "y":1},
189 {"x":9.5, "y":1},
190 {"x":10.5, "y":1},
191 {"x":11.5, "y":1},
192 {"x":12.5, "y":1},
193 {"x":13.5, "y":1, "w":1.5},
194 {"x":15, "y":1},
195
196 {"x":0, "y":2, "w":1.75},
197 {"x":1.75, "y":2},
198 {"x":2.75, "y":2},
199 {"x":3.75, "y":2},
200 {"x":4.75, "y":2},
201 {"x":5.75, "y":2},
202 {"x":6.75, "y":2},
203 {"x":7.75, "y":2},
204 {"x":8.75, "y":2},
205 {"x":9.75, "y":2},
206 {"x":10.75, "y":2},
207 {"x":11.75, "y":2},
208 {"x":12.75, "y":2, "w":2.25},
209 {"x":15, "y":2},
210
211 {"x":0, "y":3, "w":2.25},
212 {"x":2.25, "y":3},
213 {"x":3.25, "y":3},
214 {"x":4.25, "y":3},
215 {"x":5.25, "y":3},
216 {"x":6.25, "y":3},
217 {"x":7.25, "y":3},
218 {"x":8.25, "y":3},
219 {"x":9.25, "y":3},
220 {"x":10.25, "y":3},
221 {"x":11.25, "y":3},
222 {"x":12.25, "y":3, "w":1.75},
223 {"x":14, "y":3},
224 {"x":15, "y":3},
225
226 {"x":0, "y":4, "w":1.25},
227 {"x":1.25, "y":4, "w":1.25},
228 {"x":2.5, "y":4, "w":1.25},
229 {"x":3.75, "y":4, "w":6.25},
230 {"x":10, "y":4, "w":1.25},
231 {"x":11.25, "y":4, "w":1.25},
232 {"x":13, "y":4},
233 {"x":14, "y":4},
234 {"x":15, "y":4}
235 ]
236 },
237 "LAYOUT_65_iso_blocker": {
238 "layout": [
239 {"x":0, "y":0},
240 {"x":1, "y":0},
241 {"x":2, "y":0},
242 {"x":3, "y":0},
243 {"x":4, "y":0},
244 {"x":5, "y":0},
245 {"x":6, "y":0},
246 {"x":7, "y":0},
247 {"x":8, "y":0},
248 {"x":9, "y":0},
249 {"x":10, "y":0},
250 {"x":11, "y":0},
251 {"x":12, "y":0},
252 {"x":13, "y":0, "w":2},
253 {"x":15, "y":0},
254
255 {"x":0, "y":1, "w":1.5},
256 {"x":1.5, "y":1},
257 {"x":2.5, "y":1},
258 {"x":3.5, "y":1},
259 {"x":4.5, "y":1},
260 {"x":5.5, "y":1},
261 {"x":6.5, "y":1},
262 {"x":7.5, "y":1},
263 {"x":8.5, "y":1},
264 {"x":9.5, "y":1},
265 {"x":10.5, "y":1},
266 {"x":11.5, "y":1},
267 {"x":12.5, "y":1},
268 {"x":15, "y":1},
269
270 {"x":0, "y":2, "w":1.75},
271 {"x":1.75, "y":2},
272 {"x":2.75, "y":2},
273 {"x":3.75, "y":2},
274 {"x":4.75, "y":2},
275 {"x":5.75, "y":2},
276 {"x":6.75, "y":2},
277 {"x":7.75, "y":2},
278 {"x":8.75, "y":2},
279 {"x":9.75, "y":2},
280 {"x":10.75, "y":2},
281 {"x":11.75, "y":2},
282 {"x":12.75, "y":2},
283 {"x":13.75, "y":1, "w":1.25, "h":2},
284 {"x":15, "y":2},
285
286 {"x":0, "y":3, "w":1.25},
287 {"x":1.25, "y":3},
288 {"x":2.25, "y":3},
289 {"x":3.25, "y":3},
290 {"x":4.25, "y":3},
291 {"x":5.25, "y":3},
292 {"x":6.25, "y":3},
293 {"x":7.25, "y":3},
294 {"x":8.25, "y":3},
295 {"x":9.25, "y":3},
296 {"x":10.25, "y":3},
297 {"x":11.25, "y":3},
298 {"x":12.25, "y":3, "w":1.75},
299 {"x":14, "y":3},
300 {"x":15, "y":3},
301
302 {"x":0, "y":4, "w":1.25},
303 {"x":1.25, "y":4, "w":1.25},
304 {"x":2.5, "y":4, "w":1.25},
305 {"x":3.75, "y":4, "w":6.25},
306 {"x":10, "y":4, "w":1.25},
307 {"x":11.25, "y":4, "w":1.25},
308 {"x":13, "y":4},
309 {"x":14, "y":4},
310 {"x":15, "y":4}
311 ]
312 },
313 "LAYOUT_65_iso_blocker_split_bs": {
314 "layout": [
315 {"x":0, "y":0},
316 {"x":1, "y":0},
317 {"x":2, "y":0},
318 {"x":3, "y":0},
319 {"x":4, "y":0},
320 {"x":5, "y":0},
321 {"x":6, "y":0},
322 {"x":7, "y":0},
323 {"x":8, "y":0},
324 {"x":9, "y":0},
325 {"x":10, "y":0},
326 {"x":11, "y":0},
327 {"x":12, "y":0},
328 {"x":13, "y":0},
329 {"x":14, "y":0},
330 {"x":15, "y":0},
331
332 {"x":0, "y":1, "w":1.5},
333 {"x":1.5, "y":1},
334 {"x":2.5, "y":1},
335 {"x":3.5, "y":1},
336 {"x":4.5, "y":1},
337 {"x":5.5, "y":1},
338 {"x":6.5, "y":1},
339 {"x":7.5, "y":1},
340 {"x":8.5, "y":1},
341 {"x":9.5, "y":1},
342 {"x":10.5, "y":1},
343 {"x":11.5, "y":1},
344 {"x":12.5, "y":1},
345 {"x":15, "y":1},
346
347 {"x":0, "y":2, "w":1.75},
348 {"x":1.75, "y":2},
349 {"x":2.75, "y":2},
350 {"x":3.75, "y":2},
351 {"x":4.75, "y":2},
352 {"x":5.75, "y":2},
353 {"x":6.75, "y":2},
354 {"x":7.75, "y":2},
355 {"x":8.75, "y":2},
356 {"x":9.75, "y":2},
357 {"x":10.75, "y":2},
358 {"x":11.75, "y":2},
359 {"x":12.75, "y":2},
360 {"x":13.75, "y":1, "w":1.25, "h":2},
361 {"x":15, "y":2},
362
363 {"x":0, "y":3, "w":1.25},
364 {"x":1.25, "y":3},
365 {"x":2.25, "y":3},
366 {"x":3.25, "y":3},
367 {"x":4.25, "y":3},
368 {"x":5.25, "y":3},
369 {"x":6.25, "y":3},
370 {"x":7.25, "y":3},
371 {"x":8.25, "y":3},
372 {"x":9.25, "y":3},
373 {"x":10.25, "y":3},
374 {"x":11.25, "y":3},
375 {"x":12.25, "y":3, "w":1.75},
376 {"x":14, "y":3},
377 {"x":15, "y":3},
378
379 {"x":0, "y":4, "w":1.25},
380 {"x":1.25, "y":4, "w":1.25},
381 {"x":2.5, "y":4, "w":1.25},
382 {"x":3.75, "y":4, "w":6.25},
383 {"x":10, "y":4, "w":1.25},
384 {"x":11.25, "y":4, "w":1.25},
385 {"x":13, "y":4},
386 {"x":14, "y":4},
387 {"x":15, "y":4}
388 ]
389 }
24 } 390 }
25 }
26} 391}
diff --git a/keyboards/feels/feels65/keymaps/default/keymap.c b/keyboards/feels/feels65/keymaps/default/keymap.c
index 480173ee1..d767872ff 100644
--- a/keyboards/feels/feels65/keymaps/default/keymap.c
+++ b/keyboards/feels/feels65/keymaps/default/keymap.c
@@ -17,18 +17,18 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT_65_ansi_blocker( 20 [0] = LAYOUT_all(
21 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_BSPC, KC_HOME, 21 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_BSPC, KC_HOME,
22 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, 22 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,
23 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, 23 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_NUHS, KC_ENT, KC_PGDN,
24 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, 24 KC_LSFT, KC_NUBS, 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,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 [1] = LAYOUT_65_ansi_blocker( 27 [1] = LAYOUT_all(
28 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_DEL, KC_DEL, KC_INS, 28 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_DEL, KC_DEL, KC_INS,
29 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 29 _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
30 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 30 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 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_PGUP, KC_TRNS, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
32 RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END 32 RESET, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
33 ), 33 ),
34}; \ No newline at end of file 34};
diff --git a/keyboards/feels/feels65/keymaps/via/keymap.c b/keyboards/feels/feels65/keymaps/via/keymap.c
index 144cf061a..a8b859e9e 100644
--- a/keyboards/feels/feels65/keymaps/via/keymap.c
+++ b/keyboards/feels/feels65/keymaps/via/keymap.c
@@ -17,32 +17,32 @@
17#include QMK_KEYBOARD_H 17#include QMK_KEYBOARD_H
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 [0] = LAYOUT_65_ansi_blocker( 20 [0] = LAYOUT_all(
21 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_BSPC, KC_HOME, 21 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_BSPC, KC_HOME,
22 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, 22 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,
23 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, 23 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_NUHS, KC_ENT, KC_PGDN,
24 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, 24 KC_LSFT, KC_NUBS, 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,
25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 25 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
26 ), 26 ),
27 [1] = LAYOUT_65_ansi_blocker( 27 [1] = LAYOUT_all(
28 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_DEL, KC_BSPC, KC_INS, 28 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_DEL, KC_DEL, KC_INS,
29 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 29 _______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, _______,
30 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 30 _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
31 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_PGUP, KC_TRNS, 31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______,
32 RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END 32 RESET, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
33 ), 33 ),
34 [2] = LAYOUT_65_ansi_blocker( 34 [2] = LAYOUT_all(
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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
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_TRNS, KC_TRNS, KC_TRNS, 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
37 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, 37 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
38 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_PGUP, KC_TRNS, 38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 39 _______, _______, _______, _______, _______, _______, _______, _______, _______
40 ), 40 ),
41 [3] = LAYOUT_65_ansi_blocker( 41 [3] = LAYOUT_all(
42 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, 42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
43 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, 43 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
44 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, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
45 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_PGUP, KC_TRNS, 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS 46 _______, _______, _______, _______, _______, _______, _______, _______, _______
47 ), 47 ),
48}; \ No newline at end of file 48};
diff --git a/keyboards/feels/feels65/rules.mk b/keyboards/feels/feels65/rules.mk
index dc799185d..3a183349a 100644
--- a/keyboards/feels/feels65/rules.mk
+++ b/keyboards/feels/feels65/rules.mk
@@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow 20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth 21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output 22AUDIO_ENABLE = no # Audio output
23
24LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_iso_blocker 65_iso_blocker_split_bs
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-19 12:42:53 +0000