aboutsummaryrefslogtreecommitdiff
path: root/keyboards/hs60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hs60')
-rw-r--r--keyboards/hs60/v2/config.h89
-rw-r--r--keyboards/hs60/v2/keymaps/ansi/config.h2
-rw-r--r--keyboards/hs60/v2/keymaps/ansi/keymap.c22
-rw-r--r--keyboards/hs60/v2/keymaps/ansi/readme.md6
-rw-r--r--keyboards/hs60/v2/keymaps/default/keymap.c20
-rw-r--r--keyboards/hs60/v2/keymaps/default/readme.md6
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/config.h13
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/keymap.c34
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/readme.md6
-rw-r--r--keyboards/hs60/v2/mcuconf.h2
-rw-r--r--keyboards/hs60/v2/rules.mk18
-rw-r--r--keyboards/hs60/v2/v2.c621
-rw-r--r--keyboards/hs60/v2/v2.h7
13 files changed, 157 insertions, 689 deletions
diff --git a/keyboards/hs60/v2/config.h b/keyboards/hs60/v2/config.h
index 192f7d6f2..bc1681ffd 100644
--- a/keyboards/hs60/v2/config.h
+++ b/keyboards/hs60/v2/config.h
@@ -20,9 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
20#include "config_common.h" 20#include "config_common.h"
21 21
22/* USB Device descriptor parameter */ 22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xFEED 23#define VENDOR_ID 0x8968
24#define PRODUCT_ID 0x0258 24#define PRODUCT_ID 0x4853
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0002
26#define MANUFACTURER Yiancar-Designs 26#define MANUFACTURER Yiancar-Designs
27#define PRODUCT HS60 V2 27#define PRODUCT HS60 V2
28#define DESCRIPTION GH60 compatible, tool free RGB keyboard 28#define DESCRIPTION GH60 compatible, tool free RGB keyboard
@@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39#define DIODE_DIRECTION COL2ROW 39#define DIODE_DIRECTION COL2ROW
40 40
41/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 41/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
42#define DEBOUNCE 0 42#define DEBOUNCING_DELAY 5
43 43
44/* define if matrix has ghost (lacks anti-ghosting diodes) */ 44/* define if matrix has ghost (lacks anti-ghosting diodes) */
45//#define MATRIX_HAS_GHOST 45//#define MATRIX_HAS_GHOST
@@ -70,48 +70,63 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
70 */ 70 */
71//#define FORCE_NKRO 71//#define FORCE_NKRO
72 72
73/*
74 * Magic Key Options
75 *
76 * Magic keys are hotkey commands that allow control over firmware functions of
77 * the keyboard. They are best used in combination with the HID Listen program,
78 * found here: https://www.pjrc.com/teensy/hid_listen.html
79 *
80 * The options below allow the magic key functionality to be changed. This is
81 * useful if your keyboard/keypad is missing keys and you want magic key support.
82 *
83 */
84
85/* key combination for magic key command */ 73/* key combination for magic key command */
86#define IS_COMMAND() ( \ 74#define IS_COMMAND() ( \
87 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ 75 keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
88) 76)
89 77
90/* 78/* Backlight options */
91 * Feature disable options
92 * These options are also useful to firmware size reduction.
93 */
94 79
95/* disable debug print */ 80#define RGB_BACKLIGHT_ENABLED 1
96//#define NO_DEBUG
97 81
98/* disable print */ 82#define RGB_BACKLIGHT_HS60
99//#define NO_PRINT
100 83
101/* Backlight options */ 84// they aren't really used if RGB_BACKLIGHT_HS60 defined
85#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
86#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
87#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
88#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
89#define RGB_BACKLIGHT_USE_ISO_ENTER 0
90#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
102 91
103#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects 92// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
104#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended 93#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
105#define RGB_MATRIX_SKIP_FRAMES 3
106 94
107#define DRIVER_ADDR_1 0b1010000 95// disable backlight after timeout in minutes, 0 = no timeout
108#define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. 96#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
109 97
110#define DRIVER_COUNT 2 98// the default effect (RGB test)
111#ifdef HS60_ANSI 99#define RGB_BACKLIGHT_EFFECT 255
112#define DRIVER_1_LED_TOTAL 61
113#else
114#define DRIVER_1_LED_TOTAL 62
115#endif
116 100
117#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL 101#define DRIVER_COUNT 2
102#define DRIVER_LED_TOTAL 64
103
104// These define which keys in the matrix are alphas/mods
105// Used for backlight effects so colors are different for
106// alphas vs. mods
107// Each value is for a row, bit 0 is column 0
108// Alpha=0 Mod=1
109#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0010000000000001
110#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
111#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0010000000000001
112#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0010000000000001
113#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011110000000111
114
115// TODO: refactor with new user EEPROM code (coming soon)
116#define EEPROM_MAGIC 0x451F
117#define EEPROM_MAGIC_ADDR 32
118// Bump this every time we change what we store
119// This will automatically reset the EEPROM with defaults
120// and avoid loading invalid data from the EEPROM
121#define EEPROM_VERSION 0x08
122#define EEPROM_VERSION_ADDR 34
123
124// Backlight config starts after EEPROM version
125#define RGB_BACKLIGHT_CONFIG_EEPROM_ADDR 35
126// Dynamic keymap starts after backlight config (35+31)
127#define DYNAMIC_KEYMAP_EEPROM_ADDR 66
128#define DYNAMIC_KEYMAP_LAYER_COUNT 4
129// Dynamic macro starts after dynamic keymaps (66+(4*5*14*2)) = (66+560)
130#define DYNAMIC_KEYMAP_MACRO_EEPROM_ADDR 626
131#define DYNAMIC_KEYMAP_MACRO_EEPROM_SIZE 398
132#define DYNAMIC_KEYMAP_MACRO_COUNT 16
diff --git a/keyboards/hs60/v2/keymaps/ansi/config.h b/keyboards/hs60/v2/keymaps/ansi/config.h
index f51cc16d8..96adaf568 100644
--- a/keyboards/hs60/v2/keymaps/ansi/config.h
+++ b/keyboards/hs60/v2/keymaps/ansi/config.h
@@ -19,3 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19/* Include overwrites for specific keymap */ 19/* Include overwrites for specific keymap */
20 20
21#define HS60_ANSI 21#define HS60_ANSI
22#undef PRODUCT_ID
23#define PRODUCT_ID 0x4854
diff --git a/keyboards/hs60/v2/keymaps/ansi/keymap.c b/keyboards/hs60/v2/keymaps/ansi/keymap.c
index 923af9e2c..ba649470b 100644
--- a/keyboards/hs60/v2/keymaps/ansi/keymap.c
+++ b/keyboards/hs60/v2/keymaps/ansi/keymap.c
@@ -26,11 +26,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL),
27 27
28[1] = LAYOUT_60_ansi( /* FN */ 28[1] = LAYOUT_60_ansi( /* FN */
29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ 29 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , KC_TRNS,\ 30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,\
31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ 31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS,\ 32 KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS,\
33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34
35[2] = LAYOUT_60_ansi( /* Empty for dynamic keymaps */
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
41
42[3] = LAYOUT_60_ansi( /* Empty for dynamic keymaps */
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34}; 48};
35 49
36void matrix_init_user(void) { 50void matrix_init_user(void) {
diff --git a/keyboards/hs60/v2/keymaps/ansi/readme.md b/keyboards/hs60/v2/keymaps/ansi/readme.md
index fa811319d..650871a5e 100644
--- a/keyboards/hs60/v2/keymaps/ansi/readme.md
+++ b/keyboards/hs60/v2/keymaps/ansi/readme.md
@@ -1,6 +1,6 @@
1The default keymap for ANSI HS60 1The default keymap for ANSI HS60 V2
2================================ 2===================================
3 3
4![Layout image](https://imgur.com/CSyPw0J.png) 4![Layout image](https://i.imgur.com/m8t5CfE.png)
5 5
6Default layer is normal ANSI and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file 6Default layer is normal ANSI and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file
diff --git a/keyboards/hs60/v2/keymaps/default/keymap.c b/keyboards/hs60/v2/keymaps/default/keymap.c
index 2a5e82361..c1e575769 100644
--- a/keyboards/hs60/v2/keymaps/default/keymap.c
+++ b/keyboards/hs60/v2/keymaps/default/keymap.c
@@ -26,11 +26,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL),
27 27
28[1] = LAYOUT_60_iso( /* FN */ 28[1] = LAYOUT_60_iso( /* FN */
29 KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ 29 KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , \ 30 KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET , \
31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ 31 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS,\ 32 KC_TRNS, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS,\
33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 33 KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34
35[2] = LAYOUT_60_iso( /* Empty for dynamic keymaps */
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
41
42[3] = LAYOUT_60_iso( /* Empty for dynamic keymaps */
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
34}; 48};
35 49
36void matrix_init_user(void) { 50void matrix_init_user(void) {
diff --git a/keyboards/hs60/v2/keymaps/default/readme.md b/keyboards/hs60/v2/keymaps/default/readme.md
index 9125cb349..f0b29900e 100644
--- a/keyboards/hs60/v2/keymaps/default/readme.md
+++ b/keyboards/hs60/v2/keymaps/default/readme.md
@@ -1,6 +1,6 @@
1The default keymap for ISO HS60 1The default keymap for ISO HS60 V2
2=============================== 2==================================
3 3
4![Layout image](https://imgur.com/HXj4tYL.png) 4![Layout image](https://imgur.com/6go4vQV.png)
5 5
6Default layer is normal ISO and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file 6Default layer is normal ISO and Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file
diff --git a/keyboards/hs60/v2/keymaps/hhkb/config.h b/keyboards/hs60/v2/keymaps/hhkb/config.h
index 3db403ecc..fc1b6d8f4 100644
--- a/keyboards/hs60/v2/keymaps/hhkb/config.h
+++ b/keyboards/hs60/v2/keymaps/hhkb/config.h
@@ -19,3 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19/* Include overwrites for specific keymap */ 19/* Include overwrites for specific keymap */
20 20
21#define HS60_HHKB 21#define HS60_HHKB
22#undef PRODUCT_ID
23#define PRODUCT_ID 0x4855
24
25#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_0
26#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_1
27#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_2
28#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_3
29#undef RGB_BACKLIGHT_ALPHAS_MODS_ROW_4
30#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
31#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
32#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
33#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
34#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011100000000111
diff --git a/keyboards/hs60/v2/keymaps/hhkb/keymap.c b/keyboards/hs60/v2/keymaps/hhkb/keymap.c
index d52fc4bac..9641eedb4 100644
--- a/keyboards/hs60/v2/keymaps/hhkb/keymap.c
+++ b/keyboards/hs60/v2/keymaps/hhkb/keymap.c
@@ -19,18 +19,32 @@
19 19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21[0] = LAYOUT_60_hhkb( /* Base */ 21[0] = LAYOUT_60_hhkb( /* Base */
22 KC_ESC, 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_GRV, KC_BSLS, \ 22 KC_ESC, 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_GRV, KC_BSLS,\
23 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_BSPC, \ 23 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_BSPC,\
24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), \ 25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),\
26 KC_LCTL, KC_LGUI,KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ), 26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL ),
27 27
28[1] = LAYOUT_60_hhkb( /* FN */ 28[1] = LAYOUT_60_hhkb( /* FN */
29 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,\ 29 RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS,\
30 KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, KC_UP, KC_TRNS, KC_DEL, \ 30 KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_UP, KC_TRNS, KC_DEL, \
31 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, \ 31 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, \
32 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 32 KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,\
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) 33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
34
35[2] = LAYOUT_60_hhkb( /* Empty for dynamic keymaps */
36 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
37 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
41
42[3] = LAYOUT_60_hhkb( /* Empty for dynamic keymaps */
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
44 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
34}; 48};
35 49
36void matrix_init_user(void) { 50void matrix_init_user(void) {
diff --git a/keyboards/hs60/v2/keymaps/hhkb/readme.md b/keyboards/hs60/v2/keymaps/hhkb/readme.md
new file mode 100644
index 000000000..69b812c60
--- /dev/null
+++ b/keyboards/hs60/v2/keymaps/hhkb/readme.md
@@ -0,0 +1,6 @@
1The default keymap for HHKB HS60 V2
2===================================
3
4![Layout image](https://imgur.com/usbrQWL.png)
5
6Default layer is normal HHKB with 7U space. Fn layer is used for RGB functions, Volume control and arrow cluster \ No newline at end of file
diff --git a/keyboards/hs60/v2/mcuconf.h b/keyboards/hs60/v2/mcuconf.h
index 226da48d5..ce608f904 100644
--- a/keyboards/hs60/v2/mcuconf.h
+++ b/keyboards/hs60/v2/mcuconf.h
@@ -139,7 +139,7 @@
139#define STM32_GPT_USE_TIM1 FALSE 139#define STM32_GPT_USE_TIM1 FALSE
140#define STM32_GPT_USE_TIM2 FALSE 140#define STM32_GPT_USE_TIM2 FALSE
141#define STM32_GPT_USE_TIM3 FALSE 141#define STM32_GPT_USE_TIM3 FALSE
142#define STM32_GPT_USE_TIM4 FALSE 142#define STM32_GPT_USE_TIM4 TRUE
143#define STM32_GPT_USE_TIM6 TRUE 143#define STM32_GPT_USE_TIM6 TRUE
144#define STM32_GPT_USE_TIM7 TRUE 144#define STM32_GPT_USE_TIM7 TRUE
145#define STM32_GPT_USE_TIM8 TRUE 145#define STM32_GPT_USE_TIM8 TRUE
diff --git a/keyboards/hs60/v2/rules.mk b/keyboards/hs60/v2/rules.mk
index 51e3cf0a3..a2850a830 100644
--- a/keyboards/hs60/v2/rules.mk
+++ b/keyboards/hs60/v2/rules.mk
@@ -1,4 +1,9 @@
1# project specific files 1# project specific files
2SRC = keyboards/zeal60/zeal60.c \
3 keyboards/zeal60/rgb_backlight.c \
4 drivers/issi/is31fl3733.c \
5 quantum/color.c \
6 drivers/arm/i2c_master.c
2 7
3## chip/board settings 8## chip/board settings
4# the next two should match the directories in 9# the next two should match the directories in
@@ -44,15 +49,18 @@ DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
44# Build Options 49# Build Options
45# comment out to disable the options. 50# comment out to disable the options.
46# 51#
47BACKLIGHT_ENABLE = no 52BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
48BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration 53BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
49MOUSEKEY_ENABLE = yes # Mouse keys 54MOUSEKEY_ENABLE = yes # Mouse keys
50EXTRAKEY_ENABLE = yes # Audio control and System control 55EXTRAKEY_ENABLE = yes # Audio control and System control
51CONSOLE_ENABLE = no # Console for debug 56CONSOLE_ENABLE = no # Console for debug
52COMMAND_ENABLE = no # Commands for debug and configuration 57COMMAND_ENABLE = no # Commands for debug and configuration
53#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend 58SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
54NKRO_ENABLE = yes # USB Nkey Rollover 59NKRO_ENABLE = yes # USB Nkey Rollover
55AUDIO_ENABLE = no 60AUDIO_ENABLE = no # Audio output on port C6
56RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
57NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in 61NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
58#SERIAL_LINK_ENABLE = yes 62#SERIAL_LINK_ENABLE = yes
63
64RAW_ENABLE = yes
65DYNAMIC_KEYMAP_ENABLE = yes
66CIE1931_CURVE = yes
diff --git a/keyboards/hs60/v2/v2.c b/keyboards/hs60/v2/v2.c
index 4289c1fed..2e12538e9 100644
--- a/keyboards/hs60/v2/v2.c
+++ b/keyboards/hs60/v2/v2.c
@@ -13,623 +13,6 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#include "v2.h" 16#ifndef RGB_BACKLIGHT_HS60
17 17#error RGB_BACKLIGHT_M60_A not defined, recheck config.h
18//#include "is31fl3733.h"
19
20// Please ignore this is for upcoming features
21/*#ifdef RAW_ENABLE
22
23void raw_hid_receive( uint8_t *data, uint8_t length )
24{
25 uint8_t command = data[0];
26 switch ( command )
27 {
28 case id_protocol_version:
29 {
30 msg_protocol_version *msg = (msg_protocol_version*)&data[1];
31 msg->version = PROTOCOL_VERSION;
32 break;
33 }
34#if USE_KEYMAPS_IN_EEPROM
35 case id_keymap_keycode_load:
36 {
37 msg_keymap_keycode_load *msg = (msg_keymap_keycode_load*)&data[1];
38 msg->keycode = keymap_keycode_load( msg->layer, msg->row, msg->column );
39 break;
40 }
41 case id_keymap_keycode_save:
42 {
43 msg_keymap_keycode_save *msg = (msg_keymap_keycode_save*)&data[1];
44 keymap_keycode_save( msg->layer, msg->row, msg->column, msg->keycode);
45 break;
46 }
47 case id_keymap_default_save:
48 {
49 keymap_default_save();
50 break;
51 }
52#endif // USE_KEYMAPS_IN_EEPROM
53 case id_backlight_config_set_values:
54 {
55 msg_backlight_config_set_values *msg = (msg_backlight_config_set_values*)&data[1];
56 backlight_config_set_values(msg);
57 backlight_config_save();
58 break;
59 }
60 case id_backlight_config_set_alphas_mods:
61 {
62 msg_backlight_config_set_alphas_mods *msg = (msg_backlight_config_set_alphas_mods*)&data[1];
63 backlight_config_set_alphas_mods( msg->alphas_mods );
64 backlight_config_save();
65 break;
66 }
67 case id_backlight_set_key_color:
68 {
69 msg_backlight_set_key_color *msg = (msg_backlight_set_key_color*)&data[1];
70 backlight_set_key_color(msg->row, msg->column, msg->hsv);
71 break;
72 }
73 case id_system_get_state:
74 {
75 msg_system_state *msg = (msg_system_state*)&data[1];
76 msg->value = backlight_get_tick();
77 break;
78 }
79 default:
80 {
81 // Unhandled message.
82 data[0] = id_unhandled;
83 break;
84 }
85 }
86
87 // Return same buffer with values changed
88 raw_hid_send( data, length );
89
90}
91
92#endif*/
93
94#ifdef HS60_ANSI
95
96const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
97/* Refer to IS31 manual for these locations
98 * driver
99 * | R location
100 * | | G location
101 * | | | B location
102 * | | | | */
103 {0, B_1, A_1, C_1}, //MX1
104 {0, E_1, D_1, F_1}, //MX2
105 {0, H_1, G_1, I_1}, //MX3
106 {0, K_1, J_1, L_1}, //MX4
107 {0, B_2, A_2, C_2}, //MX6
108 {0, E_2, D_2, F_2}, //MX7
109 {0, H_2, G_2, I_2}, //MX8
110 {0, K_2, J_2, L_2}, //MX14
111 {0, B_3, A_3, C_3}, //MX11
112 {0, E_3, D_3, F_3}, //MX12
113 {0, H_3, G_3, I_3}, //MX13
114 {0, K_3, J_3, L_3}, //MX19
115 {0, B_4, A_4, C_4}, //MX16
116 {0, E_4, D_4, F_4}, //MX17
117 {0, H_4, G_4, I_4}, //MX18
118 {0, K_4, J_4, L_4}, //MX23
119 {0, B_5, A_5, C_5}, //MX20
120 {0, E_5, D_5, F_5}, //MX21
121 {0, H_5, G_5, I_5}, //MX22
122 {0, K_5, J_5, L_5}, //MX27
123 {0, B_6, A_6, C_6}, //MX24
124 {0, E_6, D_6, F_6}, //MX25
125 {0, H_6, G_6, I_6}, //MX26
126 {0, K_6, J_6, L_6}, //MX31
127 {0, B_7, A_7, C_7}, //MX28
128 {0, E_7, D_7, F_7}, //MX29
129 {0, H_7, G_7, I_7}, //MX30
130 {0, K_7, J_7, L_7}, //MX36
131 {0, B_8, A_8, C_8}, //MX33
132 {0, E_8, D_8, F_8}, //MX34
133 {0, H_8, G_8, I_8}, //MX35
134 {0, K_8, J_8, L_8}, //MX40
135 {0, B_9, A_9, C_9}, //MX37
136 {0, E_9, D_9, F_9}, //MX38
137 {0, H_9, G_9, I_9}, //MX39
138 {0, K_9, J_9, L_9}, //MX44
139 {0, B_10, A_10, C_10}, //MX41
140 {0, E_10, D_10, F_10}, //MX42
141 {0, H_10, G_10, I_10}, //MX43
142 {0, K_10, J_10, L_10}, //MX48
143 {0, B_11, A_11, C_11}, //MX45
144 {0, E_11, D_11, F_11}, //MX46
145 {0, H_11, G_11, I_11}, //MX47
146 {0, K_11, J_11, L_11}, //MX53
147 {0, B_12, A_12, C_12}, //MX50
148 {0, E_12, D_12, F_12}, //MX51
149 {0, H_12, G_12, I_12}, //MX52
150
151 {0, B_13, A_13, C_13}, //MX55
152 {0, E_13, D_13, F_13}, //MX56
153
154 {0, K_13, J_13, L_13}, //MX61
155 {0, B_14, A_14, C_14}, //MX59
156 {0, E_14, D_14, F_14}, //MX57
157 {0, H_14, G_14, I_14}, //MX60
158 {0, K_14, J_14, L_14}, //MX62
159 {0, B_15, A_15, C_15}, //MX5
160 {0, E_15, D_15, F_15}, //MX10
161 {0, H_15, G_15, I_15}, //MX15
162 {0, K_15, J_15, L_15}, //MX32
163
164 {0, E_16, D_16, F_16}, //MX49
165 {0, H_16, G_16, I_16}, //MX54
166 {0, K_16, J_16, L_16}, //MX58
167};
168
169const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
170//
171// MX1, MX6, MX11, MX16, MX20, MX24, MX28, MX33, MX37, MX41, MX45, MX50, MX55, MX59,
172// MX2, MX7, MX12, MX17, MX21, MX25, MX29, MX34, MX38, MX42, MX46, MX51, MX56, ---,
173// MX3, MX8, MX13, MX18, MX22, MX26, MX30, MX35, MX39, MX43, MX47, MX52, MX57, MX60,
174// MX4, ---, MX14, MX19, MX23, MX27, MX31, MX36, MX40, MX44, MX48, MX53, ---, MX61,
175// MX5, MX10, MX15, ---, ---, ---, MX32, ---, ---, ---, MX49, MX54, MX58, MX62
176/* {row | col << 4}
177 * | {x=0..224, y=0..64}
178 * | | modifier
179 * | | | */
180 {{0|(0<<4)}, { 0, 0}, 1}, //MX1
181 {{1|(0<<4)}, { 0, 16}, 1}, //MX2
182 {{2|(0<<4)}, { 0, 32}, 1}, //MX3
183 {{3|(0<<4)}, { 0, 48}, 1}, //MX4
184 {{0|(1<<4)}, { 17, 0}, 0}, //MX6
185 {{1|(1<<4)}, { 17, 16}, 0}, //MX7
186 {{2|(1<<4)}, { 17, 32}, 0}, //MX8
187 {{3|(2<<4)}, { 34, 48}, 0}, //MX14
188 {{0|(2<<4)}, { 34, 0}, 0}, //MX11
189 {{1|(2<<4)}, { 34, 16}, 0}, //MX12
190 {{2|(2<<4)}, { 34, 32}, 0}, //MX13
191 {{3|(3<<4)}, { 51, 48}, 0}, //MX19
192 {{0|(3<<4)}, { 51, 0}, 0}, //MX16
193 {{1|(3<<4)}, { 51, 16}, 0}, //MX17
194 {{2|(3<<4)}, { 51, 32}, 0}, //MX18
195 {{3|(4<<4)}, { 68, 48}, 0}, //MX23
196 {{0|(4<<4)}, { 68, 0}, 0}, //MX20
197 {{1|(4<<4)}, { 68, 16}, 0}, //MX21
198 {{2|(4<<4)}, { 68, 32}, 0}, //MX22
199 {{3|(5<<4)}, { 85, 48}, 0}, //MX27
200 {{0|(5<<4)}, { 85, 0}, 0}, //MX24
201 {{1|(5<<4)}, { 85, 16}, 0}, //MX25
202 {{2|(5<<4)}, { 85, 32}, 0}, //MX26
203 {{3|(6<<4)}, {102, 48}, 0}, //MX31
204 {{0|(6<<4)}, {102, 0}, 0}, //MX28
205 {{1|(6<<4)}, {102, 16}, 0}, //MX29
206 {{2|(6<<4)}, {102, 32}, 0}, //MX30
207 {{3|(7<<4)}, {119, 48}, 0}, //MX36
208 {{0|(7<<4)}, {119, 0}, 0}, //MX33
209 {{1|(7<<4)}, {119, 16}, 0}, //MX34
210 {{2|(7<<4)}, {119, 32}, 0}, //MX35
211 {{3|(8<<4)}, {136, 48}, 0}, //MX40
212 {{0|(8<<4)}, {136, 0}, 0}, //MX37
213 {{1|(8<<4)}, {136, 16}, 0}, //MX38
214 {{2|(8<<4)}, {136, 32}, 0}, //MX39
215 {{3|(9<<4)}, {153, 48}, 0}, //MX44
216 {{0|(9<<4)}, {153, 0}, 0}, //MX41
217 {{1|(9<<4)}, {153, 16}, 0}, //MX42
218 {{2|(9<<4)}, {153, 32}, 0}, //MX43
219 {{3|(10<<4)}, {170, 48}, 0}, //MX48
220 {{0|(10<<4)}, {170, 0}, 0}, //MX45
221 {{1|(10<<4)}, {170, 16}, 0}, //MX46
222 {{2|(10<<4)}, {170, 32}, 0}, //MX47
223 {{3|(11<<4)}, {187, 48}, 0}, //MX53
224 {{0|(11<<4)}, {187, 0}, 0}, //MX50
225 {{1|(11<<4)}, {187, 16}, 0}, //MX51
226 {{2|(11<<4)}, {187, 32}, 0}, //MX52
227
228 {{0|(12<<4)}, {204, 0}, 0}, //MX55
229 {{1|(12<<4)}, {204, 16}, 0}, //MX56
230
231 {{3|(13<<4)}, {221, 48}, 1}, //MX61
232 {{0|(13<<4)}, {221, 0}, 1}, //MX59
233 {{2|(12<<4)}, {221, 16}, 0}, //MX57
234 {{2|(13<<4)}, {221, 32}, 1}, //MX60
235 {{4|(13<<4)}, {221, 64}, 1}, //MX62
236 {{4|(0<<4)}, { 0, 64}, 1}, //MX5
237 {{4|(1<<4)}, { 17, 64}, 1}, //MX10
238 {{4|(2<<4)}, { 34, 64}, 1}, //MX15
239 {{4|(5<<4)}, {102, 64}, 0}, //MX32
240
241 {{4|(10<<4)}, {170, 64}, 1}, //MX49
242 {{4|(11<<4)}, {187, 64}, 1}, //MX54
243 {{4|(12<<4)}, {204, 64}, 1} //MX58
244};
245
246#elif defined(HS60_HHKB)
247
248const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
249/* Refer to IS31 manual for these locations
250 * driver
251 * | R location
252 * | | G location
253 * | | | B location
254 * | | | | */
255 {0, B_1, A_1, C_1}, //MX1
256 {0, E_1, D_1, F_1}, //MX2
257 {0, H_1, G_1, I_1}, //MX3
258 {0, K_1, J_1, L_1}, //MX4
259 {0, B_2, A_2, C_2}, //MX6
260 {0, E_2, D_2, F_2}, //MX7
261 {0, H_2, G_2, I_2}, //MX8
262 {0, K_2, J_2, L_2}, //MX14
263 {0, B_3, A_3, C_3}, //MX11
264 {0, E_3, D_3, F_3}, //MX12
265 {0, H_3, G_3, I_3}, //MX13
266 {0, K_3, J_3, L_3}, //MX19
267 {0, B_4, A_4, C_4}, //MX16
268 {0, E_4, D_4, F_4}, //MX17
269 {0, H_4, G_4, I_4}, //MX18
270 {0, K_4, J_4, L_4}, //MX23
271 {0, B_5, A_5, C_5}, //MX20
272 {0, E_5, D_5, F_5}, //MX21
273 {0, H_5, G_5, I_5}, //MX22
274 {0, K_5, J_5, L_5}, //MX27
275 {0, B_6, A_6, C_6}, //MX24
276 {0, E_6, D_6, F_6}, //MX25
277 {0, H_6, G_6, I_6}, //MX26
278 {0, K_6, J_6, L_6}, //MX31
279 {0, B_7, A_7, C_7}, //MX28
280 {0, E_7, D_7, F_7}, //MX29
281 {0, H_7, G_7, I_7}, //MX30
282 {0, K_7, J_7, L_7}, //MX36
283 {0, B_8, A_8, C_8}, //MX33
284 {0, E_8, D_8, F_8}, //MX34
285 {0, H_8, G_8, I_8}, //MX35
286 {0, K_8, J_8, L_8}, //MX40
287 {0, B_9, A_9, C_9}, //MX37
288 {0, E_9, D_9, F_9}, //MX38
289 {0, H_9, G_9, I_9}, //MX39
290 {0, K_9, J_9, L_9}, //MX44
291 {0, B_10, A_10, C_10}, //MX41
292 {0, E_10, D_10, F_10}, //MX42
293 {0, H_10, G_10, I_10}, //MX43
294 {0, K_10, J_10, L_10}, //MX48
295 {0, B_11, A_11, C_11}, //MX45
296 {0, E_11, D_11, F_11}, //MX46
297 {0, H_11, G_11, I_11}, //MX47
298 {0, K_11, J_11, L_11}, //MX53
299 {0, B_12, A_12, C_12}, //MX50
300 {0, E_12, D_12, F_12}, //MX51
301 {0, H_12, G_12, I_12}, //MX52
302 {0, K_12, J_12, L_12}, //MX64
303 {0, B_13, A_13, C_13}, //MX55
304 {0, E_13, D_13, F_13}, //MX56
305 {0, H_13, G_13, I_13}, //MX63
306 {0, K_13, J_13, L_13}, //MX61
307 {0, B_14, A_14, C_14}, //MX59
308 {0, E_14, D_14, F_14}, //MX57
309 {0, H_14, G_14, I_14}, //MX60
310 {0, K_14, J_14, L_14}, //MX62
311 {0, B_15, A_15, C_15}, //MX5
312 {0, E_15, D_15, F_15}, //MX10
313 {0, H_15, G_15, I_15}, //MX15
314 {0, K_15, J_15, L_15}, //MX32
315
316
317 {0, H_16, G_16, I_16}, //MX54
318 {0, K_16, J_16, L_16}, //MX58
319};
320
321const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
322//
323// MX1, MX6, MX11, MX16, MX20, MX24, MX28, MX33, MX37, MX41, MX45, MX50, MX55, MX59,
324// MX2, MX7, MX12, MX17, MX21, MX25, MX29, MX34, MX38, MX42, MX46, MX51, MX56, MX64,
325// MX3, MX8, MX13, MX18, MX22, MX26, MX30, MX35, MX39, MX43, MX47, MX52, MX57, MX60,
326// MX4, ----, MX14, MX19, MX23, MX27, MX31, MX36, MX40, MX44, MX48, MX53, MX63, MX61,
327// MX5, MX10, MX15, ----, ----, ----, MX32, ----, ---, ----, ----, MX54, MX58, MX62
328/* {row | col << 4}
329 * | {x=0..224, y=0..64}
330 * | | modifier
331 * | | | */
332 {{0|(0<<4)}, { 0, 0}, 1}, //MX1
333 {{1|(0<<4)}, { 0, 16}, 1}, //MX2
334 {{2|(0<<4)}, { 0, 32}, 1}, //MX3
335 {{3|(0<<4)}, { 0, 48}, 1}, //MX4
336 {{0|(1<<4)}, { 17, 0}, 0}, //MX6
337 {{1|(1<<4)}, { 17, 16}, 0}, //MX7
338 {{2|(1<<4)}, { 17, 32}, 0}, //MX8
339 {{3|(2<<4)}, { 34, 48}, 0}, //MX14
340 {{0|(2<<4)}, { 34, 0}, 0}, //MX11
341 {{1|(2<<4)}, { 34, 16}, 0}, //MX12
342 {{2|(2<<4)}, { 34, 32}, 0}, //MX13
343 {{3|(3<<4)}, { 51, 48}, 0}, //MX19
344 {{0|(3<<4)}, { 51, 0}, 0}, //MX16
345 {{1|(3<<4)}, { 51, 16}, 0}, //MX17
346 {{2|(3<<4)}, { 51, 32}, 0}, //MX18
347 {{3|(4<<4)}, { 68, 48}, 0}, //MX23
348 {{0|(4<<4)}, { 68, 0}, 0}, //MX20
349 {{1|(4<<4)}, { 68, 16}, 0}, //MX21
350 {{2|(4<<4)}, { 68, 32}, 0}, //MX22
351 {{3|(5<<4)}, { 85, 48}, 0}, //MX27
352 {{0|(5<<4)}, { 85, 0}, 0}, //MX24
353 {{1|(5<<4)}, { 85, 16}, 0}, //MX25
354 {{2|(5<<4)}, { 85, 32}, 0}, //MX26
355 {{3|(6<<4)}, {102, 48}, 0}, //MX31
356 {{0|(6<<4)}, {102, 0}, 0}, //MX28
357 {{1|(6<<4)}, {102, 16}, 0}, //MX29
358 {{2|(6<<4)}, {102, 32}, 0}, //MX30
359 {{3|(7<<4)}, {119, 48}, 0}, //MX36
360 {{0|(7<<4)}, {119, 0}, 0}, //MX33
361 {{1|(7<<4)}, {119, 16}, 0}, //MX34
362 {{2|(7<<4)}, {119, 32}, 0}, //MX35
363 {{3|(8<<4)}, {136, 48}, 0}, //MX40
364 {{0|(8<<4)}, {136, 0}, 0}, //MX37
365 {{1|(8<<4)}, {136, 16}, 0}, //MX38
366 {{2|(8<<4)}, {136, 32}, 0}, //MX39
367 {{3|(9<<4)}, {153, 48}, 0}, //MX44
368 {{0|(9<<4)}, {153, 0}, 0}, //MX41
369 {{1|(9<<4)}, {153, 16}, 0}, //MX42
370 {{2|(9<<4)}, {153, 32}, 0}, //MX43
371 {{3|(10<<4)}, {170, 48}, 0}, //MX48
372 {{0|(10<<4)}, {170, 0}, 0}, //MX45
373 {{1|(10<<4)}, {170, 16}, 0}, //MX46
374 {{2|(10<<4)}, {170, 32}, 0}, //MX47
375 {{3|(11<<4)}, {187, 48}, 0}, //MX53
376 {{0|(11<<4)}, {187, 0}, 0}, //MX50
377 {{1|(11<<4)}, {187, 16}, 0}, //MX51
378 {{2|(11<<4)}, {187, 32}, 0}, //MX52
379 {{1|(13<<4)}, {221, 0}, 1}, //MX64
380 {{0|(12<<4)}, {204, 0}, 0}, //MX55
381 {{1|(12<<4)}, {204, 16}, 0}, //MX56
382 {{3|(12<<4)}, {204, 48}, 0}, //MX63
383 {{3|(13<<4)}, {212, 48}, 1}, //MX61
384 {{0|(13<<4)}, {221, 0}, 0}, //MX59
385 {{2|(12<<4)}, {221, 16}, 0}, //MX57
386 {{2|(13<<4)}, {221, 32}, 1}, //MX60
387 {{4|(13<<4)}, {221, 64}, 1}, //MX62
388 {{4|(0<<4)}, { 0, 64}, 1}, //MX5
389 {{4|(1<<4)}, { 17, 64}, 1}, //MX10
390 {{4|(2<<4)}, { 34, 64}, 1}, //MX15
391 {{4|(5<<4)}, {102, 64}, 0}, //MX32
392
393
394 {{4|(11<<4)}, {187, 64}, 1}, //MX54
395 {{4|(12<<4)}, {204, 64}, 1} //MX58
396};
397
398#else //ISO layout
399
400const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
401/* Refer to IS31 manual for these locations
402 * driver
403 * | R location
404 * | | G location
405 * | | | B location
406 * | | | | */
407 {0, B_1, A_1, C_1}, //MX1
408 {0, E_1, D_1, F_1}, //MX2
409 {0, H_1, G_1, I_1}, //MX3
410 {0, K_1, J_1, L_1}, //MX4
411 {0, B_2, A_2, C_2}, //MX6
412 {0, E_2, D_2, F_2}, //MX7
413 {0, H_2, G_2, I_2}, //MX8
414 {0, K_2, J_2, L_2}, //MX14
415 {0, B_3, A_3, C_3}, //MX11
416 {0, E_3, D_3, F_3}, //MX12
417 {0, H_3, G_3, I_3}, //MX13
418 {0, K_3, J_3, L_3}, //MX19
419 {0, B_4, A_4, C_4}, //MX16
420 {0, E_4, D_4, F_4}, //MX17
421 {0, H_4, G_4, I_4}, //MX18
422 {0, K_4, J_4, L_4}, //MX23
423 {0, B_5, A_5, C_5}, //MX20
424 {0, E_5, D_5, F_5}, //MX21
425 {0, H_5, G_5, I_5}, //MX22
426 {0, K_5, J_5, L_5}, //MX27
427 {0, B_6, A_6, C_6}, //MX24
428 {0, E_6, D_6, F_6}, //MX25
429 {0, H_6, G_6, I_6}, //MX26
430 {0, K_6, J_6, L_6}, //MX31
431 {0, B_7, A_7, C_7}, //MX28
432 {0, E_7, D_7, F_7}, //MX29
433 {0, H_7, G_7, I_7}, //MX30
434 {0, K_7, J_7, L_7}, //MX36
435 {0, B_8, A_8, C_8}, //MX33
436 {0, E_8, D_8, F_8}, //MX34
437 {0, H_8, G_8, I_8}, //MX35
438 {0, K_8, J_8, L_8}, //MX40
439 {0, B_9, A_9, C_9}, //MX37
440 {0, E_9, D_9, F_9}, //MX38
441 {0, H_9, G_9, I_9}, //MX39
442 {0, K_9, J_9, L_9}, //MX44
443 {0, B_10, A_10, C_10}, //MX41
444 {0, E_10, D_10, F_10}, //MX42
445 {0, H_10, G_10, I_10}, //MX43
446 {0, K_10, J_10, L_10}, //MX48
447 {0, B_11, A_11, C_11}, //MX45
448 {0, E_11, D_11, F_11}, //MX46
449 {0, H_11, G_11, I_11}, //MX47
450 {0, K_11, J_11, L_11}, //MX53
451 {0, B_12, A_12, C_12}, //MX50
452 {0, E_12, D_12, F_12}, //MX51
453 {0, H_12, G_12, I_12}, //MX52
454 {0, K_12, J_12, L_12}, //MX9
455 {0, B_13, A_13, C_13}, //MX55
456 {0, E_13, D_13, F_13}, //MX56
457
458 {0, K_13, J_13, L_13}, //MX61
459 {0, B_14, A_14, C_14}, //MX59
460 {0, E_14, D_14, F_14}, //MX57
461 {0, H_14, G_14, I_14}, //MX60
462 {0, K_14, J_14, L_14}, //MX62
463 {0, B_15, A_15, C_15}, //MX5
464 {0, E_15, D_15, F_15}, //MX10
465 {0, H_15, G_15, I_15}, //MX15
466 {0, K_15, J_15, L_15}, //MX32
467
468 {0, E_16, D_16, F_16}, //MX49
469 {0, H_16, G_16, I_16}, //MX54
470 {0, K_16, J_16, L_16}, //MX58
471};
472
473const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
474//
475// MX1, MX6, MX11, MX16, MX20, MX24, MX28, MX33, MX37, MX41, MX45, MX50, MX55, MX59,
476// MX2, MX7, MX12, MX17, MX21, MX25, MX29, MX34, MX38, MX42, MX46, MX51, MX56, ---,
477// MX3, MX8, MX13, MX18, MX22, MX26, MX30, MX35, MX39, MX43, MX47, MX52, MX57, MX60,
478// MX4, ---, MX14, MX19, MX23, MX27, MX31, MX36, MX40, MX44, MX48, MX53, ---, MX61,
479// MX5, MX10, MX15, ---, ---, ---, MX32, ---, ---, ---, MX49, MX54, MX58, MX62
480/* {row | col << 4}
481 * | {x=0..224, y=0..64}
482 * | | modifier
483 * | | | */
484 {{0|(0<<4)}, { 0, 0}, 1}, //MX1
485 {{1|(0<<4)}, { 0, 16}, 1}, //MX2
486 {{2|(0<<4)}, { 0, 32}, 1}, //MX3
487 {{3|(0<<4)}, { 0, 48}, 1}, //MX4
488 {{0|(1<<4)}, { 17, 0}, 0}, //MX6
489 {{1|(1<<4)}, { 17, 16}, 0}, //MX7
490 {{2|(1<<4)}, { 17, 32}, 0}, //MX8
491 {{3|(2<<4)}, { 34, 48}, 0}, //MX14
492 {{0|(2<<4)}, { 34, 0}, 0}, //MX11
493 {{1|(2<<4)}, { 34, 16}, 0}, //MX12
494 {{2|(2<<4)}, { 34, 32}, 0}, //MX13
495 {{3|(3<<4)}, { 51, 48}, 0}, //MX19
496 {{0|(3<<4)}, { 51, 0}, 0}, //MX16
497 {{1|(3<<4)}, { 51, 16}, 0}, //MX17
498 {{2|(3<<4)}, { 51, 32}, 0}, //MX18
499 {{3|(4<<4)}, { 68, 48}, 0}, //MX23
500 {{0|(4<<4)}, { 68, 0}, 0}, //MX20
501 {{1|(4<<4)}, { 68, 16}, 0}, //MX21
502 {{2|(4<<4)}, { 68, 32}, 0}, //MX22
503 {{3|(5<<4)}, { 85, 48}, 0}, //MX27
504 {{0|(5<<4)}, { 85, 0}, 0}, //MX24
505 {{1|(5<<4)}, { 85, 16}, 0}, //MX25
506 {{2|(5<<4)}, { 85, 32}, 0}, //MX26
507 {{3|(6<<4)}, {102, 48}, 0}, //MX31
508 {{0|(6<<4)}, {102, 0}, 0}, //MX28
509 {{1|(6<<4)}, {102, 16}, 0}, //MX29
510 {{2|(6<<4)}, {102, 32}, 0}, //MX30
511 {{3|(7<<4)}, {119, 48}, 0}, //MX36
512 {{0|(7<<4)}, {119, 0}, 0}, //MX33
513 {{1|(7<<4)}, {119, 16}, 0}, //MX34
514 {{2|(7<<4)}, {119, 32}, 0}, //MX35
515 {{3|(8<<4)}, {136, 48}, 0}, //MX40
516 {{0|(8<<4)}, {136, 0}, 0}, //MX37
517 {{1|(8<<4)}, {136, 16}, 0}, //MX38
518 {{2|(8<<4)}, {136, 32}, 0}, //MX39
519 {{3|(9<<4)}, {153, 48}, 0}, //MX44
520 {{0|(9<<4)}, {153, 0}, 0}, //MX41
521 {{1|(9<<4)}, {153, 16}, 0}, //MX42
522 {{2|(9<<4)}, {153, 32}, 0}, //MX43
523 {{3|(10<<4)}, {170, 48}, 0}, //MX48
524 {{0|(10<<4)}, {170, 0}, 0}, //MX45
525 {{1|(10<<4)}, {170, 16}, 0}, //MX46
526 {{2|(10<<4)}, {170, 32}, 0}, //MX47
527 {{3|(11<<4)}, {187, 48}, 0}, //MX53
528 {{0|(11<<4)}, {187, 0}, 0}, //MX50
529 {{1|(11<<4)}, {187, 16}, 0}, //MX51
530 {{2|(11<<4)}, {187, 32}, 0}, //MX52
531 {{3|(2<<4)}, { 17, 32}, 1}, //MX9
532 {{0|(12<<4)}, {204, 0}, 0}, //MX55
533 {{1|(12<<4)}, {204, 16}, 0}, //MX56
534
535 {{3|(13<<4)}, {221, 48}, 1}, //MX61
536 {{0|(13<<4)}, {221, 0}, 1}, //MX59
537 {{2|(12<<4)}, {204, 32}, 0}, //MX57
538 {{2|(13<<4)}, {221, 24}, 1}, //MX60
539 {{4|(13<<4)}, {221, 64}, 1}, //MX62
540 {{4|(0<<4)}, { 0, 64}, 1}, //MX5
541 {{4|(1<<4)}, { 17, 64}, 1}, //MX10
542 {{4|(2<<4)}, { 34, 64}, 1}, //MX15
543 {{4|(5<<4)}, {102, 64}, 0}, //MX32
544
545 {{4|(10<<4)}, {170, 64}, 1}, //MX49
546 {{4|(11<<4)}, {187, 64}, 1}, //MX54
547 {{4|(12<<4)}, {204, 64}, 1} //MX58
548};
549
550#endif 18#endif
551
552void bootmagic_lite(void)
553{
554 // The lite version of TMK's bootmagic made by Wilba.
555 // 100% less potential for accidentally making the
556 // keyboard do stupid things.
557
558 // We need multiple scans because debouncing can't be turned off.
559 matrix_scan();
560 wait_ms(10);
561 matrix_scan();
562
563 // If the Esc and space bar are held down on power up,
564 // reset the EEPROM valid state and jump to bootloader.
565 // Assumes Esc is at [0,0] and spacebar is at [4,6].
566 // This isn't very generalized, but we need something that doesn't
567 // rely on user's keymaps in firmware or EEPROM.
568 if ( ( matrix_get_row(0) & (1<<0) ) &&
569 ( matrix_get_row(4) & (1<<6) ) )
570 {
571 // Set the TMK/QMK EEPROM state as invalid.
572 eeconfig_disable();
573 //eeprom_set_valid(false);
574 // Jump to bootloader.
575 bootloader_jump();
576 }
577}
578
579void matrix_init_kb(void) {
580 // put your keyboard start-up code here
581 // runs once when the firmware starts up
582
583 bootmagic_lite();
584
585 // Please ignore this is for upcoming features
586 // If the EEPROM has the magic, the data is good.
587 // OK to load from EEPROM.
588 /*if (eeprom_is_valid())
589 {
590 backlight_config_load();
591
592 // TODO: do something to "turn on" keymaps in EEPROM?
593 }
594 else
595 {
596 // If the EEPROM has not been saved before, or is out of date,
597 // save the default values to the EEPROM. Default values
598 // come from construction of the zeal_backlight_config instance.
599 backlight_config_save();
600
601 // Clear the LED colors stored in EEPROM
602 for ( int row=0; row < MATRIX_ROWS; row++ )
603 {
604 HSV hsv;
605 for ( int column=0; column < MATRIX_COLS; column++ )
606 {
607 hsv.h = rand() & 0xFF;
608 hsv.s = rand() & 0x7F;
609 hsv.v = 255;
610 backlight_set_key_color( row, column, hsv );
611 }
612 }
613 #ifdef USE_KEYMAPS_IN_EEPROM
614 keymap_default_save();
615 #endif
616 // Save the magic number last, in case saving was interrupted
617 eeprom_set_valid(true);
618 }*/
619
620 matrix_init_user();
621}
622
623void matrix_scan_kb(void) {
624
625 matrix_scan_user();
626}
627
628bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
629
630 return process_record_user(keycode, record);
631}
632
633void led_set_kb(uint8_t usb_led) {
634 //backlight_set_indicator_state(usb_led);
635} \ No newline at end of file
diff --git a/keyboards/hs60/v2/v2.h b/keyboards/hs60/v2/v2.h
index 86aeb68a7..0a35acdea 100644
--- a/keyboards/hs60/v2/v2.h
+++ b/keyboards/hs60/v2/v2.h
@@ -13,12 +13,13 @@
13 * You should have received a copy of the GNU General Public License 13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>. 14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */ 15 */
16#ifndef HS60_H 16#pragma once
17#define HS60_H
18 17
19#define XXX KC_NO 18#define XXX KC_NO
20 19
21#include "quantum.h" 20#include "quantum.h"
21#include "../../zeal60/rgb_backlight_keycodes.h"
22#include "../../zeal60/zeal60_keycodes.h"
22 23
23// This a shortcut to help you visually see your layout. 24// This a shortcut to help you visually see your layout.
24 25
@@ -63,5 +64,3 @@
63 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ 64 { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
64 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D } \ 65 { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D } \
65} 66}
66
67#endif \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 11:08:48 +0000