~ruther/qmk_firmware

f7730567509619e31742ce0a2aa5ae7cfe21d23e — yiancar 5 years ago b705008
[Keyboard] HS60 Refactor (Keymap restructure to be more standardized) (#7847)

* Keymap restructure to be more standardized

* made bootmagic lite default

* Dividing keymaps

* Update keyboards/hs60/v2/v2.c
48 files changed, 1126 insertions(+), 1772 deletions(-)

R keyboards/hs60/v2/{v2 => ansi/ansi}.h
A keyboards/hs60/v2/ansi/config.h
A keyboards/hs60/v2/ansi/info.json
R keyboards/hs60/v2/{keymaps/ansi => ansi/keymaps/default}/config.h
R keyboards/hs60/v2/{keymaps/ansi => ansi/keymaps/default}/keymap.c
R keyboards/hs60/v2/{keymaps/ansi => ansi/keymaps/default}/readme.md
R keyboards/hs60/v2/{ => ansi}/keymaps/stanrc85/config.h
R keyboards/hs60/v2/{ => ansi}/keymaps/stanrc85/keymap.c
R keyboards/hs60/v2/{ => ansi}/keymaps/stanrc85/readme.md
R keyboards/hs60/v2/{keymaps/ansi_via => ansi/keymaps/stanrc85}/rules.mk
R keyboards/hs60/v2/{keymaps/ansi_via => ansi/keymaps/via}/config.h
R keyboards/hs60/v2/{keymaps/ansi_via => ansi/keymaps/via}/keymap.c
R keyboards/hs60/v2/{keymaps/ansi_via => ansi/keymaps/via}/readme.md
R keyboards/hs60/v2/{keymaps/default_via => ansi/keymaps/via}/rules.mk
A keyboards/hs60/v2/ansi/rules.mk
A keyboards/hs60/v2/hhkb/config.h
A keyboards/hs60/v2/hhkb/hhkb.h
A keyboards/hs60/v2/hhkb/info.json
R keyboards/hs60/v2/{keymaps/hhkb => hhkb/keymaps/default}/keymap.c
R keyboards/hs60/v2/{keymaps/hhkb => hhkb/keymaps/default}/readme.md
R keyboards/hs60/v2/{ => hhkb}/keymaps/goatmaster/config.h
R keyboards/hs60/v2/{ => hhkb}/keymaps/goatmaster/keymap.c
R keyboards/hs60/v2/{ => hhkb}/keymaps/goatmaster/readme.md
R keyboards/hs60/v2/{ => hhkb}/keymaps/goatmaster/rules.mk
R keyboards/hs60/v2/{keymaps/hhkb_via => hhkb/keymaps/via}/keymap.c
R keyboards/hs60/v2/{keymaps/hhkb_via => hhkb/keymaps/via}/readme.md
R keyboards/hs60/v2/{keymaps/hhkb_via => hhkb/keymaps/via}/rules.mk
R keyboards/hs60/v2/{ => hhkb}/rules.mk
D keyboards/hs60/v2/info.json
R keyboards/hs60/v2/{ => iso}/config.h
A keyboards/hs60/v2/iso/info.json
A keyboards/hs60/v2/iso/iso.h
R keyboards/hs60/v2/{ => iso}/keymaps/default/keymap.c
R keyboards/hs60/v2/{ => iso}/keymaps/default/readme.md
R keyboards/hs60/v2/{ => iso}/keymaps/iso_andys8/keymap.c
R keyboards/hs60/v2/{ => iso}/keymaps/iso_andys8/readme.md
R keyboards/hs60/v2/{ => iso}/keymaps/iso_andys8/rules.mk
R keyboards/hs60/v2/{keymaps/default_via => iso/keymaps/via}/keymap.c
R keyboards/hs60/v2/{keymaps/default_via => iso/keymaps/via}/readme.md
R keyboards/hs60/v2/{keymaps/stanrc85 => iso/keymaps/via}/rules.mk
R keyboards/hs60/v2/{ => iso}/keymaps/win_osx_dual/keymap.c
R keyboards/hs60/v2/{ => iso}/keymaps/win_osx_dual/readme.md
R keyboards/hs60/v2/{ => iso}/keymaps/win_osx_dual/rules.mk
A keyboards/hs60/v2/iso/rules.mk
D keyboards/hs60/v2/keymaps/hhkb/config.h
D keyboards/hs60/v2/keymaps/hhkb_via/config.h
M keyboards/hs60/v2/readme.md
M keyboards/hs60/v2/v2.c
R keyboards/hs60/v2/v2.h => keyboards/hs60/v2/ansi/ansi.h +0 -28
@@ 23,20 23,6 @@

// This a shortcut to help you visually see your layout.

#define LAYOUT_60_iso( \
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      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, K31, 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 }  \
}

