summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2022-10-23 06:33:25 -0700
committerGitHub <noreply@github.com>2022-10-23 14:33:25 +0100
commit64e84419106013d9977192fd2087c0bb8baae84a (patch)
treed85fa9434bd98c094d431754274403aed8d522dc
parent9248a04e17618a796532c62d6cf71427bce9133a (diff)
Han60 Refactor (#18819)
* info.json: apply friendly formatting * han60.h: add matrix diagram * han60.h: tidy file - remove trailing whitespace - use four-space indent * info.json: remove key overlaps from LAYOUT_all rendering * rename LAYOUT_tsangan to LAYOUT_60_ansi_tsangan * rename LAYOUT_tsangan_arrowkeys to LAYOUT_60_ansi_arrow_tsangan * refactor LAYOUT_tsangan_iso into LAYOUT_60_iso_tsangan Moves position `K2C` (Enter) to the home row. * refactor LAYOUT_tsangan_iso_arrowkeys into LAYOUT_60_iso_arrow_tsangan Moves position `K2C` (Enter) to the home row. * refactor default keymap - use four-space indent - use QMK-native keycode aliases - grid-align keycodes * bugfix layout macros * add reference keymaps
Diffstat
-rw-r--r--keyboards/han60/han60.h106
-rw-r--r--keyboards/han60/info.json658
-rw-r--r--keyboards/han60/keymaps/default/keymap.c27
-rw-r--r--keyboards/han60/keymaps/default_ansi_arrow_tsangan/keymap.c35
-rw-r--r--keyboards/han60/keymaps/default_ansi_tsangan/keymap.c35
-rw-r--r--keyboards/han60/keymaps/default_iso_arrow_tsangan/keymap.c35
-rw-r--r--keyboards/han60/keymaps/default_iso_tsangan/keymap.c35
7 files changed, 554 insertions, 377 deletions
diff --git a/keyboards/han60/han60.h b/keyboards/han60/han60.h
index f6e25c23b2..ebc443a277 100644
--- a/keyboards/han60/han60.h
+++ b/keyboards/han60/han60.h
@@ -26,78 +26,94 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
-
+
#define XXX KC_NO
+/*
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │2D │ │0D │ 2u Backspace
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ └─┬─────┤
+ * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │ │
+ * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ┌──┴┐2C │ ISO Enter
+ * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │ │1D │ │
+ * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤ ┌─────┴┬──┴┬───┤
+ * │30 │ │30 │40 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │ │3B │3D │4D │ 1.75u/1u/1u
+ * └────────┘ ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─────┤ └──────┴───┴───┘
+ * │41 │42 │43 │44 │47 │49 │4B │ Tsangan/WKL
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ * ┌─────┬───┬─────┬───────────────────────────┬───┬───┬───┬───┐
+ * │41 │42 │43 │44 │47 │48 │4A │4C │ Arrow
+ * └─────┴───┴─────┴───────────────────────────┴───┴───┴───┴───┘
+ */
#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K4D, \
- K41, K42, K43, K44, K47, K48, K49, K4A, K4B, K4C \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+ K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K4D, \
+ K41, K42, K43, K44, K47, K48, K49, K4A, K4B, K4C \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
- { K40, K41, K42, K43, K44, XXX, XXX, K47, K48, K49, K4A, K4B, K4C, K4D } \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+ { K40, K41, K42, K43, K44, XXX, XXX, K47, K48, K49, K4A, K4B, K4C, K4D } \
}
-#define LAYOUT_tsangan( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K41, K42, K43, K44, K47, K49, K4B \
+#define LAYOUT_60_ansi_tsangan( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
+ K41, K42, K43, K44, K47, K49, K4B \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
- { XXX, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX } \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
+ { XXX, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX } \
}
-#define LAYOUT_tsangan_arrowkeys( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
- K41, K42, K43, K44, K47, K48, K4A, K4C \
+#define LAYOUT_60_ansi_arrow_tsangan( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
+ K41, K42, K43, K44, K47, K48, K4A, K4C \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
- { XXX, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D } \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
+ { XXX, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D } \
}
-#define LAYOUT_tsangan_iso( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, \
- K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K41, K42, K43, K44, K47, K49, K4B \
+#define LAYOUT_60_iso_tsangan( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2C, \
+ K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
+ K41, K42, K43, K44, K47, K49, K4B \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
- { K40, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX } \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, XXX }, \
+ { K40, K41, K42, K43, K44, XXX, XXX, K47, XXX, K49, XXX, K4B, XXX, XXX } \
}
-#define LAYOUT_tsangan_iso_arrowkeys( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, \
- K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
- K41, K42, K43, K44, K47, K48, K4A, K4C \
+#define LAYOUT_60_iso_arrow_tsangan( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K1D, K2C, \
+ K30, K40, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K4D, \
+ K41, K42, K43, K44, K47, K48, K4A, K4C \
) { \
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
- { K40, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D } \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, XXX, K3D }, \
+ { K40, K41, K42, K43, K44, XXX, XXX, K47, K48, XXX, K4A, XXX, K4C, K4D } \
}
diff --git a/keyboards/han60/info.json b/keyboards/han60/info.json
index 1722996c85..bbc60791f7 100644
--- a/keyboards/han60/info.json
+++ b/keyboards/han60/info.json
@@ -8,338 +8,362 @@
"pid": "0xFB60",
"device_version": "0.0.1"
},
+ "layout_aliases": {
+ "LAYOUT_tsangan": "LAYOUT_60_ansi_tsangan",
+ "LAYOUT_tsangan_arrowkeys": "LAYOUT_60_ansi_arrow_tsangan"
+ },
"layouts": {
"LAYOUT_all": {
"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 },
- { "w": 1.5, "x": 0, "y": 1 },
- { "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 },
- { "w": 1.5, "x": 13.5, "y": 1 },
- { "w": 1.75, "x": 0, "y": 2 },
- { "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 },
- { "w": 2.25, "x": 12.75, "y": 2 },
- { "w": 1.25, "x": 0, "y": 3 },
- { "x": 1.25, "y": 3 },
- { "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 },
- { "w": 1.75, "x": 11.25, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 },
- { "w": 1.5, "x": 0, "y": 4 },
- { "x": 1.5, "y": 4 },
- { "w": 1.5, "x": 2.5, "y": 4 },
- { "w": 7, "x": 4, "y": 4 },
- { "x": 11, "y": 4 },
- { "x": 12, "y": 4 },
- { "x": 12.5, "y": 4 },
- { "x": 13, "y": 4 },
- { "w": 1.5, "x": 13.5, "y": 4 },
- { "x": 14, "y": 4 }
+ {"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},
+
+ {"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},
+
+ {"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},
+
+ {"x":0, "y":3, "w":1.25},
+ {"x":1.25, "y":3},
+ {"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":0.75},
+ {"x":13, "y":3},
+ {"x":14, "y":3},
+
+ {"x":0, "y":4, "w":1.5},
+ {"x":1.5, "y":4},
+ {"x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"x":11, "y":4},
+ {"x":12, "y":4, "w":0.6},
+ {"x":12.6, "y":4, "w":0.6},
+ {"x":13.2, "y":4, "w":0.6},
+ {"x":13.8, "y":4, "w":0.6},
+ {"x":14.4, "y":4, "w":0.6}
]
},
- "LAYOUT_tsangan": {
+ "LAYOUT_60_ansi_tsangan": {
"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 },
- { "w": 2, "x": 13, "y": 0 },
- { "w": 1.5, "x": 0, "y": 1 },
- { "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 },
- { "w": 1.5, "x": 13.5, "y": 1 },
- { "w": 1.75, "x": 0, "y": 2 },
- { "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 },
- { "w": 2.25, "x": 12.75, "y": 2 },
- { "w": 2.25, "x": 0, "y": 3 },
- { "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 },
- { "w": 2.75, "x": 12.25, "y": 3 },
- { "w": 1.5, "x": 0, "y": 4 },
- { "x": 1.5, "y": 4 },
- { "w": 1.5, "x": 2.5, "y": 4 },
- { "w": 7, "x": 4, "y": 4 },
- { "w": 1.5, "x": 11, "y": 4 },
- { "x": 12.5, "y": 4 },
- { "w": 1.5, "x": 13.5, "y": 4 }
+ {"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, "w":2},
+
+ {"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},
+
+ {"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},
+
+ {"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":2.75},
+
+ {"x":0, "y":4, "w":1.5},
+ {"x":1.5, "y":4},
+ {"x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"x":11, "y":4, "w":1.5},
+ {"x":12.5, "y":4},
+ {"x":13.5, "y":4, "w":1.5}
]
},
- "LAYOUT_tsangan_arrowkeys": {
+ "LAYOUT_60_ansi_arrow_tsangan": {
"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 },
- { "w": 2, "x": 13, "y": 0 },
- { "w": 1.5, "x": 0, "y": 1 },
- { "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 },
- { "w": 1.5, "x": 13.5, "y": 1 },
- { "w": 1.75, "x": 0, "y": 2 },
- { "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 },
- { "w": 2.25, "x": 12.75, "y": 2 },
- { "w": 2.25, "x": 0, "y": 3 },
- { "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 },
- { "w": 1.75, "x": 11.25, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 },
- { "w": 1.5, "x": 0, "y": 4 },
- { "x": 1.5, "y": 4 },
- { "w": 1.5, "x": 2.5, "y": 4 },
- { "w": 7, "x": 4, "y": 4 },
- { "x": 11, "y": 4 },
- { "x": 12, "y": 4 },
- { "x": 13, "y": 4 },
- { "x": 14, "y": 4 }
+ {"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, "w":2},
+
+ {"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},
+
+ {"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},
+
+ {"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, "w":1.75},
+ {"x":13, "y":3},
+ {"x":14, "y":3},
+
+ {"x":0, "y":4, "w":1.5},
+ {"x":1.5, "y":4},
+ {"x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"x":11, "y":4},
+ {"x":12, "y":4},
+ {"x":13, "y":4},
+ {"x":14, "y":4}
]
},
- "LAYOUT_tsangan_iso": {
+ "LAYOUT_60_iso_tsangan": {
"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 },
- { "w": 2, "x": 13, "y": 0 },
- { "w": 1.5, "x": 0, "y": 1 },
- { "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 },
- { "h": 2, "w": 1.25, "x": 13.75, "y": 1 },
- { "w": 1.75, "x": 0, "y": 2 },
- { "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": 1.25, "x": 0, "y": 3 },
- { "x": 1.25, "y": 3 },
- { "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 },
- { "w": 2.75, "x": 12.25, "y": 3 },
- { "w": 1.5, "x": 0, "y": 4 },
- { "x": 1.5, "y": 4 },
- { "w": 1.5, "x": 2.5, "y": 4 },
- { "w": 7, "x": 4, "y": 4 },
- { "w": 1.5, "x": 11, "y": 4 },
- { "x": 12.5, "y": 4 },
- { "w": 1.5, "x": 13.5, "y": 4 }
+ {"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, "w":2},
+
+ {"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":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},
+ {"x":13.75, "y":1, "w":1.25, "h":2},
+
+ {"x":0, "y":3, "w":1.25},
+ {"x":1.25, "y":3},
+ {"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":2.75},
+
+ {"x":0, "y":4, "w":1.5},
+ {"x":1.5, "y":4},
+ {"x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"x":11, "y":4, "w":1.5},
+ {"x":12.5, "y":4},
+ {"x":13.5, "y":4, "w":1.5}
]
},
- "LAYOUT_tsangan_iso_arrowkeys": {
+ "LAYOUT_60_iso_arrow_tsangan": {
"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 },
- { "w": 2, "x": 13, "y": 0 },
- { "w": 1.5, "x": 0, "y": 1 },
- { "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 },
- { "h": 2, "w": 1.25, "x": 13.75, "y": 1 },
- { "w": 1.75, "x": 0, "y": 2 },
- { "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": 1.25, "x": 0, "y": 3 },
- { "x": 1.25, "y": 3 },
- { "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 },
- { "w": 1.75, "x": 11.25, "y": 3 },
- { "x": 13, "y": 3 },
- { "x": 14, "y": 3 },
- { "w": 1.5, "x": 0, "y": 4 },
- { "x": 1.5, "y": 4 },
- { "w": 1.5, "x": 2.5, "y": 4 },
- { "w": 7, "x": 4, "y": 4 },
- { "x": 11, "y": 4 },
- { "x": 12, "y": 4 },
- { "x": 13, "y": 4 },
- { "x": 14, "y": 4 }
+ {"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, "w":2},
+
+ {"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":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},
+ {"x":13.75, "y":1, "w":1.25, "h":2},
+
+ {"x":0, "y":3, "w":1.25},
+ {"x":1.25, "y":3},
+ {"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, "w":1.75},
+ {"x":13, "y":3},
+ {"x":14, "y":3},
+
+ {"x":0, "y":4, "w":1.5},
+ {"x":1.5, "y":4},
+ {"x":2.5, "y":4, "w":1.5},
+ {"x":4, "y":4, "w":7},
+ {"x":11, "y":4},
+ {"x":12, "y":4},
+ {"x":13, "y":4},
+ {"x":14, "y":4}
]
}
}
diff --git a/keyboards/han60/keymaps/default/keymap.c b/keyboards/han60/keymaps/default/keymap.c
index 4b80f8258c..5e3044f27d 100644
--- a/keyboards/han60/keymaps/default/keymap.c
+++ b/keyboards/han60/keymaps/default/keymap.c
@@ -18,21 +18,18 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* BASE */
[0] = LAYOUT_all(
- KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
- KC_LSFT, KC_GRAVE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_SLSH,
- KC_LCTL, KC_LCMD, KC_LALT, KC_SPACE, KC_RALT, KC_LEFT, MO(1), KC_DOWN, KC_RCTL, KC_RGHT
- ),
- /* FN */
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,