diff options
18 files changed, 590 insertions, 2 deletions
| diff --git a/keyboards/kprepublic/bm60hsrgb/readme.md b/keyboards/kprepublic/bm60hsrgb/readme.md index bbb6ba45a1..1f0f13ae28 100644 --- a/keyboards/kprepublic/bm60hsrgb/readme.md +++ b/keyboards/kprepublic/bm60hsrgb/readme.md @@ -2,12 +2,15 @@  A 60% hotswap inswitch RGB keyboard from KP Republic.  -* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  * Hardware Supported: BM60HSRGB  * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-60-gh60-hot-swappable-pcb-programmed-qmk-firmware-type-c)  Make example for this keyboard (after setting up your build environment): -    make kprepublic/bm60hsrgb/rev1:default +    for rev1: make kprepublic/bm60hsrgb/rev1:default +    for rev2: make kprepublic/bm60hsrgb/rev2:default + +To see which revision you have, look at the PCB. If it says bm60v2 on it, it's rev2. Otherwise it's rev1 +  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/kprepublic/bm60hsrgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c index e8be1cccf6..e8be1cccf6 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb/keymaps/default/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md index d45609f3d7..d45609f3d7 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/default/readme.md +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/default/readme.md diff --git a/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c index c43365356e..c43365356e 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md index aa2009e1e8..aa2009e1e8 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/jbradforddillon/readme.md +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/jbradforddillon/readme.md diff --git a/keyboards/kprepublic/bm60hsrgb/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c index da2f6e8ced..da2f6e8ced 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb/keymaps/via/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md index 9335f2cab0..9335f2cab0 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/via/readme.md +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/readme.md diff --git a/keyboards/kprepublic/bm60hsrgb/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/rules.mk index 036bd6d1c3..036bd6d1c3 100644 --- a/keyboards/kprepublic/bm60hsrgb/keymaps/via/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb/rev1/keymaps/via/rules.mk diff --git a/keyboards/kprepublic/bm60hsrgb/rev1/readme.md b/keyboards/kprepublic/bm60hsrgb/rev1/readme.md new file mode 100644 index 0000000000..bdc0380129 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev1/readme.md @@ -0,0 +1,13 @@ +# BM60HSRGB + +A 60% hotswap inswitch RGB keyboard from KP Republic.  + +* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) +* Hardware Supported: BM60HSRGB/rev1 +* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-60-gh60-hot-swappable-pcb-programmed-qmk-firmware-type-c) + +Make example for this keyboard (after setting up your build environment): + +    make kprepublic/bm60hsrgb/rev1:default + +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/kprepublic/bm60hsrgb/rev2/config.h b/keyboards/kprepublic/bm60hsrgb/rev2/config.h new file mode 100644 index 0000000000..e25f0ad489 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/config.h @@ -0,0 +1,139 @@ +/* Copyright 2021 bdtc123 + * + * 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       0x4B50 +#define PRODUCT_ID      0x1121 +#define DEVICE_VER      0x0002 +#define MANUFACTURER    KP Republic +#define PRODUCT         BM60V2 + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 14 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { E6, D2, D3, D5, F6 } +#define MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 } +#define UNUSED_PINS + +/* COL2ROW, ROW2COL*/ +#define DIODE_DIRECTION ROW2COL +#define USB_POLLING_INTERVAL_MS 1 + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 3 + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION +//rgb light setting +#define RGBLIGHT_LIMIT_VAL 150 +#define RGBLED_NUM          6 +#define RGB_DI_PIN          F0 +#define RGBLIGHT_ANIMATIONS +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD +#define RGBLIGHT_HUE_STEP   8 +#define RGBLIGHT_SAT_STEP   8 +#define RGBLIGHT_VAL_STEP   8 + +#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects +#define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended +#define DRIVER_ADDR_1 0b1010000 + +#define RGB_MATRIX_KEYPRESSES +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define ENABLE_RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_RAIN +#define ENABLE_RGB_MATRIX_PIXEL_FLOW +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#define ENABLE_RGB_MATRIX_SPLASH +#define ENABLE_RGB_MATRIX_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_SPLASH +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +#define DRIVER_COUNT 2 +#define DRIVER_1_LED_TOTAL 63 +//#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL + +#if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) +    #define RGB_MATRIX_DISABLE_KEYCODES +#endif + +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 + +#define ISSI_LED_TOTAL DRIVER_1_LED_TOTAL + +// Underglow LEDs are WS2812, but someone might want to use RGBLIGHT for them; +// don't use those LEDs in RGB Matrix in that case. +#ifdef RGBLIGHT_ENABLE +#    define WS2812_LED_TOTAL 0 +#else +#    define WS2812_LED_TOTAL 6 +#endif + +#define DRIVER_LED_TOTAL (ISSI_LED_TOTAL + WS2812_LED_TOTAL) + +#ifdef RGB_MATRIX_ENABLE +#    define RGB_MATRIX_KEYPRESSES +#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#endif + diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/info.json new file mode 100644 index 0000000000..51a6fbc880 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/info.json @@ -0,0 +1,78 @@ +{ +    "keyboard_name": "bm60v2", +    "url": "", +    "maintainer": "kp republic", +    "layouts": { +        "LAYOUT": { +            "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, "w":2}, + +                {"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, "w":1.75}, +                {"x":13, "y":3}, +                {"x":14, "y":3}, + +                {"x":0, "y":4, "w":1.25}, +                {"x":1.25, "y":4, "w":1.25}, +                {"x":2.5, "y":4, "w":1.25}, +                {"x":3.75, "y":4, "w":6.25}, +                {"x":10, "y":4}, +                {"x":11, "y":4}, +                {"x":12, "y":4}, +                {"x":13, "y":4}, +                {"x":14, "y":4} +            ] +        } +    } +} diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c new file mode 100644 index 0000000000..58828d5181 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2021 bdtc123 + * + * 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/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +    [0] = LAYOUT( +        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, +        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, +        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, +        KC_LSFT,          KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,        KC_UP,   KC_SLSH, +        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT +    ), +    [1] = LAYOUT( +        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET, +        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, +        _______,            _______, _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, +        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,        _______, _______, +        _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______ +    ) + +}; diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c new file mode 100644 index 0000000000..cca11326d0 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2021 bdtc123 + * + * 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/>. + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { +    [0] = LAYOUT( +        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, +        KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, +        KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT, +        KC_LSFT,          KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,        KC_UP,   KC_SLSH, +        KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT +    ), +    [1] = LAYOUT( +        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  RESET, +        _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, +        _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, +        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,        _______, _______, +        _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______ +    ), +    [2] = LAYOUT( +        _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, +        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, +        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, +        _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______ +    ), +    [3] = LAYOUT( +        _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, +        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, +        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, +        _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______ +    ) +}; diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/rules.mk new file mode 100644 index 0000000000..36b7ba9cbc --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/readme.md b/keyboards/kprepublic/bm60hsrgb/rev2/readme.md new file mode 100644 index 0000000000..14d33b058e --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/readme.md @@ -0,0 +1,13 @@ +# BM60HSRGB + +A 60% hotswap inswitch RGB keyboard from KP Republic.  + +* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123) +* Hardware Supported: BM60HSRGB/rev2 +* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-60-gh60-hot-swappable-pcb-programmed-qmk-firmware-type-c) + +Make example for this keyboard (after setting up your build environment): + +    make kprepublic/bm60hsrgb/rev2:default + +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/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c new file mode 100644 index 0000000000..c6d80d2810 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c @@ -0,0 +1,200 @@ +/* Copyright 2021 bdtc123 + * Copyright 2021 sigprof + * + * 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/>. + */ +#include "rev2.h" + +#ifdef RGB_MATRIX_ENABLE + +#    include "i2c_master.h" +#    include "is31fl3733.h" +#    include "ws2812.h" + +const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { +    { 0, B_1, A_1, C_1 }, +    { 0, B_2, A_2, C_2 }, +    { 0, B_3, A_3, C_3 }, +    { 0, B_4, A_4, C_4 }, +    { 0, B_5, A_5, C_5 }, +    { 0, B_6, A_6, C_6 }, +    { 0, B_7, A_7, C_7 }, +    { 0, B_8, A_8, C_8 }, +    { 0, B_9, A_9, C_9 }, +    { 0, B_10, A_10, C_10 }, +    { 0, B_11, A_11, C_11 }, +    { 0, B_12, A_12, C_12 }, +    { 0, B_13, A_13, C_13 }, +    { 0, B_14, A_14, C_14 }, + +    { 0, E_1,  D_1,  F_1 }, +    { 0, E_2,  D_2,  F_2 }, +    { 0, E_3,  D_3,  F_3 }, +    { 0, E_4,  D_4,  F_4 }, +    { 0, E_5,  D_5,  F_5 }, +    { 0, E_6,  D_6,  F_6 }, +    { 0, E_7,  D_7,  F_7 }, +    { 0, E_8,  D_8,  F_8 }, +    { 0, E_9,  D_9,  F_9 }, +    { 0, E_10, D_10, F_10 }, +    { 0, E_11, D_11, F_11 }, +    { 0, E_12, D_12, F_12 }, +    { 0, E_13, D_13, F_13 }, +    { 0, E_14, D_14, F_14 }, + +    { 0, H_1,  G_1,  I_1 }, +    { 0, H_2,  G_2,  I_2 }, +    { 0, H_3,  G_3,  I_3 }, +    { 0, H_4,  G_4,  I_4 }, +    { 0, H_5,  G_5,  I_5 }, +    { 0, H_6,  G_6,  I_6 }, +    { 0, H_7,  G_7,  I_7 }, +    { 0, H_8,  G_8,  I_8 }, +    { 0, H_9,  G_9,  I_9 }, +    { 0, H_10, G_10, I_10 }, +    { 0, H_11, G_11, I_11 }, +    { 0, H_12, G_12, I_12 }, +    { 0, H_14, G_14, I_14 }, + +    { 0, K_1,  J_1,  L_1 }, +    { 0, K_2,  J_2,  L_2 }, +    { 0, K_3,  J_3,  L_3 }, +    { 0, K_4,  J_4,  L_4 }, +    { 0, K_5,  J_5,  L_5 }, +    { 0, K_6,  J_6,  L_6 }, +    { 0, K_7,  J_7,  L_7 }, +    { 0, K_8,  J_8,  L_8 }, +    { 0, K_9,  J_9,  L_9 }, +    { 0, K_10, J_10, L_10 }, +    { 0, K_12, J_12, L_12 }, +    { 0, K_13, J_13, L_13 }, +    { 0, K_14, J_14, L_14 }, + +    { 0, H_16, G_16, I_16 }, +    { 0, H_15, G_15, I_15 }, +    { 0, H_13, G_13, I_13 }, +    { 0, E_15, D_15, F_15 }, +    { 0, K_15, J_15, L_15 }, +    { 0, K_11, J_11, L_11 }, +    { 0, K_16, J_16, L_16 }, +    { 0, B_16, A_16, C_16 }, +    { 0, E_16, D_16, F_16 } +}; + +led_config_t g_led_config = { +    { +        { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 }, +        { 14,     15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27 }, +        { 28,     29,     30,     31,     32,     33,     34,     35,     36,     37,     38,     39, NO_LED,     40 }, +        { 41,     42,     43,     44,     45,     46,     47,     48,     49,     50, NO_LED,     51,     52,     53 }, +        { 54,     55,     56,     NO_LED, NO_LED, 57, NO_LED,   NO_LED,   NO_LED, 58,     59,     60,     61,     62 } +    }, { +    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace +    {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 202,   0 }, +    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ],  , +    {   7,  16 }, {  22,  16 }, {  37,  16 }, {  52,  16 }, {  67,  16 }, {  82,  16 }, {  97,  16 }, { 112,  16 }, { 127,  16 }, { 142,  16 }, { 157,  16 }, { 172,  16 }, { 187,  16 }, { 206,  16 }, +    // Capslock, A, S, D, F, G, H, A, K, L, ;, ', Enter +    {  11,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 }, { 198,  32 }, +    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, +    {  18,  48 }, {  30,  48 }, {  45,  48 }, {  60,  48 }, {  75,  48 }, {  90,  48 }, { 105,  48 }, { 120,  48 }, { 135,  48 }, { 150,  48 }, { 165,  48 }, { 191,  48 }, { 210,  48 }, +    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right +    {   3,  64 }, {  22,  64 }, {  33,  64 }, { 101,  64 }, { 135,  64 }, { 153,  64 }, { 195,  64 }, { 210,  64 }, { 225,  64 } +#    if WS2812_LED_TOTAL > 0 +        ,{ 28, 40}, { 62, 40}, { 96, 40}, {130, 40}, {164, 40}, {198, 40} +#    endif +}, { +    // Esc, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, -, =, Backspace +    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, +    // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], +    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, +    // Capslock, A, S, D, F, G, H, A, K, L, ;, ', Enter +    9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, +    // LShift, Z, X, C, V, B, N, M, ,, ., /, Shift, Up, ? +    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, +    // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right +    1, 1, 1, 4, 1, 1, 1, 1, 1 +#    if WS2812_LED_TOTAL > 0 +        ,2, 2, 2, 2, 2, 2 +#    endif +    } +}; + +__attribute__ ((weak)) +void rgb_matrix_indicators_user(void) { +    if (host_keyboard_led_state().caps_lock) { +        rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); +    } +} + + +// clang-format on + +// ========================================================================== +// Custom RGB Matrix driver that combines IS31FL3733 and WS2812 +// ========================================================================== + +#    if WS2812_LED_TOTAL > 0 +LED_TYPE rgb_matrix_ws2812_array[WS2812_LED_TOTAL]; +#    endif + +static void rgb_matrix_driver_init(void) { +    i2c_init(); +    IS31FL3733_init(DRIVER_ADDR_1, 0); +    for (uint8_t index = 0; index < ISSI_LED_TOTAL; index++) { +        bool enabled = true; +        IS31FL3733_set_led_control_register(index, enabled, enabled, enabled); +    } +    IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0); +} + +static void rgb_matrix_driver_flush(void) { +    IS31FL3733_update_pwm_buffers(DRIVER_ADDR_1, 0); +#    if WS2812_LED_TOTAL > 0 +    ws2812_setleds(rgb_matrix_ws2812_array, WS2812_LED_TOTAL); +#    endif +} + +static void rgb_matrix_driver_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) { +    if (index < ISSI_LED_TOTAL) { +        IS31FL3733_set_color(index, red, green, blue); +    } else { +#    if WS2812_LED_TOTAL > 0 +        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].r = red; +        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].g = green; +        rgb_matrix_ws2812_array[index - ISSI_LED_TOTAL].b = blue; +#    endif +    } +} + +static void rgb_matrix_driver_set_color_all(uint8_t red, uint8_t green, uint8_t blue) { +    IS31FL3733_set_color_all(red, green, blue); +#    if WS2812_LED_TOTAL > 0 +    for (uint8_t i = 0; i < WS2812_LED_TOTAL; i++) { +        rgb_matrix_ws2812_array[i].r = red; +        rgb_matrix_ws2812_array[i].g = green; +        rgb_matrix_ws2812_array[i].b = blue; +    } +#    endif +} + +// clang-format off +const rgb_matrix_driver_t rgb_matrix_driver = { +    .init          = rgb_matrix_driver_init, +    .flush         = rgb_matrix_driver_flush, +    .set_color     = rgb_matrix_driver_set_color, +    .set_color_all = rgb_matrix_driver_set_color_all, +}; +// clang-format on + +#endif /* RGB_MATRIX_ENABLE */ diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h new file mode 100644 index 0000000000..de1df85666 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.h @@ -0,0 +1,32 @@ +/* Copyright 2021 bdtc123 + * + * 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 "quantum.h" + +#define LAYOUT( \ +    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, K2D,          \ +    K30,       K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B,     K3C, K3D,   \ +    K40,  K41,  K42,              K45,                K49, 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,   K1D   }, \ +    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D   }, \ +    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   KC_NO, K3B,   K3C,   K3D   }, \ +    { K40,   K41,   K42,   KC_NO, KC_NO, K45,   KC_NO, KC_NO, KC_NO, K49,   K4A,   K4B,   K4C,   K4D   }, \ +} diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk new file mode 100644 index 0000000000..f307812917 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb/rev2/rules.mk @@ -0,0 +1,27 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +#   change yes to no to disable +# +BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes       # Mouse keys +EXTRAKEY_ENABLE = yes       # Audio control and System control +CONSOLE_ENABLE = no         # Console for debug +COMMAND_ENABLE = no         # Commands for debug and configuration +NKRO_ENABLE = yes           # Enable N-Key Rollover +BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow +AUDIO_ENABLE = no           # Audio output +NO_USB_STARTUP_CHECK = no +LTO_ENABLE = yes +RGB_MATRIX_ENABLE = yes +RGB_MATRIX_DRIVER = custom +WS2812_DRIVER_REQUIRED = yes + +COMMON_VPATH += $(DRIVER_PATH)/led/issi +SRC += is31fl3733.c +QUANTUM_LIB_SRC += i2c_master.c | 
