From dc692cc4998d5257f451ad4ff9bc69f655e6ab62 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 8 Apr 2023 09:02:34 +0100 Subject: [PATCH 1/3] Added Miryoku support - added LAYOUT_split_3x5_3 to following variants: - 4x5 - 4x5_5 - 4x6 - 4x6_5 - 5x6 - 5x6_5 - removed keymap Manna-harbour_miryoku from all variants where present. --- keyboards/handwired/dactyl_manuform/4x5/4x5.h | 22 ++++++++++++++++ .../keymaps/manna-harbour_miryoku/config.h | 24 ------------------ .../keymaps/manna-harbour_miryoku/keymap.c | 4 --- .../handwired/dactyl_manuform/4x5_5/4x5_5.h | 23 +++++++++++++++++ keyboards/handwired/dactyl_manuform/4x6/4x6.h | 22 ++++++++++++++++ .../keymaps/manna-harbour_miryoku/config.h | 24 ------------------ .../keymaps/manna-harbour_miryoku/keymap.c | 4 --- .../handwired/dactyl_manuform/4x6_5/4x6_5.h | 21 ++++++++++++++++ .../keymaps/manna-harbour_miryoku/config.h | 24 ------------------ .../keymaps/manna-harbour_miryoku/keymap.c | 5 ---- keyboards/handwired/dactyl_manuform/5x6/5x6.h | 25 +++++++++++++++++++ .../keymaps/manna-harbour_miryoku/config.h | 25 ------------------- .../keymaps/manna-harbour_miryoku/keymap.c | 4 --- .../handwired/dactyl_manuform/5x6_5/5x6_5.h | 23 +++++++++++++++++ 14 files changed, 136 insertions(+), 114 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h delete mode 100644 keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h index e410c2246624..6abe0fb299a6 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h +++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.h @@ -49,3 +49,25 @@ { XXX, L41, L42, L43, L44 } \ } #endif + +#define LAYOUT_split_3x5_3( \ + L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ + L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ + L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ + XXX, XXX, XXX, XXX, \ + L33, L34, R30, R31, \ + L44, XXX, XXX, R40, \ + XXX, XXX, XXX, XXX \ +) { \ + { L00, L01, L02, L03, L04 }, \ + { L10, L11, L12, L13, L14 }, \ + { L20, L21, L22, L23, L24 }, \ + { XXX, XXX, XXX, L33, L34 }, \ + { XXX, XXX, XXX, XXX, L44 }, \ +\ + { R04, R03, R02, R01, R00 }, \ + { R14, R13, R12, R11, R10 }, \ + { R24, R23, R22, R21, R20 }, \ + { XXX, R33, XXX, R31, R30 }, \ + { XXX, XXX, XXX, XXX, R40 } \ +} \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h deleted file mode 100644 index 3860a696c886..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/config.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -#pragma once - -#define XXX KC_NO - -#define LAYOUT_miryoku(\ -K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ -K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ -K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ -N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ -)\ -LAYOUT( \ -K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ -K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ -K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ - XXX, XXX, XXX, XXX, \ - K32, K33, K36, K37, \ - K34, XXX, XXX, K35, \ - XXX, XXX, XXX, XXX \ -) diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c deleted file mode 100644 index dbab7f982043..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/manna-harbour_miryoku/keymap.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h index d2790473b50f..2a126e448bd8 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h +++ b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h @@ -27,3 +27,26 @@ { R30, R31, R32, R33, XXX }, \ { R40, R41, R42, XXX, XXX }, \ } + +#define LAYOUT_split_3x5_3( \ + L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ + L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ + L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ + XXX, XXX, XXX, XXX, \ + L33, R31, \ + L34, L44, R40, R30, \ + XXX, XXX, XXX, XXX \ + ) \ + { \ + { L00, L01, L02, L03, L04 }, \ + { L10, L11, L12, L13, L14 }, \ + { L20, L21, L22, L23, L24 }, \ + { XXX, XXX, XXX, L33, L34 }, \ + { XXX, XXX, XXX, XXX, L44 }, \ +\ + { R00, R01, R02, R03, R04 }, \ + { R10, R11, R12, R13, R14 }, \ + { R20, R21, R22, R23, R24 }, \ + { R30, R31, XXX, XXX, XXX }, \ + { R40, XXX, XXX, XXX, XXX }, \ +} diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h index 99b11a712a4c..322b0309ddae 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h +++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.h @@ -25,3 +25,25 @@ { R30, R31, R32, R33, XXX, XXX }, \ { R40, R41, R42, R43, XXX, XXX } \ } + +#define LAYOUT_split_3x5_3( \ + XXX, L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, XXX, \ + XXX, L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, XXX, \ + XXX, L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, XXX, \ + XXX, XXX, XXX, XXX, \ + L33, L34, R30, R31, \ + L43, XXX, XXX, R41, \ + XXX, XXX, XXX, XXX \ +) { \ + { XXX, L00, L01, L02, L03, L04 }, \ + { XXX, L10, L11, L12, L13, L14 }, \ + { XXX, L20, L21, L22, L23, L24,}, \ + { XXX, XXX, XXX, XXX, L33, L34 }, \ + { XXX, XXX, XXX, XXX, L43, XXX }, \ +\ + { R00, R01, R02, R03, R04, XXX }, \ + { R10, R11, R12, R13, R14, XXX }, \ + { R20, R21, R22, R23, R24, XXX }, \ + { R30, R31, XXX, XXX, XXX, XXX }, \ + { XXX, R41, XXX, XXX, XXX, XXX } \ +} \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h deleted file mode 100644 index f50033a04632..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/config.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -#pragma once - -#define XXX KC_NO - -#define LAYOUT_miryoku(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ -) \ -LAYOUT( \ -XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \ -XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \ -XXX, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, XXX, \ - XXX, XXX, XXX, XXX, \ - K32, K33, K36, K37, \ - K34, XXX, XXX, K35, \ - XXX, XXX, XXX, XXX \ -) diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c deleted file mode 100644 index dbab7f982043..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/manna-harbour_miryoku/keymap.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h index df639cbf2273..3601166d0936 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h +++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h @@ -24,3 +24,24 @@ { XXX, R31, R32, R33, XXX, XXX }, \ { R40, R41, R42, R43, XXX, XXX } \ } + +#define LAYOUT_split_3x5_3( \ + XXX, L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, XXX, \ + XXX, L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, XXX, \ + XXX, L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, XXX, \ + XXX, XXX, XXX, XXX, \ + L33, L44, L42, R42, R40, R31, \ + XXX, XXX, XXX, XXX \ +) { \ + { XXX, L00, L01, L02, L03, L04 }, \ + { XXX, L10, L11, L12, L13, L14 }, \ + { XXX, L20, L21, L22, L23, L24 }, \ + { XXX, XXX, XXX, XXX, L33, XXX }, \ + { XXX, XXX, XXX, L42, XXX, L44 }, \ +\ + { R00, R01, R02, R03, R04, XXX }, \ + { R10, R11, R12, R13, R14, XXX }, \ + { R20, R21, R22, R23, R24, XXX }, \ + { XXX, R31, XXX, XXX, XXX, XXX }, \ + { R40, XXX, R42, XXX, XXX, XXX } \ +} \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h deleted file mode 100644 index 9532d1f67c6b..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/config.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku -// generated -*- buffer-read-only: t -*- - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -#pragma once - -#define XXX KC_NO - -#define LAYOUT_miryoku(\ -K00, K01, K02, K03, K04, K05, K06, K07, K08, K09,\ -K10, K11, K12, K13, K14, K15, K16, K17, K18, K19,\ -K20, K21, K22, K23, K24, K25, K26, K27, K28, K29,\ -N30, N31, K32, K33, K34, K35, K36, K37, N38, N39\ -)\ -LAYOUT( \ -XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \ -XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \ -XXX, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, XXX, \ - XXX, XXX, XXX, XXX, \ - K32, K33, K34, K35, K36, K37, \ - XXX, XXX, XXX, XXX \ -) diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c deleted file mode 100644 index 7c5717a0fee0..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/keymaps/manna-harbour_miryoku/keymap.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku -// generated -*- buffer-read-only: t -*- - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h index ebc959ddf1f5..e123d3747c5d 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h +++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.h @@ -28,3 +28,28 @@ { R40, R41, R42, R43, XXX, XXX }, \ { R50, R51, R52, R53, XXX, XXX } \ } + +#define LAYOUT_split_3x5_3( \ + XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, \ + XXX, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, XXX, \ + XXX, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, XXX, \ + XXX, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, XXX, \ + XXX, XXX, XXX, XXX, \ + L44, L45, R40, R41, \ + L54, XXX, XXX, R51, \ + XXX, XXX, XXX, XXX \ +) { \ + { XXX, XXX, XXX, XXX, XXX, XXX }, \ + { XXX, L11, L12, L13, L14, L15 }, \ + { XXX, L21, L22, L23, L24, L25 }, \ + { XXX, L31, L32, L33, L34, L35 }, \ + { XXX, XXX, XXX, XXX, L44, L45 }, \ + { XXX, XXX, XXX, XXX, L54, XXX }, \ +\ + { XXX, XXX, XXX, XXX, XXX, XXX }, \ + { R10, R11, R12, R13, R14, XXX }, \ + { R20, R21, R22, R23, R24, XXX }, \ + { R30, R31, R32, R33, R34, XXX }, \ + { R40, R41, XXX, XXX, XXX, XXX }, \ + { XXX, R51, XXX, XXX, XXX, XXX } \ +} \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h deleted file mode 100644 index a213d43d3940..000000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/config.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . - -#pragma once - -#define XXX KC_NO - -#define LAYOUT_miryoku(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ -) \ -LAYOUT_5x6( \ -XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, \ -XXX, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, XXX, \ -XXX, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, XXX, \ -XXX, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, XXX, \ - XXX, XXX, XXX, XXX, \ - K32, K33, K36, K37, \ - K34, XXX, XXX, K35, \ - XXX, XXX, XXX, XXX \ -) diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c deleted file mode 100644 index dbab7f982043..000000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/manna-harbour_miryoku/keymap.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2019 Manna Harbour -// https://github.com/manna-harbour/miryoku - -// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h index 31794265853f..32060be17f95 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h @@ -26,3 +26,26 @@ { XXX, R41, R42, R43, XXX, XXX }, \ { R50, R51, R52, R53, XXX, XXX } \ } + +#define LAYOUT_split_3x5_3( \ + XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, \ + XXX, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, XXX, \ + XXX, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, XXX, \ + XXX, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, XXX, \ + XXX, XXX, L44, L55, L53, R52, R50, R41, XXX, XXX, \ + XXX, XXX, XXX, XXX \ +) { \ + { XXX, XXX, XXX, XXX, XXX, XXX }, \ + { XXX, L11, L12, L13, L14, L15 }, \ + { XXX, L21, L22, L23, L24, L25 }, \ + { XXX, L31, L32, L33, L34, L35 }, \ + { XXX, XXX, XXX, XXX, L44, XXX }, \ + { XXX, XXX, XXX, L53, XXX, L55 }, \ +\ + { XXX, XXX, XXX, XXX, XXX, XXX }, \ + { R10, R11, R12, R13, R14, XXX }, \ + { R20, R21, R22, R23, R24, XXX }, \ + { R30, R31, R32, R33, R34, XXX }, \ + { XXX, R41, XXX, XXX, XXX, XXX }, \ + { R50, XXX, R52, XXX, XXX, XXX } \ +} \ No newline at end of file From 1aa9910a09336b0e84f015deb6be227836dc4fc0 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 8 Apr 2023 09:22:51 +0100 Subject: [PATCH 2/3] Changes to be committed: modified: keyboards/handwired/dactyl_manuform/4x5/4x5.h modified: keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h modified: keyboards/handwired/dactyl_manuform/4x6/4x6.h modified: keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h modified: keyboards/handwired/dactyl_manuform/5x6/5x6.h modified: keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h --- keyboards/handwired/dactyl_manuform/4x5/4x5.h | 4 +--- keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h | 2 -- keyboards/handwired/dactyl_manuform/4x6/4x6.h | 12 +++++------- keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h | 10 ++++------ keyboards/handwired/dactyl_manuform/5x6/5x6.h | 13 +++++-------- keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h | 10 ++++------ 6 files changed, 19 insertions(+), 32 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h index 6abe0fb299a6..03b465e9c2f5 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h +++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.h @@ -54,10 +54,8 @@ L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - XXX, XXX, XXX, XXX, \ L33, L34, R30, R31, \ - L44, XXX, XXX, R40, \ - XXX, XXX, XXX, XXX \ + L44, R40, \ ) { \ { L00, L01, L02, L03, L04 }, \ { L10, L11, L12, L13, L14 }, \ diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h index 2a126e448bd8..5ce1862f754a 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h +++ b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h @@ -32,10 +32,8 @@ L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - XXX, XXX, XXX, XXX, \ L33, R31, \ L34, L44, R40, R30, \ - XXX, XXX, XXX, XXX \ ) \ { \ { L00, L01, L02, L03, L04 }, \ diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h index 322b0309ddae..22347ddac61a 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h +++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.h @@ -27,13 +27,11 @@ } #define LAYOUT_split_3x5_3( \ - XXX, L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, XXX, \ - XXX, L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, XXX, \ - XXX, L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, XXX, \ - XXX, XXX, XXX, XXX, \ - L33, L34, R30, R31, \ - L43, XXX, XXX, R41, \ - XXX, XXX, XXX, XXX \ + L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ + L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ + L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ + L33, L34, R30, R31, \ + L43, R41, \ ) { \ { XXX, L00, L01, L02, L03, L04 }, \ { XXX, L10, L11, L12, L13, L14 }, \ diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h index 3601166d0936..a8eeb664938b 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h +++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h @@ -26,12 +26,10 @@ } #define LAYOUT_split_3x5_3( \ - XXX, L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, XXX, \ - XXX, L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, XXX, \ - XXX, L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, XXX, \ - XXX, XXX, XXX, XXX, \ - L33, L44, L42, R42, R40, R31, \ - XXX, XXX, XXX, XXX \ + L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ + L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ + L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ + L33, L44, L42, R42, R40, R31, \ ) { \ { XXX, L00, L01, L02, L03, L04 }, \ { XXX, L10, L11, L12, L13, L14 }, \ diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h index e123d3747c5d..c1c2760d6f07 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h +++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.h @@ -30,14 +30,11 @@ } #define LAYOUT_split_3x5_3( \ - XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, \ - XXX, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, XXX, \ - XXX, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, XXX, \ - XXX, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, XXX, \ - XXX, XXX, XXX, XXX, \ - L44, L45, R40, R41, \ - L54, XXX, XXX, R51, \ - XXX, XXX, XXX, XXX \ + L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \ + L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, \ + L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, \ + L44, L45, R40, R41, \ + L54, R51, \ ) { \ { XXX, XXX, XXX, XXX, XXX, XXX }, \ { XXX, L11, L12, L13, L14, L15 }, \ diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h index 32060be17f95..f8d20340e486 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h @@ -28,12 +28,10 @@ } #define LAYOUT_split_3x5_3( \ - XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, \ - XXX, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, XXX, \ - XXX, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, XXX, \ - XXX, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, XXX, \ - XXX, XXX, L44, L55, L53, R52, R50, R41, XXX, XXX, \ - XXX, XXX, XXX, XXX \ + L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, \ + L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, \ + L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, \ + L44, L55, L53, R52, R50, R41 \ ) { \ { XXX, XXX, XXX, XXX, XXX, XXX }, \ { XXX, L11, L12, L13, L14, L15 }, \ From cabdd508f699095deb78a791a4423427a2195159 Mon Sep 17 00:00:00 2001 From: Duncan Sutherland Date: Sat, 8 Apr 2023 09:33:38 +0100 Subject: [PATCH 3/3] Changes to be committed: modified: keyboards/handwired/dactyl_manuform/4x5/4x5.c modified: keyboards/handwired/dactyl_manuform/4x5/4x5.h modified: keyboards/handwired/dactyl_manuform/4x6/4x6.c modified: keyboards/handwired/dactyl_manuform/4x6/4x6.h modified: keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c modified: keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h modified: keyboards/handwired/dactyl_manuform/5x6/5x6.c modified: keyboards/handwired/dactyl_manuform/5x6/5x6.h modified: keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c modified: keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h --- keyboards/handwired/dactyl_manuform/4x5/4x5.c | 18 +++++++++++++++++ keyboards/handwired/dactyl_manuform/4x5/4x5.h | 18 +++++++++++++++++ keyboards/handwired/dactyl_manuform/4x6/4x6.c | 20 ++++++++++++++++++- keyboards/handwired/dactyl_manuform/4x6/4x6.h | 18 +++++++++++++++++ .../handwired/dactyl_manuform/4x6_5/4x6_5.c | 20 ++++++++++++++++++- .../handwired/dactyl_manuform/4x6_5/4x6_5.h | 18 +++++++++++++++++ keyboards/handwired/dactyl_manuform/5x6/5x6.c | 20 ++++++++++++++++++- keyboards/handwired/dactyl_manuform/5x6/5x6.h | 18 +++++++++++++++++ .../handwired/dactyl_manuform/5x6_5/5x6_5.c | 20 ++++++++++++++++++- .../handwired/dactyl_manuform/5x6_5/5x6_5.h | 18 +++++++++++++++++ 10 files changed, 184 insertions(+), 4 deletions(-) diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.c b/keyboards/handwired/dactyl_manuform/4x5/4x5.c index 3170eb939983..2d1d2afede7a 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.c +++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.c @@ -1 +1,19 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #include "4x5.h" diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h index 03b465e9c2f5..4df79accb487 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h +++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.h @@ -1,3 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "quantum.h" diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.c b/keyboards/handwired/dactyl_manuform/4x6/4x6.c index 5e68c1a9fa2f..6411cc8932bb 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.c +++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.c @@ -1 +1,19 @@ -#include "4x6.h" +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "4x6.h" \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h index 22347ddac61a..40bc935095d4 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h +++ b/keyboards/handwired/dactyl_manuform/4x6/4x6.h @@ -1,3 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "quantum.h" diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c index a770f5ac406e..f7ff8560e6b9 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c +++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c @@ -1 +1,19 @@ -#include "4x6_5.h" +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "4x6_5.h" \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h index a8eeb664938b..2a138ca9874a 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h +++ b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h @@ -1,3 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "quantum.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.c b/keyboards/handwired/dactyl_manuform/5x6/5x6.c index 0e9d5481c475..4c30e39534d7 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.c +++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.c @@ -1 +1,19 @@ -#include "5x6.h" +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "5x6.h" \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h index c1c2760d6f07..7898ef226f6b 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h +++ b/keyboards/handwired/dactyl_manuform/5x6/5x6.h @@ -1,3 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "quantum.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c index e4ad432ccc76..b5606100b281 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c +++ b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c @@ -1 +1,19 @@ -#include "5x6_5.h" +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "5x6_5.h" \ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h index f8d20340e486..1228c896e0ec 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h +++ b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h @@ -1,3 +1,21 @@ +/* +Copyright 2012 Jun Wako +Copyright 2015 Jack Humbert + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + #pragma once #include "quantum.h"