Skip to content

Commit

Permalink
Move split layouts to data driven (qmk#20290)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fauxpark @coquizen
fauxpark authored and coquizen committed Jun 22, 2023
1 parent 097bb56 commit 5a2914e
Show file tree
Hide file tree
Showing 98 changed files with 2,642 additions and 3,794 deletions.
68 changes: 34 additions & 34 deletions keyboards/alt34/rev1/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,47 +19,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
{"x": 0, "y": 0.93},
{"x": 1, "y": 0.31},
{"x": 2, "y": 0},
{"x": 3, "y": 0.28},
{"x": 4, "y": 0.42},
{"matrix": [0, 0], "x": 0, "y": 0.93},
{"matrix": [0, 1], "x": 1, "y": 0.31},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0.28},
{"matrix": [0, 4], "x": 4, "y": 0.42},

{"x": 7, "y": 0.42},
{"x": 8, "y": 0.28},
{"x": 9, "y": 0},
{"x": 10, "y": 0.31},
{"x": 11, "y": 0.93},
{"matrix": [4, 4], "x": 7, "y": 0.42},
{"matrix": [4, 3], "x": 8, "y": 0.28},
{"matrix": [4, 2], "x": 9, "y": 0},
{"matrix": [4, 1], "x": 10, "y": 0.31},
{"matrix": [4, 0], "x": 11, "y": 0.93},

{"x": 0, "y": 1.93},
{"x": 1, "y": 1.31},
{"x": 2, "y": 1},
{"x": 3, "y": 1.28},
{"x": 4, "y": 1.42},
{"matrix": [1, 0], "x": 0, "y": 1.93},
{"matrix": [1, 1], "x": 1, "y": 1.31},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1.28},
{"matrix": [1, 4], "x": 4, "y": 1.42},

{"x": 7, "y": 1.42},
{"x": 8, "y": 1.28},
{"x": 9, "y": 1},
{"x": 10, "y": 1.31},
{"x": 11, "y": 1.93},
{"matrix": [5, 4], "x": 7, "y": 1.42},
{"matrix": [5, 3], "x": 8, "y": 1.28},
{"matrix": [5, 2], "x": 9, "y": 1},
{"matrix": [5, 1], "x": 10, "y": 1.31},
{"matrix": [5, 0], "x": 11, "y": 1.93},

{"x": 0, "y": 2.93},
{"x": 1, "y": 2.31},
{"x": 2, "y": 2},
{"x": 3, "y": 2.28},
{"x": 4, "y": 2.42},
{"matrix": [2, 0], "x": 0, "y": 2.93},
{"matrix": [2, 1], "x": 1, "y": 2.31},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2.28},
{"matrix": [2, 4], "x": 4, "y": 2.42},

{"x": 7, "y": 2.42},
{"x": 8, "y": 2.28},
{"x": 9, "y": 2},
{"x": 10, "y": 2.31},
{"x": 11, "y": 2.93},
{"matrix": [6, 4], "x": 7, "y": 2.42},
{"matrix": [6, 3], "x": 8, "y": 2.28},
{"matrix": [6, 2], "x": 9, "y": 2},
{"matrix": [6, 1], "x": 10, "y": 2.31},
{"matrix": [6, 0], "x": 11, "y": 2.93},

{"x": 3.5, "y": 3.45},
{"x": 4.5, "y": 3.7},
{"matrix": [3, 3], "x": 3.5, "y": 3.45},
{"matrix": [3, 4], "x": 4.5, "y": 3.7},

{"x": 6.5, "y": 3.7},
{"x": 7.5, "y": 3.45}
{"matrix": [7, 4], "x": 6.5, "y": 3.7},
{"matrix": [7, 3], "x": 7.5, "y": 3.45}
]
}
}
Expand Down
41 changes: 0 additions & 41 deletions keyboards/alt34/rev1/rev1.h
View file

This file was deleted.

37 changes: 0 additions & 37 deletions keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
View file

This file was deleted.

75 changes: 41 additions & 34 deletions keyboards/bastardkb/dilemma/3x5_2/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
39 changes: 0 additions & 39 deletions keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
View file

This file was deleted.

79 changes: 43 additions & 36 deletions keyboards/bastardkb/dilemma/3x5_3/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
]
}
}
Expand Down
10 changes: 0 additions & 10 deletions keyboards/bastardkb/dilemma/dilemma.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 5a2914e

Please sign in to comment.