summaryrefslogtreecommitdiff
path: root/keyboards/hhkb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hhkb')
-rw-r--r--keyboards/hhkb/ansi/ansi.c1
-rw-r--r--keyboards/hhkb/ansi/ansi.h23
-rw-r--r--keyboards/hhkb/ansi/info.json127
-rw-r--r--keyboards/hhkb/ansi/keymaps/blakedietz/config.h4
-rw-r--r--keyboards/hhkb/ansi/keymaps/brett/config.h3
-rw-r--r--keyboards/hhkb/jp/info.json144
-rw-r--r--keyboards/hhkb/jp/jp.c1
-rw-r--r--keyboards/hhkb/jp/jp.h28
-rw-r--r--keyboards/hhkb/rn42/suart.h5
-rw-r--r--keyboards/hhkb/yang/info.json124
-rw-r--r--keyboards/hhkb/yang/yang.c2
-rw-r--r--keyboards/hhkb/yang/yang.h36
12 files changed, 208 insertions, 290 deletions
diff --git a/keyboards/hhkb/ansi/ansi.c b/keyboards/hhkb/ansi/ansi.c
deleted file mode 100644
index cefc4e0690..0000000000
--- a/keyboards/hhkb/ansi/ansi.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "ansi.h" \ No newline at end of file
diff --git a/keyboards/hhkb/ansi/ansi.h b/keyboards/hhkb/ansi/ansi.h
deleted file mode 100644
index 28e8d2fef8..0000000000
--- a/keyboards/hhkb/ansi/ansi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
- K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \
- K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \
- K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \
- K35, K36, K37, K57, K56) \
- \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO } \
-}
-
-#define LAYOUT_60_hhkb LAYOUT
diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json
index c892d2b14b..16349fc6e2 100644
--- a/keyboards/hhkb/ansi/info.json
+++ b/keyboards/hhkb/ansi/info.json
@@ -9,69 +9,76 @@
"device_version": "1.0.4"
},
"community_layouts": ["60_hhkb"],
+ "layout_aliases": {
+ "LAYOUT_60_hhkb": "LAYOUT"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Esc", "x": 0, "y": 0 },
- { "label": "!", "x": 1, "y": 0 },
- { "label": "@", "x": 2, "y": 0 },
- { "label": "#", "x": 3, "y": 0 },
- { "label": "$", "x": 4, "y": 0 },
- { "label": "%", "x": 5, "y": 0 },
- { "label": "^", "x": 6, "y": 0 },
- { "label": "&", "x": 7, "y": 0 },
- { "label": "*", "x": 8, "y": 0 },
- { "label": "(", "x": 9, "y": 0 },
- { "label": ")", "x": 10, "y": 0 },
- { "label": "_", "x": 11, "y": 0 },
- { "label": "+", "x": 12, "y": 0 },
- { "label": "|", "x": 13, "y": 0 },
- { "label": "~", "x": 14, "y": 0 },
- { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
- { "label": "Q", "x": 1.5, "y": 1 },
- { "label": "W", "x": 2.5, "y": 1 },
- { "label": "E", "x": 3.5, "y": 1 },
- { "label": "R", "x": 4.5, "y": 1 },
- { "label": "T", "x": 5.5, "y": 1 },
- { "label": "Y", "x": 6.5, "y": 1 },
- { "label": "U", "x": 7.5, "y": 1 },
- { "label": "I", "x": 8.5, "y": 1 },
- { "label": "O", "x": 9.5, "y": 1 },
- { "label": "P", "x": 10.5, "y": 1 },
- { "label": "{", "x": 11.5, "y": 1 },
- { "label": "}", "x": 12.5, "y": 1 },
- { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
- { "label": "A", "x": 1.75, "y": 2 },
- { "label": "S", "x": 2.75, "y": 2 },
- { "label": "D", "x": 3.75, "y": 2 },
- { "label": "F", "x": 4.75, "y": 2 },
- { "label": "G", "x": 5.75, "y": 2 },
- { "label": "H", "x": 6.75, "y": 2 },
- { "label": "J", "x": 7.75, "y": 2 },
- { "label": "K", "x": 8.75, "y": 2 },
- { "label": "L", "x": 9.75, "y": 2 },
- { "label": ":", "x": 10.75, "y": 2 },
- { "label": "\"", "x": 11.75, "y": 2 },
- { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
- { "label": "Z", "x": 2.25, "y": 3 },
- { "label": "X", "x": 3.25, "y": 3 },
- { "label": "C", "x": 4.25, "y": 3 },
- { "label": "V", "x": 5.25, "y": 3 },
- { "label": "B", "x": 6.25, "y": 3 },
- { "label": "N", "x": 7.25, "y": 3 },
- { "label": "M", "x": 8.25, "y": 3 },
- { "label": "<", "x": 9.25, "y": 3 },
- { "label": ">", "x": 10.25, "y": 3 },
- { "label": "?", "x": 11.25, "y": 3 },
- { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "Fn", "x": 14, "y": 3 },
- { "label": "", "x": 1.5, "y": 4 },
- { "label": "", "x": 2.5, "y": 4, "w": 1.5 },
- { "x": 4, "y": 4, "w": 6 },
- { "label": "", "x": 10, "y": 4, "w": 1.5 },
- { "label": "", "x": 11.5, "y": 4 }
+ {"matrix": [3, 1], "x": 0, "y": 0},
+ {"matrix": [3, 0], "x": 1, "y": 0},
+ {"matrix": [0, 0], "x": 2, "y": 0},
+ {"matrix": [1, 0], "x": 3, "y": 0},
+ {"matrix": [1, 1], "x": 4, "y": 0},
+ {"matrix": [2, 0], "x": 5, "y": 0},
+ {"matrix": [2, 1], "x": 6, "y": 0},
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [6, 0], "x": 9, "y": 0},
+ {"matrix": [6, 1], "x": 10, "y": 0},
+ {"matrix": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0},
+
+ {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [2, 2], "x": 6.5, "y": 1},
+ {"matrix": [4, 2], "x": 7.5, "y": 1},
+ {"matrix": [4, 3], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [7, 3], "x": 11.5, "y": 1},
+ {"matrix": [7, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [0, 4], "x": 1.75, "y": 2},
+ {"matrix": [0, 3], "x": 2.75, "y": 2},
+ {"matrix": [1, 4], "x": 3.75, "y": 2},
+ {"matrix": [1, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 4], "x": 5.75, "y": 2},
+ {"matrix": [2, 5], "x": 6.75, "y": 2},
+ {"matrix": [4, 5], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [6, 5], "x": 9.75, "y": 2},
+ {"matrix": [6, 4], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [0, 5], "x": 2.25, "y": 3},
+ {"matrix": [0, 6], "x": 3.25, "y": 3},
+ {"matrix": [0, 7], "x": 4.25, "y": 3},
+ {"matrix": [1, 6], "x": 5.25, "y": 3},
+ {"matrix": [1, 7], "x": 6.25, "y": 3},
+ {"matrix": [2, 6], "x": 7.25, "y": 3},
+ {"matrix": [4, 6], "x": 8.25, "y": 3},
+ {"matrix": [6, 6], "x": 9.25, "y": 3},
+ {"matrix": [7, 6], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [5, 4], "x": 14, "y": 3},
+
+ {"matrix": [3, 5], "x": 1.5, "y": 4},
+ {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
+ {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [5, 6], "x": 11.5, "y": 4}
]
}
}
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
index e0d2bce0f1..8d281f2604 100644
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
+++ b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
@@ -17,8 +17,4 @@
//#define TAPPING_TOGGLE 1
// TAPPING_TERM is set in config.h this defaults to 200
-// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
-// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
-
#endif
diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h
index 8f769d603f..0711122d74 100644
--- a/keyboards/hhkb/ansi/keymaps/brett/config.h
+++ b/keyboards/hhkb/ansi/keymaps/brett/config.h
@@ -12,6 +12,3 @@
#define LSPO_MOD KC_LSFT
#define RSPC_MOD KC_RSFT
-// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
-// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
index cc05d105bf..589cf98dde 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/info.json
@@ -13,75 +13,81 @@
"layouts": {
"LAYOUT_jp": {
"layout": [
- { "label": "Esc", "x": 0, "y": 0 },
- { "label": "!", "x": 1, "y": 0 },
- { "label": "\"", "x": 2, "y": 0 },
- { "label": "#", "x": 3, "y": 0 },
- { "label": "$", "x": 4, "y": 0 },
- { "label": "%", "x": 5, "y": 0 },
- { "label": "&", "x": 6, "y": 0 },
- { "label": "'", "x": 7, "y": 0 },
- { "label": "(", "x": 8, "y": 0 },
- { "label": ")", "x": 9, "y": 0 },
- { "label": "", "x": 10, "y": 0 },
- { "label": "=", "x": 11, "y": 0 },
- { "label": "~", "x": 12, "y": 0 },
- { "label": "|", "x": 13, "y": 0 },
- { "label": "BS", "x": 14, "y": 0 },
- { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
- { "label": "Q", "x": 1.5, "y": 1 },
- { "label": "W", "x": 2.5, "y": 1 },
- { "label": "E", "x": 3.5, "y": 1 },
- { "label": "R", "x": 4.5, "y": 1 },
- { "label": "T", "x": 5.5, "y": 1 },
- { "label": "Y", "x": 6.5, "y": 1 },
- { "label": "U", "x": 7.5, "y": 1 },
- { "label": "I", "x": 8.5, "y": 1 },
- { "label": "O", "x": 9.5, "y": 1 },
- { "label": "P", "x": 10.5, "y": 1 },
- { "label": "`", "x": 11.5, "y": 1 },
- { "label": "{", "x": 12.5, "y": 1 },
- { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
- { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
- { "label": "A", "x": 1.75, "y": 2 },
- { "label": "S", "x": 2.75, "y": 2 },
- { "label": "D", "x": 3.75, "y": 2 },
- { "label": "F", "x": 4.75, "y": 2 },
- { "label": "G", "x": 5.75, "y": 2 },
- { "label": "H", "x": 6.75, "y": 2 },
- { "label": "J", "x": 7.75, "y": 2 },
- { "label": "K", "x": 8.75, "y": 2 },
- { "label": "L", "x": 9.75, "y": 2 },
- { "label": "+", "x": 10.75, "y": 2 },
- { "label": "*", "x": 11.75, "y": 2 },
- { "label": "}", "x": 12.75, "y": 2 },
- { "label": "Shift", "x": 0, "y": 3, "w": 2 },
- { "label": "Z", "x": 2, "y": 3 },
- { "label": "X", "x": 3, "y": 3 },
- { "label": "C", "x": 4, "y": 3 },
- { "label": "V", "x": 5, "y": 3 },
- { "label": "B", "x": 6, "y": 3 },
- { "label": "N", "x": 7, "y": 3 },
- { "label": "M", "x": 8, "y": 3 },
- { "label": "<", "x": 9, "y": 3 },
- { "label": ">", "x": 10, "y": 3 },
- { "label": "?", "x": 11, "y": 3 },
- { "label": "_", "x": 12, "y": 3 },
- { "label": "\u2191", "x": 13, "y": 3 },
- { "label": "Shift", "x": 14, "y": 3 },
- { "label": "Fn", "x": 0, "y": 4 },
- { "label": "HH", "x": 1.25, "y": 4 },
- { "label": "\u2662", "x": 2.25, "y": 4 },
- { "label": "", "x": 3.25, "y": 4 },
- { "label": "NN", "x": 4.25, "y": 4 },
- { "x": 5.25, "y": 4, "w": 2.5 },
- { "label": "\u25cc", "x": 7.75, "y": 4 },
- { "label": "Kana", "x": 8.75, "y": 4 },
- { "label": "", "x": 9.75, "y": 4 },
- { "label": "Fn", "x": 10.75, "y": 4 },
- { "label": "\u2190", "x": 12, "y": 4 },
- { "label": "\u2193", "x": 13, "y": 4 },
- { "label": "\u2192", "x": 14, "y": 4 }
+ {"matrix": [0, 2], "x": 0, "y": 0},
+ {"matrix": [3, 2], "x": 1, "y": 0},
+ {"matrix": [6, 2], "x": 2, "y": 0},
+ {"matrix": [2, 2], "x": 3, "y": 0},
+ {"matrix": [1, 2], "x": 4, "y": 0},
+ {"matrix": [5, 2], "x": 5, "y": 0},
+ {"matrix": [7, 2], "x": 6, "y": 0},
+ {"matrix": [10, 2], "x": 7, "y": 0},
+ {"matrix": [9, 2], "x": 8, "y": 0},
+ {"matrix": [8, 2], "x": 9, "y": 0},
+ {"matrix": [11, 2], "x": 10, "y": 0},
+ {"matrix": [14, 2], "x": 11, "y": 0},
+ {"matrix": [15, 2], "x": 12, "y": 0},
+ {"matrix": [13, 2], "x": 13, "y": 0},
+ {"matrix": [12, 2], "x": 14, "y": 0},
+
+ {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [6, 3], "x": 1.5, "y": 1},
+ {"matrix": [2, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [5, 3], "x": 4.5, "y": 1},
+ {"matrix": [7, 3], "x": 5.5, "y": 1},
+ {"matrix": [10, 3], "x": 6.5, "y": 1},
+ {"matrix": [9, 3], "x": 7.5, "y": 1},
+ {"matrix": [8, 3], "x": 8.5, "y": 1},
+ {"matrix": [11, 3], "x": 9.5, "y": 1},
+ {"matrix": [14, 3], "x": 10.5, "y": 1},
+ {"matrix": [15, 3], "x": 11.5, "y": 1},
+ {"matrix": [13, 3], "x": 12.5, "y": 1},
+ {"matrix": [0, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [6, 6], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 6], "x": 1.75, "y": 2},
+ {"matrix": [1, 6], "x": 2.75, "y": 2},
+ {"matrix": [5, 6], "x": 3.75, "y": 2},
+ {"matrix": [7, 6], "x": 4.75, "y": 2},
+ {"matrix": [10, 6], "x": 5.75, "y": 2},
+ {"matrix": [9, 6], "x": 6.75, "y": 2},
+ {"matrix": [8, 6], "x": 7.75, "y": 2},
+ {"matrix": [11, 6], "x": 8.75, "y": 2},
+ {"matrix": [14, 6], "x": 9.75, "y": 2},
+ {"matrix": [15, 6], "x": 10.75, "y": 2},
+ {"matrix": [13, 6], "x": 11.75, "y": 2},
+ {"matrix": [12, 6], "x": 12.75, "y": 2},
+
+ {"matrix": [0, 5], "x": 0, "y": 3, "w": 2},
+ {"matrix": [6, 5], "x": 2, "y": 3},
+ {"matrix": [2, 5], "x": 3, "y": 3},
+ {"matrix": [1, 5], "x": 4, "y": 3},
+ {"matrix": [5, 5], "x": 5, "y": 3},
+ {"matrix": [7, 5], "x": 6, "y": 3},
+ {"matrix": [10, 5], "x": 7, "y": 3},
+ {"matrix": [9, 5], "x": 8, "y": 3},
+ {"matrix": [8, 5], "x": 9, "y": 3},
+ {"matrix": [11, 5], "x": 10, "y": 3},
+ {"matrix": [14, 5], "x": 11, "y": 3},
+ {"matrix": [15, 5], "x": 12, "y": 3},
+ {"matrix": [13, 5], "x": 13, "y": 3},
+ {"matrix": [12, 5], "x": 14, "y": 3},
+
+ {"matrix": [0, 4], "x": 0, "y": 4},
+
+ {"matrix": [3, 4], "x": 1.25, "y": 4},
+ {"matrix": [6, 4], "x": 2.25, "y": 4},
+ {"matrix": [2, 4], "x": 3.25, "y": 4},
+ {"matrix": [1, 4], "x": 4.25, "y": 4},
+ {"matrix": [7, 4], "x": 5.25, "y": 4, "w": 2.5},
+ {"matrix": [9, 4], "x": 7.75, "y": 4},
+ {"matrix": [8, 4], "x": 8.75, "y": 4},
+ {"matrix": [11, 4], "x": 9.75, "y": 4},
+ {"matrix": [14, 4], "x": 10.75, "y": 4},
+
+ {"matrix": [15, 4], "x": 12, "y": 4},
+ {"matrix": [13, 4], "x": 13, "y": 4},
+ {"matrix": [12, 4], "x": 14, "y": 4}
]
}
}
diff --git a/keyboards/hhkb/jp/jp.c b/keyboards/hhkb/jp/jp.c
deleted file mode 100644
index f1f1388c77..0000000000
--- a/keyboards/hhkb/jp/jp.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jp.h" \ No newline at end of file
diff --git a/keyboards/hhkb/jp/jp.h b/keyboards/hhkb/jp/jp.h
deleted file mode 100644
index b243e5546c..0000000000
--- a/keyboards/hhkb/jp/jp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_jp( \
- K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \
- K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \
- K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \
- K05, K65, K25, K15, K55, K75, KA5, K95, K85, KB5, KE5, KF5, KD5, KC5, \
- K04, K34, K64, K24, K14, K74, K94, K84, KB4, KE4, KF4, KD4, KC4) \
-{ \
- { KC_NO, KC_NO, K02, K03, K04, K05, K06, KC_NO }, \
- { KC_NO, KC_NO, K12, K13, K14, K15, K16, KC_NO }, \
- { KC_NO, KC_NO, K22, K23, K24, K25, K26, KC_NO }, \
- { KC_NO, KC_NO, K32, KC_NO, K34, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { KC_NO, KC_NO, K52, K53, KC_NO, K55, K56, KC_NO }, \
- { KC_NO, KC_NO, K62, K63, K64, K65, K66, KC_NO }, \
- { KC_NO, KC_NO, K72, K73, K74, K75, K76, KC_NO }, \
- { KC_NO, KC_NO, K82, K83, K84, K85, K86, KC_NO }, \
- { KC_NO, KC_NO, K92, K93, K94, K95, K96, KC_NO }, \
- { KC_NO, KC_NO, KA2, KA3, KC_NO, KA5, KA6, KC_NO }, \
- { KC_NO, KC_NO, KB2, KB3, KB4, KB5, KB6, KC_NO }, \
- { KC_NO, KC_NO, KC2, KC_NO, KC4, KC5, KC6, KC_NO }, \
- { KC_NO, KC_NO, KD2, KD3, KD4, KD5, KD6, KC_NO }, \
- { KC_NO, KC_NO, KE2, KE3, KE4, KE5, KE6, KC_NO }, \
- { KC_NO, KC_NO, KF2, KF3, KF4, KF5, KF6, KC_NO } \
-}
diff --git a/keyboards/hhkb/rn42/suart.h b/keyboards/hhkb/rn42/suart.h
index 7d92be0692..40e40648c7 100644
--- a/keyboards/hhkb/rn42/suart.h
+++ b/keyboards/hhkb/rn42/suart.h
@@ -1,8 +1,5 @@
-#ifndef SUART
-#define SUART
+#pragma once
void xmit(uint8_t);
uint8_t rcvr(void);
uint8_t recv(void);
-
-#endif /* SUART */
diff --git a/keyboards/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index dc465cea96..bfff105e90 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -18,66 +18,70 @@
"layouts": {
"LAYOUT_60_hhkb": {
"layout": [
- { "label": "Esc", "x": 0, "y": 0 },
- { "label": "!", "x": 1, "y": 0 },
- { "label": "@", "x": 2, "y": 0 },
- { "label": "#", "x": 3, "y": 0 },
- { "label": "$", "x": 4, "y": 0 },
- { "label": "%", "x": 5, "y": 0 },
- { "label": "^", "x": 6, "y": 0 },
- { "label": "&", "x": 7, "y": 0 },
- { "label": "*", "x": 8, "y": 0 },
- { "label": "(", "x": 9, "y": 0 },
- { "label": ")", "x": 10, "y": 0 },
- { "label": "_", "x": 11, "y": 0 },
- { "label": "+", "x": 12, "y": 0 },
- { "label": "|", "x": 13, "y": 0 },
- { "label": "~", "x": 14, "y": 0 },
- { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
- { "label": "Q", "x": 1.5, "y": 1 },
- { "label": "W", "x": 2.5, "y": 1 },
- { "label": "E", "x": 3.5, "y": 1 },
- { "label": "R", "x": 4.5, "y": 1 },
- { "label": "T", "x": 5.5, "y": 1 },
- { "label": "Y", "x": 6.5, "y": 1 },
- { "label": "U", "x": 7.5, "y": 1 },
- { "label": "I", "x": 8.5, "y": 1 },
- { "label": "O", "x": 9.5, "y": 1 },
- { "label": "P", "x": 10.5, "y": 1 },
- { "label": "{", "x": 11.5, "y": 1 },
- { "label": "}", "x": 12.5, "y": 1 },
- { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 },
- { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
- { "label": "A", "x": 1.75, "y": 2 },
- { "label": "S", "x": 2.75, "y": 2 },
- { "label": "D", "x": 3.75, "y": 2 },
- { "label": "F", "x": 4.75, "y": 2 },
- { "label": "G", "x": 5.75, "y": 2 },
- { "label": "H", "x": 6.75, "y": 2 },
- { "label": "J", "x": 7.75, "y": 2 },
- { "label": "K", "x": 8.75, "y": 2 },
- { "label": "L", "x": 9.75, "y": 2 },
- { "label": ":", "x": 10.75, "y": 2 },
- { "label": "\"", "x": 11.75, "y": 2 },
- { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
- { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
- { "label": "Z", "x": 2.25, "y": 3 },
- { "label": "X", "x": 3.25, "y": 3 },
- { "label": "C", "x": 4.25, "y": 3 },
- { "label": "V", "x": 5.25, "y": 3 },
- { "label": "B", "x": 6.25, "y": 3 },
- { "label": "N", "x": 7.25, "y": 3 },
- { "label": "M", "x": 8.25, "y": 3 },
- { "label": "<", "x": 9.25, "y": 3 },
- { "label": ">", "x": 10.25, "y": 3 },
- { "label": "?", "x": 11.25, "y": 3 },
- { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
- { "label": "Fn", "x": 14, "y": 3 },
- { "label": "", "x": 1.5, "y": 4 },
- { "label": "", "x": 2.5, "y": 4, "w": 1.5 },
- { "x": 4, "y": 4, "w": 6 },
- { "label": "", "x": 10, "y": 4, "w": 1.5 },
- { "label": "", "x": 11.5, "y": 4 }
+ {"matrix": [3, 1], "x": 0, "y": 0},
+ {"matrix": [3, 0], "x": 1, "y": 0},
+ {"matrix": [0, 0], "x": 2, "y": 0},
+ {"matrix": [1, 0], "x": 3, "y": 0},
+ {"matrix": [1, 1], "x": 4, "y": 0},
+ {"matrix": [2, 0], "x": 5, "y": 0},
+ {"matrix": [2, 1], "x": 6, "y": 0},
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [6, 0], "x": 9, "y": 0},
+ {"matrix": [6, 1], "x": 10, "y": 0},
+ {"matrix": [7, 0], "x": 11, "y": 0},
+ {"matrix": [7, 1], "x": 12, "y": 0},
+ {"matrix": [5, 0], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0},
+
+ {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 1},
+ {"matrix": [0, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 2], "x": 4.5, "y": 1},
+ {"matrix": [2, 3], "x": 5.5, "y": 1},
+ {"matrix": [2, 2], "x": 6.5, "y": 1},
+ {"matrix": [4, 2], "x": 7.5, "y": 1},
+ {"matrix": [4, 3], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [7, 3], "x": 11.5, "y": 1},
+ {"matrix": [7, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [0, 4], "x": 1.75, "y": 2},
+ {"matrix": [0, 3], "x": 2.75, "y": 2},
+ {"matrix": [1, 4], "x": 3.75, "y": 2},
+ {"matrix": [1, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 4], "x": 5.75, "y": 2},
+ {"matrix": [2, 5], "x": 6.75, "y": 2},
+ {"matrix": [4, 5], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [6, 5], "x": 9.75, "y": 2},
+ {"matrix": [6, 4], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [0, 5], "x": 2.25, "y": 3},
+ {"matrix": [0, 6], "x": 3.25, "y": 3},
+ {"matrix": [0, 7], "x": 4.25, "y": 3},
+ {"matrix": [1, 6], "x": 5.25, "y": 3},
+ {"matrix": [1, 7], "x": 6.25, "y": 3},
+ {"matrix": [2, 6], "x": 7.25, "y": 3},
+ {"matrix": [4, 6], "x": 8.25, "y": 3},
+ {"matrix": [6, 6], "x": 9.25, "y": 3},
+ {"matrix": [7, 6], "x": 10.25, "y": 3},
+ {"matrix": [7, 5], "x": 11.25, "y": 3},
+ {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [5, 4], "x": 14, "y": 3},
+
+ {"matrix": [3, 5], "x": 1.5, "y": 4},
+ {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [3, 7], "x": 4, "y": 4, "w": 6},
+ {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [5, 6], "x": 11.5, "y": 4}
]
}
}
diff --git a/keyboards/hhkb/yang/yang.c b/keyboards/hhkb/yang/yang.c
index 7ae0d76390..548f0dd734 100644
--- a/keyboards/hhkb/yang/yang.c
+++ b/keyboards/hhkb/yang/yang.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "yang.h"
+#include "quantum.h"
extern uint8_t power_save_level;
diff --git a/keyboards/hhkb/yang/yang.h b/keyboards/hhkb/yang/yang.h
deleted file mode 100644
index 4858c18554..0000000000
--- a/keyboards/hhkb/yang/yang.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Kan-Ru Chen <kanru@kanru.info>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * 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/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_60_hhkb( \
- K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
- K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \
- K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \
- K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \
- K35, K36, K37, K57, K56) \
- \
-{ \
- { K00, K01, K02, K03, K04, K05, K06, K07 }, \
- { K10, K11, K12, K13, K14, K15, K16, K17 }, \
- { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36, K37 }, \
- { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \
- { K50, K51, K52, K53, K54, K55, K56, K57 }, \
- { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \
- { K70, K71, K72, K73, K74, K75, K76, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-17 21:04:24 +0000