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 small macropad-ish layouts to data driven #20341

Merged
merged 2 commits into from
Apr 5, 2023
Merged

Move small macropad-ish layouts to data driven #20341

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
2068ff1
Move small macropad-ish layouts to data driven
fauxpark Apr 4, 2023
05cbe9f
`handwired/arrow_pad`: move `pad_21` layout to keymap
fauxpark Apr 5, 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
  •  
  •  
  •  
30 changes: 0 additions & 30 deletions keyboards/10bleoledhub/10bleoledhub.h
View file
Open in desktop

This file was deleted.

23 changes: 13 additions & 10 deletions keyboards/10bleoledhub/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,19 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8},
{"label":"7", "x":0, "y":1},
{"label":"8", "x":1, "y":1},
{"label":"9", "x":2, "y":1},
{"label":"4", "x":0, "y":2},
{"label":"5", "x":1, "y":2},
{"label":"6", "x":2, "y":2},
{"label":"1", "x":0, "y":3},
{"label":"2", "x":1, "y":3},
{"label":"3", "x":2, "y":3}
{"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8},

{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},

{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3}
]
}
}
Expand Down
12 changes: 0 additions & 12 deletions keyboards/2key2crawl/2key2crawl.h
View file
Open in desktop

This file was deleted.

23 changes: 12 additions & 11 deletions keyboards/2key2crawl/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,19 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00", "x":0, "y":0},
{"label":"K01", "x":1, "y":0},
{"label":"K02", "x":2, "y":0},
{"label":"K03", "x":3, "y":0},
{"label":"K15", "x":4, "y":0},
{"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": [1, 5], "x": 4, "y": 0},

{"label":"K10", "x":0, "y":1},
{"label":"K11", "x":1, "y":1},
{"label":"K12", "x":2, "y":1},
{"label":"K13", "x":3, "y":1},
{"label":"K14", "x":4, "y":1},
{"label":"K16", "x":5.5, "y":0.5}
{"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": [1, 6], "x": 5.5, "y": 0.5}
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion keyboards/3keyecosystem/2key2/2key2.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 "2key2.h"
#include "quantum.h"

// RGB Matrix configuration
// based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration
Expand Down
33 changes: 0 additions & 33 deletions keyboards/3keyecosystem/2key2/2key2.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions keyboards/3keyecosystem/2key2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"layouts": {
"LAYOUT": {
"layout": [
{"label": "k00", "x": 0, "y": 0},
{"label": "k01", "x": 1, "y": 0}
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0}
]
}
}
Expand Down
70 changes: 0 additions & 70 deletions keyboards/4by3/4by3.h
View file
Open in desktop

This file was deleted.

58 changes: 47 additions & 11 deletions keyboards/4by3/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,64 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
"LAYOUT": "LAYOUT_horizontal"
},
"layouts": {
"LAYOUT_horizontal": {
"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 },
{ "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, { "x": 3, "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": [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": [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}
]
},
"LAYOUT_vertical_right": {
"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": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
{"matrix": [2, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [0, 0], "x": 2, "y": 0},

{"matrix": [2, 1], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [0, 1], "x": 2, "y": 1},

{"matrix": [2, 2], "x": 0, "y": 2},
{"matrix": [1, 2], "x": 1, "y": 2},
{"matrix": [0, 2], "x": 2, "y": 2},

{"matrix": [2, 3], "x": 0, "y": 3},
{"matrix": [1, 3], "x": 1, "y": 3},
{"matrix": [0, 3], "x": 2, "y": 3}
]
},
"LAYOUT_vertical_left": {
"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": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 }
{"matrix": [0, 3], "x": 0, "y": 0},
{"matrix": [1, 3], "x": 1, "y": 0},
{"matrix": [2, 3], "x": 2, "y": 0},

{"matrix": [0, 2], "x": 0, "y": 1},
{"matrix": [1, 2], "x": 1, "y": 1},
{"matrix": [2, 2], "x": 2, "y": 1},

{"matrix": [0, 1], "x": 0, "y": 2},
{"matrix": [1, 1], "x": 1, "y": 2},
{"matrix": [2, 1], "x": 2, "y": 2},

{"matrix": [0, 0], "x": 0, "y": 3},
{"matrix": [1, 0], "x": 1, "y": 3},
{"matrix": [2, 0], "x": 2, "y": 3}
]
}
}
Expand Down
13 changes: 0 additions & 13 deletions keyboards/9key/9key.h
View file
Open in desktop

This file was deleted.

14 changes: 13 additions & 1 deletion keyboards/9key/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,19 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]
"layout": [
{"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},

{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2}
]
}
}
}
10 changes: 9 additions & 1 deletion keyboards/abstract/ellipse/rev1/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,15 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]
"layout": [
{"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.25},
{"matrix": [1, 1], "x": 1, "y": 1.25},
{"matrix": [1, 2], "x": 2, "y": 1.25}
]
}
}
}
36 changes: 0 additions & 36 deletions keyboards/abstract/ellipse/rev1/rev1.h
View file
Open in desktop

This file was deleted.

Loading