From 0b4065b50cbcb1760c7e81d3c550c2dfdacd9d83 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 4 Aug 2024 11:03:54 +1000 Subject: [PATCH] `hs60/v1`: separate into ANSI and ISO revisions (#24136) --- keyboards/hs60/v1/ansi/ansi.c | 81 +++++++ keyboards/hs60/v1/ansi/keyboard.json | 143 +++++++++++ .../ansi => ansi/keymaps/default}/keymap.c | 0 .../ansi => ansi/keymaps/default}/readme.md | 0 keyboards/hs60/v1/{ => ansi}/rules.mk | 0 keyboards/hs60/v1/config.h | 17 -- keyboards/hs60/v1/info.json | 85 +++++++ keyboards/hs60/v1/iso/iso.c | 81 +++++++ keyboards/hs60/v1/iso/keyboard.json | 145 +++++++++++ .../v1/{ => iso}/keymaps/default/keymap.c | 0 .../v1/{ => iso}/keymaps/default/readme.md | 0 keyboards/hs60/v1/iso/rules.mk | 4 + keyboards/hs60/v1/keyboard.json | 226 ----------------- keyboards/hs60/v1/keymaps/ansi/config.h | 23 -- keyboards/hs60/v1/readme.md | 22 +- keyboards/hs60/v1/v1.c | 228 ------------------ 16 files changed, 547 insertions(+), 508 deletions(-) create mode 100644 keyboards/hs60/v1/ansi/ansi.c create mode 100644 keyboards/hs60/v1/ansi/keyboard.json rename keyboards/hs60/v1/{keymaps/ansi => ansi/keymaps/default}/keymap.c (100%) rename keyboards/hs60/v1/{keymaps/ansi => ansi/keymaps/default}/readme.md (100%) rename keyboards/hs60/v1/{ => ansi}/rules.mk (100%) create mode 100644 keyboards/hs60/v1/info.json create mode 100644 keyboards/hs60/v1/iso/iso.c create mode 100644 keyboards/hs60/v1/iso/keyboard.json rename keyboards/hs60/v1/{ => iso}/keymaps/default/keymap.c (100%) rename keyboards/hs60/v1/{ => iso}/keymaps/default/readme.md (100%) create mode 100644 keyboards/hs60/v1/iso/rules.mk delete mode 100644 keyboards/hs60/v1/keyboard.json delete mode 100644 keyboards/hs60/v1/keymaps/ansi/config.h diff --git a/keyboards/hs60/v1/ansi/ansi.c b/keyboards/hs60/v1/ansi/ansi.c new file mode 100644 index 00000000000..a1c04831a72 --- /dev/null +++ b/keyboards/hs60/v1/ansi/ansi.c @@ -0,0 +1,81 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {1, C1_7, C2_7, C3_7}, //C7 + {1, C1_6, C2_6, C3_6}, //C6 + {1, C1_5, C2_5, C3_5}, //C5 + {1, C1_4, C2_4, C3_4}, //C4 + {1, C1_3, C2_3, C3_3}, //C3 + {1, C1_2, C2_2, C4_3}, //C2 + {1, C1_1, C3_2, C4_2}, //C1 + {0, C1_7, C2_7, C3_7}, //A7 + {0, C1_6, C2_6, C3_6}, //A6 + {0, C1_5, C2_5, C3_5}, //A5 + {0, C1_4, C2_4, C3_4}, //A4 + {0, C1_3, C2_3, C3_3}, //A3 + {0, C1_2, C2_2, C4_3}, //A2 + {0, C1_1, C3_2, C4_2}, //A1 + + {1, C1_8, C2_8, C3_8}, //C8 + {1, C9_1, C8_1, C7_1}, //C9 + {1, C9_2, C8_2, C7_2}, //C10 + {1, C9_3, C8_3, C7_3}, //C11 + {1, C9_4, C8_4, C7_4}, //C12 + {1, C9_5, C8_5, C7_5}, //C13 + {1, C9_6, C8_6, C7_6}, //C14 + {0, C1_8, C2_8, C3_8}, //A8 + {0, C9_1, C8_1, C7_1}, //A9 + {0, C9_2, C8_2, C7_2}, //A10 + {0, C9_3, C8_3, C7_3}, //A11 + {0, C9_4, C8_4, C7_4}, //A12 + {0, C9_5, C8_5, C7_5}, //A13 + {0, C9_7, C8_7, C6_6}, //A15 + + {1, C1_12, C2_12, C3_12}, //D4 + {1, C1_13, C2_13, C3_13}, //D5 + {1, C1_14, C2_14, C3_14}, //D6 + {1, C1_15, C2_15, C3_15}, //D7 + {1, C1_16, C2_16, C3_16}, //D8 + {1, C9_8, C7_7, C6_7}, //C16 + {1, C9_7, C8_7, C6_6}, //C15 + {0, C1_13, C2_13, C3_13}, //B5 + {0, C1_14, C2_14, C3_14}, //B6 + {0, C1_15, C2_15, C3_15}, //B7 + {0, C1_16, C2_16, C3_16}, //B8 + {0, C9_8, C7_7, C6_7}, //A16 + {0, C9_6, C8_6, C7_6}, //A14 + + {1, C1_11, C2_11, C3_11}, //D3 + {1, C1_9, C3_10, C4_10}, //D1 + {1, C9_9, C8_9, C7_9}, //D9 + {1, C9_10, C8_10, C7_10}, //D10 + {1, C9_11, C8_11, C7_11}, //D11 + {1, C9_12, C8_12, C7_12}, //D12 + {0, C1_12, C2_12, C3_12}, //B4 + {0, C1_11, C2_11, C3_11}, //B3 + {0, C1_10, C2_10, C4_11}, //B2 + {0, C1_9, C3_10, C4_10}, //B1 + {0, C9_9, C8_9, C7_9}, //B9 + {0, C9_10, C8_10, C7_10}, //B10 + + {1, C9_16, C7_15, C6_15}, //D16 + {1, C9_15, C8_15, C6_14}, //D15 + {1, C9_14, C8_14, C7_14}, //D14 + {1, C9_13, C8_13, C7_13}, //D13 + {0, C9_14, C8_14, C7_14}, //B14 + {0, C9_13, C8_13, C7_13}, //B13 + {0, C9_12, C8_12, C7_12}, //B12 + {0, C9_11, C8_11, C7_11} //B11 +}; + +#endif diff --git a/keyboards/hs60/v1/ansi/keyboard.json b/keyboards/hs60/v1/ansi/keyboard.json new file mode 100644 index 00000000000..8512aa176da --- /dev/null +++ b/keyboards/hs60/v1/ansi/keyboard.json @@ -0,0 +1,143 @@ +{ + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1}, + + {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1}, + {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4}, + {"matrix": [2, 12], "x": 220, "y": 16, "flags": 4}, + + {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1}, + {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 214, "y": 32, "flags": 1}, + + {"matrix": [3, 0], "x": 10, "y": 48, "flags": 1}, + {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 68, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 84, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 100, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 116, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 132, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 148, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 164, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 180, "y": 48, "flags": 4}, + {"matrix": [3, 13], "x": 210, "y": 48, "flags": 1}, + + {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}, + {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1}, + {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1}, + {"matrix": [4, 6], "x": 102, "y": 64, "flags": 4}, + {"matrix": [4, 10], "x": 162, "y": 64, "flags": 1}, + {"matrix": [4, 11], "x": 182, "y": 64, "flags": 1}, + {"matrix": [4, 12], "x": 202, "y": 64, "flags": 1}, + {"matrix": [4, 13], "x": 222, "y": 64, "flags": 1} + ] + }, + "community_layouts": ["60_ansi"], + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/hs60/v1/keymaps/ansi/keymap.c b/keyboards/hs60/v1/ansi/keymaps/default/keymap.c similarity index 100% rename from keyboards/hs60/v1/keymaps/ansi/keymap.c rename to keyboards/hs60/v1/ansi/keymaps/default/keymap.c diff --git a/keyboards/hs60/v1/keymaps/ansi/readme.md b/keyboards/hs60/v1/ansi/keymaps/default/readme.md similarity index 100% rename from keyboards/hs60/v1/keymaps/ansi/readme.md rename to keyboards/hs60/v1/ansi/keymaps/default/readme.md diff --git a/keyboards/hs60/v1/rules.mk b/keyboards/hs60/v1/ansi/rules.mk similarity index 100% rename from keyboards/hs60/v1/rules.mk rename to keyboards/hs60/v1/ansi/rules.mk diff --git a/keyboards/hs60/v1/config.h b/keyboards/hs60/v1/config.h index 1bbc88ac1d4..3c4f470d8a7 100644 --- a/keyboards/hs60/v1/config.h +++ b/keyboards/hs60/v1/config.h @@ -17,22 +17,5 @@ along with this program. If not, see . #pragma once -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND #define IS31FL3731_I2C_ADDRESS_2 IS31FL3731_I2C_ADDRESS_SCL - -#ifdef HS60_ANSI -#define RGB_MATRIX_LED_COUNT 61 -#else -#define RGB_MATRIX_LED_COUNT 62 -#endif diff --git a/keyboards/hs60/v1/info.json b/keyboards/hs60/v1/info.json new file mode 100644 index 00000000000..c6ebae97ce9 --- /dev/null +++ b/keyboards/hs60/v1/info.json @@ -0,0 +1,85 @@ +{ + "keyboard_name": "HS60", + "manufacturer": "Yiancar-Designs", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0xFEED", + "pid": "0x0257", + "device_version": "0.0.1" + }, + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "driver": "is31fl3731", + "max_brightness": 215, + "sleep": true + }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "F7"] + }, + "diode_direction": "COL2ROW", + "qmk_lufa_bootloader": { + "esc_input": "B2", + "esc_output": "B5" + }, + "processor": "atmega32u4", + "bootloader": "qmk-dfu", + "features": { + "bootmagic": false, + "mousekey": false, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + } +} diff --git a/keyboards/hs60/v1/iso/iso.c b/keyboards/hs60/v1/iso/iso.c new file mode 100644 index 00000000000..f1f5ad72406 --- /dev/null +++ b/keyboards/hs60/v1/iso/iso.c @@ -0,0 +1,81 @@ +// Copyright 2024 QMK +// SPDX-License-Identifier: GPL-3.0-or-later + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {1, C1_7, C2_7, C3_7}, //C7 + {1, C1_6, C2_6, C3_6}, //C6 + {1, C1_5, C2_5, C3_5}, //C5 + {1, C1_4, C2_4, C3_4}, //C4 + {1, C1_3, C2_3, C3_3}, //C3 + {1, C1_2, C2_2, C4_3}, //C2 + {1, C1_1, C3_2, C4_2}, //C1 + {0, C1_7, C2_7, C3_7}, //A7 + {0, C1_6, C2_6, C3_6}, //A6 + {0, C1_5, C2_5, C3_5}, //A5 + {0, C1_4, C2_4, C3_4}, //A4 + {0, C1_3, C2_3, C3_3}, //A3 + {0, C1_2, C2_2, C4_3}, //A2 + {0, C1_1, C3_2, C4_2}, //A1 + + {1, C1_8, C2_8, C3_8}, //C8 + {1, C9_1, C8_1, C7_1}, //C9 + {1, C9_2, C8_2, C7_2}, //C10 + {1, C9_3, C8_3, C7_3}, //C11 + {1, C9_4, C8_4, C7_4}, //C12 + {1, C9_5, C8_5, C7_5}, //C13 + {1, C9_6, C8_6, C7_6}, //C14 + {0, C1_8, C2_8, C3_8}, //A8 + {0, C9_1, C8_1, C7_1}, //A9 + {0, C9_2, C8_2, C7_2}, //A10 + {0, C9_3, C8_3, C7_3}, //A11 + {0, C9_4, C8_4, C7_4}, //A12 + {0, C9_5, C8_5, C7_5}, //A13 + + {1, C1_12, C2_12, C3_12}, //D4 + {1, C1_13, C2_13, C3_13}, //D5 + {1, C1_14, C2_14, C3_14}, //D6 + {1, C1_15, C2_15, C3_15}, //D7 + {1, C1_16, C2_16, C3_16}, //D8 + {1, C9_8, C7_7, C6_7}, //C16 + {1, C9_7, C8_7, C6_6}, //C15 + {0, C1_13, C2_13, C3_13}, //B5 + {0, C1_14, C2_14, C3_14}, //B6 + {0, C1_15, C2_15, C3_15}, //B7 + {0, C1_16, C2_16, C3_16}, //B8 + {0, C9_8, C7_7, C6_7}, //A16 + {0, C9_7, C8_7, C6_6}, //A15 + {0, C9_6, C8_6, C7_6}, //A14 + + {1, C1_11, C2_11, C3_11}, //D3 + {1, C1_10, C2_10, C4_11}, //D2 + {1, C1_9, C3_10, C4_10}, //D1 + {1, C9_9, C8_9, C7_9}, //D9 + {1, C9_10, C8_10, C7_10}, //D10 + {1, C9_11, C8_11, C7_11}, //D11 + {1, C9_12, C8_12, C7_12}, //D12 + {0, C1_12, C2_12, C3_12}, //B4 + {0, C1_11, C2_11, C3_11}, //B3 + {0, C1_10, C2_10, C4_11}, //B2 + {0, C1_9, C3_10, C4_10}, //B1 + {0, C9_9, C8_9, C7_9}, //B9 + {0, C9_10, C8_10, C7_10}, //B10 + + {1, C9_16, C7_15, C6_15}, //D16 + {1, C9_15, C8_15, C6_14}, //D15 + {1, C9_14, C8_14, C7_14}, //D14 + {1, C9_13, C8_13, C7_13}, //D13 + {0, C9_14, C8_14, C7_14}, //B14 + {0, C9_13, C8_13, C7_13}, //B13 + {0, C9_12, C8_12, C7_12}, //B12 + {0, C9_11, C8_11, C7_11} //B11 +}; +#endif diff --git a/keyboards/hs60/v1/iso/keyboard.json b/keyboards/hs60/v1/iso/keyboard.json new file mode 100644 index 00000000000..b83de6627cc --- /dev/null +++ b/keyboards/hs60/v1/iso/keyboard.json @@ -0,0 +1,145 @@ +{ + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 216, "y": 0, "flags": 1}, + + {"matrix": [1, 0], "x": 4, "y": 16, "flags": 1}, + {"matrix": [1, 1], "x": 24, "y": 16, "flags": 4}, + {"matrix": [1, 2], "x": 40, "y": 16, "flags": 4}, + {"matrix": [1, 3], "x": 56, "y": 16, "flags": 4}, + {"matrix": [1, 4], "x": 72, "y": 16, "flags": 4}, + {"matrix": [1, 5], "x": 88, "y": 16, "flags": 4}, + {"matrix": [1, 6], "x": 104, "y": 16, "flags": 4}, + {"matrix": [1, 7], "x": 120, "y": 16, "flags": 4}, + {"matrix": [1, 8], "x": 136, "y": 16, "flags": 4}, + {"matrix": [1, 9], "x": 152, "y": 16, "flags": 4}, + {"matrix": [1, 10], "x": 168, "y": 16, "flags": 4}, + {"matrix": [1, 11], "x": 184, "y": 16, "flags": 4}, + {"matrix": [1, 12], "x": 200, "y": 16, "flags": 4}, + + {"matrix": [2, 0], "x": 6, "y": 32, "flags": 1}, + {"matrix": [2, 1], "x": 28, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 44, "y": 32, "flags": 4}, + {"matrix": [2, 3], "x": 60, "y": 32, "flags": 4}, + {"matrix": [2, 4], "x": 76, "y": 32, "flags": 4}, + {"matrix": [2, 5], "x": 92, "y": 32, "flags": 4}, + {"matrix": [2, 6], "x": 108, "y": 32, "flags": 4}, + {"matrix": [2, 7], "x": 124, "y": 32, "flags": 4}, + {"matrix": [2, 8], "x": 140, "y": 32, "flags": 4}, + {"matrix": [2, 9], "x": 156, "y": 32, "flags": 4}, + {"matrix": [2, 10], "x": 172, "y": 32, "flags": 4}, + {"matrix": [2, 11], "x": 188, "y": 32, "flags": 4}, + {"matrix": [2, 12], "x": 204, "y": 32, "flags": 4}, + {"matrix": [2, 13], "x": 222, "y": 24, "flags": 1}, + + {"matrix": [3, 0], "x": 2, "y": 48, "flags": 1}, + {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4}, + {"matrix": [3, 2], "x": 36, "y": 48, "flags": 4}, + {"matrix": [3, 3], "x": 52, "y": 48, "flags": 4}, + {"matrix": [3, 4], "x": 68, "y": 48, "flags": 4}, + {"matrix": [3, 5], "x": 84, "y": 48, "flags": 4}, + {"matrix": [3, 6], "x": 100, "y": 48, "flags": 4}, + {"matrix": [3, 7], "x": 116, "y": 48, "flags": 4}, + {"matrix": [3, 8], "x": 132, "y": 48, "flags": 4}, + {"matrix": [3, 9], "x": 148, "y": 48, "flags": 4}, + {"matrix": [3, 10], "x": 164, "y": 48, "flags": 4}, + {"matrix": [3, 11], "x": 180, "y": 48, "flags": 4}, + {"matrix": [3, 13], "x": 210, "y": 48, "flags": 1}, + + {"matrix": [4, 0], "x": 2, "y": 64, "flags": 1}, + {"matrix": [4, 1], "x": 22, "y": 64, "flags": 1}, + {"matrix": [4, 2], "x": 42, "y": 64, "flags": 1}, + {"matrix": [4, 6], "x": 102, "y": 64, "flags": 4}, + {"matrix": [4, 10], "x": 162, "y": 64, "flags": 1}, + {"matrix": [4, 11], "x": 182, "y": 64, "flags": 1}, + {"matrix": [4, 12], "x": 202, "y": 64, "flags": 1}, + {"matrix": [4, 13], "x": 222, "y": 64, "flags": 1} + ] + }, + "community_layouts": ["60_iso"], + "layouts": { + "LAYOUT_60_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] + } + } +} diff --git a/keyboards/hs60/v1/keymaps/default/keymap.c b/keyboards/hs60/v1/iso/keymaps/default/keymap.c similarity index 100% rename from keyboards/hs60/v1/keymaps/default/keymap.c rename to keyboards/hs60/v1/iso/keymaps/default/keymap.c diff --git a/keyboards/hs60/v1/keymaps/default/readme.md b/keyboards/hs60/v1/iso/keymaps/default/readme.md similarity index 100% rename from keyboards/hs60/v1/keymaps/default/readme.md rename to keyboards/hs60/v1/iso/keymaps/default/readme.md diff --git a/keyboards/hs60/v1/iso/rules.mk b/keyboards/hs60/v1/iso/rules.mk new file mode 100644 index 00000000000..5cde06a483e --- /dev/null +++ b/keyboards/hs60/v1/iso/rules.mk @@ -0,0 +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. +NO_SUSPEND_POWER_DOWN = yes diff --git a/keyboards/hs60/v1/keyboard.json b/keyboards/hs60/v1/keyboard.json deleted file mode 100644 index f4a05dfe27e..00000000000 --- a/keyboards/hs60/v1/keyboard.json +++ /dev/null @@ -1,226 +0,0 @@ -{ - "keyboard_name": "HS60", - "manufacturer": "Yiancar-Designs", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0xFEED", - "pid": "0x0257", - "device_version": "0.0.1" - }, - "rgb_matrix": { - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "driver": "is31fl3731", - "max_brightness": 215 - }, - "matrix_pins": { - "cols": ["F1", "F4", "F5", "E6", "F0", "B7", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], - "rows": ["B0", "B1", "B2", "B3", "F7"] - }, - "diode_direction": "COL2ROW", - "qmk_lufa_bootloader": { - "esc_input": "B2", - "esc_output": "B5" - }, - "processor": "atmega32u4", - "bootloader": "qmk-dfu", - "features": { - "bootmagic": false, - "mousekey": false, - "extrakey": true, - "nkro": true, - "rgb_matrix": true - }, - "qmk": { - "locking": { - "enabled": true, - "resync": true - } - }, - "community_layouts": ["60_ansi", "60_iso"], - "layouts": { - "LAYOUT_60_iso": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 12], "x": 12.75, "y": 2}, - {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, - {"matrix": [3, 1], "x": 1.25, "y": 3}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} - ] - }, - "LAYOUT_60_ansi": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 3], "x": 3, "y": 0}, - {"matrix": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, - {"matrix": [0, 6], "x": 6, "y": 0}, - {"matrix": [0, 7], "x": 7, "y": 0}, - {"matrix": [0, 8], "x": 8, "y": 0}, - {"matrix": [0, 9], "x": 9, "y": 0}, - {"matrix": [0, 10], "x": 10, "y": 0}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - - {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"matrix": [1, 1], "x": 1.5, "y": 1}, - {"matrix": [1, 2], "x": 2.5, "y": 1}, - {"matrix": [1, 3], "x": 3.5, "y": 1}, - {"matrix": [1, 4], "x": 4.5, "y": 1}, - {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"matrix": [1, 7], "x": 7.5, "y": 1}, - {"matrix": [1, 8], "x": 8.5, "y": 1}, - {"matrix": [1, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 10], "x": 10.5, "y": 1}, - {"matrix": [1, 11], "x": 11.5, "y": 1}, - {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, - - {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"matrix": [2, 1], "x": 1.75, "y": 2}, - {"matrix": [2, 2], "x": 2.75, "y": 2}, - {"matrix": [2, 3], "x": 3.75, "y": 2}, - {"matrix": [2, 4], "x": 4.75, "y": 2}, - {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"matrix": [2, 7], "x": 7.75, "y": 2}, - {"matrix": [2, 8], "x": 8.75, "y": 2}, - {"matrix": [2, 9], "x": 9.75, "y": 2}, - {"matrix": [2, 10], "x": 10.75, "y": 2}, - {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - - {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"matrix": [3, 2], "x": 2.25, "y": 3}, - {"matrix": [3, 3], "x": 3.25, "y": 3}, - {"matrix": [3, 4], "x": 4.25, "y": 3}, - {"matrix": [3, 5], "x": 5.25, "y": 3}, - {"matrix": [3, 6], "x": 6.25, "y": 3}, - {"matrix": [3, 7], "x": 7.25, "y": 3}, - {"matrix": [3, 8], "x": 8.25, "y": 3}, - {"matrix": [3, 9], "x": 9.25, "y": 3}, - {"matrix": [3, 10], "x": 10.25, "y": 3}, - {"matrix": [3, 11], "x": 11.25, "y": 3}, - {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, - - {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, - {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, - {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, - {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, - {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} - ] - } - } -} diff --git a/keyboards/hs60/v1/keymaps/ansi/config.h b/keyboards/hs60/v1/keymaps/ansi/config.h deleted file mode 100644 index 82cdc2689c6..00000000000 --- a/keyboards/hs60/v1/keymaps/ansi/config.h +++ /dev/null @@ -1,23 +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 . -*/ -#pragma once - -/* Include overwrites for specific keymap */ - -#ifdef KEYBOARD_hs60 - #define HS60_ANSI -#endif diff --git a/keyboards/hs60/v1/readme.md b/keyboards/hs60/v1/readme.md index 4b613e2a52c..e9c8e2d6ee1 100644 --- a/keyboards/hs60/v1/readme.md +++ b/keyboards/hs60/v1/readme.md @@ -1,22 +1,16 @@ -HS60 -==== +# HS60 [HS60](https://mechboards.co.uk/wp-content/uploads/2018/04/IMG_20180420_140353.jpg) -This is a standard fixed layout 60% PCB. It comes in two varians, ISO and ANSI and support full per-key RGB. +This is a standard fixed layout 60% PCB. It comes in two variants, ISO and ANSI and support full per-key RGB. -Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) -Hardware Supported: HS60 ISO and ANSI PCBs with Atmega 32u4 -Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/ - -If you're using the [community layouts feature](https://docs.qmk.fm/#/feature_layouts) and using the 60_ansi layout, you need to make sure that you include this on your config.h to ensure that the RGB Matrix is properly configured: - - #ifdef KEYBOARD_hs60 - #define HS60_ANSI - #endif +* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) +* Hardware Supported: HS60 ISO and ANSI PCBs with Atmega 32u4 +* Hardware Availability: https://mechboards.co.uk/shop/all/hs60-pcb/ Make example for this keyboard (after setting up your build environment): - make hs60/v1:default + make hs60/v1/ansi:default + make hs60/v1/iso: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. +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/hs60/v1/v1.c b/keyboards/hs60/v1/v1.c index 7a43784ad96..ecb78c70d06 100644 --- a/keyboards/hs60/v1/v1.c +++ b/keyboards/hs60/v1/v1.c @@ -15,224 +15,6 @@ */ #include "quantum.h" -#ifdef HS60_ANSI - -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { -/* Refer to IS31 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, C1_1, C3_2, C4_2}, //A1 - {0, C1_2, C2_2, C4_3}, //A2 - {0, C1_3, C2_3, C3_3}, //A3 - {0, C1_4, C2_4, C3_4}, //A4 - {0, C1_5, C2_5, C3_5}, //A5 - {0, C1_6, C2_6, C3_6}, //A6 - {0, C1_7, C2_7, C3_7}, //A7 - {0, C1_8, C2_8, C3_8}, //A8 - {0, C9_1, C8_1, C7_1}, //A9 - {0, C9_2, C8_2, C7_2}, //A10 - {0, C9_3, C8_3, C7_3}, //A11 - {0, C9_4, C8_4, C7_4}, //A12 - {0, C9_5, C8_5, C7_5}, //A13 - {0, C9_6, C8_6, C7_6}, //A14 - {0, C9_7, C8_7, C6_6}, //A15 - {0, C9_8, C7_7, C6_7}, //A16 - - {0, C1_9, C3_10, C4_10}, //B1 - {0, C1_10, C2_10, C4_11}, //B2 - {0, C1_11, C2_11, C3_11}, //B3 - {0, C1_12, C2_12, C3_12}, //B4 - {0, C1_13, C2_13, C3_13}, //B5 - {0, C1_14, C2_14, C3_14}, //B6 - {0, C1_15, C2_15, C3_15}, //B7 - {0, C1_16, C2_16, C3_16}, //B8 - {0, C9_9, C8_9, C7_9}, //B9 - {0, C9_10, C8_10, C7_10}, //B10 - {0, C9_11, C8_11, C7_11}, //B11 - {0, C9_12, C8_12, C7_12}, //B12 - {0, C9_13, C8_13, C7_13}, //B13 - {0, C9_14, C8_14, C7_14}, //B14 - - {1, C1_1, C3_2, C4_2}, //C1 - {1, C1_2, C2_2, C4_3}, //C2 - {1, C1_3, C2_3, C3_3}, //C3 - {1, C1_4, C2_4, C3_4}, //C4 - {1, C1_5, C2_5, C3_5}, //C5 - {1, C1_6, C2_6, C3_6}, //C6 - {1, C1_7, C2_7, C3_7}, //C7 - {1, C1_8, C2_8, C3_8}, //C8 - {1, C9_1, C8_1, C7_1}, //C9 - {1, C9_2, C8_2, C7_2}, //C10 - {1, C9_3, C8_3, C7_3}, //C11 - {1, C9_4, C8_4, C7_4}, //C12 - {1, C9_5, C8_5, C7_5}, //C13 - {1, C9_6, C8_6, C7_6}, //C14 - {1, C9_7, C8_7, C6_6}, //C15 - {1, C9_8, C7_7, C6_7}, //C16 - - {1, C1_9, C3_10, C4_10}, //D1 - //D2 - {1, C1_11, C2_11, C3_11}, //D3 - {1, C1_12, C2_12, C3_12}, //D4 - {1, C1_13, C2_13, C3_13}, //D5 - {1, C1_14, C2_14, C3_14}, //D6 - {1, C1_15, C2_15, C3_15}, //D7 - {1, C1_16, C2_16, C3_16}, //D8 - {1, C9_9, C8_9, C7_9}, //D9 - {1, C9_10, C8_10, C7_10}, //D10 - {1, C9_11, C8_11, C7_11}, //D11 - {1, C9_12, C8_12, C7_12}, //D12 - {1, C9_13, C8_13, C7_13}, //D13 - {1, C9_14, C8_14, C7_14}, //D14 - {1, C9_15, C8_15, C6_14}, //D15 - {1, C9_16, C7_15, C6_15} //D16 -}; - -led_config_t g_led_config = { { - { 36, 35, 34, 33, 32, 31, 30, 6, 5, 4, 3, 2, 1, 0 }, - { 37, 38, 39, 40, 41, 42, 43, 7, 8, 9, 10, 11, 12, NO_LED }, - { 48, 49, 50, 51, 52, 45, 44, 20, 21, 22, 23, 15, 14, 13 }, - { 47, NO_LED, 46, 53, 54, 55, 56, 19, 18, 17, 16, 24, NO_LED, 25 }, - { 60, 59, 58, 57, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 29, 28, 27, 26 } -}, { - //A1-A16 - { 224, 0 }, { 204, 0 }, { 187, 0 }, { 170, 0 }, { 153, 0 }, { 136, 0 }, { 119, 0 }, { 119, 16 }, { 136, 16 }, { 153, 16 }, { 170, 16 }, { 187, 16 }, { 204, 16 }, { 224, 32 }, - { 224, 16 }, { 197, 32 }, - //B1-B14 - { 170, 48 }, { 153, 48 }, { 136, 48 }, { 119, 48 }, { 119, 32 }, { 136, 32 }, { 153, 32 }, { 170, 32 }, { 187, 48 }, { 214, 48 }, { 224, 64 }, { 204, 64 }, { 187, 64 }, { 170, 64 }, - //C1-C16 - { 102, 0 }, { 85, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, { 0, 16 }, { 17, 16 }, { 34, 16 }, { 51, 16 }, { 68, 16 }, { 85, 16 }, { 102, 16 }, - { 102, 32 }, { 85, 32 }, - //D1-D16 - { 32, 48 }, { 10, 48 }, { 0, 32 }, { 17, 32 }, { 34, 32 }, { 51, 32 }, { 68, 32 }, { 51, 48 }, { 68, 48 }, { 85, 48 }, { 102, 48 }, { 102, 64 }, { 34, 68 }, { 17, 68 }, - { 0, 68 } -}, { - //A1-A16 - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, - //B1-B14 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, - //C1-C16 - 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, - 4, 4, - //D1-D16 - 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1 -} }; - -#else - -const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = { -/* Refer to IS31 manual for these locations - * driver - * | R location - * | | G location - * | | | B location - * | | | | */ - {0, C1_1, C3_2, C4_2}, //A1 - {0, C1_2, C2_2, C4_3}, //A2 - {0, C1_3, C2_3, C3_3}, //A3 - {0, C1_4, C2_4, C3_4}, //A4 - {0, C1_5, C2_5, C3_5}, //A5 - {0, C1_6, C2_6, C3_6}, //A6 - {0, C1_7, C2_7, C3_7}, //A7 - {0, C1_8, C2_8, C3_8}, //A8 - {0, C9_1, C8_1, C7_1}, //A9 - {0, C9_2, C8_2, C7_2}, //A10 - {0, C9_3, C8_3, C7_3}, //A11 - {0, C9_4, C8_4, C7_4}, //A12 - {0, C9_5, C8_5, C7_5}, //A13 - {0, C9_6, C8_6, C7_6}, //A14 - {0, C9_7, C8_7, C6_6}, //A15 - {0, C9_8, C7_7, C6_7}, //A16 - - {0, C1_9, C3_10, C4_10}, //B1 - {0, C1_10, C2_10, C4_11}, //B2 - {0, C1_11, C2_11, C3_11}, //B3 - {0, C1_12, C2_12, C3_12}, //B4 - {0, C1_13, C2_13, C3_13}, //B5 - {0, C1_14, C2_14, C3_14}, //B6 - {0, C1_15, C2_15, C3_15}, //B7 - {0, C1_16, C2_16, C3_16}, //B8 - {0, C9_9, C8_9, C7_9}, //B9 - {0, C9_10, C8_10, C7_10}, //B10 - {0, C9_11, C8_11, C7_11}, //B11 - {0, C9_12, C8_12, C7_12}, //B12 - {0, C9_13, C8_13, C7_13}, //B13 - {0, C9_14, C8_14, C7_14}, //B14 - - {1, C1_1, C3_2, C4_2}, //C1 - {1, C1_2, C2_2, C4_3}, //C2 - {1, C1_3, C2_3, C3_3}, //C3 - {1, C1_4, C2_4, C3_4}, //C4 - {1, C1_5, C2_5, C3_5}, //C5 - {1, C1_6, C2_6, C3_6}, //C6 - {1, C1_7, C2_7, C3_7}, //C7 - {1, C1_8, C2_8, C3_8}, //C8 - {1, C9_1, C8_1, C7_1}, //C9 - {1, C9_2, C8_2, C7_2}, //C10 - {1, C9_3, C8_3, C7_3}, //C11 - {1, C9_4, C8_4, C7_4}, //C12 - {1, C9_5, C8_5, C7_5}, //C13 - {1, C9_6, C8_6, C7_6}, //C14 - {1, C9_7, C8_7, C6_6}, //C15 - {1, C9_8, C7_7, C6_7}, //C16 - - {1, C1_9, C3_10, C4_10}, //D1 - {1, C1_10, C2_10, C4_11}, //D2 - {1, C1_11, C2_11, C3_11}, //D3 - {1, C1_12, C2_12, C3_12}, //D4 - {1, C1_13, C2_13, C3_13}, //D5 - {1, C1_14, C2_14, C3_14}, //D6 - {1, C1_15, C2_15, C3_15}, //D7 - {1, C1_16, C2_16, C3_16}, //D8 - {1, C9_9, C8_9, C7_9}, //D9 - {1, C9_10, C8_10, C7_10}, //D10 - {1, C9_11, C8_11, C7_11}, //D11 - {1, C9_12, C8_12, C7_12}, //D12 - {1, C9_13, C8_13, C7_13}, //D13 - {1, C9_14, C8_14, C7_14}, //D14 - {1, C9_15, C8_15, C6_14}, //D15 - {1, C9_16, C7_15, C6_15} //D16 -}; - -led_config_t g_led_config = { { - { 36, 35, 34, 33, 32, 31, 30, 6, 5, 4, 3, 2, 1, 0 }, - { 37, 38, 39, 40, 41, 42, 43, 7, 8, 9, 10, 11, 12, NO_LED }, - { 49, 50, 51, 52, 53, 45, 44, 20, 21, 22, 23, 15, 14, 13 }, - { 48, 47, 46, 54, 55, 56, 57, 19, 18, 17, 16, 24, NO_LED, 25 }, - { 61, 60, 59, 58, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 29, 28, 27, 26 } -}, { - //A1-A16 - { 224, 0 }, { 204, 0 }, { 187, 0 }, { 170, 0 }, { 153, 0 }, { 136, 0 }, { 119, 0 }, { 119, 16 }, { 136, 16 }, { 153, 16 }, { 170, 16 }, { 187, 16 }, { 204, 16 }, { 224, 8 }, - { 204, 32 }, { 187, 32 }, - //B1-B14 - { 170, 48 }, { 153, 48 }, { 136, 48 }, { 119, 48 }, { 119, 32 }, { 136, 32 }, { 153, 32 }, { 170, 32 }, { 187, 48 }, { 214, 48 }, { 224, 64 }, { 204, 64 }, { 187, 64 }, { 170, 64 }, - //C1-C16 - { 102, 0 }, { 85, 0 }, { 68, 0 }, { 51, 0 }, { 34, 0 }, { 17, 0 }, { 0, 0 }, { 0, 16 }, { 17, 16 }, { 34, 16 }, { 51, 16 }, { 68, 16 }, { 85, 16 }, { 102, 16 }, - { 102, 32 }, { 85, 32 }, - //D1-D16 - { 32, 48 }, { 17, 48 }, { 0, 48 }, { 0, 32 }, { 17, 32 }, { 34, 32 }, { 51, 32 }, { 68, 32 }, { 51, 48 }, { 68, 48 }, { 85, 48 }, { 102, 48 }, { 102, 64 }, { 34, 68 }, - { 17, 68 }, { 0, 68 } -}, { - //A1-A16 - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 4, 4, - //B1-B14 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, - //C1-C16 - 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, - 4, 4, - //D1-D16 - 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 1, 1 -} }; - -#endif - #ifndef DEBOUNCE # define DEBOUNCE 5 #endif @@ -307,13 +89,3 @@ void matrix_init_kb(void) { matrix_init_user(); } - -void suspend_power_down_kb(void) -{ - rgb_matrix_set_suspend_state(true); -} - -void suspend_wakeup_init_kb(void) -{ - rgb_matrix_set_suspend_state(false); -}