Skip to content

Commit

Permalink
Fix some invalid layout macros (qmk#20256)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark authored and rodrigob committed Apr 9, 2023
1 parent 8791d4f commit aaf5be7
Show file tree
Hide file tree
Showing 20 changed files with 719 additions and 1,448 deletions.
27 changes: 0 additions & 27 deletions keyboards/bastardkb/charybdis/3x5/3x5.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,4 @@
{ k60, k61, k62, k63, k64 }, \
{ k70, KC_NO, k72, KC_NO, KC_NO }, \
}

/**
* \brief Compatibility layout with the split_3x5_3 community layout.
*
* This effectively renders the Charbdis Nano compatible with existing layout
* implementations relying on the `split_3x5_3` layout, which includes, among
* others, Manna-Harbour's (@manna_harbour) Miryoku layout.
*
* The last key on the layout is ignored, to transform the input 36-keys layout
* into the Charybdis Nano's 35-keys layout.
*/
#define LAYOUT_split_3x5_3( \
k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
k32, k33, k30, k70, k72, ___ \
) \
{ \
{ k00, k01, k02, k03, k04 }, \
{ k10, k11, k12, k13, k14 }, \
{ k20, k21, k22, k23, k24 }, \
{ k30, KC_NO, k32, k33, KC_NO }, \
{ k40, k41, k42, k43, k44 }, \
{ k50, k51, k52, k53, k54 }, \
{ k60, k61, k62, k63, k64 }, \
{ k70, KC_NO, k72, KC_NO, KC_NO }, \
}
// clang-format on
41 changes: 0 additions & 41 deletions keyboards/bastardkb/charybdis/3x5/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"pid": "0x1832",
"vid": "0xA8F8"
},
"community_layouts": ["split_3x5_3"],
"layout_aliases": {
"LAYOUT_charybdis_3x5": "LAYOUT"
},
Expand Down Expand Up @@ -48,46 +47,6 @@
{ "label": "R30", "x": 9, "y": 3 },
{ "label": "R31", "x": 10, "y": 3 }
]
},
"LAYOUT_split_3x5_3": {
"layout": [
{ "label": "L00", "x": 0, "y": 0 },
{ "label": "L01", "x": 1, "y": 0 },
{ "label": "L02", "x": 2, "y": 0 },
{ "label": "L03", "x": 3, "y": 0 },
{ "label": "L04", "x": 4, "y": 0 },
{ "label": "R00", "x": 11, "y": 0 },
{ "label": "R01", "x": 12, "y": 0 },
{ "label": "R02", "x": 13, "y": 0 },
{ "label": "R03", "x": 14, "y": 0 },
{ "label": "R04", "x": 15, "y": 0 },
{ "label": "L10", "x": 0, "y": 1 },
{ "label": "L11", "x": 1, "y": 1 },
{ "label": "L12", "x": 2, "y": 1 },
{ "label": "L13", "x": 3, "y": 1 },
{ "label": "L14", "x": 4, "y": 1 },
{ "label": "R10", "x": 11, "y": 1 },
{ "label": "R11", "x": 12, "y": 1 },
{ "label": "R12", "x": 13, "y": 1 },
{ "label": "R13", "x": 14, "y": 1 },
{ "label": "R14", "x": 15, "y": 1 },
{ "label": "L20", "x": 0, "y": 2 },
{ "label": "L21", "x": 1, "y": 2 },
{ "label": "L22", "x": 2, "y": 2 },
{ "label": "L23", "x": 3, "y": 2 },
{ "label": "L24", "x": 4, "y": 2 },
{ "label": "R20", "x": 11, "y": 2 },
{ "label": "R21", "x": 12, "y": 2 },
{ "label": "R22", "x": 13, "y": 2 },
{ "label": "R23", "x": 14, "y": 2 },
{ "label": "R24", "x": 15, "y": 2 },
{ "label": "L30", "x": 4, "y": 3 },
{ "label": "L31", "x": 5, "y": 3 },
{ "label": "L32", "x": 6, "y": 3 },
{ "label": "R30", "x": 9, "y": 3 },
{ "label": "R31", "x": 10, "y": 3 },
{ "label": "R32", "x": 11, "y": 3 }
]
}
}
}
23 changes: 0 additions & 23 deletions keyboards/bastardkb/charybdis/3x6/3x6.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,4 @@
{ k60, k61, k62, k63, k64, k65 }, \
{ KC_NO, k71, KC_NO, k73, KC_NO, KC_NO }, \
}

