rotated the layout and matrix thumb groups 90 deg.

- per a suggestion from Jason Trill (jjt on github); after looking at it
  a while, i think it is a bit more natural.. :)
partial-rewrite
Ben Blazak 2012-12-11 10:50:47 -08:00
parent 4c2cc8e5e9
commit 8d3d17bb20
3 changed files with 76 additions and 76 deletions

View File

@ -30,18 +30,18 @@ _backslash, _quote, _comma, _period, _P, _Y, 1,
_tab, _A, _O, _E, _U, _I,
_shiftL, _semicolon, _Q, _J, _K, _X, 1,
_guiL, _grave, _backslash, _arrowL, _arrowR,
_bs, 0,
_del, 0, _ctrlL,
_end, _home, _altL,
_ctrlL, _altL,
0, 0, _home,
_bs, _del, _end,
// right hand
3, _6, _7, _8, _9, _0, _dash,
_bracketL, _F, _G, _C, _R, _L, _bracketR,
_D, _H, _T, _N, _S, _slash,
1, _B, _M, _W, _V, _Z, _shiftR,
_arrowL, _arrowD, _arrowU, _arrowR, _guiR,
0, _space,
_ctrlR, 0, _enter,
_altR, _pageU, _pageD ),
_altR, _ctrlR,
_pageU, 0, 0,
_pageD, _enter, _space ),
KB_MATRIX_LAYER( // layout: layer 1: function and symbol keys
@ -53,7 +53,7 @@ _ctrlR, 0, _enter,
0, _semicolon, _slash, _dash, _0_kp,_semicolon,
0, _6_kp, _7_kp, _8_kp, _9_kp, _equal, 2,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0,
// right hand
@ -62,7 +62,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
_backslash, _1_kp, _9, _0, _equal, _volumeD,
2, _8, _2_kp, _3_kp, _4_kp, _5_kp, _mute,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0 ),
@ -76,7 +76,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0,
// right hand
@ -85,7 +85,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0 ),
@ -99,7 +99,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
0, _insert, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0,
// right hand
@ -108,9 +108,9 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, _4_kp, _5_kp, _6_kp, _add_kp, 0,
0, 0, _1_kp, _2_kp, _3_kp, _enter_kp, 0,
0, 0, _dec_kp, _enter_kp, 0,
0, _0_kp,
0, 0, 0,
0, 0, 0 ),
0, 0,
0, 0, 0,
0, 0, _0_kp ),
};
@ -169,8 +169,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
s2kcap, kprrel, kprrel, kprrel, kprrel, kprrel, lpush1,
kprrel, kprrel, kprrel, kprrel, kprrel,
kprrel, NULL,
kprrel, NULL, kprrel,
kprrel, kprrel,
NULL, NULL, kprrel,
kprrel, kprrel, kprrel,
// right hand
slpunum, kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
@ -178,8 +178,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
lpush1, kprrel, kprrel, kprrel, kprrel, kprrel, s2kcap,
kprrel, kprrel, kprrel, kprrel, kprrel,
NULL, kprrel,
kprrel, NULL, kprrel,
kprrel, kprrel,
kprrel, NULL, NULL,
kprrel, kprrel, kprrel ),
@ -192,7 +192,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre, lpush2,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -201,7 +201,7 @@ NULL,
kprrel, kprrel,sshprre,sshprre,sshprre, kprrel,
lpush2,sshprre, kprrel, kprrel, kprrel, kprrel, kprrel,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),
@ -215,7 +215,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
// right hand
@ -224,7 +224,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL ),
@ -238,7 +238,7 @@ NULL,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, kprrel, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -247,7 +247,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, ktrans,
ktrans, kprrel,
ktrans, kprrel,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),
@ -267,8 +267,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
s2kcap, kprrel, kprrel, kprrel, kprrel, kprrel, lpop1,
kprrel, kprrel, kprrel, kprrel, kprrel,
kprrel, NULL,
kprrel, NULL, kprrel,
kprrel, kprrel,
kprrel, NULL, NULL,
kprrel, kprrel, kprrel,
// right hand
NULL, kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
@ -276,8 +276,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
lpop1, kprrel, kprrel, kprrel, kprrel, kprrel, s2kcap,
kprrel, kprrel, kprrel, kprrel, kprrel,
NULL, kprrel,
kprrel, NULL, kprrel,
kprrel, kprrel,
kprrel, NULL, NULL,
kprrel, kprrel, kprrel ),
@ -290,7 +290,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre, lpop2,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -299,7 +299,7 @@ NULL,
kprrel, kprrel,sshprre,sshprre,sshprre, kprrel,
lpop2,sshprre, kprrel, kprrel, kprrel, kprrel, kprrel,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),
@ -313,7 +313,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
// right hand
@ -322,7 +322,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL ),
@ -336,7 +336,7 @@ NULL,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, kprrel, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -345,7 +345,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, ktrans,
ktrans, kprrel,
ktrans, kprrel,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),

