Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove FLIP_HALF layouts and move to data driven #20588

Merged
merged 2 commits into from
Apr 29, 2023
Merged

Remove FLIP_HALF layouts and move to data driven #20588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f08ca9f
Remove `FLIP_HALF` layouts and move to data driven
fauxpark Apr 27, 2023
6ef8870
typo
fauxpark Apr 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions keyboards/40percentclub/25/25.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,69 +16,6 @@
#pragma once

#include "quantum.h"
#define ___ KC_NO

#ifndef FLIP_HALF
#define LAYOUT_ortho_5x10( \
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, \
L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \
L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ L30, L31, L32, L33, L34 }, \
{ L40, L41, L42, L43, L44 }, \
{ R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 }, \
{ R34, R33, R32, R31, R30 }, \
{ R44, R43, R42, R41, R40 } \
}
#else
#define LAYOUT_ortho_5x10( \
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, \
L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \
L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ L30, L31, L32, L33, L34 }, \
{ L40, L41, L42, L43, L44 }, \
{ R00, R01, R02, R03, R04 }, \
{ R10, R11, R12, R13, R14 }, \
{ R20, R21, R22, R23, R24 }, \
{ R30, R31, R32, R33, R34 }, \
{ R40, R41, R42, R43, R44 } \
}
#endif

#define LAYOUT_ortho_5x5( \
L00, L01, L02, L03, L04, \
L10, L11, L12, L13, L14, \
L20, L21, L22, L23, L24, \
L30, L31, L32, L33, L34, \
L40, L41, L42, L43, L44 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ L30, L31, L32, L33, L34 }, \
{ L40, L41, L42, L43, L44 }, \
{ ___, ___, ___, ___, ___ }, \
{ ___, ___, ___, ___, ___ }, \
{ ___, ___, ___, ___, ___ }, \
{ ___, ___, ___, ___, ___ }, \
{ ___, ___, ___, ___, ___ } \
}

#define LAYOUT_macro LAYOUT_ortho_5x5
#define LAYOUT_split LAYOUT_ortho_5x10

#ifdef USE_I2C
#error "I2C not Supported"
Expand Down
101 changes: 89 additions & 12 deletions keyboards/40percentclub/25/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,101 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_5x5", "ortho_5x10"],
"layout_aliases": {
"LAYOUT_macro": "LAYOUT_ortho_5x5",
"LAYOUT_split": "LAYOUT_ortho_5x10"
},
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2},
{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3},
{"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}
]
{"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": [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": [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": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4}
]
},
"LAYOUT_ortho_5x10": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0},
{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1},
{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2},
{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3},
{"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}
]
{"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": [5, 4], "x": 5, "y": 0},
{"matrix": [5, 3], "x": 6, "y": 0},
{"matrix": [5, 2], "x": 7, "y": 0},
{"matrix": [5, 1], "x": 8, "y": 0},
{"matrix": [5, 0], "x": 9, "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": [6, 4], "x": 5, "y": 1},
{"matrix": [6, 3], "x": 6, "y": 1},
{"matrix": [6, 2], "x": 7, "y": 1},
{"matrix": [6, 1], "x": 8, "y": 1},
{"matrix": [6, 0], "x": 9, "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": [7, 4], "x": 5, "y": 2},
{"matrix": [7, 3], "x": 6, "y": 2},
{"matrix": [7, 2], "x": 7, "y": 2},
{"matrix": [7, 1], "x": 8, "y": 2},
{"matrix": [7, 0], "x": 9, "y": 2},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [8, 4], "x": 5, "y": 3},
{"matrix": [8, 3], "x": 6, "y": 3},
{"matrix": [8, 2], "x": 7, "y": 3},
{"matrix": [8, 1], "x": 8, "y": 3},
{"matrix": [8, 0], "x": 9, "y": 3},

{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4},
{"matrix": [9, 4], "x": 5, "y": 4},
{"matrix": [9, 3], "x": 6, "y": 4},
{"matrix": [9, 2], "x": 7, "y": 4},
{"matrix": [9, 1], "x": 8, "y": 4},
{"matrix": [9, 0], "x": 9, "y": 4}
]
}
}
}
36 changes: 0 additions & 36 deletions keyboards/40percentclub/6lit/6lit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,42 +16,6 @@
#pragma once

#include "quantum.h"
#define ___ KC_NO

