summaryrefslogtreecommitdiff
path: root/keyboards/hs60
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2024-08-04 11:03:54 +1000
committerGitHub <noreply@github.com>2024-08-04 02:03:54 +0100
commit0b4065b50cbcb1760c7e81d3c550c2dfdacd9d83 (patch)
tree9a8b6dccd695d24e1b76bf79c556807e47dec4ed /keyboards/hs60
parentb04fee4ff74420c7495ac6e5e7f655a035ac6653 (diff)
`hs60/v1`: separate into ANSI and ISO revisions (#24136)
Diffstat (limited to 'keyboards/hs60')
-rw-r--r--keyboards/hs60/v1/ansi/ansi.c81
-rw-r--r--keyboards/hs60/v1/ansi/keyboard.json143
-rw-r--r--keyboards/hs60/v1/ansi/keymaps/default/keymap.c (renamed from keyboards/hs60/v1/keymaps/ansi/keymap.c)0
-rw-r--r--keyboards/hs60/v1/ansi/keymaps/default/readme.md (renamed from keyboards/hs60/v1/keymaps/ansi/readme.md)0
-rw-r--r--keyboards/hs60/v1/ansi/rules.mk (renamed from keyboards/hs60/v1/rules.mk)0
-rw-r--r--keyboards/hs60/v1/config.h17
-rw-r--r--keyboards/hs60/v1/info.json85
-rw-r--r--keyboards/hs60/v1/iso/iso.c81
-rw-r--r--keyboards/hs60/v1/iso/keyboard.json145
-rw-r--r--keyboards/hs60/v1/iso/keymaps/default/keymap.c (renamed from keyboards/hs60/v1/keymaps/default/keymap.c)0
-rw-r--r--keyboards/hs60/v1/iso/keymaps/default/readme.md (renamed from keyboards/hs60/v1/keymaps/default/readme.md)0
-rw-r--r--keyboards/hs60/v1/iso/rules.mk4
-rw-r--r--keyboards/hs60/v1/keyboard.json226
-rw-r--r--keyboards/hs60/v1/keymaps/ansi/config.h23
-rw-r--r--keyboards/hs60/v1/readme.md22
-rw-r--r--keyboards/hs60/v1/v1.c228
16 files changed, 547 insertions, 508 deletions
diff --git a/keyboards/hs60/v1/ansi/ansi.c b/keyboards/hs60/v1/ansi/ansi.c
new file mode 100644
index 0000000000..a1c04831a7
--- /dev/null
+++ b/keyboards/hs60/v1/ansi/ansi.c
@@ -0,0 +1,81 @@
1// Copyright 2024 QMK
2// SPDX-License-Identifier: GPL-3.0-or-later
3
4#include "quantum.h"
5
6#ifdef RGB_MATRIX_ENABLE
7const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
8/* Refer to IS31 manual for these locations
9 * driver
10 * | R location
11 * | | G location
12 * | | | B location
13 * | | | | */
14 {1, C1_7, C2_7, C3_7}, //C7
15 {1, C1_6, C2_6, C3_6}, //C6
16 {1, C1_5, C2_5, C3_5}, //C5
17 {1, C1_4, C2_4, C3_4}, //C4
18 {1, C1_3, C2_3, C3_3}, //C3
19 {1, C1_2, C2_2, C4_3}, //C2
20 {1, C1_1, C3_2, C4_2}, //C1
21 {0, C1_7, C2_7, C3_7}, //A7
22 {0, C1_6, C2_6, C3_6}, //A6
23 {0, C1_5, C2_5, C3_5}, //A5
24 {0, C1_4, C2_4, C3_4}, //A4
25 {0, C1_3, C2_3, C3_3}, //A3
26 {0, C1_2, C2_2, C4_3}, //A2
27 {0, C1_1, C3_2, C4_2}, //A1
28
29 {1, C1_8, C2_8, C3_8}, //C8
30 {1, C9_1, C8_1, C7_1}, //C9
31 {1, C9_2, C8_2, C7_2}, //C10
32 {1, C9_3, C8_3, C7_3}, //C11
33 {1, C9_4, C8_4, C7_4}, //C12
34 {1, C9_5, C8_5, C7_5}, //C13
35 {1, C9_6, C8_6, C7_6}, //C14
36 {0, C1_8, C2_8, C3_8}, //A8
37 {0, C9_1, C8_1, C7_1}, //A9
38 {0, C9_2, C8_2, C7_2}, //A10
39 {0, C9_3, C8_3, C7_3}, //A11
40 {0, C9_4, C8_4, C7_4}, //A12
41 {0, C9_5, C8_5, C7_5}, //A13
42 {0, C9_7, C8_7, C6_6}, //A15
43
44 {1, C1_12, C2_12, C3_12}, //D4
45 {1, C1_13, C2_13, C3_13}, //D5
46 {1, C1_14, C2_14, C3_14}, //D6
47 {1, C1_15, C2_15, C3_15}, //D7
48 {1, C1_16, C2_16, C3_16}, //D8
49 {1, C9_8, C7_7, C6_7}, //C16
50 {1, C9_7, C8_7, C6_6}, //C15
51 {0, C1_13, C2_13, C3_13}, //B5
52 {0, C1_14, C2_14, C3_14}, //B6
53 {0, C1_15, C2_15, C3_15}, //B7
54 {0, C1_16, C2_16, C3_16}, //B8
55 {0, C9_8, C7_7, C6_7}, //A16
56 {0, C9_6, C8_6, C7_6}, //A14
57
58 {1, C1_11, C2_11, C3_11}, //D3
59 {1, C1_9, C3_10, C4_10}, //D1
60 {1, C9_9, C8_9, C7_9}, //D9
61 {1, C9_10, C8_10, C7_10}, //D10
62 {1, C9_11, C8_11, C7_11}, //D11
63 {1, C9_12, C8_12, C7_12}, //D12
64 {0, C1_12, C2_12, C3_12}, //B4
65 {0, C1_11, C2_11, C3_11}, //B3
66 {0, C1_10, C2_10, C4_11}, //B2
67 {0, C1_9, C3_10, C4_10}, //B1
68 {0, C9_9, C8_9, C7_9}, //B9
69 {0, C9_10, C8_10, C7_10}, //B10
70
71 {1, C9_16, C7_15, C6_15}, //D16
72 {1, C9_15, C8_15, C6_14}, //D15
73 {1, C9_14, C8_14, C7_14}, //D14
74 {1, C9_13, C8_13, C7_13}, //D13
75 {0, C9_14, C8_14, C7_14}, //B14
76 {0, C9_13, C8_13, C7_13}, //B13
77 {0, C9_12, C8_12, C7_12}, //B12
78 {0, C9_11, C8_11, C7_11} //B11
79};
80
81#endif
diff --git a/keyboards/hs60/v1/ansi/keyboard.json b/keyboards/hs60/v1/ansi/keyboard.json
new file mode 100644
index 0000000000..8512aa176d
--- /dev/null
+++ b/keyboards/hs60/v1/ansi/keyboard.json
@@ -0,0 +1,143 @@
1{
2 "rgb_matrix": {
3 "layout": [
4 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
5 {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
6 {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
7 {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
8 {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
9 {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
10 {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
11 {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
12 {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
13 {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
14 {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
15 {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
16 {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
17 {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
18
19 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
20 {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
21 {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
22 {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
23 {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
24 {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
25 {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
26 {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
27 {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
28 {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
29 {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
30 {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
31 {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
32 {"matrix": [2, 12], "x": 220, "y": 16, "flags": 4},
33
34 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
35 {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
36 {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
37 {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
38 {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
39 {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
40 {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
41 {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
42 {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
43 {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
44 {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
45 {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
46 {"matrix": [2, 13], "x": 214, "y": 32, "flags": 1},
47
48 {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1},
49 {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
50 {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
51 {"matrix": [3, 4], "x": 68, "y": 48, "flags": 4},
52 {"matrix": [3, 5], "x": 84, "y": 48, "flags": 4},
53 {"matrix": [3, 6], "x": 100, "y": 48, "flags": 4},
54 {"matrix": [3, 7], "x": 116, "y": 48, "flags": 4},
55 {"matrix": [3, 8], "x": 132, "y": 48, "flags": 4},
56 {"matrix": [3, 9], "x": 148, "y": 48, "flags": 4},
57 {"matrix": [3, 10], "x": 164, "y": 48, "flags": 4},
58 {"matrix": [3, 11], "x": 180, "y": 48, "flags": 4},
59 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 1},
60
61 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
62 {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
63 {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
64 {"matrix": [4, 6], "x": 102, "y": 64, "flags": 4},
65 {"matrix": [4, 10], "x": 162, "y": 64, "flags": 1},
66 {"matrix": [4, 11], "x": 182, "y": 64, "flags": 1},
67 {"matrix": [4, 12], "x": 202, "y": 64, "flags": 1},
68 {"matrix": [4, 13], "x": 222, "y": 64, "flags": 1}
69 ]
70 },
71 "community_layouts": ["60_ansi"],
72 "layouts": {
73 "LAYOUT_60_ansi": {
74 "layout": [
75 {"matrix": [0, 0], "x": 0, "y": 0},
76 {"matrix": [0, 1], "x": 1, "y": 0},
77 {"matrix": [0, 2], "x": 2, "y": 0},
78 {"matrix": [0, 3], "x": 3, "y": 0},
79 {"matrix": [0, 4], "x": 4, "y": 0},
80 {"matrix": [0, 5], "x": 5, "y": 0},
81 {"matrix": [0, 6], "x": 6, "y": 0},
82 {"matrix": [0, 7], "x": 7, "y": 0},
83 {"matrix": [0, 8], "x": 8, "y": 0},
84 {"matrix": [0, 9], "x": 9, "y": 0},
85 {"matrix": [0, 10], "x": 10, "y": 0},
86 {"matrix": [0, 11], "x": 11, "y": 0},
87 {"matrix": [0, 12], "x": 12, "y": 0},
88 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
89
90 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
91 {"matrix": [1, 1], "x": 1.5, "y": 1},
92 {"matrix": [1, 2], "x": 2.5, "y": 1},
93 {"matrix": [1, 3], "x": 3.5, "y": 1},
94 {"matrix": [1, 4], "x": 4.5, "y": 1},
95 {"matrix": [1, 5], "x": 5.5, "y": 1},
96 {"matrix": [1, 6], "x": 6.5, "y": 1},
97 {"matrix": [1, 7], "x": 7.5, "y": 1},
98 {"matrix": [1, 8], "x": 8.5, "y": 1},
99 {"matrix": [1, 9], "x": 9.5, "y": 1},
100 {"matrix": [1, 10], "x": 10.5, "y": 1},
101 {"matrix": [1, 11], "x": 11.5, "y": 1},
102 {"matrix": [1, 12], "x": 12.5, "y": 1},
103 {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
104
105 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
106 {"matrix": [2, 1], "x": 1.75, "y": 2},
107 {"matrix": [2, 2], "x": 2.75, "y": 2},
108 {"matrix": [2, 3], "x": 3.75, "y": 2},
109 {"matrix": [2, 4], "x": 4.75, "y": 2},
110 {"matrix": [2, 5], "x": 5.75, "y": 2},
111 {"matrix": [2, 6], "x": 6.75, "y": 2},
112 {"matrix": [2, 7], "x": 7.75, "y": 2},
113 {"matrix": [2, 8], "x": 8.75, "y": 2},
114 {"matrix": [2, 9], "x": 9.75, "y": 2},
115 {"matrix": [2, 10], "x": 10.75, "y": 2},
116 {"matrix": [2, 11], "x": 11.75, "y": 2},
117 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
118
119 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
120 {"matrix": [3, 2], "x": 2.25, "y": 3},
121 {"matrix": [3, 3], "x": 3.25, "y": 3},
122 {"matrix": [3, 4], "x": 4.25, "y": 3},
123 {"matrix": [3, 5], "x": 5.25, "y": 3},
124 {"matrix": [3, 6], "x": 6.25, "y": 3},
125 {"matrix": [3, 7], "x": 7.25, "y": 3},
126 {"matrix": [3, 8], "x": 8.25, "y": 3},
127 {"matrix": [3, 9], "x": 9.25, "y": 3},
128 {"matrix": [3, 10], "x": 10.25, "y": 3},
129 {"matrix": [3, 11], "x": 11.25, "y": 3},
130 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
131
132 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
133 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
134 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
135 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
136 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
137 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
138 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
139 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
140 ]
141 }
142 }
143}
diff --git a/keyboards/hs60/v1/keymaps/ansi/keymap.c b/keyboards/hs60/v1/ansi/keymaps/default/keymap.c
index 3d52fe4d52..3d52fe4d52 100644
--- a/keyboards/hs60/v1/keymaps/ansi/keymap.c
+++ b/keyboards/hs60/v1/ansi/keymaps/default/keymap.c
diff --git a/keyboards/hs60/v1/keymaps/ansi/readme.md b/keyboards/hs60/v1/ansi/keymaps/default/readme.md
index fa811319d3..fa811319d3 100644
--- a/keyboards/hs60/v1/keymaps/ansi/readme.md
+++ b/keyboards/hs60/v1/ansi/keymaps/default/readme.md
diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/ansi/rules.mk
index 5cde06a483..5cde06a483 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/ansi/rules.mk
diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h
index 1bbc88ac1d..3c4f470d8a 100644
--- a/keyboards/hs60/v1/config.h
+++ b/keyboards/hs60/v1/config.h
@@ -17,22 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
17 17
18#pragma once 18#pragma once
19 19
20/*
21 * Feature disable options
22 * These options are also useful to firmware size reduction.
23 */
24
25/* disable debug print */
26//#define NO_DEBUG
27
28/* disable print */
29//#define NO_PRINT
30
31#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND 20#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
32#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL 21#define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL
33
34#ifdef HS60_ANSI
35#define RGB_MATRIX_LED_COUNT 61
36#else
37#define RGB_MATRIX_LED_COUNT 62
38#endif
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json
new file mode 100644
index 0000000000..c6ebae97ce
--- /dev/null
+++ b/keyboards/hs60/v1/info.json
@@ -0,0 +1,85 @@
1{
2 "keyboard_name": "HS60",
3 "manufacturer": "Yiancar-Designs",
4 "url": "",
5 "maintainer": "qmk",
6 "usb": {
7 "vid": "0xFEED",
8 "pid": "0x0257",
9 "device_version": "0.0.1"
10 },
11 "rgb_matrix": {
12 "animations": {
13 "alphas_mods": true,
14 "gradient_up_down": true,
15 "gradient_left_right": true,
16 "breathing": true,
17 "band_sat": true,
18 "band_val": true,
19 "band_pinwheel_sat": true,
20 "band_pinwheel_val": true,
21 "band_spiral_sat": true,
22 "band_spiral_val": true,
23 "cycle_all": true,
24 "cycle_left_right": true,
25 "cycle_up_down": true,
26 "rainbow_moving_chevron": true,
27 "cycle_out_in": true,
28 "cycle_out_in_dual": true,
29 "cycle_pinwheel": true,
30 "cycle_spiral": true,
31 "dual_beacon": true,
32 "rainbow_beacon": true,
33 "rainbow_pinwheels": true,
34 "raindrops": true,
35 "jellybean_raindrops": true,
36 "hue_breathing": true,
37 "hue_pendulum": true,
38 "hue_wave": true,
39 "pixel_rain": true,
40 "pixel_flow": true,
41 "pixel_fractal": true,
42 "typing_heatmap": true,
43 "digital_rain": true,
44 "solid_reactive_simple": true,
45 "solid_reactive": true,
46 "solid_reactive_wide": true,
47 "solid_reactive_multiwide": true,
48 "solid_reactive_cross": true,
49 "solid_reactive_multicross": true,
50 "solid_reactive_nexus": true,
51 "solid_reactive_multinexus": true,
52 "splash": true,
53 "multisplash": true,
54 "solid_splash": true,
55 "solid_multisplash": true
56 },
57 "driver": "is31fl3731",
58 "max_brightness": 215,
59 "sleep": true
60 },
61 "matrix_pins": {
62 "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
63 "rows": ["B0", "B1", "B2", "B3", "F7"]
64 },
65 "diode_direction": "COL2ROW",
66 "qmk_lufa_bootloader": {
67 "esc_input": "B2",
68 "esc_output": "B5"
69 },
70 "processor": "atmega32u4",
71 "bootloader": "qmk-dfu",
72 "features": {
73 "bootmagic": false,
74 "mousekey": false,
75 "extrakey": true,
76 "nkro": true,
77 "rgb_matrix": true
78 },
79 "qmk": {
80 "locking": {
81 "enabled": true,
82 "resync": true
83 }
84 }
85}
diff --git a/keyboards/hs60/v1/iso/iso.c b/keyboards/hs60/v1/iso/iso.c
new file mode 100644
index 0000000000..f1f5ad7240
--- /dev/null
+++ b/keyboards/hs60/v1/iso/iso.c
@@ -0,0 +1,81 @@
1// Copyright 2024 QMK
2// SPDX-License-Identifier: GPL-3.0-or-later
3
4#include "quantum.h"
5
6#ifdef RGB_MATRIX_ENABLE
7const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
8/* Refer to IS31 manual for these locations
9 * driver
10 * | R location
11 * | | G location
12 * | | | B location
13 * | | | | */
14 {1, C1_7, C2_7, C3_7}, //C7
15 {1, C1_6, C2_6, C3_6}, //C6
16 {1, C1_5, C2_5, C3_5}, //C5
17 {1, C1_4, C2_4, C3_4}, //C4
18 {1, C1_3, C2_3, C3_3}, //C3
19 {1, C1_2, C2_2, C4_3}, //C2
20 {1, C1_1, C3_2, C4_2}, //C1
21 {0, C1_7, C2_7, C3_7}, //A7
22 {0, C1_6, C2_6, C3_6}, //A6
23 {0, C1_5, C2_5, C3_5}, //A5
24 {0, C1_4, C2_4, C3_4}, //A4
25 {0, C1_3, C2_3, C3_3}, //A3
26 {0, C1_2, C2_2, C4_3}, //A2
27 {0, C1_1, C3_2, C4_2}, //A1
28
29 {1, C1_8, C2_8, C3_8}, //C8
30 {1, C9_1, C8_1, C7_1}, //C9
31 {1, C9_2, C8_2, C7_2}, //C10
32 {1, C9_3, C8_3, C7_3}, //C11
33 {1, C9_4, C8_4, C7_4}, //C12
34 {1, C9_5, C8_5, C7_5}, //C13
35 {1, C9_6, C8_6, C7_6}, //C14
36 {0, C1_8, C2_8, C3_8}, //A8
37 {0, C9_1, C8_1, C7_1}, //A9
38 {0, C9_2, C8_2, C7_2}, //A10
39 {0, C9_3, C8_3, C7_3}, //A11
40 {0, C9_4, C8_4, C7_4}, //A12
41 {0, C9_5, C8_5, C7_5}, //A13
42
43 {1, C1_12, C2_12, C3_12}, //D4
44 {1, C1_13, C2_13, C3_13}, //D5
45 {1, C1_14, C2_14, C3_14}, //D6
46 {1, C1_15, C2_15, C3_15}, //D7
47 {1, C1_16, C2_16, C3_16}, //D8
48 {1, C9_8, C7_7, C6_7}, //C16
49 {1, C9_7, C8_7, C6_6}, //C15
50 {0, C1_13, C2_13, C3_13}, //B5
51 {0, C1_14, C2_14, C3_14}, //B6
52 {0, C1_15, C2_15, C3_15}, //B7
53 {0, C1_16, C2_16, C3_16}, //B8
54 {0, C9_8, C7_7, C6_7}, //A16
55 {0, C9_7, C8_7, C6_6}, //A15
56 {0, C9_6, C8_6, C7_6}, //A14
57
58 {1, C1_11, C2_11, C3_11}, //D3
59 {1, C1_10, C2_10, C4_11}, //D2
60 {1, C1_9, C3_10, C4_10}, //D1
61 {1, C9_9, C8_9, C7_9}, //D9
62 {1, C9_10, C8_10, C7_10}, //D10
63 {1, C9_11, C8_11, C7_11}, //D11
64 {1, C9_12, C8_12, C7_12}, //D12
65 {0, C1_12, C2_12, C3_12}, //B4
66 {0, C1_11, C2_11, C3_11}, //B3
67 {0, C1_10, C2_10, C4_11}, //B2
68 {0, C1_9, C3_10, C4_10}, //B1
69 {0, C9_9, C8_9, C7_9}, //B9
70 {0, C9_10, C8_10, C7_10}, //B10
71
72 {1, C9_16, C7_15, C6_15}, //D16
73 {1, C9_15, C8_15, C6_14}, //D15
74 {1, C9_14, C8_14, C7_14}, //D14
75 {1, C9_13, C8_13, C7_13}, //D13
76 {0, C9_14, C8_14, C7_14}, //B14
77 {0, C9_13, C8_13, C7_13}, //B13
78 {0, C9_12, C8_12, C7_12}, //B12
79 {0, C9_11, C8_11, C7_11} //B11
80};
81#endif
diff --git a/keyboards/hs60/v1/iso/keyboard.json b/keyboards/hs60/v1/iso/keyboard.json
new file mode 100644
index 0000000000..b83de6627c
--- /dev/null
+++ b/keyboards/hs60/v1/iso/keyboard.json
@@ -0,0 +1,145 @@
1{
2 "rgb_matrix": {
3 "layout": [
4 {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
5 {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
6 {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
7 {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
8 {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
9 {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
10 {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
11 {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
12 {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
13 {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
14 {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
15 {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
16 {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
17 {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1},
18
19 {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
20 {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4},
21 {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4},
22 {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4},
23 {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4},
24 {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4},
25 {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4},
26 {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4},
27 {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4},
28 {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4},
29 {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4},
30 {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4},
31 {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4},
32
33 {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
34 {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4},
35 {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4},
36 {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4},
37 {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4},
38 {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4},
39 {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4},
40 {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4},
41 {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4},
42 {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4},
43 {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
44 {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4},
45 {"matrix": [2, 12], "x": 204, "y": 32, "flags": 4},
46 {"matrix": [2, 13], "x": 222, "y": 24, "flags": 1},
47
48 {"matrix": [3, 0], "x": 2, "y": 48, "flags": 1},
49 {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4},
50 {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4},
51 {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
52 {"matrix": [3, 4], "x": 68, "y": 48, "flags": 4},
53 {"matrix": [3, 5], "x": 84, "y": 48, "flags": 4},
54 {"matrix": [3, 6], "x": 100, "y": 48, "flags": 4},
55 {"matrix": [3, 7], "x": 116, "y": 48, "flags": 4},
56 {"matrix": [3, 8], "x": 132, "y": 48, "flags": 4},
57 {"matrix": [3, 9], "x": 148, "y": 48, "flags": 4},
58 {"matrix": [3, 10], "x": 164, "y": 48, "flags": 4},
59 {"matrix": [3, 11], "x": 180, "y": 48, "flags": 4},
60 {"matrix": [3, 13], "x": 210, "y": 48, "flags": 1},
61
62 {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
63 {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1},
64 {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1},
65 {"matrix": [4, 6], "x": 102, "y": 64, "flags": 4},
66 {"matrix": [4, 10], "x": 162, "y": 64, "flags": 1},
67 {"matrix": [4, 11], "x": 182, "y": 64, "flags": 1},
68 {"matrix": [4, 12], "x": 202, "y": 64, "flags": 1},
69 {"matrix": [4, 13], "x": 222, "y": 64, "flags": 1}
70 ]
71 },
72 "community_layouts": ["60_iso"],
73 "layouts": {
74 "LAYOUT_60_iso": {
75 "layout": [
76 {"matrix": [0, 0], "x": 0, "y": 0},
77 {"matrix": [0, 1], "x": 1, "y": 0},
78 {"matrix": [0, 2], "x": 2, "y": 0},
79 {"matrix": [0, 3], "x": 3, "y": 0},
80 {"matrix": [0, 4], "x": 4, "y": 0},
81 {"matrix": [0, 5], "x": 5, "y": 0},
82 {"matrix": [0, 6], "x": 6, "y": 0},
83 {"matrix": [0, 7], "x": 7, "y": 0},
84 {"matrix": [0, 8], "x": 8, "y": 0},
85 {"matrix": [0, 9], "x": 9, "y": 0},
86 {"matrix": [0, 10], "x": 10, "y": 0},
87 {"matrix": [0, 11], "x": 11, "y": 0},
88 {"matrix": [0, 12], "x": 12, "y": 0},
89 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
90
91 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
92 {"matrix": [1, 1], "x": 1.5, "y": 1},
93 {"matrix": [1, 2], "x": 2.5, "y": 1},
94 {"matrix": [1, 3], "x": 3.5, "y": 1},
95 {"matrix": [1, 4], "x": 4.5, "y": 1},
96 {"matrix": [1, 5], "x": 5.5, "y": 1},
97 {"matrix": [1, 6], "x": 6.5, "y": 1},
98 {"matrix": [1, 7], "x": 7.5, "y": 1},
99 {"matrix": [1, 8], "x": 8.5, "y": 1},
100 {"matrix": [1, 9], "x": 9.5, "y": 1},
101 {"matrix": [1, 10], "x": 10.5, "y": 1},
102 {"matrix": [1, 11], "x": 11.5, "y": 1},
103 {"matrix": [1, 12], "x": 12.5, "y": 1},
104
105 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
106 {"matrix": [2, 1], "x": 1.75, "y": 2},
107 {"matrix": [2, 2], "x": 2.75, "y": 2},
108 {"matrix": [2, 3], "x": 3.75, "y": 2},
109 {"matrix": [2, 4], "x": 4.75, "y": 2},
110 {"matrix": [2, 5], "x": 5.75, "y": 2},
111 {"matrix": [2, 6], "x": 6.75, "y": 2},
112 {"matrix": [2, 7], "x": 7.75, "y": 2},
113 {"matrix": [2, 8], "x": 8.75, "y": 2},
114 {"matrix": [2, 9], "x": 9.75, "y": 2},
115 {"matrix": [2, 10], "x": 10.75, "y": 2},
116 {"matrix": [2, 11], "x": 11.75, "y": 2},
117 {"matrix": [2, 12], "x": 12.75, "y": 2},
118 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
119
120 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
121 {"matrix": [3, 1], "x": 1.25, "y": 3},
122 {"matrix": [3, 2], "x": 2.25, "y": 3},
123 {"matrix": [3, 3], "x": 3.25, "y": 3},
124 {"matrix": [3, 4], "x": 4.25, "y": 3},
125 {"matrix": [3, 5], "x": 5.25, "y": 3},
126 {"matrix": [3, 6], "x": 6.25, "y": 3},
127 {"matrix": [3, 7], "x": 7.25, "y": 3},
128 {"matrix": [3, 8], "x": 8.25, "y": 3},
129 {"matrix": [3, 9], "x": 9.25, "y": 3},
130 {"matrix": [3, 10], "x": 10.25, "y": 3},
131 {"matrix": [3, 11], "x": 11.25, "y": 3},
132 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
133
134 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
135 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
136 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
137 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
138 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
139 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
140 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
141 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
142 ]
143 }
144 }
145}
diff --git a/keyboards/hs60/v1/keymaps/default/keymap.c b/keyboards/hs60/v1/iso/keymaps/default/keymap.c
index 5059aabe20..5059aabe20 100644
--- a/keyboards/hs60/v1/keymaps/default/keymap.c
+++ b/keyboards/hs60/v1/iso/keymaps/default/keymap.c
diff --git a/keyboards/hs60/v1/keymaps/default/readme.md b/keyboards/hs60/v1/iso/keymaps/default/readme.md
index 9125cb349e..9125cb349e 100644
--- a/keyboards/hs60/v1/keymaps/default/readme.md
+++ b/keyboards/hs60/v1/iso/keymaps/default/readme.md
diff --git a/keyboards/hs60/v1/iso/rules.mk b/keyboards/hs60/v1/iso/rules.mk
new file mode 100644
index 0000000000..5cde06a483
--- /dev/null
+++ b/keyboards/hs60/v1/iso/rules.mk
@@ -0,0 +1,4 @@
1# Do not put the microcontroller into power saving mode
2# when we get USB suspend event. We want it to keep updating
3# backlight effects.
4NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json
deleted file mode 100644
index f4a05dfe27..0000000000
--- a/keyboards/hs60/v1/keyboard.json
+++ /dev/null
@@ -1,226 +0,0 @@
1{
2 "keyboard_name": "HS60",
3 "manufacturer": "Yiancar-Designs",
4 "url": "",
5 "maintainer": "qmk",
6 "usb": {
7 "vid": "0xFEED",
8 "pid": "0x0257",
9 "device_version": "0.0.1"
10 },
11 "rgb_matrix": {
12 "animations": {
13 "alphas_mods": true,
14 "gradient_up_down": true,
15 "gradient_left_right": true,
16 "breathing": true,
17 "band_sat": true,
18 "band_val": true,
19 "band_pinwheel_sat": true,
20 "band_pinwheel_val": true,
21 "band_spiral_sat": true,
22 "band_spiral_val": true,
23 "cycle_all": true,
24 "cycle_left_right": true,
25 "cycle_up_down": true,
26 "rainbow_moving_chevron": true,
27 "cycle_out_in": true,
28 "cycle_out_in_dual": true,
29 "cycle_pinwheel": true,
30 "cycle_spiral": true,
31 "dual_beacon": true,
32 "rainbow_beacon": true,
33 "rainbow_pinwheels": true,
34 "raindrops": true,
35 "jellybean_raindrops": true,
36 "hue_breathing": true,
37 "hue_pendulum": true,
38 "hue_wave": true,
39 "pixel_rain": true,
40 "pixel_flow": true,
41 "pixel_fractal": true,
42 "typing_heatmap": true,
43 "digital_rain": true,
44 "solid_reactive_simple": true,
45 "solid_reactive": true,
46 "solid_reactive_wide": true,
47 "solid_reactive_multiwide": true,
48 "solid_reactive_cross": true,
49 "solid_reactive_multicross": true,
50 "solid_reactive_nexus": true,
51 "solid_reactive_multinexus": true,
52 "splash": true,
53 "multisplash": true,
54 "solid_splash": true,
55 "solid_multisplash": true
56 },
57 "driver": "is31fl3731",
58 "max_brightness": 215
59 },
60 "matrix_pins": {
61 "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
62 "rows": ["B0", "B1", "B2", "B3", "F7"]
63 },
64 "diode_direction": "COL2ROW",
65 "qmk_lufa_bootloader": {
66 "esc_input": "B2",
67 "esc_output": "B5"
68 },
69 "processor": "atmega32u4",
70 "bootloader": "qmk-dfu",
71 "features": {
72 "bootmagic": false,
73 "mousekey": false,
74 "extrakey": true,
75 "nkro": true,
76 "rgb_matrix": true
77 },
78 "qmk": {
79 "locking": {
80 "enabled": true,
81 "resync": true
82 }
83 },
84 "community_layouts": ["60_ansi", "60_iso"],
85 "layouts": {
86 "LAYOUT_60_iso": {
87 "layout": [
88 {"matrix": [0, 0], "x": 0, "y": 0},
89 {"matrix": [0, 1], "x": 1, "y": 0},
90 {"matrix": [0, 2], "x": 2, "y": 0},
91 {"matrix": [0, 3], "x": 3, "y": 0},
92 {"matrix": [0, 4], "x": 4, "y": 0},
93 {"matrix": [0, 5], "x": 5, "y": 0},
94 {"matrix": [0, 6], "x": 6, "y": 0},
95 {"matrix": [0, 7], "x": 7, "y": 0},
96 {"matrix": [0, 8], "x": 8, "y": 0},
97 {"matrix": [0, 9], "x": 9, "y": 0},
98 {"matrix": [0, 10], "x": 10, "y": 0},
99 {"matrix": [0, 11], "x": 11, "y": 0},
100 {"matrix": [0, 12], "x": 12, "y": 0},
101 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
102
103 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
104 {"matrix": [1, 1], "x": 1.5, "y": 1},
105 {"matrix": [1, 2], "x": 2.5, "y": 1},
106 {"matrix": [1, 3], "x": 3.5, "y": 1},
107 {"matrix": [1, 4], "x": 4.5, "y": 1},
108 {"matrix": [1, 5], "x": 5.5, "y": 1},
109 {"matrix": [1, 6], "x": 6.5, "y": 1},
110 {"matrix": [1, 7], "x": 7.5, "y": 1},
111 {"matrix": [1, 8], "x": 8.5, "y": 1},
112 {"matrix": [1, 9], "x": 9.5, "y": 1},
113 {"matrix": [1, 10], "x": 10.5, "y": 1},
114 {"matrix": [1, 11], "x": 11.5, "y": 1},
115 {"matrix": [1, 12], "x": 12.5, "y": 1},
116
117 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
118 {"matrix": [2, 1], "x": 1.75, "y": 2},
119 {"matrix": [2, 2], "x": 2.75, "y": 2},
120 {"matrix": [2, 3], "x": 3.75, "y": 2},
121 {"matrix": [2, 4], "x": 4.75, "y": 2},
122 {"matrix": [2, 5], "x": 5.75, "y": 2},
123 {"matrix": [2, 6], "x": 6.75, "y": 2},
124 {"matrix": [2, 7], "x": 7.75, "y": 2},
125 {"matrix": [2, 8], "x": 8.75, "y": 2},
126 {"matrix": [2, 9], "x": 9.75, "y": 2},
127 {"matrix": [2, 10], "x": 10.75, "y": 2},
128 {"matrix": [2, 11], "x": 11.75, "y": 2},
129 {"matrix": [2, 12], "x": 12.75, "y": 2},
130 {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
131
132 {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
133 {"matrix": [3, 1], "x": 1.25, "y": 3},
134 {"matrix": [3, 2], "x": 2.25, "y": 3},
135 {"matrix": [3, 3], "x": 3.25, "y": 3},
136 {"matrix": [3, 4], "x": 4.25, "y": 3},
137 {"matrix": [3, 5], "x": 5.25, "y": 3},
138 {"matrix": [3, 6], "x": 6.25, "y": 3},
139 {"matrix": [3, 7], "x": 7.25, "y": 3},
140 {"matrix": [3, 8], "x": 8.25, "y": 3},
141 {"matrix": [3, 9], "x": 9.25, "y": 3},
142 {"matrix": [3, 10], "x": 10.25, "y": 3},
143 {"matrix": [3, 11], "x": 11.25, "y": 3},
144 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
145
146 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
147 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
148 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
149 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
150 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
151 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
152 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
153 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
154 ]
155 },
156 "LAYOUT_60_ansi": {
157 "layout": [
158 {"matrix": [0, 0], "x": 0, "y": 0},
159 {"matrix": [0, 1], "x": 1, "y": 0},
160 {"matrix": [0, 2], "x": 2, "y": 0},
161 {"matrix": [0, 3], "x": 3, "y": 0},
162 {"matrix": [0, 4], "x": 4, "y": 0},
163 {"matrix": [0, 5], "x": 5, "y": 0},
164 {"matrix": [0, 6], "x": 6, "y": 0},
165 {"matrix": [0, 7], "x": 7, "y": 0},
166 {"matrix": [0, 8], "x": 8, "y": 0},
167 {"matrix": [0, 9], "x": 9, "y": 0},
168 {"matrix": [0, 10], "x": 10, "y": 0},
169 {"matrix": [0, 11], "x": 11, "y": 0},
170 {"matrix": [0, 12], "x": 12, "y": 0},
171 {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
172
173 {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
174 {"matrix": [1, 1], "x": 1.5, "y": 1},
175 {"matrix": [1, 2], "x": 2.5, "y": 1},
176 {"matrix": [1, 3], "x": 3.5, "y": 1},
177 {"matrix": [1, 4], "x": 4.5, "y": 1},
178 {"matrix": [1, 5], "x": 5.5, "y": 1},
179 {"matrix": [1, 6], "x": 6.5, "y": 1},
180 {"matrix": [1, 7], "x": 7.5, "y": 1},
181 {"matrix": [1, 8], "x": 8.5, "y": 1},
182 {"matrix": [1, 9], "x": 9.5, "y": 1},
183 {"matrix": [1, 10], "x": 10.5, "y": 1},
184 {"matrix": [1, 11], "x": 11.5, "y": 1},
185 {"matrix": [1, 12], "x": 12.5, "y": 1},
186 {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
187
188 {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
189 {"matrix": [2, 1], "x": 1.75, "y": 2},
190 {"matrix": [2, 2], "x": 2.75, "y": 2},
191 {"matrix": [2, 3], "x": 3.75, "y": 2},
192 {"matrix": [2, 4], "x": 4.75, "y": 2},
193 {"matrix": [2, 5], "x": 5.75, "y": 2},
194 {"matrix": [2, 6], "x": 6.75, "y": 2},
195 {"matrix": [2, 7], "x": 7.75, "y": 2},
196 {"matrix": [2, 8], "x": 8.75, "y": 2},
197 {"matrix": [2, 9], "x": 9.75, "y": 2},
198 {"matrix": [2, 10], "x": 10.75, "y": 2},
199 {"matrix": [2, 11], "x": 11.75, "y": 2},
200 {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
201
202 {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
203 {"matrix": [3, 2], "x": 2.25, "y": 3},
204 {"matrix": [3, 3], "x": 3.25, "y": 3},
205 {"matrix": [3, 4], "x": 4.25, "y": 3},
206 {"matrix": [3, 5], "x": 5.25, "y": 3},
207 {"matrix": [3, 6], "x": 6.25, "y": 3},
208 {"matrix": [3, 7], "x": 7.25, "y": 3},
209 {"matrix": [3, 8], "x": 8.25, "y": 3},
210 {"matrix": [3, 9], "x": 9.25, "y": 3},
211 {"matrix": [3, 10], "x": 10.25, "y": 3},
212 {"matrix": [3, 11], "x": 11.25, "y": 3},
213 {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
214
215 {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
216 {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
217 {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
218 {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
219 {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
220 {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
221 {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
222 {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
223 ]
224 }
225 }
226}
diff --git a/keyboards/hs60/v1/keymaps/ansi/config.h b/keyboards/hs60/v1/keymaps/ansi/config.h
deleted file mode 100644
index 82cdc2689c..0000000000
--- a/keyboards/hs60/v1/keymaps/ansi/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2Copyright 2018 Yiancar
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#pragma once
18
19/* Include overwrites for specific keymap */
20
21#ifdef KEYBOARD_hs60
22 #define HS60_ANSI
23#endif
diff --git a/keyboards/hs60/v1/readme.md b/keyboards/hs60/v1/readme.md
index 4b613e2a52..e9c8e2d6ee 100644
--- a/keyboards/hs60/v1/readme.md
+++ b/keyboards/hs60/v1/readme.md
@@ -1,22 +1,16 @@
1HS60 1# HS60
2====
3 2
4[HS60](https://mechboards.co.uk/wp-content/uploads/2018/04/IMG_20180420_140353.jpg) 3[HS60](https://mechboards.co.uk/wp-content/uploads/2018/04/IMG_20180420_140353.jpg)
5 4
6This is a standard fixed layout 60% PCB. It comes in two varians, ISO and ANSI and support full per-key RGB. 5This is a standard fixed layout 60% PCB. It comes in two variants, ISO and ANSI and support full per-key RGB.
7 6
8Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) 7* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
9Hardware Supported: HS60 ISO and ANSI PCBs with Atmega 32u4 8* Hardware Supported: HS60 ISO and ANSI PCBs with Atmega 32u4
10Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/ 9* Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/
11
12If you're using the [community layouts feature](https://docs.qmk.fm/#/feature_layouts) and using the 60_ansi layout, you need to make sure that you include this on your config.h to ensure that the RGB Matrix is properly configured:
13
14 #ifdef KEYBOARD_hs60
15 #define HS60_ANSI
16 #endif
17 10
18Make example for this keyboard (after setting up your build environment): 11Make example for this keyboard (after setting up your build environment):
19 12
20 make hs60/v1:default 13 make hs60/v1/ansi:default
14 make hs60/v1/iso:default
21 15
22See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 16See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index 7a43784ad9..ecb78c70d0 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -15,224 +15,6 @@
15 */ 15 */
16#include "quantum.h" 16#include "quantum.h"
17 17
18#ifdef HS60_ANSI
19
20const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
21/* Refer to IS31 manual for these locations
22 * driver
23 * | R location
24 * | | G location
25 * | | | B location
26 * | | | | */
27 {0, C1_1, C3_2, C4_2}, //A1
28 {0, C1_2, C2_2, C4_3}, //A2
29 {0, C1_3, C2_3, C3_3}, //A3
30 {0, C1_4, C2_4, C3_4}, //A4
31 {0, C1_5, C2_5, C3_5}, //A5
32 {0, C1_6, C2_6, C3_6}, //A6
33 {0, C1_7, C2_7, C3_7}, //A7
34 {0, C1_8, C2_8, C3_8}, //A8
35 {0, C9_1, C8_1, C7_1}, //A9
36 {0, C9_2, C8_2, C7_2}, //A10
37 {0, C9_3, C8_3, C7_3}, //A11
38 {0, C9_4, C8_4, C7_4}, //A12
39 {0, C9_5, C8_5, C7_5}, //A13
40 {0, C9_6, C8_6, C7_6}, //A14
41 {0, C9_7, C8_7, C6_6}, //A15
42 {0, C9_8, C7_7, C6_7}, //A16
43
44 {0, C1_9, C3_10, C4_10}, //B1
45 {0, C1_10, C2_10, C4_11}, //B2
46 {0, C1_11, C2_11, C3_11}, //B3
47 {0, C1_12, C2_12, C3_12}, //B4
48 {0, C1_13, C2_13, C3_13}, //B5
49 {0, C1_14, C2_14, C3_14}, //B6
50 {0, C1_15, C2_15, C3_15}, //B7
51 {0, C1_16, C2_16, C3_16}, //B8
52 {0, C9_9, C8_9, C7_9}, //B9
53 {0, C9_10, C8_10, C7_10}, //B10
54 {0, C9_11, C8_11, C7_11}, //B11
55 {0, C9_12, C8_12, C7_12}, //B12
56 {0, C9_13, C8_13, C7_13}, //B13
57 {0, C9_14, C8_14, C7_14}, //B14
58
59 {1, C1_1, C3_2, C4_2}, //C1
60 {1, C1_2, C2_2, C4_3}, //C2
61 {1, C1_3, C2_3, C3_3}, //C3
62 {1, C1_4, C2_4, C3_4}, //C4
63 {1, C1_5, C2_5, C3_5}, //C5
64 {1, C1_6, C2_6, C3_6}, //C6
65 {1, C1_7, C2_7, C3_7}, //C7
66 {1, C1_8, C2_8, C3_8}, //C8
67 {1, C9_1, C8_1, C7_1}, //C9
68 {1, C9_2, C8_2, C7_2}, //C10
69 {1, C9_3, C8_3, C7_3}, //C11
70 {1, C9_4, C8_4, C7_4}, //C12
71 {1, C9_5, C8_5, C7_5}, //C13
72 {1, C9_6, C8_6, C7_6}, //C14
73 {1, C9_7, C8_7, C6_6}, //C15
74 {1, C9_8, C7_7, C6_7}, //C16
75
76 {1, C1_9, C3_10, C4_10}, //D1
77 //D2
78 {1, C1_11, C2_11, C3_11}, //D3
79 {1, C1_12, C2_12, C3_12}, //D4
80 {1, C1_13, C2_13, C3_13}, //D5
81 {1, C1_14, C2_14, C3_14}, //D6
82 {1, C1_15, C2_15, C3_15}, //D7
83 {1, C1_16, C2_16, C3_16}, //D8
84 {1, C9_9, C8_9, C7_9}, //D9
85 {1, C9_10, C8_10, C7_10}, //D10
86 {1, C9_11, C8_11, C7_11}, //D11
87 {1, C9_12, C8_12, C7_12}, //D12
88 {1, C9_13, C8_13, C7_13}, //D13
89 {1, C9_14, C8_14, C7_14}, //D14
90 {1, C9_15, C8_15, C6_14}, //D15
91 {1, C9_16, C7_15, C6_15} //D16
92};
93
94led_config_t g_led_config = { {
95 { 36, 35, 34, 33, 32, 31, 30, 6, 5, 4, 3, 2, 1, 0 },
96 { 37, 38, 39, 40, 41, 42, 43, 7, 8, 9, 10, 11, 12, NO_LED },
97 { 48, 49, 50, 51, 52, 45, 44, 20, 21, 22, 23, 15, 14, 13 },
98 { 47, NO_LED, 46, 53, 54, 55, 56, 19, 18, 17, 16, 24, NO_LED, 25 },
99 { 60, 59, 58, 57, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 29, 28, 27, 26 }
100}, {
101 //A1-A16
102 { 224, 0 }, { 204, 0 }, { 187, 0 }, { 170, 0 }, { 153, 0 }, { 136, 0 }, { 119, 0 }, { 119, 16 }, { 136, 16 }, { 153, 16 }, { 170, 16 }, { 187, 16 }, { 204, 16 }, { 224, 32 },
103 { 224, 16 }, { 197, 32 },
104 //B1-B14
105 { 170, 48 }, { 153, 48 }, { 136, 48 }, { 119, 48 }, { 119, 32 }, { 136, 32 }, { 153, 32 }, { 170, 32 }, { 187, 48 }, { 214, 48 }, { 224, 64 }, { 204, 64 }, { 187, 64 }, { 170, 64 },
106 //C1-C16
107 { 102, 0 }, { 85, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, { 0, 16 }, { 17, 16 }, { 34, 16 }, { 51, 16 }, { 68, 16 }, { 85, 16 }, { 102, 16 },
108 { 102, 32 }, { 85, 32 },
109 //D1-D16
110 { 32, 48 }, { 10, 48 }, { 0, 32 }, { 17, 32 }, { 34, 32 }, { 51, 32 }, { 68, 32 }, { 51, 48 }, { 68, 48 }, { 85, 48 }, { 102, 48 }, { 102, 64 }, { 34, 68 }, { 17, 68 },
111 { 0, 68 }
112}, {
113 //A1-A16
114 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
115 4, 4,
116 //B1-B14
117 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1,
118 //C1-C16
119 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4,
120 4, 4,
121 //D1-D16
122 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
123 1
124} };
125
126#else
127
128const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
129/* Refer to IS31 manual for these locations
130 * driver
131 * | R location
132 * | | G location
133 * | | | B location
134 * | | | | */
135 {0, C1_1, C3_2, C4_2}, //A1
136 {0, C1_2, C2_2, C4_3}, //A2
137 {0, C1_3, C2_3, C3_3}, //A3
138 {0, C1_4, C2_4, C3_4}, //A4
139 {0, C1_5, C2_5, C3_5}, //A5
140 {0, C1_6, C2_6, C3_6}, //A6
141 {0, C1_7, C2_7, C3_7}, //A7
142 {0, C1_8, C2_8, C3_8}, //A8
143 {0, C9_1, C8_1, C7_1}, //A9
144 {0, C9_2, C8_2, C7_2}, //A10
145 {0, C9_3, C8_3, C7_3}, //A11
146 {0, C9_4, C8_4, C7_4}, //A12
147 {0, C9_5, C8_5, C7_5}, //A13
148 {0, C9_6, C8_6, C7_6}, //A14
149 {0, C9_7, C8_7, C6_6}, //A15
150 {0, C9_8, C7_7, C6_7}, //A16
151
152 {0, C1_9, C3_10, C4_10}, //B1
153 {0, C1_10, C2_10, C4_11}, //B2
154 {0, C1_11, C2_11, C3_11}, //B3
155 {0, C1_12, C2_12, C3_12}, //B4
156 {0, C1_13, C2_13, C3_13}, //B5
157 {0, C1_14, C2_14, C3_14}, //B6
158 {0, C1_15, C2_15, C3_15}, //B7
159 {0, C1_16, C2_16, C3_16}, //B8
160 {0, C9_9, C8_9, C7_9}, //B9
161 {0, C9_10, C8_10, C7_10}, //B10
162 {0, C9_11, C8_11, C7_11}, //B11
163 {0, C9_12, C8_12, C7_12}, //B12
164 {0, C9_13, C8_13, C7_13}, //B13
165 {0, C9_14, C8_14, C7_14}, //B14
166
167 {1, C1_1, C3_2, C4_2}, //C1
168 {1, C1_2, C2_2, C4_3}, //C2
169 {1, C1_3, C2_3, C3_3}, //C3
170 {1, C1_4, C2_4, C3_4}, //C4
171 {1, C1_5, C2_5, C3_5}, //C5
172 {1, C1_6, C2_6, C3_6}, //C6
173 {1, C1_7, C2_7, C3_7}, //C7
174 {1, C1_8, C2_8, C3_8}, //C8
175 {1, C9_1, C8_1, C7_1}, //C9
176 {1, C9_2, C8_2, C7_2}, //C10
177 {1, C9_3, C8_3, C7_3}, //C11
178 {1, C9_4, C8_4, C7_4}, //C12
179 {1, C9_5, C8_5, C7_5}, //C13
180 {1, C9_6, C8_6, C7_6}, //C14
181 {1, C9_7, C8_7, C6_6}, //C15
182 {1, C9_8, C7_7, C6_7}, //C16
183
184 {1, C1_9, C3_10, C4_10}, //D1
185 {1, C1_10, C2_10, C4_11}, //D2
186 {1, C1_11, C2_11, C3_11}, //D3
187 {1, C1_12, C2_12, C3_12}, //D4
188 {1, C1_13, C2_13, C3_13}, //D5
189 {1, C1_14, C2_14, C3_14}, //D6
190 {1, C1_15, C2_15, C3_15}, //D7
191 {1, C1_16, C2_16, C3_16}, //D8
192 {1, C9_9, C8_9, C7_9}, //D9
193 {1, C9_10, C8_10, C7_10}, //D10
194 {1, C9_11, C8_11, C7_11}, //D11
195 {1, C9_12, C8_12, C7_12}, //D12
196 {1, C9_13, C8_13, C7_13}, //D13
197 {1, C9_14, C8_14, C7_14}, //D14
198 {1, C9_15, C8_15, C6_14}, //D15
199 {1, C9_16, C7_15, C6_15} //D16
200};
201
202led_config_t g_led_config = { {
203 { 36, 35, 34, 33, 32, 31, 30, 6, 5, 4, 3, 2, 1, 0 },
204 { 37, 38, 39, 40, 41, 42, 43, 7, 8, 9, 10, 11, 12, NO_LED },
205 { 49, 50, 51, 52, 53, 45, 44, 20, 21, 22, 23, 15, 14, 13 },
206 { 48, 47, 46, 54, 55, 56, 57, 19, 18, 17, 16, 24, NO_LED, 25 },
207 { 61, 60, 59, 58, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 29, 28, 27, 26 }
208}, {
209 //A1-A16
210 { 224, 0 }, { 204, 0 }, { 187, 0 }, { 170, 0 }, { 153, 0 }, { 136, 0 }, { 119, 0 }, { 119, 16 }, { 136, 16 }, { 153, 16 }, { 170, 16 }, { 187, 16 }, { 204, 16 }, { 224, 8 },
211 { 204, 32 }, { 187, 32 },
212 //B1-B14
213 { 170, 48 }, { 153, 48 }, { 136, 48 }, { 119, 48 }, { 119, 32 }, { 136, 32 }, { 153, 32 }, { 170, 32 }, { 187, 48 }, { 214, 48 }, { 224, 64 }, { 204, 64 }, { 187, 64 }, { 170, 64 },
214 //C1-C16
215 { 102, 0 }, { 85, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, { 0, 16 }, { 17, 16 }, { 34, 16 }, { 51, 16 }, { 68, 16 }, { 85, 16 }, { 102, 16 },
216 { 102, 32 }, { 85, 32 },
217 //D1-D16
218 { 32, 48 }, { 17, 48 }, { 0, 48 }, { 0, 32 }, { 17, 32 }, { 34, 32 }, { 51, 32 }, { 68, 32 }, { 51, 48 }, { 68, 48 }, { 85, 48 }, { 102, 48 }, { 102, 64 }, { 34, 68 },
219 { 17, 68 }, { 0, 68 }
220}, {
221 //A1-A16
222 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
223 4, 4,
224 //B1-B14
225 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1,
226 //C1-C16
227 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4,
228 4, 4,
229 //D1-D16
230 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
231 1, 1
232} };
233
234#endif
235
236#ifndef DEBOUNCE 18#ifndef DEBOUNCE
237# define DEBOUNCE 5 19# define DEBOUNCE 5
238#endif 20#endif
@@ -307,13 +89,3 @@ void matrix_init_kb(void) {
307 89
308 matrix_init_user(); 90 matrix_init_user();
309} 91}
310
311void suspend_power_down_kb(void)
312{
313 rgb_matrix_set_suspend_state(true);
314}
315
316void suspend_wakeup_init_kb(void)
317{
318 rgb_matrix_set_suspend_state(false);
319}
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-03 06:02:28 +0000