/**
* \brief Compatibility layout with the split_3x5_6 community layout.
*
* This effectively renders the Charbdis Nano compatible with existing layout
* implementations relying on the `split_3x6_3` layout.
*/
#define LAYOUT_split_3x6_3( \
k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \
k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \
k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \
k33, k34, k31, k71, k73, ___ \
) \
{ \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ KC_NO, k31, KC_NO, k33, k34, KC_NO }, \
{ k40, k41, k42, k43, k44, k45 }, \
{ k50, k51, k52, k53, k54, k55 }, \
{ k60, k61, k62, k63, k64, k65 }, \
{ KC_NO, k71, KC_NO, k73, KC_NO, KC_NO }, \
}
// clang-format on
47 changes: 0 additions & 47 deletions keyboards/bastardkb/charybdis/3x6/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"usb": {
"pid": "0x1834"
},
"community_layouts": ["split_3x6_3"],
"layout_aliases": {
"LAYOUT_charybdis_3x6": "LAYOUT"
},
Expand Down Expand Up @@ -52,52 +51,6 @@
{ "label": "R31", "x": 9, "y": 3 },
{ "label": "R33", "x": 10, "y": 3 }
]
},
"LAYOUT_split_3x6_3": {
"layout": [
{ "label": "L00", "x": 0, "y": 0 },
{ "label": "L01", "x": 1, "y": 0 },
{ "label": "L02", "x": 2, "y": 0 },
{ "label": "L03", "x": 3, "y": 0 },
{ "label": "L04", "x": 4, "y": 0 },
{ "label": "L05", "x": 5, "y": 0 },
{ "label": "R00", "x": 11, "y": 0 },
{ "label": "R01", "x": 12, "y": 0 },
{ "label": "R02", "x": 13, "y": 0 },
{ "label": "R03", "x": 14, "y": 0 },
{ "label": "R04", "x": 15, "y": 0 },
{ "label": "R05", "x": 16, "y": 0 },
{ "label": "L10", "x": 0, "y": 1 },
{ "label": "L11", "x": 1, "y": 1 },
{ "label": "L12", "x": 2, "y": 1 },
{ "label": "L13", "x": 3, "y": 1 },
{ "label": "L14", "x": 4, "y": 1 },
{ "label": "L15", "x": 5, "y": 1 },
{ "label": "R10", "x": 11, "y": 1 },
{ "label": "R11", "x": 12, "y": 1 },
{ "label": "R12", "x": 13, "y": 1 },
{ "label": "R13", "x": 14, "y": 1 },
{ "label": "R14", "x": 15, "y": 1 },
{ "label": "R15", "x": 16, "y": 1 },
{ "label": "L20", "x": 0, "y": 2 },
{ "label": "L21", "x": 1, "y": 2 },
{ "label": "L22", "x": 2, "y": 2 },
{ "label": "L23", "x": 3, "y": 2 },
{ "label": "L24", "x": 4, "y": 2 },
{ "label": "L25", "x": 5, "y": 2 },
{ "label": "R20", "x": 11, "y": 2 },
{ "label": "R21", "x": 12, "y": 2 },
{ "label": "R22", "x": 13, "y": 2 },
{ "label": "R23", "x": 14, "y": 2 },
{ "label": "R24", "x": 15, "y": 2 },
{ "label": "R25", "x": 16, "y": 2 },
{ "label": "L33", "x": 5, "y": 3 },
{ "label": "L34", "x": 6, "y": 3 },
{ "label": "L31", "x": 7, "y": 3 },
{ "label": "R33", "x": 9, "y": 3 },
{ "label": "R34", "x": 10, "y": 3 },
{ "label": "R31", "x": 11, "y": 3 }
]
}
}
}
Loading

0 comments on commit aaf5be7

Please sign in to comment.