aboutsummaryrefslogtreecommitdiff
path: root/keyboards/hs60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/hs60')
-rw-r--r--keyboards/hs60/v1/keyboard.json (renamed from keyboards/hs60/v1/info.json)7
-rw-r--r--keyboards/hs60/v1/rules.mk20
-rw-r--r--keyboards/hs60/v1/v1.c74
-rw-r--r--keyboards/hs60/v2/ansi/keyboard.json (renamed from keyboards/hs60/v2/ansi/info.json)6
-rw-r--r--keyboards/hs60/v2/ansi/rules.mk17
-rw-r--r--keyboards/hs60/v2/hhkb/keyboard.json (renamed from keyboards/hs60/v2/hhkb/info.json)6
-rw-r--r--keyboards/hs60/v2/hhkb/rules.mk17
-rw-r--r--keyboards/hs60/v2/iso/keyboard.json (renamed from keyboards/hs60/v2/iso/info.json)6
-rw-r--r--keyboards/hs60/v2/iso/rules.mk17
9 files changed, 32 insertions, 138 deletions
diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/keyboard.json
index f9d77c3513..3c07491a3d 100644
--- a/keyboards/hs60/v1/info.json
+++ b/keyboards/hs60/v1/keyboard.json
@@ -68,6 +68,13 @@
},
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"community_layouts": ["60_ansi", "60_iso"],
"layouts": {
"LAYOUT_60_iso": {
diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/rules.mk
index 7aa0a5ae51..5cde06a483 100644
--- a/keyboards/hs60/v1/rules.mk
+++ b/keyboards/hs60/v1/rules.mk
@@ -1,22 +1,4 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes # Use RGB matrix
-RAW_ENABLE = yes
-
-# Experimental features for zealcmd please do no enable
-#RAW_ENABLE = yes
-#USE_KEYMAPS_IN_EEPROM = yes
+NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c
index f68bcbdf9e..7a43784ad9 100644
--- a/keyboards/hs60/v1/v1.c
+++ b/keyboards/hs60/v1/v1.c
@@ -15,80 +15,6 @@
*/
#include "quantum.h"
-// Please ignore this is for upcoming features
-/*#ifdef RAW_ENABLE
-
-void raw_hid_receive( uint8_t *data, uint8_t length )
-{
- uint8_t command = data[0];
- switch ( command )
- {
- case id_protocol_version:
- {
- msg_protocol_version *msg = (msg_protocol_version*)&data[1];
- msg->version = PROTOCOL_VERSION;
- break;
- }
-#if USE_KEYMAPS_IN_EEPROM
- case id_keymap_keycode_load:
- {
- msg_keymap_keycode_load *msg = (msg_keymap_keycode_load*)&data[1];
- msg->keycode = keymap_keycode_load( msg->layer, msg->row, msg->column );
- break;
- }
- case id_keymap_keycode_save:
- {
- msg_keymap_keycode_save *msg = (msg_keymap_keycode_save*)&data[1];
- keymap_keycode_save( msg->layer, msg->row, msg->column, msg->keycode);
- break;
- }
- case id_keymap_default_save:
- {
- keymap_default_save();
- break;
- }
-#endif // USE_KEYMAPS_IN_EEPROM
- case id_backlight_config_set_values:
- {
- msg_backlight_config_set_values *msg = (msg_backlight_config_set_values*)&data[1];
- backlight_config_set_values(msg);
- backlight_config_save();
- break;
- }
- case id_backlight_config_set_alphas_mods:
- {
- msg_backlight_config_set_alphas_mods *msg = (msg_backlight_config_set_alphas_mods*)&data[1];
- backlight_config_set_alphas_mods( msg->alphas_mods );
- backlight_config_save();
- break;
- }
- case id_backlight_set_key_color:
- {
- msg_backlight_set_key_color *msg = (msg_backlight_set_key_color*)&data[1];
- backlight_set_key_color(msg->row, msg->column, msg->hsv);
- break;
- }
- case id_system_get_state:
- {
- msg_system_state *msg = (msg_system_state*)&data[1];
- msg->value = backlight_get_tick();
- break;
- }
- default:
- {
- // Unhandled message.
- data[0] = id_unhandled;
- break;
- }
- }
-
- // Return same buffer with values changed
- raw_hid_send( data, length );
-
-}
-
-#endif*/
-
#ifdef HS60_ANSI
const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/keyboard.json
index 0debcea8d1..e0781ef54b 100644
--- a/keyboards/hs60/v2/ansi/info.json
+++ b/keyboards/hs60/v2/ansi/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"board": "QMK_PROTON_C",
"community_layouts": ["60_ansi"],
"layouts": {
diff --git a/keyboards/hs60/v2/ansi/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index bc8cb00131..3b7a32713c 100644
--- a/keyboards/hs60/v2/ansi/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -1,26 +1,13 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
+NO_SUSPEND_POWER_DOWN = yes
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/hs60/v2/hhkb/info.json b/keyboards/hs60/v2/hhkb/keyboard.json
index 5323fe20f0..d9bc040e23 100644
--- a/keyboards/hs60/v2/hhkb/info.json
+++ b/keyboards/hs60/v2/hhkb/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"board": "QMK_PROTON_C",
"layouts": {
"LAYOUT_60_hhkb": {
diff --git a/keyboards/hs60/v2/hhkb/rules.mk b/keyboards/hs60/v2/hhkb/rules.mk
index bc8cb00131..3b7a32713c 100644
--- a/keyboards/hs60/v2/hhkb/rules.mk
+++ b/keyboards/hs60/v2/hhkb/rules.mk
@@ -1,26 +1,13 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
+NO_SUSPEND_POWER_DOWN = yes
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
-I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/hs60/v2/iso/info.json b/keyboards/hs60/v2/iso/keyboard.json
index c422ae2d72..a51dac05fa 100644
--- a/keyboards/hs60/v2/iso/info.json
+++ b/keyboards/hs60/v2/iso/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "STM32F303",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"board": "QMK_PROTON_C",
"community_layouts": ["60_iso"],
"layouts": {
diff --git a/keyboards/hs60/v2/iso/rules.mk b/keyboards/hs60/v2/iso/rules.mk
index bc8cb00131..3b7a32713c 100644
--- a/keyboards/hs60/v2/iso/rules.mk
+++ b/keyboards/hs60/v2/iso/rules.mk
@@ -1,26 +1,13 @@
# Do not put the microcontroller into power saving mode
# when we get USB suspend event. We want it to keep updating
# backlight effects.
-OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
-
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in
+NO_SUSPEND_POWER_DOWN = yes
CIE1931_CURVE = yes
+I2C_DRIVER_REQUIRED = yes
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
keyboards/wilba_tech/wt_rgb_backlight.c \
drivers/led/issi/is31fl3733.c \
quantum/color.c
-I2C_DRIVER_REQUIRED = yes