#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, \


@@ 50,17 36,3 @@
    { 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 }  \
}

#define LAYOUT_60_hhkb( \
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
    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, K3C,      K3D,      \
    K40, K41, K42,                K46,                     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, K1D }, \
    { 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, K3C, K3D }, \
    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D }  \
}

A keyboards/hs60/v2/ansi/config.h => keyboards/hs60/v2/ansi/config.h +146 -0
@@ 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


A keyboards/hs60/v2/ansi/info.json => keyboards/hs60/v2/ansi/info.json +333 -0
@@ 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
        }
      ]
    }
  }
}

R keyboards/hs60/v2/keymaps/ansi/config.h => keyboards/hs60/v2/ansi/keymaps/default/config.h +0 -0
R keyboards/hs60/v2/keymaps/ansi/keymap.c => keyboards/hs60/v2/ansi/keymaps/default/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/ansi/readme.md => keyboards/hs60/v2/ansi/keymaps/default/readme.md +0 -0
R keyboards/hs60/v2/keymaps/stanrc85/config.h => keyboards/hs60/v2/ansi/keymaps/stanrc85/config.h +0 -5
@@ 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

R keyboards/hs60/v2/keymaps/stanrc85/keymap.c => keyboards/hs60/v2/ansi/keymaps/stanrc85/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/stanrc85/readme.md => keyboards/hs60/v2/ansi/keymaps/stanrc85/readme.md +0 -0
R keyboards/hs60/v2/keymaps/ansi_via/rules.mk => keyboards/hs60/v2/ansi/keymaps/stanrc85/rules.mk +0 -0
R keyboards/hs60/v2/keymaps/ansi_via/config.h => keyboards/hs60/v2/ansi/keymaps/via/config.h +0 -0
R keyboards/hs60/v2/keymaps/ansi_via/keymap.c => keyboards/hs60/v2/ansi/keymaps/via/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/ansi_via/readme.md => keyboards/hs60/v2/ansi/keymaps/via/readme.md +0 -0
R keyboards/hs60/v2/keymaps/default_via/rules.mk => keyboards/hs60/v2/ansi/keymaps/via/rules.mk +0 -0
A keyboards/hs60/v2/ansi/rules.mk => keyboards/hs60/v2/ansi/rules.mk +33 -0
@@ 0,0 1,33 @@
# MCU name
MCU = STM32F303

# 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
#   comment out to disable the options.
#
BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
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
COMMAND_ENABLE = no                # Commands for debug and configuration
SLEEP_LED_ENABLE = no              # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes                  # USB Nkey Rollover
AUDIO_ENABLE = no                  # Audio output on port C6
NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
#SERIAL_LINK_ENABLE = yes

CIE1931_CURVE = yes

LAYOUTS = 60_ansi

# project specific files
SRC =	keyboards/wilba_tech/wt_main.c \
		keyboards/wilba_tech/wt_rgb_backlight.c \
		drivers/issi/is31fl3733.c \
		quantum/color.c \
		drivers/arm/i2c_master.c

A keyboards/hs60/v2/hhkb/config.h => keyboards/hs60/v2/hhkb/config.h +146 -0
@@ 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 compatible, tool free RGB keyboard

