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

Move layouts for direct_pins boards to data driven #19872

Merged
merged 3 commits into from
Feb 19, 2023
Merged

Move layouts for direct_pins boards to data driven #19872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39210f6
Move layouts for direct_pins boards to data driven
fauxpark Feb 17, 2023
8ccace3
Found a couple more
fauxpark Feb 17, 2023
31a377a
Fix wrong matrix col for choconum
fauxpark Feb 19, 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
2 changes: 1 addition & 1 deletion keyboards/0xcb/1337/1337.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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/>.
*/
#include "1337.h"
#include "quantum.h"

void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
Expand Down
40 changes: 0 additions & 40 deletions keyboards/0xcb/1337/1337.h
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions keyboards/0xcb/1337/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"layouts": {
"LAYOUT": {
"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},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2}
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":0, "y":2, "matrix": [2, 0]},
{"x":1, "y":2, "matrix": [2, 1]},
{"x":2, "y":2, "matrix": [2, 2]}
]
}
}
Expand Down
16 changes: 8 additions & 8 deletions keyboards/0xcb/tutelpad/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "k03", "x": 0, "y": 0},
{"label": "k02", "x": 1, "y": 0},
{"label": "k01", "x": 2, "y": 0},
{"label": "k00", "x": 3, "y": 0},
{"x": 0, "y": 0, "matrix": [0, 0]},
{"x": 1, "y": 0, "matrix": [0, 1]},
{"x": 2, "y": 0, "matrix": [0, 2]},
{"x": 3, "y": 0, "matrix": [0, 3]},

{"label": "k13", "x": 0, "y": 1},
{"label": "k12", "x": 1, "y": 1},
{"label": "k11", "x": 2, "y": 1},
{"label": "k10", "x": 3, "y": 1}
{"x": 0, "y": 1, "matrix": [1, 0]},
{"x": 1, "y": 1, "matrix": [1, 1]},
{"x": 2, "y": 1, "matrix": [1, 2]},
{"x": 3, "y": 1, "matrix": [1, 3]}
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion keyboards/0xcb/tutelpad/tutelpad.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "tutelpad.h"
#include "quantum.h"

#ifdef OLED_ENABLE

Expand Down
35 changes: 0 additions & 35 deletions keyboards/0xcb/tutelpad/tutelpad.h
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions keyboards/1k/1k.c
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions keyboards/1k/1k.h
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion keyboards/1k/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"layouts": {
"LAYOUT_ortho_1x1": {
"layout": [
{"x":0, "y":0}
{"x":0, "y":0, "matrix": [0, 0]}
]
}
}
Expand Down
16 changes: 0 additions & 16 deletions keyboards/25keys/cassette42/cassette42.c
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions keyboards/25keys/cassette42/cassette42.h
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion keyboards/25keys/cassette42/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,14 @@
},
"layouts": {
"LAYOUT": {
"layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}]
"layout": [
{"x":0.5, "y":0.75, "matrix": [0, 4]},
{"x":2.5, "y":0.75, "matrix": [0, 5]},
{"x":0, "y":1.75, "matrix": [0, 0]},
{"x":1, "y":1.75, "matrix": [0, 1]},
{"x":2, "y":1.75, "matrix": [0, 2]},
{"x":3, "y":1.75, "matrix": [0, 3]}
]
}
}
}
2 changes: 1 addition & 1 deletion keyboards/40percentclub/4pack/4pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "4pack.h"
#include "quantum.h"

// Optional override functions below.
// You can leave any or all of these undefined.
Expand Down
33 changes: 0 additions & 33 deletions keyboards/40percentclub/4pack/4pack.h
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion keyboards/40percentclub/4pack/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@
},
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
"layout": [
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":3, "y":0, "matrix": [0, 3]}
]
}
}
}
14 changes: 13 additions & 1 deletion keyboards/40percentclub/nano/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,21 @@
["D1", "D0", "D4", "C6"]
]
},
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_2x4"
},
"layouts": {
"LAYOUT_ortho_2x4": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
"layout": [
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":3, "y":0, "matrix": [0, 3]},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":3, "y":1, "matrix": [1, 3]}
]
}
}
}
1 change: 0 additions & 1 deletion keyboards/40percentclub/nano/nano.c
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions keyboards/40percentclub/nano/nano.h
View file
Open in desktop

This file was deleted.

18 changes: 9 additions & 9 deletions keyboards/40percentclub/nein/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"layouts": {
"LAYOUT_ortho_3x3": {
"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},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2}
{"x":0, "y":0, "matrix": [0, 0]},
{"x":1, "y":0, "matrix": [0, 1]},
{"x":2, "y":0, "matrix": [0, 2]},
{"x":0, "y":1, "matrix": [1, 0]},
{"x":1, "y":1, "matrix": [1, 1]},
{"x":2, "y":1, "matrix": [1, 2]},
{"x":0, "y":2, "matrix": [2, 0]},
{"x":1, "y":2, "matrix": [2, 1]},
{"x":2, "y":2, "matrix": [2, 2]}
]
}
}
Expand Down
Loading