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 single LAYOUTs to data driven #20365

Merged
merged 32 commits into from
Apr 12, 2023
Merged

Move single LAYOUTs to data driven #20365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
7b43693
Move single `LAYOUT`s to data driven, 0-9
fauxpark Apr 8, 2023
73429d3
Move single `LAYOUT`s to data driven, A
fauxpark Apr 8, 2023
68cdfe0
Move single `LAYOUT`s to data driven, B
fauxpark Apr 8, 2023
7bf9421
Move single `LAYOUT`s to data driven, C
fauxpark Apr 8, 2023
96f86d3
Move single `LAYOUT`s to data driven, D
fauxpark Apr 8, 2023
82bca7a
Move single `LAYOUT`s to data driven, E
fauxpark Apr 8, 2023
26bba82
Move single `LAYOUT`s to data driven, F
fauxpark Apr 8, 2023
b01c495
Move single `LAYOUT`s to data driven, G
fauxpark Apr 8, 2023
6dcc7c8
Move single `LAYOUT`s to data driven, H
fauxpark Apr 8, 2023
4726d5d
Move single `LAYOUT`s to data driven, handwired
fauxpark Apr 8, 2023
c60470d
Move single `LAYOUT`s to data driven, I
fauxpark Apr 8, 2023
7ad686d
Move single `LAYOUT`s to data driven, J
fauxpark Apr 8, 2023
b81e155
Move single `LAYOUT`s to data driven, K
fauxpark Apr 8, 2023
61e082c
Move single `LAYOUT`s to data driven, L
fauxpark Apr 8, 2023
837ced5
Move single `LAYOUT`s to data driven, M
fauxpark Apr 8, 2023
3864963
Move single `LAYOUT`s to data driven, N
fauxpark Apr 8, 2023
a3e5d71
Move single `LAYOUT`s to data driven, O
fauxpark Apr 8, 2023
6502970
Move single `LAYOUT`s to data driven, P
fauxpark Apr 8, 2023
2e1d48b
Move single `LAYOUT`s to data driven, Q
fauxpark Apr 8, 2023
46f1a90
Move single `LAYOUT`s to data driven, R
fauxpark Apr 8, 2023
ac87529
Move single `LAYOUT`s to data driven, S
fauxpark Apr 8, 2023
268df4a
Move single `LAYOUT`s to data driven, T
fauxpark Apr 8, 2023
43282c6
Move single `LAYOUT`s to data driven, U
fauxpark Apr 8, 2023
6f4a5d9
Move single `LAYOUT`s to data driven, V
fauxpark Apr 8, 2023
0a7ce96
Move single `LAYOUT`s to data driven, W
fauxpark Apr 8, 2023
8ac0dfc
Move single `LAYOUT`s to data driven, X
fauxpark Apr 8, 2023
aa5efc9
Move single `LAYOUT`s to data driven, Y
fauxpark Apr 8, 2023
afbbb9e
Fix build failures
fauxpark Apr 8, 2023
b6f7623
Merge branch 'develop' into dd-single-layouts
fauxpark Apr 8, 2023
3307439
More build fixes
fauxpark Apr 8, 2023
3486a2e
Fix mino_plus layout
fauxpark Apr 9, 2023
4e0cab4
typo
fauxpark Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
47 changes: 0 additions & 47 deletions keyboards/25keys/aleth42/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,5 @@
"usb": {
"vid": "0x04D8",
"pid": "0xEAC8"
},
"layouts": {
"LAYOUT": {
"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":10, "y":0},
{"x":11, "y":0},
{"x":0, "y":1, "w":1.25},
{"x":1.25, "y":1},
{"x":2.25, "y":1},
{"x":3.25, "y":1},
{"x":4.25, "y":1},
{"x":5.25, "y":1},
{"x":6.25, "y":1},
{"x":7.25, "y":1},
{"x":8.25, "y":1},
{"x":9.25, "y":1},
{"x":10.25, "y":1, "w":1.75},
{"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2},
{"x":2.75, "y":2},
{"x":3.75, "y":2},
{"x":4.75, "y":2},
{"x":5.75, "y":2},
{"x":6.75, "y":2},
{"x":7.75, "y":2},
{"x":8.75, "y":2},
{"x":9.75, "y":2},
{"x":10.75, "y":2, "w":1.25},
{"x":0, "y":3, "w":1.25},
{"x":1.25, "y":3},
{"x":2.25, "y":3, "w":1.25},
{"x":3.5, "y":3, "w":2.75},
{"x":6.25, "y":3, "w":2.25},
{"x":8.5, "y":3, "w":1.25},
{"x":9.75, "y":3},
{"x":10.75, "y":3, "w":1.25}]
}
}
}
53 changes: 52 additions & 1 deletion keyboards/25keys/aleth42/rev0/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,56 @@
"pin": "C7"
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu"
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
{"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": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [3, 10], "x": 11, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"matrix": [1, 1], "x": 1.25, "y": 1},
{"matrix": [1, 2], "x": 2.25, "y": 1},
{"matrix": [1, 3], "x": 3.25, "y": 1},
{"matrix": [1, 4], "x": 4.25, "y": 1},
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1},
{"matrix": [1, 7], "x": 7.25, "y": 1},
{"matrix": [1, 8], "x": 8.25, "y": 1},
{"matrix": [1, 9], "x": 9.25, "y": 1},
{"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},

{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},

{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3},
{"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
{"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
{"matrix": [3, 4], "x": 6.25, "y": 3, "w": 2.25},
{"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
{"matrix": [3, 6], "x": 9.75, "y": 3},
{"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
}
54 changes: 0 additions & 54 deletions keyboards/25keys/aleth42/rev0/rev0.h
View file
Open in desktop

This file was deleted.

53 changes: 52 additions & 1 deletion keyboards/25keys/aleth42/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,56 @@
"breathing": true
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
{"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": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [3, 10], "x": 11, "y": 0},

{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"matrix": [1, 1], "x": 1.25, "y": 1},
{"matrix": [1, 2], "x": 2.25, "y": 1},
{"matrix": [1, 3], "x": 3.25, "y": 1},
{"matrix": [1, 4], "x": 4.25, "y": 1},
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1},
{"matrix": [1, 7], "x": 7.25, "y": 1},
{"matrix": [1, 8], "x": 8.25, "y": 1},
{"matrix": [1, 9], "x": 9.25, "y": 1},
{"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75},

{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},

{"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
{"matrix": [3, 1], "x": 1.25, "y": 3},
{"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
{"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75},
{"matrix": [3, 4], "x": 6.25, "y": 3, "w": 2.25},
{"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25},
{"matrix": [3, 6], "x": 9.75, "y": 3},
{"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
}
54 changes: 0 additions & 54 deletions keyboards/25keys/aleth42/rev1/rev1.h
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions keyboards/30wer/30wer.h
View file
Open in desktop

This file was deleted.

78 changes: 40 additions & 38 deletions keyboards/30wer/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,44 +18,46 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Tab", "x":0, "y":0},
{"label":"Q", "x":1, "y":0},
{"label":"W", "x":2, "y":0},
{"label":"E", "x":3, "y":0},
{"label":"R", "x":4, "y":0},
{"label":"T", "x":5, "y":0},
{"label":"Y", "x":6, "y":0},
{"label":"U", "x":7, "y":0},
{"label":"I", "x":8, "y":0},
{"label":"O", "x":9, "y":0},
{"label":"P", "x":10, "y":0},
{"label":"Bksp", "x":11, "y":0},
{"label":"Delete", "x":12, "y":0, "w":1.25},
{"label":"Ctrl", "x":0, "y":1, "w":1.25},
{"label":"A", "x":1.25, "y":1},
{"label":"S", "x":2.25, "y":1},
{"label":"D", "x":3.25, "y":1},
{"label":"F", "x":4.25, "y":1},
{"label":"G", "x":5.25, "y":1},
{"label":"H", "x":6.25, "y":1},
{"label":"J", "x":7.25, "y":1},
{"label":"K", "x":8.25, "y":1},
{"label":"L", "x":9.25, "y":1},
{"label":":", "x":10.25, "y":1},
{"label":"\"", "x":11.25, "y":1},
{"label":"Enter", "x":12.25, "y":1},
{"label":"Shift", "x":0, "y":2, "w":1.75},
{"label":"Z", "x":1.75, "y":2},
{"label":"X", "x":2.75, "y":2},
{"label":"C", "x":3.75, "y":2},
{"label":"V", "x":4.75, "y":2},
{"label":"B", "x":5.75, "y":2},
{"label":"N", "x":6.75, "y":2},
{"label":"M", "x":7.75, "y":2},
{"label":"<", "x":8.75, "y":2},
{"label":">", "x":9.75, "y":2},
{"label":"?", "x":10.75, "y":2},
{"label":"Space", "x":11.75, "y":2, "w":1.5}
{"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": [0, 5], "x": 5, "y": 0},
{"matrix": [0, 6], "x": 6, "y": 0},
{"matrix": [0, 7], "x": 7, "y": 0},
{"matrix": [0, 8], "x": 8, "y": 0},
{"matrix": [0, 9], "x": 9, "y": 0},
{"matrix": [0, 10], "x": 10, "y": 0},
{"matrix": [0, 11], "x": 11, "y": 0},
{"matrix": [0, 12], "x": 12, "y": 0, "w": 1.25},

{"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
{"matrix": [1, 1], "x": 1.25, "y": 1},
{"matrix": [1, 2], "x": 2.25, "y": 1},
{"matrix": [1, 3], "x": 3.25, "y": 1},
{"matrix": [1, 4], "x": 4.25, "y": 1},
{"matrix": [1, 5], "x": 5.25, "y": 1},
{"matrix": [1, 6], "x": 6.25, "y": 1},
{"matrix": [1, 7], "x": 7.25, "y": 1},
{"matrix": [1, 8], "x": 8.25, "y": 1},
{"matrix": [1, 9], "x": 9.25, "y": 1},
{"matrix": [1, 10], "x": 10.25, "y": 1},
{"matrix": [1, 11], "x": 11.25, "y": 1},
{"matrix": [1, 12], "x": 12.25, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 1], "x": 1.75, "y": 2},
{"matrix": [2, 2], "x": 2.75, "y": 2},
{"matrix": [2, 3], "x": 3.75, "y": 2},
{"matrix": [2, 4], "x": 4.75, "y": 2},
{"matrix": [2, 5], "x": 5.75, "y": 2},
{"matrix": [2, 6], "x": 6.75, "y": 2},
{"matrix": [2, 7], "x": 7.75, "y": 2},
{"matrix": [2, 8], "x": 8.75, "y": 2},
{"matrix": [2, 9], "x": 9.75, "y": 2},
{"matrix": [2, 10], "x": 10.75, "y": 2},
{"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.5}
]
}
}
Expand Down
Loading