#define HS60_HHKB

/* 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 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011100000000111

#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


A keyboards/hs60/v2/hhkb/hhkb.h => keyboards/hs60/v2/hhkb/hhkb.h +38 -0
@@ 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_hhkb( \
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \
    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, K3C,      K3D,      \
    K40, K41, K42,                K46,                     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, K1D }, \
    { 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, K3C, K3D }, \
    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, XXX, K4B, K4C, K4D }  \
}

A keyboards/hs60/v2/hhkb/info.json => keyboards/hs60/v2/hhkb/info.json +12 -0
@@ 0,0 1,12 @@
{
  "keyboard_name": "HS60v2",
  "maintainer": "yiancar",
  "url": "",
  "width": 15,
  "height": 5,
  "layouts": {
    "LAYOUT_60_hhkb": {
        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
    }
  }
}

R keyboards/hs60/v2/keymaps/hhkb/keymap.c => keyboards/hs60/v2/hhkb/keymaps/default/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/hhkb/readme.md => keyboards/hs60/v2/hhkb/keymaps/default/readme.md +0 -0
R keyboards/hs60/v2/keymaps/goatmaster/config.h => keyboards/hs60/v2/hhkb/keymaps/goatmaster/config.h +0 -15
@@ 18,20 18,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.

/* Include overwrites for specific keymap */

#define HS60_HHKB
#undef  PRODUCT_ID
#define PRODUCT_ID      0x4855

#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_0
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_1
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_2
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_3
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_4
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011100000000111

#undef RGB_BACKLIGHT_CAPS_LOCK_INDICATOR
#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 255 }, .index = 3-1 } //red

R keyboards/hs60/v2/keymaps/goatmaster/keymap.c => keyboards/hs60/v2/hhkb/keymaps/goatmaster/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/goatmaster/readme.md => keyboards/hs60/v2/hhkb/keymaps/goatmaster/readme.md +0 -0
R keyboards/hs60/v2/keymaps/goatmaster/rules.mk => keyboards/hs60/v2/hhkb/keymaps/goatmaster/rules.mk +0 -0
R keyboards/hs60/v2/keymaps/hhkb_via/keymap.c => keyboards/hs60/v2/hhkb/keymaps/via/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/hhkb_via/readme.md => keyboards/hs60/v2/hhkb/keymaps/via/readme.md +0 -0
R keyboards/hs60/v2/keymaps/hhkb_via/rules.mk => keyboards/hs60/v2/hhkb/keymaps/via/rules.mk +0 -0
R keyboards/hs60/v2/rules.mk => keyboards/hs60/v2/hhkb/rules.mk +1 -3
@@ 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,8 23,6 @@ NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plu

CIE1931_CURVE = yes

LAYOUTS = 60_ansi 60_iso

# project specific files
SRC =	keyboards/wilba_tech/wt_main.c \
		keyboards/wilba_tech/wt_rgb_backlight.c \