View File

@ -30,18 +30,18 @@ _backslash, _Q, _W, _E, _R, _T, 1,
_tab, _A, _S, _D, _F, _G,
_shiftL, _Z, _X, _C, _V, _B, 1,
_guiL, _grave, _backslash, _arrowL, _arrowR,
_bs, 0,
_del, 0, _ctrlL,
_end, _home, _altL,
_ctrlL, _altL,
0, 0, _home,
_bs, _del, _end,
// right hand
3, _6, _7, _8, _9, _0, _dash,
_bracketL, _Y, _U, _I, _O, _P, _bracketR,
_H, _J, _K, _L, _semicolon, _quote,
1, _N, _M, _comma, _period, _slash, _shiftR,
_arrowL, _arrowD, _arrowU, _arrowR, _guiR,
0, _space,
_ctrlR, 0, _enter,
_altR, _pageU, _pageD ),
_altR, _ctrlR,
_pageU, 0, 0,
_pageD, _enter, _space ),
KB_MATRIX_LAYER( // layout: layer 1: function and symbol keys
@ -53,7 +53,7 @@ _ctrlR, 0, _enter,
0, _semicolon, _slash, _dash, _0_kp,_semicolon,
0, _6_kp, _7_kp, _8_kp, _9_kp, _equal, 2,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0,
// right hand
@ -62,7 +62,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
_backslash, _1_kp, _9, _0, _equal, _volumeD,
2, _8, _2_kp, _3_kp, _4_kp, _5_kp, _mute,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0 ),
@ -76,7 +76,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0,
// right hand
@ -85,7 +85,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0 ),
@ -99,7 +99,7 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0,
0, _insert, 0, 0, 0,
0, 0,
0, 0,
0, 0, 0,
0, 0, 0,
// right hand
@ -108,9 +108,9 @@ _F12, _F6, _F7, _F8, _F9, _F10, _power,
0, _4_kp, _5_kp, _6_kp, _add_kp, 0,
0, 0, _1_kp, _2_kp, _3_kp, _enter_kp, 0,
0, 0, _dec_kp, _enter_kp, 0,
0, _0_kp,
0, 0, 0,
0, 0, 0 ),
0, 0,
0, 0, 0,
0, 0, _0_kp ),
};
@ -169,8 +169,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
s2kcap, kprrel, kprrel, kprrel, kprrel, kprrel, lpush1,
kprrel, kprrel, kprrel, kprrel, kprrel,
kprrel, NULL,
kprrel, NULL, kprrel,
kprrel, kprrel,
NULL, NULL, kprrel,
kprrel, kprrel, kprrel,
// right hand
slpunum, kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
@ -178,8 +178,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
lpush1, kprrel, kprrel, kprrel, kprrel, kprrel, s2kcap,
kprrel, kprrel, kprrel, kprrel, kprrel,
NULL, kprrel,
kprrel, NULL, kprrel,
kprrel, kprrel,
kprrel, NULL, NULL,
kprrel, kprrel, kprrel ),
@ -192,7 +192,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre, lpush2,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -201,7 +201,7 @@ NULL,
kprrel, kprrel,sshprre,sshprre,sshprre, kprrel,
lpush2,sshprre, kprrel, kprrel, kprrel, kprrel, kprrel,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),
@ -215,7 +215,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
// right hand
@ -224,7 +224,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL ),
@ -238,7 +238,7 @@ NULL,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, kprrel, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -247,7 +247,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, ktrans,
ktrans, kprrel,
ktrans, kprrel,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),
@ -267,8 +267,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
s2kcap, kprrel, kprrel, kprrel, kprrel, kprrel, lpop1,
kprrel, kprrel, kprrel, kprrel, kprrel,
kprrel, NULL,
kprrel, NULL, kprrel,
kprrel, kprrel,
kprrel, NULL, NULL,
kprrel, kprrel, kprrel,
// right hand
NULL, kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
@ -276,8 +276,8 @@ NULL,
kprrel, kprrel, kprrel, kprrel, kprrel, kprrel,
lpop1, kprrel, kprrel, kprrel, kprrel, kprrel, s2kcap,
kprrel, kprrel, kprrel, kprrel, kprrel,
NULL, kprrel,
kprrel, NULL, kprrel,
kprrel, kprrel,
kprrel, NULL, NULL,
kprrel, kprrel, kprrel ),
@ -290,7 +290,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre,
ktrans, kprrel, kprrel, kprrel, kprrel,sshprre, lpop2,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -299,7 +299,7 @@ NULL,
kprrel, kprrel,sshprre,sshprre,sshprre, kprrel,
lpop2,sshprre, kprrel, kprrel, kprrel, kprrel, kprrel,
ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),
@ -313,7 +313,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
// right hand
@ -322,7 +322,7 @@ NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL ),
@ -336,7 +336,7 @@ NULL,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans, ktrans, ktrans, ktrans, ktrans,
ktrans, kprrel, ktrans, ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans,
// right hand
@ -345,7 +345,7 @@ NULL,
ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, kprrel, kprrel, ktrans,
ktrans, ktrans, kprrel, kprrel, ktrans,
ktrans, kprrel,
ktrans, kprrel,
ktrans, ktrans, ktrans,
ktrans, ktrans, ktrans ),

