summaryrefslogtreecommitdiff
path: root/keyboards/avalanche
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/avalanche
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/avalanche')
-rw-r--r--keyboards/avalanche/v1/info.json129
-rw-r--r--keyboards/avalanche/v1/v1.h29
-rw-r--r--keyboards/avalanche/v2/info.json133
-rw-r--r--keyboards/avalanche/v2/v2.h29
-rw-r--r--keyboards/avalanche/v3/info.json133
-rw-r--r--keyboards/avalanche/v3/v3.h29
-rw-r--r--keyboards/avalanche/v4/info.json133
-rw-r--r--keyboards/avalanche/v4/v4.c2
-rw-r--r--keyboards/avalanche/v4/v4.h29
9 files changed, 275 insertions, 371 deletions
diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json
index e8ce03904f..7787ae2a95 100644
--- a/keyboards/avalanche/v1/info.json
+++ b/keyboards/avalanche/v1/info.json
@@ -21,72 +21,77 @@
21 "layouts": { 21 "layouts": {
22 "LAYOUT": { 22 "LAYOUT": {
23 "layout": [ 23 "layout": [
24 {"label":"L01", "x":1, "y":0.75}, 24 {"matrix": [0, 1], "x": 1, "y": 0.75},
25 {"label":"L02", "x":2, "y":0.75}, 25 {"matrix": [0, 2], "x": 2, "y": 0.75},
26 {"label":"L03", "x":3, "y":0.25}, 26 {"matrix": [0, 3], "x": 3, "y": 0.25},
27 {"label":"L04", "x":4, "y":0}, 27 {"matrix": [0, 4], "x": 4, "y": 0},
28 {"label":"L05", "x":5, "y":0.25}, 28 {"matrix": [0, 5], "x": 5, "y": 0.25},
29 {"label":"L06", "x":6, "y":0.35}, 29 {"matrix": [0, 6], "x": 6, "y": 0.35},
30 {"label":"R06", "x":10, "y":0.35},
31 {"label":"R05", "x":11, "y":0.25},
32 {"label":"R04", "x":12, "y":0},
33 {"label":"R03", "x":13, "y":0.25},
34 {"label":"R02", "x":14, "y":0.75},
35 {"label":"R01", "x":15, "y":0.75},
36 30
37 {"label":"L11", "x":1, "y":1.75}, 31 {"matrix": [5, 6], "x": 10, "y": 0.35},
38 {"label":"L12", "x":2, "y":1.75}, 32 {"matrix": [5, 5], "x": 11, "y": 0.25},
39 {"label":"L13", "x":3, "y":1.25}, 33 {"matrix": [5, 4], "x": 12, "y": 0},
40 {"label":"L14", "x":4, "y":1}, 34 {"matrix": [5, 3], "x": 13, "y": 0.25},
41 {"label":"L15", "x":5, "y":1.25}, 35 {"matrix": [5, 2], "x": 14, "y": 0.75},
42 {"label":"L16", "x":6, "y":1.35}, 36 {"matrix": [5, 1], "x": 15, "y": 0.75},
43 {"label":"R16", "x":10, "y":1.35},
44 {"label":"R15", "x":11, "y":1.25},
45 {"label":"R14", "x":12, "y":1},
46 {"label":"R13", "x":13, "y":1.25},
47 {"label":"R12", "x":14, "y":1.75},
48 {"label":"R11", "x":15, "y":1.75},
49 37
50 {"label":"L20", "x":0, "y":2.85}, 38 {"matrix": [1, 1], "x": 1, "y": 1.75},
51 {"label":"L21", "x":1, "y":2.75}, 39 {"matrix": [1, 2], "x": 2, "y": 1.75},
52 {"label":"L22", "x":2, "y":2.75}, 40 {"matrix": [1, 3], "x": 3, "y": 1.25},
53 {"label":"L23", "x":3, "y":2.25}, 41 {"matrix": [1, 4], "x": 4, "y": 1},
54 {"label":"L24", "x":4, "y":2}, 42 {"matrix": [1, 5], "x": 5, "y": 1.25},
55 {"label":"L25", "x":5, "y":2.25}, 43 {"matrix": [1, 6], "x": 6, "y": 1.35},
56 {"label":"L26", "x":6, "y":2.35},
57 {"label":"L27", "x":7, "y":2.6},
58 {"label":"R27", "x":9, "y":2.6},
59 {"label":"R26", "x":10, "y":2.35},
60 {"label":"R25", "x":11, "y":2.25},
61 {"label":"R24", "x":12, "y":2},
62 {"label":"R23", "x":13, "y":2.25},
63 {"label":"R22", "x":14, "y":2.75},
64 {"label":"R21", "x":15, "y":2.75},
65 {"label":"R20", "x":16, "y":2.85},
66 44
67 {"label":"L31", "x":1, "y":3.75}, 45 {"matrix": [6, 6], "x": 10, "y": 1.35},
68 {"label":"L32", "x":2, "y":3.75}, 46 {"matrix": [6, 5], "x": 11, "y": 1.25},
69 {"label":"L33", "x":3, "y":3.25}, 47 {"matrix": [6, 4], "x": 12, "y": 1},
70 {"label":"L34", "x":4, "y":3}, 48 {"matrix": [6, 3], "x": 13, "y": 1.25},
71 {"label":"L35", "x":5, "y":3.25}, 49 {"matrix": [6, 2], "x": 14, "y": 1.75},
72 {"label":"L36", "x":6, "y":3.35}, 50 {"matrix": [6, 1], "x": 15, "y": 1.75},
73 {"label":"L37", "x":7, "y":3.7},
74 {"label":"R37", "x":9, "y":3.7},
75 {"label":"R36", "x":10, "y":3.35},
76 {"label":"R35", "x":11, "y":3.25},
77 {"label":"R34", "x":12, "y":3},
78 {"label":"R33", "x":13, "y":3.25},
79 {"label":"R32", "x":14, "y":3.75},
80 {"label":"R31", "x":15, "y":3.75},
81 51
82 {"label":"L44", "x":3.5, "y":4.45, "w":1.25}, 52 {"matrix": [2, 0], "x": 0, "y": 2.85},
83 {"label":"L45", "x":4.75, "y":4.4, "w":1.25}, 53 {"matrix": [2, 1], "x": 1, "y": 2.75},
84 {"label":"L46", "x":6, "y":4.45}, 54 {"matrix": [2, 2], "x": 2, "y": 2.75},
85 {"label":"L47", "x":7, "y":4.8}, 55 {"matrix": [2, 3], "x": 3, "y": 2.25},
86 {"label":"R47", "x":9, "y":4.8}, 56 {"matrix": [2, 4], "x": 4, "y": 2},
87 {"label":"R46", "x":10, "y":4.45}, 57 {"matrix": [2, 5], "x": 5, "y": 2.25},
88 {"label":"R45", "x":11, "y":4.4, "w":1.25}, 58 {"matrix": [2, 6], "x": 6, "y": 2.35},
89 {"label":"R44", "x":12.25, "y":4.45, "w":1.25} 59 {"matrix": [2, 7], "x": 7, "y": 2.6},
60
61 {"matrix": [7, 7], "x": 9, "y": 2.6},
62 {"matrix": [7, 6], "x": 10, "y": 2.35},
63 {"matrix": [7, 5], "x": 11, "y": 2.25},
64 {"matrix": [7, 4], "x": 12, "y": 2},
65 {"matrix": [7, 3], "x": 13, "y": 2.25},
66 {"matrix": [7, 2], "x": 14, "y": 2.75},
67 {"matrix": [7, 1], "x": 15, "y": 2.75},
68 {"matrix": [7, 0], "x": 16, "y": 2.85},
69
70 {"matrix": [3, 1], "x": 1, "y": 3.75},
71 {"matrix": [3, 2], "x": 2, "y": 3.75},
72 {"matrix": [3, 3], "x": 3, "y": 3.25},
73 {"matrix": [3, 4], "x": 4, "y": 3},
74 {"matrix": [3, 5], "x": 5, "y": 3.25},
75 {"matrix": [3, 6], "x": 6, "y": 3.35},
76 {"matrix": [3, 7], "x": 7, "y": 3.7},
77
78 {"matrix": [8, 7], "x": 9, "y": 3.7},
79 {"matrix": [8, 6], "x": 10, "y": 3.35},
80 {"matrix": [8, 5], "x": 11, "y": 3.25},
81 {"matrix": [8, 4], "x": 12, "y": 3},
82 {"matrix": [8, 3], "x": 13, "y": 3.25},
83 {"matrix": [8, 2], "x": 14, "y": 3.75},
84 {"matrix": [8, 1], "x": 15, "y": 3.75},
85
86 {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25},
87 {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25},
88 {"matrix": [4, 6], "x": 6, "y": 4.45},
89 {"matrix": [4, 7], "x": 7, "y": 4.8},
90
91 {"matrix": [9, 7], "x": 9, "y": 4.8},
92 {"matrix": [9, 6], "x": 10, "y": 4.45},
93 {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25},
94 {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25}
90 ] 95 ]
91 } 96 }
92 } 97 }
diff --git a/keyboards/avalanche/v1/v1.h b/keyboards/avalanche/v1/v1.h
deleted file mode 100644
index dd6c921e69..0000000000
--- a/keyboards/avalanche/v1/v1.h
+++ /dev/null
@@ -1,29 +0,0 @@
1// Copyright 2022 Vitaly Volkov (@vlkv)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8#define L__ KC_NO
9#define R__ KC_NO
10
11#define LAYOUT( \
12 L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, \
13 L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, \
14 L20, L21, L22, L23, L24, L25, L26, L27, R27, R26, R25, R24, R23, R22, R21, R20, \
15 L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, \
16 L44, L45, L46, L47, R47, R46, R45, R44 \
17) \
18{ \
19 { L__, L01, L02, L03, L04, L05, L06, L__}, \
20 { L__, L11, L12, L13, L14, L15, L16, L__}, \
21 { L20, L21, L22, L23, L24, L25, L26, L27}, \
22 { L__, L31, L32, L33, L34, L35, L36, L37}, \
23 { L__, L__, L__, L__, L44, L45, L46, L47}, \
24 { R__, R01, R02, R03, R04, R05, R06, R__}, \
25 { R__, R11, R12, R13, R14, R15, R16, R__}, \
26 { R20, R21, R22, R23, R24, R25, R26, R27}, \
27 { R__, R31, R32, R33, R34, R35, R36, R37}, \
28 { R__, R__, R__, R__, R44, R45, R46, R47} \
29}
diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json
index b7b7df5dff..92f02721de 100644
--- a/keyboards/avalanche/v2/info.json
+++ b/keyboards/avalanche/v2/info.json
@@ -29,74 +29,79 @@
29 "layouts": { 29 "layouts": {
30 "LAYOUT": { 30 "LAYOUT": {
31 "layout": [ 31 "layout": [
32 {"label":"L00", "x":1, "y":0.75}, 32 {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75},
33 {"label":"L01", "x":2, "y":0.75}, 33 {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75},
34 {"label":"L02", "x":3, "y":0.25}, 34 {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25},
35 {"label":"L03", "x":4, "y":0}, 35 {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0},
36 {"label":"L04", "x":5, "y":0.25}, 36 {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25},
37 {"label":"L05", "x":6, "y":0.35}, 37 {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35},
38 {"label":"R05", "x":10, "y":0.35},
39 {"label":"R04", "x":11, "y":0.25},
40 {"label":"R03", "x":12, "y":0},
41 {"label":"R02", "x":13, "y":0.25},
42 {"label":"R01", "x":14, "y":0.75},
43 {"label":"R00", "x":15, "y":0.75},
44 38
45 {"label":"L10", "x":1, "y":1.75}, 39 {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35},
46 {"label":"L11", "x":2, "y":1.75}, 40 {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25},
47 {"label":"L12", "x":3, "y":1.25}, 41 {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0},
48 {"label":"L13", "x":4, "y":1}, 42 {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25},
49 {"label":"L14", "x":5, "y":1.25}, 43 {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75},
50 {"label":"L15", "x":6, "y":1.35}, 44 {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75},
51 {"label":"R15", "x":10, "y":1.35},
52 {"label":"R14", "x":11, "y":1.25},
53 {"label":"R13", "x":12, "y":1},
54 {"label":"R12", "x":13, "y":1.25},
55 {"label":"R11", "x":14, "y":1.75},
56 {"label":"R10", "x":15, "y":1.75},
57 45
58 {"label":"L40", "x":0, "y":2.85}, 46 {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75},
59 {"label":"L20", "x":1, "y":2.75}, 47 {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75},
60 {"label":"L21", "x":2, "y":2.75}, 48 {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25},
61 {"label":"L22", "x":3, "y":2.25}, 49 {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1},
62 {"label":"L23", "x":4, "y":2}, 50 {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25},
63 {"label":"L24", "x":5, "y":2.25}, 51 {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35},
64 {"label":"L25", "x":6, "y":2.35},
65 {"label":"L26", "x":7, "y":2.6},
66 {"label":"R26", "x":9, "y":2.6},
67 {"label":"R25", "x":10, "y":2.35},
68 {"label":"R24", "x":11, "y":2.25},
69 {"label":"R23", "x":12, "y":2},
70 {"label":"R22", "x":13, "y":2.25},
71 {"label":"R21", "x":14, "y":2.75},
72 {"label":"R20", "x":15, "y":2.75},
73 {"label":"R40", "x":16, "y":2.85},
74 52
75 {"label":"L30", "x":1, "y":3.75}, 53 {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35},
76 {"label":"L31", "x":2, "y":3.75}, 54 {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25},
77 {"label":"L32", "x":3, "y":3.25}, 55 {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1},
78 {"label":"L33", "x":4, "y":3}, 56 {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25},
79 {"label":"L34", "x":5, "y":3.25}, 57 {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75},
80 {"label":"L35", "x":6, "y":3.35}, 58 {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75},
81 {"label":"L36", "x":7, "y":3.7},
82 {"label":"R36", "x":9, "y":3.7},
83 {"label":"R35", "x":10, "y":3.35},
84 {"label":"R34", "x":11, "y":3.25},
85 {"label":"R33", "x":12, "y":3},
86 {"label":"R32", "x":13, "y":3.25},
87 {"label":"R31", "x":14, "y":3.75},
88 {"label":"R30", "x":15, "y":3.75},
89 59
90 {"label":"L42", "x":3, "y":4.55}, 60 {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85},
91 {"label":"L43", "x":4, "y":4.45}, 61 {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75},
92 {"label":"L44", "x":5, "y":4.4}, 62 {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75},
93 {"label":"L45", "x":6, "y":4.45}, 63 {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25},
94 {"label":"L46", "x":7, "y":4.8}, 64 {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2},
95 {"label":"R46", "x":9, "y":4.8}, 65 {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25},
96 {"label":"R45", "x":10, "y":4.45}, 66 {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35},
97 {"label":"R44", "x":11, "y":4.4}, 67 {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6},
98 {"label":"R43", "x":12, "y":4.45}, 68
99 {"label":"R42", "x":13, "y":4.55} 69 {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6},
70 {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35},
71 {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25},
72 {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2},
73 {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25},
74 {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75},
75 {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75},
76 {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85},
77
78 {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75},
79 {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75},
80 {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25},
81 {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3},
82 {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25},
83 {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35},
84 {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7},
85
86 {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7},
87 {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35},
88 {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25},
89 {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3},
90 {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25},
91 {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75},
92 {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75},
93
94 {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55},
95 {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45},
96 {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4},
97 {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45},
98 {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8},
99
100 {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8},
101 {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45},
102 {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4},
103 {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45},
104 {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55}
100 ] 105 ]
101 } 106 }
102 } 107 }
diff --git a/keyboards/avalanche/v2/v2.h b/keyboards/avalanche/v2/v2.h
deleted file mode 100644
index f8319c3ef4..0000000000
--- a/keyboards/avalanche/v2/v2.h
+++ /dev/null
@@ -1,29 +0,0 @@
1// Copyright 2022 Vitaly Volkov (@vlkv)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8#define L__ KC_NO
9#define R__ KC_NO
10
11#define LAYOUT( \
12 L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
13 L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
14 L40, L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, R40, \
15 L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30, \
16 L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \
17) \
18{ \
19 { L00, L01, L02, L03, L04, L05, L__}, \
20 { L10, L11, L12, L13, L14, L15, L__}, \
21 { L20, L21, L22, L23, L24, L25, L26}, \
22 { L30, L31, L32, L33, L34, L35, L36}, \
23 { L40, L__, L42, L43, L44, L45, L46}, \
24 { R00, R01, R02, R03, R04, R05, R__}, \
25 { R10, R11, R12, R13, R14, R15, R__}, \
26 { R20, R21, R22, R23, R24, R25, R26}, \
27 { R30, R31, R32, R33, R34, R35, R36}, \
28 { R40, R__, R42, R43, R44, R45, R46} \
29}
diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json
index 20337f25c1..ed507485f5 100644
--- a/keyboards/avalanche/v3/info.json
+++ b/keyboards/avalanche/v3/info.json
@@ -29,74 +29,79 @@
29 "layouts": { 29 "layouts": {
30 "LAYOUT": { 30 "LAYOUT": {
31 "layout": [ 31 "layout": [
32 {"label":"L00", "x":1, "y":0.75}, 32 {"matrix": [0, 0], "x": 1, "y": 0.75},
33 {"label":"L01", "x":2, "y":0.75}, 33 {"matrix": [0, 1], "x": 2, "y": 0.75},
34 {"label":"L02", "x":3, "y":0.25}, 34 {"matrix": [0, 2], "x": 3, "y": 0.25},
35 {"label":"L03", "x":4, "y":0}, 35 {"matrix": [0, 3], "x": 4, "y": 0},
36 {"label":"L04", "x":5, "y":0.25}, 36 {"matrix": [0, 4], "x": 5, "y": 0.25},
37 {"label":"L05", "x":6, "y":0.35}, 37 {"matrix": [0, 5], "x": 6, "y": 0.35},
38 {"label":"R05", "x":12, "y":0.35},
39 {"label":"R04", "x":13, "y":0.25},
40 {"label":"R03", "x":14, "y":0},
41 {"label":"R02", "x":15, "y":0.25},
42 {"label":"R01", "x":16, "y":0.75},
43 {"label":"R00", "x":17, "y":0.75},
44 38
45 {"label":"L10", "x":1, "y":1.75}, 39 {"matrix": [5, 5], "x": 12, "y": 0.35},
46 {"label":"L11", "x":2, "y":1.75}, 40 {"matrix": [5, 4], "x": 13, "y": 0.25},
47 {"label":"L12", "x":3, "y":1.25}, 41 {"matrix": [5, 3], "x": 14, "y": 0},
48 {"label":"L13", "x":4, "y":1}, 42 {"matrix": [5, 2], "x": 15, "y": 0.25},
49 {"label":"L14", "x":5, "y":1.25}, 43 {"matrix": [5, 1], "x": 16, "y": 0.75},
50 {"label":"L15", "x":6, "y":1.35}, 44 {"matrix": [5, 0], "x": 17, "y": 0.75},
51 {"label":"R15", "x":12, "y":1.35},
52 {"label":"R14", "x":13, "y":1.25},
53 {"label":"R13", "x":14, "y":1},
54 {"label":"R12", "x":15, "y":1.25},
55 {"label":"R11", "x":16, "y":1.75},
56 {"label":"R10", "x":17, "y":1.75},
57 45
58 {"label":"L40", "x":0, "y":2.85}, 46 {"matrix": [1, 0], "x": 1, "y": 1.75},
59 {"label":"L20", "x":1, "y":2.75}, 47 {"matrix": [1, 1], "x": 2, "y": 1.75},
60 {"label":"L21", "x":2, "y":2.75}, 48 {"matrix": [1, 2], "x": 3, "y": 1.25},
61 {"label":"L22", "x":3, "y":2.25}, 49 {"matrix": [1, 3], "x": 4, "y": 1},
62 {"label":"L23", "x":4, "y":2}, 50 {"matrix": [1, 4], "x": 5, "y": 1.25},
63 {"label":"L24", "x":5, "y":2.25}, 51 {"matrix": [1, 5], "x": 6, "y": 1.35},
64 {"label":"L25", "x":6, "y":2.35},
65 {"label":"R25", "x":12, "y":2.35},
66 {"label":"R24", "x":13, "y":2.25},
67 {"label":"R23", "x":14, "y":2},
68 {"label":"R22", "x":15, "y":2.25},
69 {"label":"R21", "x":16, "y":2.75},
70 {"label":"R20", "x":17, "y":2.75},
71 {"label":"R40", "x":18, "y":2.85},
72 52
73 {"label":"L30", "x":1, "y":3.75}, 53 {"matrix": [6, 5], "x": 12, "y": 1.35},
74 {"label":"L31", "x":2, "y":3.75}, 54 {"matrix": [6, 4], "x": 13, "y": 1.25},
75 {"label":"L32", "x":3, "y":3.25}, 55 {"matrix": [6, 3], "x": 14, "y": 1},
76 {"label":"L33", "x":4, "y":3}, 56 {"matrix": [6, 2], "x": 15, "y": 1.25},
77 {"label":"L34", "x":5, "y":3.25}, 57 {"matrix": [6, 1], "x": 16, "y": 1.75},
78 {"label":"L35", "x":6, "y":3.35}, 58 {"matrix": [6, 0], "x": 17, "y": 1.75},
79 {"label":"L36", "x":7, "y":3.7},
80 {"label":"L26", "x":8, "y":4.05},
81 {"label":"R26", "x":10, "y":4.05},
82 {"label":"R36", "x":11, "y":3.7},
83 {"label":"R35", "x":12, "y":3.35},
84 {"label":"R34", "x":13, "y":3.25},
85 {"label":"R33", "x":14, "y":3},
86 {"label":"R32", "x":15, "y":3.25},
87 {"label":"R31", "x":16, "y":3.75},
88 {"label":"R30", "x":17, "y":3.75},
89 59
90 {"label":"L42", "x":3.4, "y":4.55}, 60 {"matrix": [4, 0], "x": 0, "y": 2.85},
91 {"label":"L43", "x":4.6, "y":4.45}, 61 {"matrix": [2, 0], "x": 1, "y": 2.75},
92 {"label":"L44", "x":5.8, "y":4.4}, 62 {"matrix": [2, 1], "x": 2, "y": 2.75},
93 {"label":"L45", "x":7, "y":4.7}, 63 {"matrix": [2, 2], "x": 3, "y": 2.25},
94 {"label":"L46", "x":8, "y":5.05}, 64 {"matrix": [2, 3], "x": 4, "y": 2},
95 {"label":"R46", "x":10, "y":5.05}, 65 {"matrix": [2, 4], "x": 5, "y": 2.25},
96 {"label":"R45", "x":11, "y":4.7}, 66 {"matrix": [2, 5], "x": 6, "y": 2.35},
97 {"label":"R44", "x":12.2, "y":4.4}, 67
98 {"label":"R43", "x":13.4, "y":4.45}, 68 {"matrix": [7, 5], "x": 12, "y": 2.35},
99 {"label":"R42", "x":14.6, "y":4.55} 69 {"matrix": [7, 4], "x": 13, "y": 2.25},
70 {"matrix": [7, 3], "x": 14, "y": 2},
71 {"matrix": [7, 2], "x": 15, "y": 2.25},
72 {"matrix": [7, 1], "x": 16, "y": 2.75},
73 {"matrix": [7, 0], "x": 17, "y": 2.75},
74 {"matrix": [9, 0], "x": 18, "y": 2.85},
75
76 {"matrix": [3, 0], "x": 1, "y": 3.75},
77 {"matrix": [3, 1], "x": 2, "y": 3.75},
78 {"matrix": [3, 2], "x": 3, "y": 3.25},
79 {"matrix": [3, 3], "x": 4, "y": 3},
80 {"matrix": [3, 4], "x": 5, "y": 3.25},
81 {"matrix": [3, 5], "x": 6, "y": 3.35},
82 {"matrix": [3, 6], "x": 7, "y": 3.7},
83 {"matrix": [2, 6], "x": 8, "y": 4.05},
84
85 {"matrix": [7, 6], "x": 10, "y": 4.05},
86 {"matrix": [8, 6], "x": 11, "y": 3.7},
87 {"matrix": [8, 5], "x": 12, "y": 3.35},
88 {"matrix": [8, 4], "x": 13, "y": 3.25},
89 {"matrix": [8, 3], "x": 14, "y": 3},
90 {"matrix": [8, 2], "x": 15, "y": 3.25},
91 {"matrix": [8, 1], "x": 16, "y": 3.75},
92 {"matrix": [8, 0], "x": 17, "y": 3.75},
93
94 {"matrix": [4, 2], "x": 3.4, "y": 4.55},
95 {"matrix": [4, 3], "x": 4.6, "y": 4.45},
96 {"matrix": [4, 4], "x": 5.8, "y": 4.4},
97 {"matrix": [4, 5], "x": 7, "y": 4.7},
98 {"matrix": [4, 6], "x": 8, "y": 5.05},
99
100 {"matrix": [9, 6], "x": 10, "y": 5.05},
101 {"matrix": [9, 5], "x": 11, "y": 4.7},
102 {"matrix": [9, 4], "x": 12.2, "y": 4.4},
103 {"matrix": [9, 3], "x": 13.4, "y": 4.45},
104 {"matrix": [9, 2], "x": 14.6, "y": 4.55}
100 ] 105 ]
101 } 106 }
102 } 107 }
diff --git a/keyboards/avalanche/v3/v3.h b/keyboards/avalanche/v3/v3.h
deleted file mode 100644
index 426f979e9b..0000000000
--- a/keyboards/avalanche/v3/v3.h
+++ /dev/null
@@ -1,29 +0,0 @@
1// Copyright 2022 Vitaly Volkov (@vlkv)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8#define L__ KC_NO
9#define R__ KC_NO
10
11#define LAYOUT( \
12 L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
13 L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
14 L40, L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, R40, \
15 L30, L31, L32, L33, L34, L35, L36, L26, R26, R36, R35, R34, R33, R32, R31, R30, \
16 L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \
17) \
18{ \
19 { L00, L01, L02, L03, L04, L05, L__}, \
20 { L10, L11, L12, L13, L14, L15, L__}, \
21 { L20, L21, L22, L23, L24, L25, L26}, \
22 { L30, L31, L32, L33, L34, L35, L36}, \
23 { L40, L__, L42, L43, L44, L45, L46}, \
24 { R00, R01, R02, R03, R04, R05, R__}, \
25 { R10, R11, R12, R13, R14, R15, R__}, \
26 { R20, R21, R22, R23, R24, R25, R26}, \
27 { R30, R31, R32, R33, R34, R35, R36}, \
28 { R40, R__, R42, R43, R44, R45, R46} \
29}
diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json
index 786d11588a..85ff0c16fe 100644
--- a/keyboards/avalanche/v4/info.json
+++ b/keyboards/avalanche/v4/info.json
@@ -29,74 +29,79 @@
29 "layouts": { 29 "layouts": {
30 "LAYOUT": { 30 "LAYOUT": {
31 "layout": [ 31 "layout": [
32 {"label":"L00", "x":1, "y":0.75}, 32 {"matrix": [0, 0], "x": 1, "y": 0.75},
33 {"label":"L01", "x":2, "y":0.75}, 33 {"matrix": [0, 1], "x": 2, "y": 0.75},
34 {"label":"L02", "x":3, "y":0.25}, 34 {"matrix": [0, 2], "x": 3, "y": 0.25},
35 {"label":"L03", "x":4, "y":0}, 35 {"matrix": [0, 3], "x": 4, "y": 0},
36 {"label":"L04", "x":5, "y":0.25}, 36 {"matrix": [0, 4], "x": 5, "y": 0.25},
37 {"label":"L05", "x":6, "y":0.35}, 37 {"matrix": [0, 5], "x": 6, "y": 0.35},
38 {"label":"R05", "x":12, "y":0.35},
39 {"label":"R04", "x":13, "y":0.25},
40 {"label":"R03", "x":14, "y":0},
41 {"label":"R02", "x":15, "y":0.25},
42 {"label":"R01", "x":16, "y":0.75},
43 {"label":"R00", "x":17, "y":0.75},
44 38
45 {"label":"L10", "x":1, "y":1.75}, 39 {"matrix": [5, 5], "x": 12, "y": 0.35},
46 {"label":"L11", "x":2, "y":1.75}, 40 {"matrix": [5, 4], "x": 13, "y": 0.25},
47 {"label":"L12", "x":3, "y":1.25}, 41 {"matrix": [5, 3], "x": 14, "y": 0},
48 {"label":"L13", "x":4, "y":1}, 42 {"matrix": [5, 2], "x": 15, "y": 0.25},
49 {"label":"L14", "x":5, "y":1.25}, 43 {"matrix": [5, 1], "x": 16, "y": 0.75},
50 {"label":"L15", "x":6, "y":1.35}, 44 {"matrix": [5, 0], "x": 17, "y": 0.75},
51 {"label":"R15", "x":12, "y":1.35},
52 {"label":"R14", "x":13, "y":1.25},
53 {"label":"R13", "x":14, "y":1},
54 {"label":"R12", "x":15, "y":1.25},
55 {"label":"R11", "x":16, "y":1.75},
56 {"label":"R10", "x":17, "y":1.75},
57 45
58 {"label":"L40", "x":0, "y":2.85}, 46 {"matrix": [1, 0], "x": 1, "y": 1.75},
59 {"label":"L20", "x":1, "y":2.75}, 47 {"matrix": [1, 1], "x": 2, "y": 1.75},
60 {"label":"L21", "x":2, "y":2.75}, 48 {"matrix": [1, 2], "x": 3, "y": 1.25},
61 {"label":"L22", "x":3, "y":2.25}, 49 {"matrix": [1, 3], "x": 4, "y": 1},
62 {"label":"L23", "x":4, "y":2}, 50 {"matrix": [1, 4], "x": 5, "y": 1.25},
63 {"label":"L24", "x":5, "y":2.25}, 51 {"matrix": [1, 5], "x": 6, "y": 1.35},
64 {"label":"L25", "x":6, "y":2.35},
65 {"label":"R25", "x":12, "y":2.35},
66 {"label":"R24", "x":13, "y":2.25},
67 {"label":"R23", "x":14, "y":2},
68 {"label":"R22", "x":15, "y":2.25},
69 {"label":"R21", "x":16, "y":2.75},
70 {"label":"R20", "x":17, "y":2.75},
71 {"label":"R40", "x":18, "y":2.85},
72 52
73 {"label":"L30", "x":1, "y":3.75}, 53 {"matrix": [6, 5], "x": 12, "y": 1.35},
74 {"label":"L31", "x":2, "y":3.75}, 54 {"matrix": [6, 4], "x": 13, "y": 1.25},
75 {"label":"L32", "x":3, "y":3.25}, 55 {"matrix": [6, 3], "x": 14, "y": 1},
76 {"label":"L33", "x":4, "y":3}, 56 {"matrix": [6, 2], "x": 15, "y": 1.25},
77 {"label":"L34", "x":5, "y":3.25}, 57 {"matrix": [6, 1], "x": 16, "y": 1.75},
78 {"label":"L35", "x":6, "y":3.35}, 58 {"matrix": [6, 0], "x": 17, "y": 1.75},
79 {"label":"L36", "x":7, "y":3.7},
80 {"label":"L26", "x":8, "y":4.05},
81 {"label":"R26", "x":10, "y":4.05},
82 {"label":"R36", "x":11, "y":3.7},
83 {"label":"R35", "x":12, "y":3.35},
84 {"label":"R34", "x":13, "y":3.25},
85 {"label":"R33", "x":14, "y":3},
86 {"label":"R32", "x":15, "y":3.25},
87 {"label":"R31", "x":16, "y":3.75},
88 {"label":"R30", "x":17, "y":3.75},
89 59
90 {"label":"L42", "x":3.4, "y":4.55}, 60 {"matrix": [4, 0], "x": 0, "y": 2.85},
91 {"label":"L43", "x":4.6, "y":4.45}, 61 {"matrix": [2, 0], "x": 1, "y": 2.75},
92 {"label":"L44", "x":5.8, "y":4.4}, 62 {"matrix": [2, 1], "x": 2, "y": 2.75},
93 {"label":"L45", "x":7, "y":4.7}, 63 {"matrix": [2, 2], "x": 3, "y": 2.25},
94 {"label":"L46", "x":8, "y":5.05}, 64 {"matrix": [2, 3], "x": 4, "y": 2},
95 {"label":"R46", "x":10, "y":5.05}, 65 {"matrix": [2, 4], "x": 5, "y": 2.25},
96 {"label":"R45", "x":11, "y":4.7}, 66 {"matrix": [2, 5], "x": 6, "y": 2.35},
97 {"label":"R44", "x":12.2, "y":4.4}, 67
98 {"label":"R43", "x":13.4, "y":4.45}, 68 {"matrix": [7, 5], "x": 12, "y": 2.35},
99 {"label":"R42", "x":14.6, "y":4.55} 69 {"matrix": [7, 4], "x": 13, "y": 2.25},
70 {"matrix": [7, 3], "x": 14, "y": 2},
71 {"matrix": [7, 2], "x": 15, "y": 2.25},
72 {"matrix": [7, 1], "x": 16, "y": 2.75},
73 {"matrix": [7, 0], "x": 17, "y": 2.75},
74 {"matrix": [9, 0], "x": 18, "y": 2.85},
75
76 {"matrix": [3, 0], "x": 1, "y": 3.75},
77 {"matrix": [3, 1], "x": 2, "y": 3.75},
78 {"matrix": [3, 2], "x": 3, "y": 3.25},
79 {"matrix": [3, 3], "x": 4, "y": 3},
80 {"matrix": [3, 4], "x": 5, "y": 3.25},
81 {"matrix": [3, 5], "x": 6, "y": 3.35},
82 {"matrix": [3, 6], "x": 7, "y": 3.7},
83 {"matrix": [2, 6], "x": 8, "y": 4.05},
84
85 {"matrix": [7, 6], "x": 10, "y": 4.05},
86 {"matrix": [8, 6], "x": 11, "y": 3.7},
87 {"matrix": [8, 5], "x": 12, "y": 3.35},
88 {"matrix": [8, 4], "x": 13, "y": 3.25},
89 {"matrix": [8, 3], "x": 14, "y": 3},
90 {"matrix": [8, 2], "x": 15, "y": 3.25},
91 {"matrix": [8, 1], "x": 16, "y": 3.75},
92 {"matrix": [8, 0], "x": 17, "y": 3.75},
93
94 {"matrix": [4, 2], "x": 3.4, "y": 4.55},
95 {"matrix": [4, 3], "x": 4.6, "y": 4.45},
96 {"matrix": [4, 4], "x": 5.8, "y": 4.4},
97 {"matrix": [4, 5], "x": 7, "y": 4.7},
98 {"matrix": [4, 6], "x": 8, "y": 5.05},
99
100 {"matrix": [9, 6], "x": 10, "y": 5.05},
101 {"matrix": [9, 5], "x": 11, "y": 4.7},
102 {"matrix": [9, 4], "x": 12.2, "y": 4.4},
103 {"matrix": [9, 3], "x": 13.4, "y": 4.45},
104 {"matrix": [9, 2], "x": 14.6, "y": 4.55}
100 ] 105 ]
101 } 106 }
102 } 107 }
diff --git a/keyboards/avalanche/v4/v4.c b/keyboards/avalanche/v4/v4.c
index e5a651ce4a..5b27385729 100644
--- a/keyboards/avalanche/v4/v4.c
+++ b/keyboards/avalanche/v4/v4.c
@@ -1,7 +1,7 @@
1// Copyright 2022 Vitaly Volkov (@vlkv) 1// Copyright 2022 Vitaly Volkov (@vlkv)
2// SPDX-License-Identifier: GPL-2.0-or-later 2// SPDX-License-Identifier: GPL-2.0-or-later
3 3
4#include "v4.h" 4#include "quantum.h"
5 5
6#ifdef OLED_ENABLE 6#ifdef OLED_ENABLE
7oled_rotation_t oled_init_kb(oled_rotation_t rotation) { 7oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/avalanche/v4/v4.h b/keyboards/avalanche/v4/v4.h
deleted file mode 100644
index 426f979e9b..0000000000
--- a/keyboards/avalanche/v4/v4.h
+++ /dev/null
@@ -1,29 +0,0 @@
1// Copyright 2022 Vitaly Volkov (@vlkv)
2// SPDX-License-Identifier: GPL-2.0-or-later
3
4#pragma once
5
6#include "quantum.h"
7
8#define L__ KC_NO
9#define R__ KC_NO
10
11#define LAYOUT( \
12 L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
13 L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
14 L40, L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, R40, \
15 L30, L31, L32, L33, L34, L35, L36, L26, R26, R36, R35, R34, R33, R32, R31, R30, \
16 L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \
17) \
18{ \
19 { L00, L01, L02, L03, L04, L05, L__}, \
20 { L10, L11, L12, L13, L14, L15, L__}, \
21 { L20, L21, L22, L23, L24, L25, L26}, \
22 { L30, L31, L32, L33, L34, L35, L36}, \
23 { L40, L__, L42, L43, L44, L45, L46}, \
24 { R00, R01, R02, R03, R04, R05, R__}, \
25 { R10, R11, R12, R13, R14, R15, R__}, \
26 { R20, R21, R22, R23, R24, R25, R26}, \
27 { R30, R31, R32, R33, R34, R35, R36}, \
28 { R40, R__, R42, R43, R44, R45, R46} \
29}