#ifndef FLIP_HALF
#define LAYOUT_ortho_2x6( \
L00, L01, L02, R00, R01, R02, \
L10, L11, L12, R10, R11, R12 \
) { \
{ L00, L01, L02 }, \
{ L10, L11, L12 }, \
{ R02, R01, R00 }, \
{ R12, R11, R10 }, \
}
#else
#define LAYOUT_ortho_2x6( \
L00, L01, L02, R00, R01, R02, \
L10, L11, L12, R10, R11, R12 \
) { \
{ L00, L01, L02 }, \
{ L10, L11, L12 }, \
{ R00, R01, R02 }, \
{ R10, R11, R12 }, \
}
#endif

#define LAYOUT_ortho_2x3( \
L00, L01, L02, \
L10, L11, L12 \
) { \
{ L00, L01, L02 }, \
{ L10, L11, L12 }, \
{ ___, ___, ___ }, \
{ ___, ___, ___ }, \
}

#define LAYOUT_macro LAYOUT_ortho_2x3
#define LAYOUT_split LAYOUT_ortho_2x6

#ifdef USE_I2C
#error "I2C not Supported"
Expand Down
28 changes: 24 additions & 4 deletions keyboards/40percentclub/6lit/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,37 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_2x3", "ortho_2x6"],
"layout_aliases": {
"LAYOUT_macro": "LAYOUT_ortho_2x3",
"LAYOUT_split": "LAYOUT_ortho_2x6"
},
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1}
]
},
"LAYOUT_ortho_2x6": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [2, 2], "x": 3, "y": 0},
{"matrix": [2, 1], "x": 4, "y": 0},
{"matrix": [2, 0], "x": 5, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [3, 2], "x": 3, "y": 1},
{"matrix": [3, 1], "x": 4, "y": 1},
{"matrix": [3, 0], "x": 5, "y": 1}
]
}
}
Expand Down
45 changes: 0 additions & 45 deletions keyboards/40percentclub/foobar/foobar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,6 @@
#pragma once

#include "quantum.h"
#define ___ KC_NO

#ifndef FLIP_HALF
#define LAYOUT_ortho_3x10( \
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 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ R04, R03, R02, R01, R00 }, \
{ R14, R13, R12, R11, R10 }, \
{ R24, R23, R22, R21, R20 } \
}
#else
#define LAYOUT_ortho_3x10( \
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 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ R00, R01, R02, R03, R04 }, \
{ R10, R11, R12, R13, R14 }, \
{ R20, R21, R22, R23, R24 } \
}
#endif

#define LAYOUT_ortho_3x5( \
L00, L01, L02, L03, L04, \
L10, L11, L12, L13, L14, \
L20, L21, L22, L23, L24 \
) { \
{ L00, L01, L02, L03, L04 }, \
{ L10, L11, L12, L13, L14 }, \
{ L20, L21, L22, L23, L24 }, \
{ ___, ___, ___, ___, ___ }, \
{ ___, ___, ___, ___, ___ }, \
{ ___, ___, ___, ___, ___ } \
}

#define LAYOUT_macro LAYOUT_ortho_3x5
#define LAYOUT_split LAYOUT_ortho_3x10

#ifdef USE_I2C
#error "I2C not Supported"
Expand Down
59 changes: 53 additions & 6 deletions keyboards/40percentclub/foobar/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,66 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_3x10"],
"layout_aliases": {
"LAYOUT_macro": "LAYOUT_ortho_3x5",
"LAYOUT_split": "LAYOUT_ortho_3x10"
},
"layouts": {
"LAYOUT_ortho_3x5": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}
{"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": [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": [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}
]
},
"LAYOUT_ortho_3x10": {
"layout": [
{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0},
{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1},
{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}
{"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": [3, 4], "x": 5, "y": 0},
{"matrix": [3, 3], "x": 6, "y": 0},
{"matrix": [3, 2], "x": 7, "y": 0},
{"matrix": [3, 1], "x": 8, "y": 0},
{"matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1},
{"matrix": [4, 3], "x": 6, "y": 1},
{"matrix": [4, 2], "x": 7, "y": 1},
{"matrix": [4, 1], "x": 8, "y": 1},
{"matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2},
{"matrix": [5, 3], "x": 6, "y": 2},
{"matrix": [5, 2], "x": 7, "y": 2},
{"matrix": [5, 1], "x": 8, "y": 2},
{"matrix": [5, 0], "x": 9, "y": 2}
]
}
}
Expand Down
Loading