summaryrefslogtreecommitdiffstats
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/hs60/v2/ansi/ansi.h38
-rw-r--r--keyboards/hs60/v2/ansi/config.h146
-rw-r--r--keyboards/hs60/v2/ansi/info.json333
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/default/config.h (renamed from keyboards/hs60/v2/keymaps/ansi/config.h)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/default/keymap.c (renamed from keyboards/hs60/v2/keymaps/ansi/keymap.c)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/default/readme.md (renamed from keyboards/hs60/v2/keymaps/ansi/readme.md)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/stanrc85/config.h (renamed from keyboards/hs60/v2/keymaps/stanrc85/config.h)5
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c (renamed from keyboards/hs60/v2/keymaps/stanrc85/keymap.c)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/stanrc85/readme.md (renamed from keyboards/hs60/v2/keymaps/stanrc85/readme.md)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/stanrc85/rules.mk (renamed from keyboards/hs60/v2/keymaps/ansi_via/rules.mk)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/via/config.h (renamed from keyboards/hs60/v2/keymaps/ansi_via/config.h)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/via/keymap.c (renamed from keyboards/hs60/v2/keymaps/ansi_via/keymap.c)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/via/readme.md (renamed from keyboards/hs60/v2/keymaps/ansi_via/readme.md)0
-rw-r--r--keyboards/hs60/v2/ansi/keymaps/via/rules.mk (renamed from keyboards/hs60/v2/keymaps/default_via/rules.mk)0
-rw-r--r--keyboards/hs60/v2/ansi/rules.mk (renamed from keyboards/hs60/v2/rules.mk)4
-rw-r--r--keyboards/hs60/v2/hhkb/config.h146
-rw-r--r--keyboards/hs60/v2/hhkb/hhkb.h (renamed from keyboards/hs60/v2/v2.h)28
-rw-r--r--keyboards/hs60/v2/hhkb/info.json12
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/default/keymap.c (renamed from keyboards/hs60/v2/keymaps/hhkb/keymap.c)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/default/readme.md (renamed from keyboards/hs60/v2/keymaps/hhkb/readme.md)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h (renamed from keyboards/hs60/v2/keymaps/goatmaster/config.h)15
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c (renamed from keyboards/hs60/v2/keymaps/goatmaster/keymap.c)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md (renamed from keyboards/hs60/v2/keymaps/goatmaster/readme.md)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/goatmaster/rules.mk (renamed from keyboards/hs60/v2/keymaps/goatmaster/rules.mk)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/via/keymap.c (renamed from keyboards/hs60/v2/keymaps/hhkb_via/keymap.c)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/via/readme.md (renamed from keyboards/hs60/v2/keymaps/hhkb_via/readme.md)0
-rw-r--r--keyboards/hs60/v2/hhkb/keymaps/via/rules.mk (renamed from keyboards/hs60/v2/keymaps/hhkb_via/rules.mk)0
-rw-r--r--keyboards/hs60/v2/hhkb/rules.mk31
-rw-r--r--keyboards/hs60/v2/info.json1650
-rw-r--r--keyboards/hs60/v2/iso/config.h (renamed from keyboards/hs60/v2/config.h)4
-rw-r--r--keyboards/hs60/v2/iso/info.json338
-rw-r--r--keyboards/hs60/v2/iso/iso.h38
-rw-r--r--keyboards/hs60/v2/iso/keymaps/default/keymap.c (renamed from keyboards/hs60/v2/keymaps/default/keymap.c)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/default/readme.md (renamed from keyboards/hs60/v2/keymaps/default/readme.md)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c (renamed from keyboards/hs60/v2/keymaps/iso_andys8/keymap.c)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/iso_andys8/readme.md (renamed from keyboards/hs60/v2/keymaps/iso_andys8/readme.md)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/iso_andys8/rules.mk (renamed from keyboards/hs60/v2/keymaps/iso_andys8/rules.mk)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/via/keymap.c (renamed from keyboards/hs60/v2/keymaps/default_via/keymap.c)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/via/readme.md (renamed from keyboards/hs60/v2/keymaps/default_via/readme.md)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/via/rules.mk (renamed from keyboards/hs60/v2/keymaps/stanrc85/rules.mk)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c (renamed from keyboards/hs60/v2/keymaps/win_osx_dual/keymap.c)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/win_osx_dual/readme.md (renamed from keyboards/hs60/v2/keymaps/win_osx_dual/readme.md)0
-rw-r--r--keyboards/hs60/v2/iso/keymaps/win_osx_dual/rules.mk (renamed from keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk)0
-rw-r--r--keyboards/hs60/v2/iso/rules.mk33
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb/config.h34
-rw-r--r--keyboards/hs60/v2/keymaps/hhkb_via/config.h34
-rw-r--r--keyboards/hs60/v2/readme.md4
-rw-r--r--keyboards/hs60/v2/v2.c3
48 files changed, 1125 insertions, 1771 deletions
diff --git a/keyboards/hs60/v2/ansi/ansi.h b/keyboards/hs60/v2/ansi/ansi.h
new file mode 100644
index 0000000000..e29cc65c0e
--- /dev/null
+++ b/keyboards/hs60/v2/ansi/ansi.h
@@ -0,0 +1,38 @@
+/* Copyright 2018 Yiancar
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define XXX KC_NO
+
+#include "quantum.h"
+#include "../../wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "via.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_60_ansi( \
+ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, \
+ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
+ K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
+ K40, K41, K42, K46, K4A, K4B, K4C, K4D \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+ { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+ { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D } \
+}
diff --git a/keyboards/hs60/v2/ansi/config.h b/keyboards/hs60/v2/ansi/config.h
new file mode 100644
index 0000000000..a02c362c96
--- /dev/null
+++ b/keyboards/hs60/v2/ansi/config.h
@@ -0,0 +1,146 @@
+/*
+Copyright 2018 Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x8968
+#define PRODUCT_ID 0x4854
+#define DEVICE_VER 0x0002
+#define MANUFACTURER Yiancar-Designs
+#define PRODUCT HS60 V2
+#define DESCRIPTION GH60 compatible, tool free RGB keyboard
+
+#define HS60_ANSI
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
+#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3 }
+// To enable debugger set A13 A14 -> A5 A6
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* Backlight options */
+
+#define RGB_BACKLIGHT_ENABLED 1
+
+#define RGB_BACKLIGHT_HS60
+
+// they aren't really used if RGB_BACKLIGHT_HS60 defined
+#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
+#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
+#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
+#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
+#define RGB_BACKLIGHT_USE_ISO_ENTER 0
+#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
+
+// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
+#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
+
+// disable backlight after timeout in minutes, 0 = no timeout
+#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
+
+// the default brightness
+#define RGB_BACKLIGHT_BRIGHTNESS 255
+
+// the default effect (RGB test)
+#define RGB_BACKLIGHT_EFFECT 6
+
+// the default effect speed (0-3)
+#define RGB_BACKLIGHT_EFFECT_SPEED 0
+
+// the default color1 and color2
+#define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 }
+#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
+
+#define DRIVER_COUNT 2
+#define DRIVER_LED_TOTAL 64
+
+// These define which keys in the matrix are alphas/mods
+// Used for backlight effects so colors are different for
+// alphas vs. mods
+// Each value is for a row, bit 0 is column 0
+// Alpha=0 Mod=1
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0010000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0010000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0010000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011110000000111
+
+#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+
+// Backlight config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+
diff --git a/keyboards/hs60/v2/ansi/info.json b/keyboards/hs60/v2/ansi/info.json
new file mode 100644
index 0000000000..a977f9be0c
--- /dev/null
+++ b/keyboards/hs60/v2/ansi/info.json
@@ -0,0 +1,333 @@
+{
+ "keyboard_name": "HS60v2",
+ "maintainer": "yiancar",
+ "url": "",
+ "width": 15,
+ "height": 5,
+ "layouts": {
+ "LAYOUT_60_ansi": {
+ "key_count": 61,
+ "layout": [
+ {
+ "label": "~",
+ "x": 0,
+ "y": 0
+ },
+ {
+ "label": "!",
+ "x": 1,
+ "y": 0
+ },
+ {
+ "label": "@",
+ "x": 2,
+ "y": 0
+ },
+ {
+ "label": "#",
+ "x": 3,
+ "y": 0
+ },
+ {
+ "label": "$",
+ "x": 4,
+ "y": 0
+ },
+ {
+ "label": "%",
+ "x": 5,
+ "y": 0
+ },
+ {
+ "label": "^",
+ "x": 6,
+ "y": 0
+ },
+ {
+ "label": "&",
+ "x": 7,
+ "y": 0
+ },
+ {
+ "label": "*",
+ "x": 8,
+ "y": 0
+ },
+ {
+ "label": "(",
+ "x": 9,
+ "y": 0
+ },
+ {
+ "label": ")",
+ "x": 10,
+ "y": 0
+ },
+ {
+ "label": "_",
+ "x": 11,
+ "y": 0
+ },
+ {
+ "label": "+",
+ "x": 12,
+ "y": 0
+ },
+ {
+ "label": "Backspace",
+ "x": 13,
+ "y": 0,
+ "w": 2
+ },
+ {
+ "label": "Tab",
+ "x": 0,
+ "y": 1,
+ "w": 1.5
+ },
+ {
+ "label": "Q",
+ "x": 1.5,
+ "y": 1
+ },
+ {
+ "label": "W",
+ "x": 2.5,
+ "y": 1
+ },
+ {
+ "label": "E",
+ "x": 3.5,
+ "y": 1
+ },
+ {
+ "label": "R",
+ "x": 4.5,
+ "y": 1
+ },
+ {
+ "label": "T",
+ "x": 5.5,
+ "y": 1
+ },
+ {
+ "label": "Y",
+ "x": 6.5,
+ "y": 1
+ },
+ {
+ "label": "U",
+ "x": 7.5,
+ "y": 1
+ },
+ {
+ "label": "I",
+ "x": 8.5,
+ "y": 1
+ },
+ {
+ "label": "O",
+ "x": 9.5,
+ "y": 1
+ },
+ {
+ "label": "P",
+ "x": 10.5,
+ "y": 1
+ },
+ {
+ "label": "{",
+ "x": 11.5,
+ "y": 1
+ },
+ {
+ "label": "}",
+ "x": 12.5,
+ "y": 1
+ },
+ {
+ "label": "|",
+ "x": 13.5,
+ "y": 1,
+ "w": 1.5
+ },
+ {
+ "label": "Caps Lock",
+ "x": 0,
+ "y": 2,
+ "w": 1.75
+ },
+ {
+ "label": "A",
+ "x": 1.75,
+ "y": 2
+ },
+ {
+ "label": "S",
+ "x": 2.75,
+ "y": 2
+ },
+ {
+ "label": "D",
+ "x": 3.75,
+ "y": 2
+ },
+ {
+ "label": "F",
+ "x": 4.75,
+ "y": 2
+ },
+ {
+ "label": "G",
+ "x": 5.75,
+ "y": 2
+ },
+ {
+ "label": "H",
+ "x": 6.75,
+ "y": 2
+ },
+ {
+ "label": "J",
+ "x": 7.75,
+ "y": 2
+ },
+ {
+ "label": "K",
+ "x": 8.75,
+ "y": 2
+ },
+ {
+ "label": "L",
+ "x": 9.75,
+ "y": 2
+ },
+ {
+ "label": ":",
+ "x": 10.75,
+ "y": 2
+ },
+ {
+ "label": "\"",
+ "x": 11.75,
+ "y": 2
+ },
+ {
+ "label": "Enter",
+ "x": 12.75,
+ "y": 2,
+ "w": 2.25
+ },
+ {
+ "label": "Shift",
+ "x": 0,
+ "y": 3,
+ "w": 2.25
+ },
+ {
+ "label": "Z",
+ "x": 2.25,
+ "y": 3
+ },
+ {
+ "label": "X",
+ "x": 3.25,
+ "y": 3
+ },
+ {
+ "label": "C",
+ "x": 4.25,
+ "y": 3
+ },
+ {
+ "label": "V",
+ "x": 5.25,
+ "y": 3
+ },
+ {
+ "label": "B",
+ "x": 6.25,
+ "y": 3
+ },
+ {
+ "label": "N",
+ "x": 7.25,
+ "y": 3
+ },
+ {
+ "label": "M",
+ "x": 8.25,
+ "y": 3
+ },
+ {
+ "label": "<",
+ "x": 9.25,
+ "y": 3
+ },
+ {
+ "label": ">",
+ "x": 10.25,
+ "y": 3
+ },
+ {
+ "label": "?",
+ "x": 11.25,
+ "y": 3
+ },
+ {
+ "label": "Shift",
+ "x": 12.25,
+ "y": 3,
+ "w": 2.75
+ },
+ {
+ "label": "Ctrl",
+ "x": 0,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "Win",
+ "x": 1.25,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "Alt",
+ "x": 2.5,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "x": 3.75,
+ "y": 4,
+ "w": 6.25
+ },
+ {
+ "label": "Alt",
+ "x": 10,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "Win",
+ "x": 11.25,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "Menu",
+ "x": 12.5,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "Ctrl",
+ "x": 13.75,
+ "y": 4,
+ "w": 1.25
+ }
+ ]
+ }
+ }
+}
diff --git a/keyboards/hs60/v2/keymaps/ansi/config.h b/keyboards/hs60/v2/ansi/keymaps/default/config.h
index 96adaf5688..96adaf5688 100644
--- a/keyboards/hs60/v2/keymaps/ansi/config.h
+++ b/keyboards/hs60/v2/ansi/keymaps/default/config.h
diff --git a/keyboards/hs60/v2/keymaps/ansi/keymap.c b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
index ba649470b4..ba649470b4 100644
--- a/keyboards/hs60/v2/keymaps/ansi/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/default/keymap.c
diff --git a/keyboards/hs60/v2/keymaps/ansi/readme.md b/keyboards/hs60/v2/ansi/keymaps/default/readme.md
index 3afd8afb33..3afd8afb33 100644
--- a/keyboards/hs60/v2/keymaps/ansi/readme.md
+++ b/keyboards/hs60/v2/ansi/keymaps/default/readme.md
diff --git a/keyboards/hs60/v2/keymaps/stanrc85/config.h b/keyboards/hs60/v2/ansi/keymaps/stanrc85/config.h
index d61e6bde4f..bf39aae3a2 100644
--- a/keyboards/hs60/v2/keymaps/stanrc85/config.h
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/config.h
@@ -1,10 +1,5 @@
#pragma once
-// Include overwrites for specific keymap
-#define HS60_ANSI
-#undef PRODUCT_ID
-#define PRODUCT_ID 0x4854
-
// disable backlight after timeout in minutes, 0 = no timeout
#undef RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT
#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 20
diff --git a/keyboards/hs60/v2/keymaps/stanrc85/keymap.c b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
index 2e6a704839..2e6a704839 100644
--- a/keyboards/hs60/v2/keymaps/stanrc85/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c
diff --git a/keyboards/hs60/v2/keymaps/stanrc85/readme.md b/keyboards/hs60/v2/ansi/keymaps/stanrc85/readme.md
index 430d363f37..430d363f37 100644
--- a/keyboards/hs60/v2/keymaps/stanrc85/readme.md
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/readme.md
diff --git a/keyboards/hs60/v2/keymaps/ansi_via/rules.mk b/keyboards/hs60/v2/ansi/keymaps/stanrc85/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/hs60/v2/keymaps/ansi_via/rules.mk
+++ b/keyboards/hs60/v2/ansi/keymaps/stanrc85/rules.mk
diff --git a/keyboards/hs60/v2/keymaps/ansi_via/config.h b/keyboards/hs60/v2/ansi/keymaps/via/config.h
index 96adaf5688..96adaf5688 100644
--- a/keyboards/hs60/v2/keymaps/ansi_via/config.h
+++ b/keyboards/hs60/v2/ansi/keymaps/via/config.h
diff --git a/keyboards/hs60/v2/keymaps/ansi_via/keymap.c b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
index ba649470b4..ba649470b4 100644
--- a/keyboards/hs60/v2/keymaps/ansi_via/keymap.c
+++ b/keyboards/hs60/v2/ansi/keymaps/via/keymap.c
diff --git a/keyboards/hs60/v2/keymaps/ansi_via/readme.md b/keyboards/hs60/v2/ansi/keymaps/via/readme.md
index a462da6619..a462da6619 100644
--- a/keyboards/hs60/v2/keymaps/ansi_via/readme.md
+++ b/keyboards/hs60/v2/ansi/keymaps/via/readme.md
diff --git a/keyboards/hs60/v2/keymaps/default_via/rules.mk b/keyboards/hs60/v2/ansi/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/hs60/v2/keymaps/default_via/rules.mk
+++ b/keyboards/hs60/v2/ansi/keymaps/via/rules.mk
diff --git a/keyboards/hs60/v2/rules.mk b/keyboards/hs60/v2/ansi/rules.mk
index 37deb63be7..d013775c11 100644
--- a/keyboards/hs60/v2/rules.mk
+++ b/keyboards/hs60/v2/ansi/rules.mk
@@ -10,7 +10,7 @@ OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
# comment out to disable the options.
#
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
@@ -23,7 +23,7 @@ NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plu
CIE1931_CURVE = yes
-LAYOUTS = 60_ansi 60_iso
+LAYOUTS = 60_ansi
# project specific files
SRC = keyboards/wilba_tech/wt_main.c \
diff --git a/keyboards/hs60/v2/hhkb/config.h b/keyboards/hs60/v2/hhkb/config.h
new file mode 100644
index 0000000000..45cfe57168
--- /dev/null
+++ b/keyboards/hs60/v2/hhkb/config.h
@@ -0,0 +1,146 @@
+/*
+Copyright 2018 Yiancar
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x8968
+#define PRODUCT_ID 0x4855
+#define DEVICE_VER 0x0002
+#define MANUFACTURER Yiancar-Designs
+#define PRODUCT HS60 V2
+#define DESCRIPTION GH60 compati