summaryrefslogtreecommitdiff
path: root/keyboards/ristretto
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/ristretto
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/ristretto')
-rw-r--r--keyboards/ristretto/info.json103
-rw-r--r--keyboards/ristretto/ristretto.c2
-rw-r--r--keyboards/ristretto/ristretto.h31
3 files changed, 55 insertions, 81 deletions
diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json
index 5906cc9f14..3853accd9b 100644
--- a/keyboards/ristretto/info.json
+++ b/keyboards/ristretto/info.json
@@ -23,58 +23,63 @@
23 "layouts": { 23 "layouts": {
24 "LAYOUT": { 24 "LAYOUT": {
25 "layout": [ 25 "layout": [
26 {"label":"ESC", "x":0, "y":0.25}, 26 {"matrix": [0, 0], "x": 0, "y": 0.25},
27 {"label":"Q", "x":1, "y":0.25}, 27 {"matrix": [0, 1], "x": 1, "y": 0.25},
28 {"label":"W", "x":2, "y":0.25}, 28 {"matrix": [0, 2], "x": 2, "y": 0.25},
29 {"label":"E", "x":3, "y":0}, 29 {"matrix": [0, 3], "x": 3, "y": 0},
30 {"label":"R", "x":4, "y":0.25}, 30 {"matrix": [0, 4], "x": 4, "y": 0.25},
31 {"label":"T", "x":5, "y":0.25}, 31 {"matrix": [0, 5], "x": 5, "y": 0.25},
32 {"label":"Y", "x":9, "y":0.25},
33 {"label":"U", "x":10, "y":0.25},
34 {"label":"I", "x":11, "y":0},
35 {"label":"O", "x":12, "y":0.25},
36 {"label":"P", "x":13, "y":0.25},
37 {"label":"BKSP", "x":14, "y":0.25},
38 32
39 {"label":"TAB", "x":0, "y":1.25}, 33 {"matrix": [0, 7], "x": 9, "y": 0.25},
40 {"label":"A", "x":1, "y":1.25}, 34 {"matrix": [0, 8], "x": 10, "y": 0.25},
41 {"label":"S", "x":2, "y":1.25}, 35 {"matrix": [0, 9], "x": 11, "y": 0},
42 {"label":"D", "x":3, "y":1}, 36 {"matrix": [0, 10], "x": 12, "y": 0.25},
43 {"label":"F", "x":4, "y":1.25}, 37 {"matrix": [0, 11], "x": 13, "y": 0.25},
44 {"label":"G", "x":5, "y":1.25}, 38 {"matrix": [0, 12], "x": 14, "y": 0.25},
45 {"label":"H", "x":9, "y":1.25},
46 {"label":"J", "x":10, "y":1.25},
47 {"label":"K", "x":11, "y":1},
48 {"label":"L", "x":12, "y":1.25},
49 {"label":";", "x":13, "y":1.25},
50 {"label":"'", "x":14, "y":1.25},
51 39
52 {"label":"LSFT", "x":0, "y":2.25}, 40 {"matrix": [1, 0], "x": 0, "y": 1.25},
53 {"label":"Z", "x":1, "y":2.25}, 41 {"matrix": [1, 1], "x": 1, "y": 1.25},
54 {"label":"X", "x":2, "y":2.25}, 42 {"matrix": [1, 2], "x": 2, "y": 1.25},
55 {"label":"C", "x":3, "y":2}, 43 {"matrix": [1, 3], "x": 3, "y": 1},
56 {"label":"V", "x":4, "y":2.25}, 44 {"matrix": [1, 4], "x": 4, "y": 1.25},
57 {"label":"B", "x":5, "y":2.25}, 45 {"matrix": [1, 5], "x": 5, "y": 1.25},
58 {"label":"N", "x":9, "y":2.25},
59 {"label":"M", "x":10, "y":2.25},
60 {"label":"<", "x":11, "y":2},
61 {"label":">", "x":12, "y":2.25},
62 {"label":"?", "x":13, "y":2.25},
63 {"label":"ENTR", "x":14, "y":2.25},
64 46
65 {"label":"LCTL", "x":0, "y":3.25}, 47 {"matrix": [1, 7], "x": 9, "y": 1.25},
66 {"label":"LGUI", "x":1, "y":3.25}, 48 {"matrix": [1, 8], "x": 10, "y": 1.25},
67 {"label":"LALT", "x":2, "y":3.25}, 49 {"matrix": [1, 9], "x": 11, "y": 1},
68 {"label":"LOWER", "x":3, "y":3, "h":1.25}, 50 {"matrix": [1, 10], "x": 12, "y": 1.25},
69 {"label":"Enter", "x":4, "y":3.25}, 51 {"matrix": [1, 11], "x": 13, "y": 1.25},
70 {"label":"SPACE", "x":5, "y":3.25, "w":1.5}, 52 {"matrix": [1, 12], "x": 14, "y": 1.25},
71 {"label":"Rotary", "x":7, "y":3.25}, 53
72 {"label":"SPACE", "x":8.5, "y":3.25, "w":1.5}, 54 {"matrix": [2, 0], "x": 0, "y": 2.25},
73 {"label":"SHIFT", "x":10, "y":3.25}, 55 {"matrix": [2, 1], "x": 1, "y": 2.25},
74 {"label":"RAISE", "x":11, "y":3, "h":1.25}, 56 {"matrix": [2, 2], "x": 2, "y": 2.25},
75 {"label":"RALT", "x":12, "y":3.25}, 57 {"matrix": [2, 3], "x": 3, "y": 2},
76 {"label":"RGUI", "x":13, "y":3.25}, 58 {"matrix": [2, 4], "x": 4, "y": 2.25},
77 {"label":"RCTL", "x":14, "y":3.25} 59 {"matrix": [2, 5], "x": 5, "y": 2.25},
60
61 {"matrix": [2, 7], "x": 9, "y": 2.25},
62 {"matrix": [2, 8], "x": 10, "y": 2.25},
63 {"matrix": [2, 9], "x": 11, "y": 2},
64 {"matrix": [2, 10], "x": 12, "y": 2.25},
65 {"matrix": [2, 11], "x": 13, "y": 2.25},
66 {"matrix": [2, 12], "x": 14, "y": 2.25},
67
68 {"matrix": [3, 0], "x": 0, "y": 3.25},
69 {"matrix": [3, 1], "x": 1, "y": 3.25},
70 {"matrix": [3, 2], "x": 2, "y": 3.25},
71 {"matrix": [3, 3], "x": 3, "y": 3, "h": 1.25},
72 {"matrix": [3, 4], "x": 4, "y": 3.25},
73 {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 1.5},
74
75 {"matrix": [3, 6], "x": 7, "y": 3.25},
76
77 {"matrix": [3, 7], "x": 8.5, "y": 3.25, "w": 1.5},
78 {"matrix": [3, 8], "x": 10, "y": 3.25},
79 {"matrix": [3, 9], "x": 11, "y": 3, "h": 1.25},
80 {"matrix": [3, 10], "x": 12, "y": 3.25},
81 {"matrix": [3, 11], "x": 13, "y": 3.25},
82 {"matrix": [3, 12], "x": 14, "y": 3.25}
78 ] 83 ]
79 } 84 }
80 } 85 }
diff --git a/keyboards/ristretto/ristretto.c b/keyboards/ristretto/ristretto.c
index d004b3dffe..1d4ed69d0f 100644
--- a/keyboards/ristretto/ristretto.c
+++ b/keyboards/ristretto/ristretto.c
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17#include "ristretto.h" 17#include "quantum.h"
18 18
19enum layers { 19enum layers {
20 _BASE, 20 _BASE,
diff --git a/keyboards/ristretto/ristretto.h b/keyboards/ristretto/ristretto.h
deleted file mode 100644
index 66be57b18b..0000000000
--- a/keyboards/ristretto/ristretto.h
+++ /dev/null
@@ -1,31 +0,0 @@
1/* Copyright 2021 Brandon Lewis
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define LAYOUT( \
22 K000, K001, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, \
23 K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, \
24 K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, \
25 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 \
26) { \
27 {K000, K001, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012}, \
28 {K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112}, \
29 {K200, K201, K202, K203, K204, K205, KC_NO, K207, K208, K209, K210, K211, K212}, \
30 {K300, K301, K302, K303, K304, K305, K306 , K307, K308, K309, K310, K311, K312} \
31}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:37:50 +0000