sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move split layouts to data driven (#20290)

Browse Source
This commit is contained in:
Ryan
2023-04-01 13:09:53 +11:00
committed by GitHub
parent 297779385f
commit e40b6ca3b0
98 changed files with 2631 additions and 3783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
View File

@@ -1,37 +0,0 @@
/**
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* 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 <http://www.gnu.org/licenses/>.
*/
#pragma once
// clang-format off
#define LAYOUT_split_3x5_2( \
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, \
k30, k32, k72, k70 \
) \
{ \
{ k00, k01, k02, k03, k04 }, \
{ k10, k11, k12, k13, k14 }, \
{ k20, k21, k22, k23, k24 }, \
{ k30, KC_NO, k32, KC_NO, 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

75
keyboards/bastardkb/dilemma/3x5_2/info.json
View File

@@ -7,40 +7,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"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": "L32", "x": 5, "y": 3 },
{ "label": "R32", "x": 10, "y": 3 },
{ "label": "R30", "x": 11, "y": 3 }
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [4, 4], "x": 11, "y": 0},
{"matrix": [4, 3], "x": 12, "y": 0},
{"matrix": [4, 2], "x": 13, "y": 0},
{"matrix": [4, 1], "x": 14, "y": 0},
{"matrix": [4, 0], "x": 15, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [5, 4], "x": 11, "y": 1},
{"matrix": [5, 3], "x": 12, "y": 1},
{"matrix": [5, 2], "x": 13, "y": 1},
{"matrix": [5, 1], "x": 14, "y": 1},
{"matrix": [5, 0], "x": 15, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [6, 4], "x": 11, "y": 2},
{"matrix": [6, 3], "x": 12, "y": 2},
{"matrix": [6, 2], "x": 13, "y": 2},
{"matrix": [6, 1], "x": 14, "y": 2},
{"matrix": [6, 0], "x": 15, "y": 2},
{"matrix": [3, 0], "x": 4, "y": 3},
{"matrix": [3, 2], "x": 5, "y": 3},
{"matrix": [7, 2], "x": 10, "y": 3},
{"matrix": [7, 0], "x": 11, "y": 3}
]
}
}

2
keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
View File

@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "3x5_3.h"
#include "quantum.h"
/**
* LEDs index.

39
keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
View File

@@ -1,39 +0,0 @@
/**
* Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
*
* 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 <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "dilemma.h"
// clang-format off
#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, k30, k31, k71, k70, k72 \
) \
{ \
{ k00, k01, k02, k03, k04 }, \
{ k10, k11, k12, k13, k14 }, \
{ k20, k21, k22, k23, k24 }, \
{ k30, k31, k32, KC_NO, KC_NO }, \
{ k40, k41, k42, k43, k44 }, \
{ k50, k51, k52, k53, k54 }, \
{ k60, k61, k62, k63, k64 }, \
{ k70, k71, k72, KC_NO, KC_NO }, \
}
// clang-format on

79
keyboards/bastardkb/dilemma/3x5_3/info.json
View File

@@ -21,42 +21,49 @@
"layouts": {
"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": "L32", "x": 4, "y": 3 },
{ "label": "L33", "x": 5, "y": 3 },
{ "label": "L34", "x": 6, "y": 3 },
{ "label": "R32", "x": 11, "y": 3 },
{ "label": "R33", "x": 10, "y": 3 },
{ "label": "R34", "x": 9, "y": 3 }
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [4, 4], "x": 11, "y": 0},
{"matrix": [4, 3], "x": 12, "y": 0},
{"matrix": [4, 2], "x": 13, "y": 0},
{"matrix": [4, 1], "x": 14, "y": 0},
{"matrix": [4, 0], "x": 15, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [5, 4], "x": 11, "y": 1},
{"matrix": [5, 3], "x": 12, "y": 1},
{"matrix": [5, 2], "x": 13, "y": 1},
{"matrix": [5, 1], "x": 14, "y": 1},
{"matrix": [5, 0], "x": 15, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [6, 4], "x": 11, "y": 2},
{"matrix": [6, 3], "x": 12, "y": 2},
{"matrix": [6, 2], "x": 13, "y": 2},
{"matrix": [6, 1], "x": 14, "y": 2},
{"matrix": [6, 0], "x": 15, "y": 2},
{"matrix": [3, 2], "x": 4, "y": 3},
{"matrix": [3, 0], "x": 5, "y": 3},
{"matrix": [3, 1], "x": 6, "y": 3},
{"matrix": [7, 1], "x": 11, "y": 3},
{"matrix": [7, 0], "x": 10, "y": 3},
{"matrix": [7, 2], "x": 9, "y": 3}
]
}
}

10
keyboards/bastardkb/dilemma/dilemma.h
View File

@@ -17,16 +17,6 @@
#pragma once
// clang-format off
#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled)
# include "3x5_2.h"
#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3)
# include "3x5_3.h"
#else
# error "Unsuported format"
#endif
// clang-format on
#include "quantum.h"
#ifdef POINTING_DEVICE_ENABLE