Update treadstone48/rev2 info.json (#10241)
* Keyboard: add treeadstone48 * rename layout defines * Use of pragma once * move common include code * fixed info.json * change keymap layout from kc to normal * fix alpha revision keymap * fixed info.json * remove USE_Link_Time_Optimization * Updated treadstone48 info.json file * remove kc define * Nested layout macro 1/2 * Nested layout macro 2/2
This commit is contained in:
marksard
GitHub
parent
ae7a076964
commit
4e3a96ff3e
@ -66,26 +66,24 @@
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75 \
|
||||
) \
|
||||
LAYOUT_full( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N \
|
||||
)
|
||||
|
||||
// Used to create a keymap using only KC_ prefixed keys
|
||||
#define LAYOUT_base_kc( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75 \
|
||||
) \
|
||||
LAYOUT_base( \
|
||||
KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, \
|
||||
KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L50, KC_##L51, KC_##L52, KC_##L53, KC_##L54, KC_##L55, \
|
||||
KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L60, KC_##L61, KC_##L62, KC_##L63, KC_##L64, KC_##L65, \
|
||||
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L70, KC_##L71, KC_##L72, KC_##L73, KC_##L74, KC_##L75 \
|
||||
)
|
||||
{ \
|
||||
{ L45, L44, L43, L42, L41, L40 }, \
|
||||
{ L55, L54, L53, L52, L51, L50 }, \
|
||||
{ L65, L64, L63, L62, L61, L60 }, \
|
||||
{ L75, L74, L73, L72, L71, L70 }, \
|
||||
{ L05, L04, L03, L02, L01, L00 }, \
|
||||
{ L15, L14, L13, L12, L11, L10 }, \
|
||||
{ L25, L24, L23, L22, L21, L20 }, \
|
||||
{ L35, L34, L33, L32, L31, L30 }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@ -99,12 +97,24 @@
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, R70, R71, R72, R73, R74, L75 \
|
||||
) \
|
||||
LAYOUT_full( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R44, R43, R42, R41, R40, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R54, R53, R52, R51, R50, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R64, R63, R62, R61, R60, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R74, R73, R72, R71, R70 \
|
||||
)
|
||||
{ \
|
||||
{ L45, L44, L43, L42, L41, L40 }, \
|
||||
{ L55, L54, L53, L52, L51, L50 }, \
|
||||
{ L65, L64, L63, L62, L61, L60 }, \
|
||||
{ L75, L74, L73, L72, L71, L70 }, \
|
||||
{ L05, L04, L03, L02, L01, L00 }, \
|
||||
{ L15, L14, L13, L12, L11, L10 }, \
|
||||
{ L25, L24, L23, L22, L21, L20 }, \
|
||||
{ L35, L34, L33, L32, L31, L30 }, \
|
||||
{ R40, R41, R42, R43, R44, K_N }, \
|
||||
{ R50, R51, R52, R53, R54, K_N }, \
|
||||
{ R60, R61, R62, R63, R64, K_N }, \
|
||||
{ R70, R71, R72, R73, R74, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
}
|
||||
|
||||
// When use right hand side of the Rhymestone.
|
||||
#ifdef RHYMESTONE_RIGHTHAND
|
||||
@ -115,27 +125,25 @@
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, R70, R71, R72, R73, R74, L75 \
|
||||
) \
|
||||
LAYOUT_full( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R40, R41, R42, R43, R44, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R50, R51, R52, R53, R54, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R60, R61, R62, R63, R64, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R70, R71, R72, R73, R74 \
|
||||
)
|
||||
{ \
|
||||
{ L45, L44, L43, L42, L41, L40 }, \
|
||||
{ L55, L54, L53, L52, L51, L50 }, \
|
||||
{ L65, L64, L63, L62, L61, L60 }, \
|
||||
{ L75, L74, L73, L72, L71, L70 }, \
|
||||
{ L05, L04, L03, L02, L01, L00 }, \
|
||||
{ L15, L14, L13, L12, L11, L10 }, \
|
||||
{ L25, L24, L23, L22, L21, L20 }, \
|
||||
{ L35, L34, L33, L32, L31, L30 }, \
|
||||
{ R44, R43, R42, R41, R40, K_N }, \
|
||||
{ R54, R53, R52, R51, R50, K_N }, \
|
||||
{ R64, R63, R62, R61, R60, K_N }, \
|
||||
{ R74, R73, R72, R71, R70, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
}
|
||||
#endif
|
||||
|
||||
// Used to create a keymap using only KC_ prefixed keys
|
||||
#define LAYOUT_rs_kc( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, R70, R71, R72, R73, R74 \
|
||||
) \
|
||||
LAYOUT_rs( \
|
||||
KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, \
|
||||
KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L50, KC_##L51, KC_##L52, KC_##L53, KC_##L54, KC_##L55, KC_##R50, KC_##R51, KC_##R52, KC_##R53, KC_##R54, \
|
||||
KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L60, KC_##L61, KC_##L62, KC_##L63, KC_##L64, KC_##L65, KC_##R60, KC_##R61, KC_##R62, KC_##R63, KC_##R64, \
|
||||
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L70, KC_##L71, KC_##L72, KC_##L73, KC_##L74, KC_##L75, KC_##R70, KC_##R71, KC_##R72, KC_##R73, KC_##R74 \
|
||||
)
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@ -146,9 +154,7 @@
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
#ifdef ANGELINA_KEYMAP
|
||||
#undef LAYOUT_base
|
||||
#undef LAYOUT_base_kc
|
||||
#undef LAYOUT_rs
|
||||
#undef LAYOUT_rs_kc
|
||||
|
||||
#define LAYOUT_base( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
|
||||
@ -156,26 +162,25 @@
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
|
||||
L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, L30 \
|
||||
) \
|
||||
LAYOUT_full( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N, K_N \
|
||||
)
|
||||
{ \
|
||||
{ L45, L44, L43, L42, L41, L40 }, \
|
||||
{ L55, L54, L53, L52, L51, L50 }, \
|
||||
{ L65, L64, L63, L62, L61, L60 }, \
|
||||
{ L75, L74, L73, L72, L71, L70 }, \
|
||||
{ L05, L04, L03, L02, L01, L00 }, \
|
||||
{ L15, L14, L13, L12, L11, L10 }, \
|
||||
{ L25, L24, L23, L22, L21, L20 }, \
|
||||
{ L35, L34, L33, L32, L31, L30 }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
}
|
||||
|
||||
// Used to create a keymap using only KC_ prefixed keys
|
||||
#define LAYOUT_base_kc( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75 \
|
||||
) \
|
||||
LAYOUT_base( \
|
||||
KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, \
|
||||
KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L50, KC_##L51, KC_##L52, KC_##L53, KC_##L54, KC_##L55, \
|
||||
KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L60, KC_##L61, KC_##L62, KC_##L63, KC_##L64, KC_##L65, \
|
||||
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L70, KC_##L71, KC_##L72, KC_##L73, KC_##L74, KC_##L75 \
|
||||
)
|
||||
|
||||
#define LAYOUT_rs( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, \
|
||||
@ -183,26 +188,23 @@
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
|
||||
L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, R70, R71, R72, R73, R74, L30 \
|
||||
) \
|
||||
LAYOUT_full( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R44, R43, R42, R41, R40, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R54, R53, R52, R51, R50, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R64, R63, R62, R61, R60, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, K_N, K_N, K_N, K_N, K_N, K_N, K_N, R74, R73, R72, R71, R70 \
|
||||
)
|
||||
|
||||
// Used to create a keymap using only KC_ prefixed keys
|
||||
#define LAYOUT_rs_kc( \
|
||||
L00, L01, L02, L03, L04, L05, L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, \
|
||||
L10, L11, L12, L13, L14, L15, L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, \
|
||||
L20, L21, L22, L23, L24, L25, L60, L61, L62, L63, L64, L65, R60, R61, R62, R63, R64, \
|
||||
L30, L31, L32, L33, L34, L35, L70, L71, L72, L73, L74, L75, R70, R71, R72, R73, R74 \
|
||||
) \
|
||||
LAYOUT_rs( \
|
||||
KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, \
|
||||
KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##L50, KC_##L51, KC_##L52, KC_##L53, KC_##L54, KC_##L55, KC_##R50, KC_##R51, KC_##R52, KC_##R53, KC_##R54, \
|
||||
KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##L60, KC_##L61, KC_##L62, KC_##L63, KC_##L64, KC_##L65, KC_##R60, KC_##R61, KC_##R62, KC_##R63, KC_##R64, \
|
||||
KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##L70, KC_##L71, KC_##L72, KC_##L73, KC_##L74, KC_##L75, KC_##R70, KC_##R71, KC_##R72, KC_##R73, KC_##R74 \
|
||||
)
|
||||
|
||||
{ \
|
||||
{ L45, L44, L43, L42, L41, L40 }, \
|
||||
{ L55, L54, L53, L52, L51, L50 }, \
|
||||
{ L65, L64, L63, L62, L61, L60 }, \
|
||||
{ L75, L74, L73, L72, L71, L70 }, \
|
||||
{ L05, L04, L03, L02, L01, L00 }, \
|
||||
{ L15, L14, L13, L12, L11, L10 }, \
|
||||
{ L25, L24, L23, L22, L21, L20 }, \
|
||||
{ L35, L34, L33, L32, L31, L30 }, \
|
||||
{ R40, R41, R42, R43, R44, K_N }, \
|
||||
{ R50, R51, R52, R53, R54, K_N }, \
|
||||
{ R60, R61, R62, R63, R64, K_N }, \
|
||||
{ R70, R71, R72, R73, R74, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
{ K_N, K_N, K_N, K_N, K_N, K_N }, \
|
||||
}
|
||||
#endif
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -63,9 +63,10 @@
|
||||
"y": 0
|
||||
},
|
||||
{
|
||||
"label": "-",
|
||||
"x": 13.75,
|
||||
"y": 0
|
||||
"label": "Backspace",
|
||||
"x": 12.75,
|
||||
"y": 0,
|
||||
"w": 2
|
||||
},
|
||||
{
|
||||
"label": "Tab",
|
||||
@ -190,6 +191,11 @@
|
||||
"x": 12.75,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "Shift",
|
||||
"x": 13.75,
|
||||
"y": 2
|
||||
},
|
||||
{
|
||||
"label": "Ctrl",
|
||||
"x": 0.75,
|
||||
@ -214,12 +220,13 @@
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "BackSpace",
|
||||
"label": "Backspace",
|
||||
"x": 5.5,
|
||||
"y": 3,
|
||||
"w": 2
|
||||
},
|
||||
{
|
||||
"label": "Space",
|
||||
"x": 7.5,
|
||||
"y": 3,
|
||||
"w": 2
|
||||
@ -249,11 +256,6 @@
|
||||
"label": "\u2192",
|
||||
"x": 13.75,
|
||||
"y": 3
|
||||
},
|
||||
{
|
||||
"label": "_",
|
||||
"x": 12.75,
|
||||
"y": 0
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user