summaryrefslogtreecommitdiff
path: root/keyboards/hhkb_lite_2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hhkb_lite_2')
-rw-r--r--keyboards/hhkb_lite_2/config.h9
-rw-r--r--keyboards/hhkb_lite_2/hhkb_lite_2.c1
-rw-r--r--keyboards/hhkb_lite_2/hhkb_lite_2.h22
-rw-r--r--keyboards/hhkb_lite_2/info.json134
4 files changed, 70 insertions, 96 deletions
diff --git a/keyboards/hhkb_lite_2/config.h b/keyboards/hhkb_lite_2/config.h
deleted file mode 100644
index 8e2163885b..0000000000
--- a/keyboards/hhkb_lite_2/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F4, F1, F0, B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { F6, F7, B6, B5, B4, D7, D6, D4, D5, C7, C6, D3, D2, D1}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/hhkb_lite_2/hhkb_lite_2.c b/keyboards/hhkb_lite_2/hhkb_lite_2.c
deleted file mode 100644
index d0eaf250d6..0000000000
--- a/keyboards/hhkb_lite_2/hhkb_lite_2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "hhkb_lite_2.h"
diff --git a/keyboards/hhkb_lite_2/hhkb_lite_2.h b/keyboards/hhkb_lite_2/hhkb_lite_2.h
deleted file mode 100644
index ccdd765a23..0000000000
--- a/keyboards/hhkb_lite_2/hhkb_lite_2.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
- K509, K109, K108, K107, K106, K006, K005, K105, K104, K103, K102, K002, K004, K413, K009, \
- K309, K209, K208, K207, K206, K306, K305, K205, K204, K203, K202, K302, K304, K313, \
- K010, K409, K408, K407, K406, K506, K505, K405, K404, K403, K402, K502, K613, \
- K311, K609, K608, K607, K606, K706, K705, K605, K600, K603, K702, K611, \
- K001, K512, K400, K713, K300, K712, \
- K000, \
- K303, K100, K200 \
-) { \
- { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, KC_NO, K009, K010, KC_NO, KC_NO, KC_NO }, \
- { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, KC_NO, KC_NO, KC_NO }, \
- { K300, KC_NO, K302, K303, K304, K305, K306, KC_NO, KC_NO, K309, KC_NO, K311, KC_NO, K313 }, \
- { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO, KC_NO, K413 }, \
- { KC_NO, KC_NO, K502, KC_NO, KC_NO, K505, K506, KC_NO, KC_NO, K509, KC_NO, KC_NO, K512, KC_NO }, \
- { K600, KC_NO, KC_NO, K603, KC_NO, K605, K606, K607, K608, K609, KC_NO, K611, KC_NO, K613 }, \
- { KC_NO, KC_NO, K702, KC_NO, KC_NO, K705, K706, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K712, K713 } \
-}
diff --git a/keyboards/hhkb_lite_2/info.json b/keyboards/hhkb_lite_2/info.json
index 1051663c30..9b937416cc 100644
--- a/keyboards/hhkb_lite_2/info.json
+++ b/keyboards/hhkb_lite_2/info.json
@@ -8,6 +8,11 @@
"pid": "0x88B2",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7", "C6", "D3", "D2", "D1"],
+ "rows": ["F5", "F4", "F1", "F0", "B0", "B1", "B2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"bootmagic": {
"matrix": [5, 9]
},
@@ -16,75 +21,76 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
+ {"matrix": [5, 9], "x": 0, "y": 0},
+ {"matrix": [1, 9], "x": 1, "y": 0},
+ {"matrix": [1, 8], "x": 2, "y": 0},
+ {"matrix": [1, 7], "x": 3, "y": 0},
+ {"matrix": [1, 6], "x": 4, "y": 0},
+ {"matrix": [0, 6], "x": 5, "y": 0},
+ {"matrix": [0, 5], "x": 6, "y": 0},
+ {"matrix": [1, 5], "x": 7, "y": 0},
+ {"matrix": [1, 4], "x": 8, "y": 0},
+ {"matrix": [1, 3], "x": 9, "y": 0},
+ {"matrix": [1, 2], "x": 10, "y": 0},
+ {"matrix": [0, 2], "x": 11, "y": 0},
+ {"matrix": [0, 4], "x": 12, "y": 0},
+ {"matrix": [4, 13], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "y": 0},
+
+ {"matrix": [3, 9], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [2, 9], "x": 1.5, "y": 1},
+ {"matrix": [2, 8], "x": 2.5, "y": 1},
+ {"matrix": [2, 7], "x": 3.5, "y": 1},
+ {"matrix": [2, 6], "x": 4.5, "y": 1},
+ {"matrix": [3, 6], "x": 5.5, "y": 1},
+ {"matrix": [3, 5], "x": 6.5, "y": 1},
+ {"matrix": [2, 5], "x": 7.5, "y": 1},
+ {"matrix": [2, 4], "x": 8.5, "y": 1},
+ {"matrix": [2, 3], "x": 9.5, "y": 1},
+ {"matrix": [2, 2], "x": 10.5, "y": 1},
+ {"matrix": [3, 2], "x": 11.5, "y": 1},
+ {"matrix": [3, 4], "x": 12.5, "y": 1},
+ {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
+ {"matrix": [0, 10], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [4, 9], "x": 1.75, "y": 2},
+ {"matrix": [4, 8], "x": 2.75, "y": 2},
+ {"matrix": [4, 7], "x": 3.75, "y": 2},
+ {"matrix": [4, 6], "x": 4.75, "y": 2},
+ {"matrix": [5, 6], "x": 5.75, "y": 2},
+ {"matrix": [5, 5], "x": 6.75, "y": 2},
+ {"matrix": [4, 5], "x": 7.75, "y": 2},
+ {"matrix": [4, 4], "x": 8.75, "y": 2},
+ {"matrix": [4, 3], "x": 9.75, "y": 2},
+ {"matrix": [4, 2], "x": 10.75, "y": 2},
+ {"matrix": [5, 2], "x": 11.75, "y": 2},
+ {"matrix": [6, 13], "x": 12.75, "y": 2, "w": 2.25},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2, "w":2.25},
+ {"matrix": [3, 11], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [6, 9], "x": 2.25, "y": 3},
+ {"matrix": [6, 8], "x": 3.25, "y": 3},
+ {"matrix": [6, 7], "x": 4.25, "y": 3},
+ {"matrix": [6, 6], "x": 5.25, "y": 3},
+ {"matrix": [7, 6], "x": 6.25, "y": 3},
+ {"matrix": [7, 5], "x": 7.25, "y": 3},
+ {"matrix": [6, 5], "x": 8.25, "y": 3},
+ {"matrix": [6, 0], "x": 9.25, "y": 3},
+ {"matrix": [6, 3], "x": 10.25, "y": 3},
+ {"matrix": [7, 2], "x": 11.25, "y": 3},
+ {"matrix": [6, 11], "x": 12.25, "y": 3, "w": 1.75},
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
+ {"matrix": [0, 1], "x": 14, "y": 3},
- {"x":2, "y":4},
- {"x":3, "y":4},
- {"x":4, "y":4, "w":6},
- {"x":10, "y":4},
- {"x":11, "y":4},
+ {"matrix": [5, 12], "x": 2, "y": 4},
+ {"matrix": [4, 0], "x": 3, "y": 4},
+ {"matrix": [7, 13], "x": 4, "y": 4, "w": 6},
+ {"matrix": [3, 0], "x": 10, "y": 4},
+ {"matrix": [7, 12], "x": 11, "y": 4},
+ {"matrix": [0, 0], "x": 13.167, "y": 4, "w": 0.916, "h": 0.75},
- {"x":13.167, "y":4, "w":0.916, "h":0.75},
- {"x":12.25, "y":4.75, "w":0.917, "h":0.75},
- {"x":13.167, "y":4.75, "w":0.916, "h":0.75},
- {"x":14.08, "y":4.75, "w":0.917, "h":0.75}
+ {"matrix": [3, 3], "x": 12.25, "y": 4.75, "w": 0.917, "h": 0.75},
+ {"matrix": [1, 0], "x": 13.167, "y": 4.75, "w": 0.916, "h": 0.75},
+ {"matrix": [2, 0], "x": 14.08, "y": 4.75, "w": 0.917, "h": 0.75}
]
}
}