Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New Keyboard: E8.5 TKL #9447

Merged
merged 21 commits into from
Jun 20, 2020
Merged

New Keyboard: E8.5 TKL #9447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5ee7651
e85 commit
mechmerlin Jun 11, 2020
56e39e4
update exclusive directory readme
mechmerlin Jun 16, 2020
73be3d2
add both hotswap layouts to the h file as matrix is just about the sa…
mechmerlin Jun 16, 2020
bbe5ac6
fix up a few files
mechmerlin Jun 16, 2020
a88f515
add a RESET key to Layer 1
mechmerlin Jun 16, 2020
7ee0647
add a VIA enabled keymap
mechmerlin Jun 16, 2020
aca815f
rather than disable more features, I figured it was more prudent to r…
mechmerlin Jun 16, 2020
29658fd
create a directory for tsangan for easier make targets
mechmerlin Jun 16, 2020
a0b1064
this is not a tkl_ansi board, its got one more key
mechmerlin Jun 16, 2020
514db3d
rename tkl_ansi to tkl_standard and add another keymap for it
mechmerlin Jun 16, 2020
4032eb5
move everything up one level
mechmerlin Jun 17, 2020
87c1ee6
rename hotswap to e85 and update readme for new paths
mechmerlin Jun 17, 2020
7f194e9
rename layouts and add a LAYOUT_all to info.json
mechmerlin Jun 17, 2020
87db522
missed some renames
mechmerlin Jun 17, 2020
b6da088
checking in all my code
mechmerlin Jun 17, 2020
7a77b33
come up with a more sensible PID
mechmerlin Jun 17, 2020
6545be2
update name on info.json
mechmerlin Jun 17, 2020
03923b1
make rgb lighting much simpler
mechmerlin Jun 17, 2020
d0d07c2
Update keyboards/exclusive/e85/config.h
mechmerlin Jun 19, 2020
5badc9c
Update keyboards/exclusive/e85/e85.c
mechmerlin Jun 19, 2020
3762568
Update keyboards/exclusive/e85/rules.mk
mechmerlin Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add both hotswap layouts to the h file as matrix is just about the sa… 
…me for both of them
  • Loading branch information
@mechmerlin
mechmerlin committed Jun 16, 2020
commit 73be3d23f28e8edd25b697436eae879b232bad92
59 changes: 40 additions & 19 deletions keyboards/exclusive/e85/hotswap/hotswap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,44 @@

#define ___ KC_NO