D keyboards/hs60/v2/info.json => keyboards/hs60/v2/info.json +0 -1650
@@ 1,1650 0,0 @@
{
  "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
        }
      ]
    },
    "LAYOUT_60_iso": {
      "key_count": 62,
      "layout": [
        {
          "label": "\\u00ac",
          "x": 0,
          "y": 0
        },
        {
          "label": "!",
          "x": 1,
          "y": 0
        },
        {
          "label": "\"",
          "x": 2,
          "y": 0
        },
        {
          "label": "\\u00a3",
          "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": "Enter",
          "x": 13.75,
          "y": 1,
          "w": 1.25,
          "h": 2
        },
        {
          "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": "~",
          "x": 12.75,
          "y": 2
        },
        {
          "label": "Shift",
          "x": 0,
          "y": 3,
          "w": 1.25
        },
        {
          "label": "|",
          "x": 1.25,
          "y": 3
        },
        {
          "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": "AltGr",
          "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
        }
      ]
    },
    "KEYMAP_AEK": {
      "key_count": 60,
      "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.5
        },
        {
          "label": "Win",
          "x": 1.5,
          "y": 4,
          "w": 1.25
        },
        {
          "label": "Alt",
          "x": 2.75,
          "y": 4,
          "w": 1.5
        },
        {
          "x": 4.25,
          "y": 4,
          "w": 6.5
        },
        {
          "label": "AltGr",
          "x": 10.75,
          "y": 4,
          "w": 1.5
        },
        {
          "label": "Win",
          "x": 12.25,
          "y": 4,
          "w": 1.25
        },
        {
          "label": "Ctrl",
          "x": 13.5,
          "y": 4,
          "w": 1.5
        }
      ]
    },
    "KEYMAP": {
      "key_count": 65,
      "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
        },
        {
          "x": 13,
          "y": 0
        },
        {
          "label": "Back",
          "x": 14,
          "y": 0
        },
        {
          "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
        },
        {
          "x": 12.75,
          "y": 2
        },
        {
          "label": "Enter",
          "x": 13.75,
          "y": 2,
          "w": 1.25
        },
        {
          "x": 0,
          "y": 3
        },
        {
          "label": "Shift",
          "x": 1,
          "y": 3,
          "w": 1.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": 1.75
        },
        {
          "x": 14,
          "y": 3
        },
        {
          "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
        }
      ]
    },
    "LAYOUT_60_ansi_split_bs_rshift": {
      "key_count": 63,
      "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
        },
        {
          "x": 13,
          "y": 0
        },
        {
          "label": "Back",
          "x": 14,
          "y": 0
        },
        {
          "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": 1.75
        },
        {
          "x": 14,
          "y": 3
        },
        {
          "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
        }
      ]
    }
  }
}

R keyboards/hs60/v2/config.h => keyboards/hs60/v2/iso/config.h +4 -0
@@ 82,6 82,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *
 */

/* Bootmagic Lite key configuration */
#define BOOTMAGIC_LITE_ROW 0
#define BOOTMAGIC_LITE_COLUMN 0

/* Backlight options */

#define RGB_BACKLIGHT_ENABLED 1

A keyboards/hs60/v2/iso/info.json => keyboards/hs60/v2/iso/info.json +338 -0
@@ 0,0 1,338 @@
{
  "keyboard_name": "HS60v2",
  "maintainer": "yiancar",
  "url": "",
  "width": 15,
  "height": 5,
  "layouts": {
    "LAYOUT_60_iso": {
      "key_count": 62,
      "layout": [
        {
          "label": "\\u00ac",
          "x": 0,
          "y": 0
        },
        {
          "label": "!",
          "x": 1,
          "y": 0
        },
        {
          "label": "\"",
          "x": 2,
          "y": 0
        },
        {
          "label": "\\u00a3",
          "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": "Enter",
          "x": 13.75,
          "y": 1,
          "w": 1.25,
          "h": 2
        },
        {
          "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": "~",
          "x": 12.75,
          "y": 2
        },
        {
          "label": "Shift",
          "x": 0,
          "y": 3,
          "w": 1.25
        },
        {
          "label": "|",
          "x": 1.25,
          "y": 3
        },
        {
          "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": "AltGr",
          "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
        }
      ]
    }
  }
}

A keyboards/hs60/v2/iso/iso.h => keyboards/hs60/v2/iso/iso.h +38 -0
@@ 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_iso( \
    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C,      \
    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      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, K31, 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 }  \
}

