Skip to content

Commit

Permalink
DYZ TKL touch-up (#14744)
Browse files Browse the repository at this point in the history 
* friendly-format info.json

* add LAYOUT_all layout data

* add matrix diagram to dyz_tkl.h

* add LAYOUT_tkl_ansi

* add LAYOUT_tkl_ansi_f13

* add LAYOUT_tkl_iso

* add LAYOUT_tkl_iso_f13

* remove `ENCODER_ENABLE = no` from rules.mk

* remove redundant definitions from config.h

Data-driven compilation calculates `MATRIX_ROWS` and `MATRIX_COLS` from the info.json data, so defining them in config.h isn't necessary.

* add missing comma to info.json per fauxpark
  • Loading branch information
@noroadsleft
noroadsleft authored Oct 8, 2021
1 parent 51470df commit 9d070e6
Show file tree
Hide file tree
Showing 4 changed files with 611 additions and 20 deletions.
5 changes: 0 additions & 5 deletions keyboards/dyz/dyz_tkl/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MANUFACTURER dyz
#define PRODUCT dyz_TKL

/* key matrix size */
#define MATRIX_ROWS 12
#define MATRIX_COLS 9


/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

Expand Down
135 changes: 123 additions & 12 deletions keyboards/dyz/dyz_tkl/dyz_tkl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,29 @@
#include "quantum.h"
#define _X_ KC_NO

/*
* ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┬───┬───┐
* │00 ││10 │01 │11 │02 ││12 │03 │13 │04 ││14 │05 │06 │16 ││07 ││17 │08 │18 │ F13 Function Row
* └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┴───┴───┘
* ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
* │00 │ │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │06 │16 │07 ││17 │08 │18 │
* └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ ┌───────┐
* │20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 ││37 │28 │38 │ │36 │ 2u Backspace
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ └─┬─────┤
* │40 │50 │41 │51 │42 │52 │53 │44 │54 │45 │55 │46 │56 │47 ││57 │48 │58 │ │ │
* 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ ┌──┴┐67 │ ISO Enter
* LShift │60 │70 │61 │71 │62 │72 │73 │64 │74 │65 │75 │66 │76 │ │76 │ │
* ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ┌─┴───┴────┤
* │80 │ │80 │90 │81 │91 │82 │92 │93 │84 │94 │85 │95 │86 │96 │87 │ │88 │ │96 │ 2.75u RShift
* └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐ └──────────┘
* │A0 │B0 │A1 │B3 │B5 │A6 │B6 │A7 ││B7 │A8 │B8 │
* └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
* ┌─────┬───┬─────┬───────────────────────────┬─────┬───┬─────┐
* │A0 │B0 │A1 │B3 │A6 │B6 │A7 │ Tsangan
* └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
*/

#define LAYOUT_all( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07, K17, K08, K18, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, \
Expand All @@ -26,16 +49,104 @@
K80, K90, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86, K96, K87, K88, \
KA0, KB0, KA1, KB3, KB5, KA6, KB6, KA7, KB7, KA8, KB8 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, K41, K42, _X_, K44, K45, K46, K47, K48 }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
{ K60, K61, K62, _X_, K64, K65, K66, K67, _X_ }, \
{ K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
{ K80, K81, K82, _X_, K84, K85, K86, K87, K88 }, \
{ K90, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
{ KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
{ KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 } \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, K41, K42, _X_, K44, K45, K46, K47, K48 }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
{ K60, K61, K62, _X_, K64, K65, K66, K67, _X_ }, \
{ K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
{ K80, K81, K82, _X_, K84, K85, K86, K87, K88 }, \
{ K90, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
{ KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
{ KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 } \
}

#define LAYOUT_tkl_ansi( \
K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07, K17, K08, K18, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, K28, K38, \
K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, \
K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, \
K80, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86, K96, K88, \
KA0, KB0, KA1, KB3, KB5, KA6, KB6, KA7, KB7, KA8, KB8 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ _X_, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, K41, K42, _X_, K44, K45, K46, K47, K48 }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
{ K60, K61, K62, _X_, K64, K65, K66, _X_, _X_ }, \
{ K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
{ K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
{ _X_, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
{ KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
{ KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 } \
}

#define LAYOUT_tkl_ansi_f13( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07, K17, K08, K18, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, K28, K38, \
K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, \
K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, \
K80, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86, K96, K88, \
KA0, KB0, KA1, KB3, KB5, KA6, KB6, KA7, KB7, KA8, KB8 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, K41, K42, _X_, K44, K45, K46, K47, K48 }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
{ K60, K61, K62, _X_, K64, K65, K66, _X_, _X_ }, \
{ K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
{ K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
{ _X_, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
{ KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
{ KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 } \
}

#define LAYOUT_tkl_iso( \
K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07, K17, K08, K18, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, K28, K38, \
K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K57, K48, K58, \
K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, K67, \
K80, K90, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86, K96, K88, \
KA0, KB0, KA1, KB3, KB5, KA6, KB6, KA7, KB7, KA8, KB8 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ _X_, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, K41, K42, _X_, K44, K45, K46, _X_, K48 }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
{ K60, K61, K62, _X_, K64, K65, K66, K67, _X_ }, \
{ K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
{ K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
{ K90, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
{ KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
{ KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 } \
}

#define LAYOUT_tkl_iso_f13( \
K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K06, K16, K07, K17, K08, K18, \
K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, K28, K38, \
K40, K50, K41, K51, K42, K52, K53, K44, K54, K45, K55, K46, K56, K57, K48, K58, \
K60, K70, K61, K71, K62, K72, K73, K64, K74, K65, K75, K66, K76, K67, \
K80, K90, K81, K91, K82, K92, K93, K84, K94, K85, K95, K86, K96, K88, \
KA0, KB0, KA1, KB3, KB5, KA6, KB6, KA7, KB7, KA8, KB8 \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
{ K10, K11, K12, K13, K14, _X_, K16, K17, K18 }, \
{ K20, K21, K22, K23, K24, K25, K26, _X_, K28 }, \
{ K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \
{ K40, K41, K42, _X_, K44, K45, K46, _X_, K48 }, \
{ K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
{ K60, K61, K62, _X_, K64, K65, K66, K67, _X_ }, \
{ K70, K71, K72, K73, K74, K75, K76, _X_, _X_ }, \
{ K80, K81, K82, _X_, K84, K85, K86, _X_, K88 }, \
{ K90, K91, K92, K93, K94, K95, K96, _X_, _X_ }, \
{ KA0, KA1, _X_, _X_, _X_, _X_, KA6, KA7, KA8 }, \
{ KB0, _X_, _X_, KB3, _X_, KB5, KB6, KB7, KB8 } \
}
Loading

0 comments on commit 9d070e6

Please sign in to comment.