summaryrefslogtreecommitdiff
path: root/keyboards/tr60w
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-15 21:09:08 +1000
committerGitHub <noreply@github.com>2023-04-15 21:09:08 +1000
commit0ddb7d7863d180c571091dd1fa154abb53de5a04 (patch)
treec54dd60383887528e92061a509f01e2eb24e60eb /keyboards/tr60w
parent172a40686b84af7f887350a20c526855c7f7649c (diff)
Move single `60_ansi`, `60_hhkb` and `60_iso` layouts to data driven (#20438)
Diffstat (limited to 'keyboards/tr60w')
-rw-r--r--keyboards/tr60w/info.json124
-rw-r--r--keyboards/tr60w/tr60w.c2
-rw-r--r--keyboards/tr60w/tr60w.h18
3 files changed, 63 insertions, 81 deletions
diff --git a/keyboards/tr60w/info.json b/keyboards/tr60w/info.json
index 01ec8b32c7..62e5fae73b 100644
--- a/keyboards/tr60w/info.json
+++ b/keyboards/tr60w/info.json
@@ -24,72 +24,72 @@
24 "layouts": { 24 "layouts": {
25 "LAYOUT_60_tsangan_hhkb": { 25 "LAYOUT_60_tsangan_hhkb": {
26 "layout": [ 26 "layout": [
27 {"x": 0, "y": 0}, 27 {"matrix": [0, 0], "x": 0, "y": 0},
28 {"x": 1, "y": 0}, 28 {"matrix": [0, 1], "x": 1, "y": 0},
29 {"x": 2, "y": 0}, 29 {"matrix": [0, 2], "x": 2, "y": 0},
30 {"x": 3, "y": 0}, 30 {"matrix": [0, 3], "x": 3, "y": 0},
31 {"x": 4, "y": 0}, 31 {"matrix": [0, 4], "x": 4, "y": 0},
32 {"x": 5, "y": 0}, 32 {"matrix": [0, 5], "x": 5, "y": 0},
33 {"x": 6, "y": 0}, 33 {"matrix": [0, 6], "x": 6, "y": 0},
34 {"x": 7, "y": 0}, 34 {"matrix": [0, 7], "x": 7, "y": 0},
35 {"x": 8, "y": 0}, 35 {"matrix": [0, 8], "x": 8, "y": 0},
36 {"x": 9, "y": 0}, 36 {"matrix": [0, 9], "x": 9, "y": 0},
37 {"x": 10, "y": 0}, 37 {"matrix": [0, 10], "x": 10, "y": 0},
38 {"x": 11, "y": 0}, 38 {"matrix": [0, 11], "x": 11, "y": 0},
39 {"x": 12, "y": 0}, 39 {"matrix": [0, 12], "x": 12, "y": 0},
40 {"x": 13, "y": 0}, 40 {"matrix": [0, 13], "x": 13, "y": 0},
41 {"x": 14, "y": 0}, 41 {"matrix": [1, 13], "x": 14, "y": 0},
42 42
43 {"x": 0, "y": 1, "w": 1.5}, 43 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
44 {"x": 1.5, "y": 1}, 44 {"matrix": [1, 1], "x": 1.5, "y": 1},
45 {"x": 2.5, "y": 1}, 45 {"matrix": [1, 2], "x": 2.5, "y": 1},
46 {"x": 3.5, "y": 1}, 46 {"matrix": [1, 3], "x": 3.5, "y": 1},
47 {"x": 4.5, "y": 1}, 47 {"matrix": [1, 4], "x": 4.5, "y": 1},
48 {"x": 5.5, "y": 1}, 48 {"matrix": [1, 5], "x": 5.5, "y": 1},
49 {"x": 6.5, "y": 1}, 49 {"matrix": [1, 6], "x": 6.5, "y": 1},
50 {"x": 7.5, "y": 1}, 50 {"matrix": [1, 7], "x": 7.5, "y": 1},
51 {"x": 8.5, "y": 1}, 51 {"matrix": [1, 8], "x": 8.5, "y": 1},
52 {"x": 9.5, "y": 1}, 52 {"matrix": [1, 9], "x": 9.5, "y": 1},
53 {"x": 10.5, "y": 1}, 53 {"matrix": [1, 10], "x": 10.5, "y": 1},
54 {"x": 11.5, "y": 1}, 54 {"matrix": [1, 11], "x": 11.5, "y": 1},
55 {"x": 12.5, "y": 1}, 55 {"matrix": [1, 12], "x": 12.5, "y": 1},
56 {"x": 13.5, "y": 1, "w": 1.5}, 56 {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5},
57 57
58 {"x": 0, "y": 2, "w": 1.75}, 58 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
59 {"x": 1.75, "y": 2}, 59 {"matrix": [2, 1], "x": 1.75, "y": 2},
60 {"x": 2.75, "y": 2}, 60 {"matrix": [2, 2], "x": 2.75, "y": 2},
61 {"x": 3.75, "y": 2}, 61 {"matrix": [2, 3], "x": 3.75, "y": 2},
62 {"x": 4.75, "y": 2}, 62 {"matrix": [2, 4], "x": 4.75, "y": 2},
63 {"x": 5.75, "y": 2}, 63 {"matrix": [2, 5], "x": 5.75, "y": 2},
64 {"x": 6.75, "y": 2}, 64 {"matrix": [2, 6], "x": 6.75, "y": 2},
65 {"x": 7.75, "y": 2}, 65 {"matrix": [2, 7], "x": 7.75, "y": 2},
66 {"x": 8.75, "y": 2}, 66 {"matrix": [2, 8], "x": 8.75, "y": 2},
67 {"x": 9.75, "y": 2}, 67 {"matrix": [2, 9], "x": 9.75, "y": 2},
68 {"x": 10.75, "y": 2}, 68 {"matrix": [2, 10], "x": 10.75, "y": 2},
69 {"x": 11.75, "y": 2}, 69 {"matrix": [2, 11], "x": 11.75, "y": 2},
70 {"x": 12.75, "y": 2, "w": 2.25}, 70 {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
71 71
72 {"x": 0, "y": 3, "w": 2.25}, 72 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
73 {"x": 2.25, "y": 3}, 73 {"matrix": [3, 1], "x": 2.25, "y": 3},
74 {"x": 3.25, "y": 3}, 74 {"matrix": [3, 2], "x": 3.25, "y": 3},
75 {"x": 4.25, "y": 3}, 75 {"matrix": [3, 3], "x": 4.25, "y": 3},
76 {"x": 5.25, "y": 3}, 76 {"matrix": [3, 4], "x": 5.25, "y": 3},
77 {"x": 6.25, "y": 3}, 77 {"matrix": [3, 5], "x": 6.25, "y": 3},
78 {"x": 7.25, "y": 3}, 78 {"matrix": [3, 6], "x": 7.25, "y": 3},
79 {"x": 8.25, "y": 3}, 79 {"matrix": [3, 7], "x": 8.25, "y": 3},
80 {"x": 9.25, "y": 3}, 80 {"matrix": [3, 8], "x": 9.25, "y": 3},
81 {"x": 10.25, "y": 3}, 81 {"matrix": [3, 9], "x": 10.25, "y": 3},
82 {"x": 11.25, "y": 3}, 82 {"matrix": [3, 10], "x": 11.25, "y": 3},
83 {"x": 12.25, "y": 3, "w": 1.75}, 83 {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
84 {"x": 14, "y": 3}, 84 {"matrix": [3, 12], "x": 14, "y": 3},
85 85
86 {"x": 0, "y": 4, "w": 1.5}, 86 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
87 {"x": 1.5, "y": 4}, 87 {"matrix": [4, 1], "x": 1.5, "y": 4},
88 {"x": 2.5, "y": 4, "w": 1.5}, 88 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
89 {"x": 4, "y": 4, "w": 7}, 89 {"matrix": [5, 5], "x": 4, "y": 4, "w": 7},
90 {"x": 11, "y": 4, "w": 1.5}, 90 {"matrix": [5, 10], "x": 11, "y": 4, "w": 1.5},
91 {"x": 12.5, "y": 4}, 91 {"matrix": [5, 11], "x": 12.5, "y": 4},
92 {"x": 13.5, "y": 4, "w": 1.5} 92 {"matrix": [5, 12], "x": 13.5, "y": 4, "w": 1.5}
93 ] 93 ]
94 } 94 }
95 } 95 }
diff --git a/keyboards/tr60w/tr60w.c b/keyboards/tr60w/tr60w.c
index 83547a8862..2bc0648241 100644
--- a/keyboards/tr60w/tr60w.c
+++ b/keyboards/tr60w/tr60w.c
@@ -1,4 +1,4 @@
1#include "tr60w.h" 1#include "quantum.h"
2 2
3bool led_update_kb(led_t led_state) { 3bool led_update_kb(led_t led_state) {
4 bool runDefault = led_update_user(led_state); 4 bool runDefault = led_update_user(led_state);
diff --git a/keyboards/tr60w/tr60w.h b/keyboards/tr60w/tr60w.h
deleted file mode 100644
index 9fa5d5b61f..0000000000
--- a/keyboards/tr60w/tr60w.h
+++ /dev/null
@@ -1,18 +0,0 @@
1#pragma once
2
3#include "quantum.h"
4
5#define LAYOUT_60_tsangan_hhkb( \
6 K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K113, \
7 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213, \
8 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
9 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
10 K400, K401, K402, K505, K510, K511, K512 \
11) { \
12 { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
13 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
14 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
15 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
16 { K400, K401, K402, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
17 { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, KC_NO, K510, K511, K512, KC_NO } \
18}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 05:37:00 +0000