R keyboards/hs60/v2/keymaps/default/keymap.c => keyboards/hs60/v2/iso/keymaps/default/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/default/readme.md => keyboards/hs60/v2/iso/keymaps/default/readme.md +0 -0
R keyboards/hs60/v2/keymaps/iso_andys8/keymap.c => keyboards/hs60/v2/iso/keymaps/iso_andys8/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/iso_andys8/readme.md => keyboards/hs60/v2/iso/keymaps/iso_andys8/readme.md +0 -0
R keyboards/hs60/v2/keymaps/iso_andys8/rules.mk => keyboards/hs60/v2/iso/keymaps/iso_andys8/rules.mk +0 -0
R keyboards/hs60/v2/keymaps/default_via/keymap.c => keyboards/hs60/v2/iso/keymaps/via/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/default_via/readme.md => keyboards/hs60/v2/iso/keymaps/via/readme.md +0 -0
R keyboards/hs60/v2/keymaps/stanrc85/rules.mk => keyboards/hs60/v2/iso/keymaps/via/rules.mk +0 -0
R keyboards/hs60/v2/keymaps/win_osx_dual/keymap.c => keyboards/hs60/v2/iso/keymaps/win_osx_dual/keymap.c +0 -0
R keyboards/hs60/v2/keymaps/win_osx_dual/readme.md => keyboards/hs60/v2/iso/keymaps/win_osx_dual/readme.md +0 -0
R keyboards/hs60/v2/keymaps/win_osx_dual/rules.mk => keyboards/hs60/v2/iso/keymaps/win_osx_dual/rules.mk +0 -0
A keyboards/hs60/v2/iso/rules.mk => keyboards/hs60/v2/iso/rules.mk +33 -0
@@ 0,0 1,33 @@
# MCU name
MCU = STM32F303

# 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
#   comment out to disable the options.
#
BACKLIGHT_ENABLE = no              # Enable keyboard backlight functionality
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
COMMAND_ENABLE = no                # Commands for debug and configuration
SLEEP_LED_ENABLE = no              # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes                  # USB Nkey Rollover
AUDIO_ENABLE = no                  # Audio output on port C6
NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
#SERIAL_LINK_ENABLE = yes

CIE1931_CURVE = yes

LAYOUTS = 60_iso

# project specific files
SRC =	keyboards/wilba_tech/wt_main.c \
		keyboards/wilba_tech/wt_rgb_backlight.c \
		drivers/issi/is31fl3733.c \
		quantum/color.c \
		drivers/arm/i2c_master.c

D keyboards/hs60/v2/keymaps/hhkb/config.h => keyboards/hs60/v2/keymaps/hhkb/config.h +0 -34
@@ 1,34 0,0 @@
/*
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 overwrites for specific keymap */

#define HS60_HHKB
#undef  PRODUCT_ID
#define PRODUCT_ID      0x4855

#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_0
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_1
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_2
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_3
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_4
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011100000000111

D keyboards/hs60/v2/keymaps/hhkb_via/config.h => keyboards/hs60/v2/keymaps/hhkb_via/config.h +0 -34
@@ 1,34 0,0 @@
/*
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 overwrites for specific keymap */

#define HS60_HHKB
#undef  PRODUCT_ID
#define PRODUCT_ID      0x4855

#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_0
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_1
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_2
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_3
#undef  RGB_BACKLIGHT_ALPHAS_MODS_ROW_4
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0000000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011100000000111

M keyboards/hs60/v2/readme.md => keyboards/hs60/v2/readme.md +2 -2
@@ 17,7 17,7 @@ Due to the RGB implementation, the HS60 is currently not compatible with communi

Make example for this keyboard (after setting up your build environment):

    make hs60/v2:default
    make hs60/v2/<layout>:default

See [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.



@@ 34,4 34,4 @@ See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools)
- Unplug
- Hold Escape
- Plug In
- Flash using QMK Toolbox or dfu-util (`make hs60/v2:<keymap>:dfu-util`)
- Flash using QMK Toolbox or dfu-util (`make hs60/v2/<layout>:<keymap>:dfu-util`)

M keyboards/hs60/v2/v2.c => keyboards/hs60/v2/v2.c +2 -1
@@ 13,6 13,7 @@
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

#ifndef RGB_BACKLIGHT_HS60
#error RGB_BACKLIGHT_M60_A not defined, recheck config.h
#error RGB_BACKLIGHT_HS60 not defined, recheck config.h
#endif