View File

@ -55,9 +55,9 @@
k30,k31,k32,k33,k34,k35, \
k20,k21,k22,k23,k24,k25,k26, \
k10,k11,k12,k13,k14, \
k03,k15, \
k02,k16,k05, \
k01,k04,k06, \
k05,k06, \
k15,k16,k04, \
k03,k02,k01, \
\
/* right hand, spatial positions */ \
k57,k58,k59,k5A,k5B,k5C,k5D, \
@ -65,9 +65,9 @@
k38,k39,k3A,k3B,k3C,k3D, \
k27,k28,k29,k2A,k2B,k2C,k2D, \
k19,k1A,k1B,k1C,k1D, \
k18,k0A, \
k08,k17,k0B, \
k07,k09,k0C ) \
k07,k08, \
k09,k17,k18, \
k0C,k0B,k0A ) \
\
/* matrix positions */ \
{{ na,k01,k02,k03,k04,k05,k06, k07,k08,k09,k0A,k0B,k0C, na }, \
@ -87,7 +87,7 @@
kxx,kxx,kxx,kxx,kxx,kxx, \
kxx,kxx,kxx,kxx,kxx,kxx,kxx, \
kxx,kxx,kxx,kxx,kxx, \
kxx,kxx, \
kxx,kxx, \
kxx,kxx,kxx, \
kxx,kxx,kxx, \
\
@ -96,7 +96,7 @@
kxx,kxx,kxx,kxx,kxx,kxx, \
kxx,kxx,kxx,kxx,kxx,kxx,kxx, \
kxx,kxx,kxx,kxx,kxx, \
kxx,kxx, \
kxx,kxx, \
kxx,kxx,kxx, \
kxx,kxx,kxx ) \