#define LAYOUT( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k68, k67, k65, k64, k63, k66, k62, k61, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k78, k70, k77, k75, k73, k76, k72, k71, \
k20, k21, k22, k23, k24, k25, k26, k27, k28, k88, k87, k85, k84, k83, k86, k82, k81, \
k30, k31, k32, k33, k34, k35, k36, k37, k94, k98, k97, k95, k93, \
k40, k42, k43, k44, k45, k46, k47, k48, ka8, ka7, ka5, ka4, ka2, \
k50, k51, k52, k56, k58, k57, k54, k53, ka6, ka3, ka1 \
){ \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, ___ }, \
{ k40, ___, k42, k43, k44, k45, k46, k47, k48 }, \
{ k50, k51, k52, k53, k54, ___, k56, k57, k58 }, \
{ ___, k61, k62, k63, k64, k65, k66, k67, k68 }, \
{ k70, k71, k72, k73, ___, k75, k76, k77, k78 }, \
{ ___, k81, k82, k83, k84, k85, k86, k87, k88 }, \
{ ___, ___, ___, k93, k94, k95, ___, k97, k98 }, \
{ ___, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8 } \
#define LAYOUT_tkl_ansi( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83, K86, K82, K81, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, KC_NO, K42, K43, K44, K45, K46, K47, K48 }, \
{ K50, K51, K52, K53, K54, KC_NO, K56, K57, K58 }, \
{ KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \
{ K70, K71, K72, K73, KC_NO, K75, K76, K77, K78 }, \
{ KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \
{ KC_NO, KC_NO, K92, K93, KC_NO, K95, KC_NO, K97, K98 }, \
{ KC_NO, KA1, KA2, KC_NO, KA4, KA5, KA6, KA7, KA8 }, \
}

#define LAYOUT_tkl_tsangan( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73, K76, K72, K71, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83, K86, K82, K81, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93, \
K40, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, K92, \
K50, K51, K52, K56, K57, K54, K53, KA6, KA2, KA1 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, KC_NO, K42, K43, K44, K45, K46, K47, K48 }, \
{ K50, K51, K52, K53, K54, KC_NO, K56, K57, KC_NO }, \
{ KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \
{ K70, K71, K72, K73, KC_NO, K75, K76, K77, K78 }, \
{ KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \
{ KC_NO, KC_NO, K92, K93, KC_NO, K95, KC_NO, K97, K98 }, \
{ KC_NO, KA1, KA2, KC_NO, KA4, KA5, KA6, KA7, KA8 }, \
}
198 changes: 188 additions & 10 deletions keyboards/exclusive/e85/hotswap/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,196 @@
{
"keyboard_name": "hotswap",
"keyboard_name": "E8.5 Hotswap Tsangan",
"url": "",
"maintainer": "mechmerlin",
"width": 3,
"height": 2,
"maintainer": "qmk",
"width": 18.25,
"height": 6.5,
"layouts": {
"LAYOUT": {
"LAYOUT_tkl_ansi": {
"key_count": 88,
"layout": [
{"label":"k00", "x":0, "y":0},
{"label":"k01", "x":1, "y":0},
{"label":"k02", "x":2, "y":0},
{"label":"k10", "x":0, "y":1, "w":1.5},
{"label":"k12", "x":1.5, "y":1, "w":1.5}
{"label":"K00 (E6,D0)", "x":0, "y":0},
{"label":"K01 (E6,D1)", "x":1.25, "y":0},
{"label":"K02 (E6,D2)", "x":2.25, "y":0},
{"label":"K03 (E6,D3)", "x":3.25, "y":0},
{"label":"K04 (E6,D5)", "x":4.25, "y":0},
{"label":"K05 (E6,D4)", "x":5.5, "y":0},
{"label":"K06 (E6,D6)", "x":6.5, "y":0},
{"label":"K07 (E6,D7)", "x":7.5, "y":0},
{"label":"K08 (E6,B4)", "x":8.5, "y":0},
{"label":"K68 (F7,B4)", "x":9.75, "y":0},
{"label":"K67 (F7,D7)", "x":10.75, "y":0},
{"label":"K65 (F7,D4)", "x":11.75, "y":0},
{"label":"K64 (F7,D5)", "x":12.75, "y":0},
{"label":"K63 (F7,D3)", "x":14, "y":0},
{"label":"K66 (F7,D6)", "x":15.25, "y":0},
{"label":"K62 (F7,D2)", "x":16.25, "y":0},
{"label":"K61 (F7,D1)", "x":17.25, "y":0},
{"label":"K10 (B0,D0)", "x":0, "y":1.5},
{"label":"K11 (B0,D1)", "x":1, "y":1.5},
{"label":"K12 (B0,D2)", "x":2, "y":1.5},
{"label":"K13 (B0,D3)", "x":3, "y":1.5},
{"label":"K14 (B0,D5)", "x":4, "y":1.5},
{"label":"K15 (B0,D4)", "x":5, "y":1.5},
{"label":"K16 (B0,D6)", "x":6, "y":1.5},
{"label":"K17 (B0,D7)", "x":7, "y":1.5},
{"label":"K18 (B0,B4)", "x":8, "y":1.5},
{"label":"K78 (F6,B4)", "x":9, "y":1.5},
{"label":"K70 (F6,D0)", "x":10, "y":1.5},
{"label":"K77 (F6,D7)", "x":11, "y":1.5},
{"label":"K75 (F6,D4)", "x":12, "y":1.5},
{"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
{"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
{"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
{"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
{"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
{"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
{"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
{"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
{"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
{"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
{"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
{"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
{"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
{"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
{"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
{"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
{"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
{"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
{"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
{"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
{"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
{"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
{"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
{"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
{"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
{"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
{"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
{"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
{"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
{"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
{"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
{"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
{"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
{"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
{"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
{"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
{"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
{"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
{"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
{"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
{"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
{"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
{"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
{"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
{"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
{"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
{"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25},
{"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25},
{"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25},
{"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25},
{"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25},
{"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25},
{"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25},
{"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25},
{"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
{"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
{"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
]
},

"LAYOUT_tkl_tsangan": {
"key_count": 87,
"layout": [
{"label":"K00 (E6,D0)", "x":0, "y":0},
{"label":"K01 (E6,D1)", "x":1.25, "y":0},
{"label":"K02 (E6,D2)", "x":2.25, "y":0},
{"label":"K03 (E6,D3)", "x":3.25, "y":0},
{"label":"K04 (E6,D5)", "x":4.25, "y":0},
{"label":"K05 (E6,D4)", "x":5.5, "y":0},
{"label":"K06 (E6,D6)", "x":6.5, "y":0},
{"label":"K07 (E6,D7)", "x":7.5, "y":0},
{"label":"K08 (E6,B4)", "x":8.5, "y":0},
{"label":"K68 (F7,B4)", "x":9.75, "y":0},
{"label":"K67 (F7,D7)", "x":10.75, "y":0},
{"label":"K65 (F7,D4)", "x":11.75, "y":0},
{"label":"K64 (F7,D5)", "x":12.75, "y":0},
{"label":"K63 (F7,D3)", "x":14, "y":0},
{"label":"K66 (F7,D6)", "x":15.25, "y":0},
{"label":"K62 (F7,D2)", "x":16.25, "y":0},
{"label":"K61 (F7,D1)", "x":17.25, "y":0},
{"label":"K10 (B0,D0)", "x":0, "y":1.5},
{"label":"K11 (B0,D1)", "x":1, "y":1.5},
{"label":"K12 (B0,D2)", "x":2, "y":1.5},
{"label":"K13 (B0,D3)", "x":3, "y":1.5},
{"label":"K14 (B0,D5)", "x":4, "y":1.5},
{"label":"K15 (B0,D4)", "x":5, "y":1.5},
{"label":"K16 (B0,D6)", "x":6, "y":1.5},
{"label":"K17 (B0,D7)", "x":7, "y":1.5},
{"label":"K18 (B0,B4)", "x":8, "y":1.5},
{"label":"K78 (F6,B4)", "x":9, "y":1.5},
{"label":"K70 (F6,D0)", "x":10, "y":1.5},
{"label":"K77 (F6,D7)", "x":11, "y":1.5},
{"label":"K75 (F6,D4)", "x":12, "y":1.5},
{"label":"K73 (F6,D3)", "x":13, "y":1.5, "w":2},
{"label":"K76 (F6,D6)", "x":15.25, "y":1.5},
{"label":"K72 (F6,D2)", "x":16.25, "y":1.5},
{"label":"K71 (F6,D1)", "x":17.25, "y":1.5},
{"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5},
{"label":"K21 (B1,D1)", "x":1.5, "y":2.5},
{"label":"K22 (B1,D2)", "x":2.5, "y":2.5},
{"label":"K23 (B1,D3)", "x":3.5, "y":2.5},
{"label":"K24 (B1,D5)", "x":4.5, "y":2.5},
{"label":"K25 (B1,D4)", "x":5.5, "y":2.5},
{"label":"K26 (B1,D6)", "x":6.5, "y":2.5},
{"label":"K27 (B1,D7)", "x":7.5, "y":2.5},
{"label":"K28 (B1,B4)", "x":8.5, "y":2.5},
{"label":"K88 (F5,B4)", "x":9.5, "y":2.5},
{"label":"K87 (F5,D7)", "x":10.5, "y":2.5},
{"label":"K85 (F5,D4)", "x":11.5, "y":2.5},
{"label":"K84 (F5,D5)", "x":12.5, "y":2.5},
{"label":"K83 (F5,D3)", "x":13.5, "y":2.5, "w":1.5},
{"label":"K86 (F5,D6)", "x":15.25, "y":2.5},
{"label":"K82 (F5,D2)", "x":16.25, "y":2.5},
{"label":"K81 (F5,D1)", "x":17.25, "y":2.5},
{"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75},
{"label":"K31 (B2,D1)", "x":1.75, "y":3.5},
{"label":"K32 (B2,D2)", "x":2.75, "y":3.5},
{"label":"K33 (B2,D3)", "x":3.75, "y":3.5},
{"label":"K34 (B2,D5)", "x":4.75, "y":3.5},
{"label":"K35 (B2,D4)", "x":5.75, "y":3.5},
{"label":"K36 (B2,D6)", "x":6.75, "y":3.5},
{"label":"K37 (B2,D7)", "x":7.75, "y":3.5},
{"label":"K38 (B2,B4)", "x":8.75, "y":3.5},
{"label":"K98 (F4,B4)", "x":9.75, "y":3.5},
{"label":"K97 (F4,D7)", "x":10.75, "y":3.5},
{"label":"K95 (F4,D4)", "x":11.75, "y":3.5},
{"label":"K93 (F4,D3)", "x":12.75, "y":3.5, "w":2.25},
{"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":2.25},
{"label":"K42 (B3,D2)", "x":2.25, "y":4.5},
{"label":"K43 (B3,D3)", "x":3.25, "y":4.5},
{"label":"K44 (B3,D5)", "x":4.25, "y":4.5},
{"label":"K45 (B3,D4)", "x":5.25, "y":4.5},
{"label":"K46 (B3,D6)", "x":6.25, "y":4.5},
{"label":"K47 (B3,D7)", "x":7.25, "y":4.5},
{"label":"K48 (B3,B4)", "x":8.25, "y":4.5},
{"label":"KA8 (F1,B4)", "x":9.25, "y":4.5},
{"label":"KA7 (F1,D7)", "x":10.25, "y":4.5},
{"label":"KA5 (F1,D4)", "x":11.25, "y":4.5},
{"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":2.75},
{"label":"K92 (F4,D2)", "x":16.25, "y":4.5},
{"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.5},
{"label":"K51 (B7,D1)", "x":1.5, "y":5.5},
{"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.5},
{"label":"K56 (B7,D6)", "x":4, "y":5.5, "w":7},
{"label":"K57 (B7,D7)", "x":11, "y":5.5, "w":1.5},
{"label":"K54 (B7,D5)", "x":12.5, "y":5.5},
{"label":"K53 (B7,D3)", "x":13.5, "y":5.5, "w":1.5},
{"label":"KA6 (F1,D6)", "x":15.25, "y":5.5},
{"label":"KA2 (F1,D2)", "x":16.25, "y":5.5},
{"label":"KA1 (F1,D1)", "x":17.25, "y":5.5}
]
}
}
,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
}
19 changes: 0 additions & 19 deletions keyboards/exclusive/e85/hotswap/keymaps/default/config.h
View file
Open in desktop

This file was deleted.

Loading