From db548df85290a6c1e95a85c77426d505199aafd8 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Fri, 19 Nov 2021 14:07:25 +0800 Subject: [PATCH 01/15] add bm60hsrgb_poker/rev2 --- .../kprepublic/bm60hsrgb_poker/readme.md | 15 +- .../{ => rev1}/keymaps/david/keymap.c | 0 .../{ => rev1}/keymaps/default/keymap.c | 0 .../{ => rev1}/keymaps/ipetepete/keymap.c | 0 .../{ => rev1}/keymaps/ipetepete/readme.md | 0 .../{ => rev1}/keymaps/ipetepete/rules.mk | 0 .../{ => rev1}/keymaps/via/keymap.c | 0 .../{ => rev1}/keymaps/via/rules.mk | 0 .../kprepublic/bm60hsrgb_poker/rev1/readme.md | 13 ++ .../kprepublic/bm60hsrgb_poker/rev2/config.h | 92 ++++++++++ .../kprepublic/bm60hsrgb_poker/rev2/info.json | 78 +++++++++ .../rev2/keymaps/default/keymap.c | 35 ++++ .../bm60hsrgb_poker/rev2/keymaps/via/keymap.c | 49 ++++++ .../bm60hsrgb_poker/rev2/keymaps/via/rules.mk | 2 + .../kprepublic/bm60hsrgb_poker/rev2/readme.md | 13 ++ .../kprepublic/bm60hsrgb_poker/rev2/rev2.c | 162 ++++++++++++++++++ .../kprepublic/bm60hsrgb_poker/rev2/rev2.h | 62 +++++++ .../kprepublic/bm60hsrgb_poker/rev2/rules.mk | 26 +++ 18 files changed, 534 insertions(+), 13 deletions(-) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/david/keymap.c (100%) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/default/keymap.c (100%) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/ipetepete/keymap.c (100%) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/ipetepete/readme.md (100%) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/ipetepete/rules.mk (100%) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/via/keymap.c (100%) rename keyboards/kprepublic/bm60hsrgb_poker/{ => rev1}/keymaps/via/rules.mk (100%) create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h create mode 100644 keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md index ef29166df8ea..7dfbf2da6c97 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md @@ -1,13 +1,2 @@ -# BM60HSRGB_Poker 60% Mechanical Keyboard RGB PCB - -A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. - -* Keyboard Maintainer: [ipetepete](https://github.com/ipetepete) -* Hardware Supported: BM60HSRGB_Poker -* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) - -Make example for this keyboard (after setting up your build environment): - - make kprepublic/bm60hsrgb_poker/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). +For boards with bm60v2_poker written on the pcb, use rev2 +Otherwise, use rev1 diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/david/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/david/keymap.c rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/david/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/default/keymap.c rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/default/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/keymap.c rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/readme.md rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/readme.md diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/ipetepete/rules.mk rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/ipetepete/rules.mk diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/keymap.c rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/keymap.c diff --git a/keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/rules.mk similarity index 100% rename from keyboards/kprepublic/bm60hsrgb_poker/keymaps/via/rules.mk rename to keyboards/kprepublic/bm60hsrgb_poker/rev1/keymaps/via/rules.mk diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md new file mode 100644 index 000000000000..ef29166df8ea --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md @@ -0,0 +1,13 @@ +# BM60HSRGB_Poker 60% Mechanical Keyboard RGB PCB + +A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. + +* Keyboard Maintainer: [ipetepete](https://github.com/ipetepete) +* Hardware Supported: BM60HSRGB_Poker +* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) + +Make example for this keyboard (after setting up your build environment): + + make kprepublic/bm60hsrgb_poker/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_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h new file mode 100644 index 000000000000..abd712c062af --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h @@ -0,0 +1,92 @@ +/* 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 . + */ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4B50 +#define PRODUCT_ID 0x1122 +#define DEVICE_VER 0x0002 +#define MANUFACTURER KP Republic +#define PRODUCT BM60V2_poker + +/* 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 5 + +/* 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_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_SNAKE +#define RGBLIGHT_EFFECT_KNIGHT +#define RGBLIGHT_EFFECT_CHRISTMAS +#define RGBLIGHT_EFFECT_STATIC_GRADIENT +#define RGBLIGHT_EFFECT_RGB_TEST +#define RGBLIGHT_EFFECT_ALTERNATING +#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 RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL +# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define DISABLE_RGB_MATRIX_BAND_SAT +# define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define DISABLE_RGB_MATRIX_RAINDROPS +# define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define DRIVER_ADDR_1 0b1010000 +# define DRIVER_COUNT 1 +# define DRIVER_1_LED_TOTAL 61 +# 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 180 + diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json new file mode 100644 index 000000000000..ffa2c0bd123d --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -0,0 +1,78 @@ +{ + "keyboard_name": "bm60v2_poker", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "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}, + {"x":14, "y":3,"w":2.75}, + + {"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,"w":1.25}, + {"x":11.25, "y":4,"w":1.25}, + {"x":12.5, "y":4,"w":1.25}, + {"x":13.75, "y":4,"w":1.25} + ] + } + } +} diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c new file mode 100644 index 000000000000..38fd852b3122 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c @@ -0,0 +1,35 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + KC_GESC, 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_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_60_ansi( + _______, 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, _______, _______, _______, _______, _______, + _______, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c new file mode 100644 index 000000000000..c21cb234f17d --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c @@ -0,0 +1,49 @@ +/* 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 . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_60_ansi( + KC_GESC, 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_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RGUI, KC_RCTL + ), + [1] = LAYOUT_60_ansi( + _______, 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, _______, _______, _______, _______, _______, + _______, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_60_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_60_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + +}; diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md new file mode 100644 index 000000000000..3818c8c8db59 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md @@ -0,0 +1,13 @@ +# BM60 Poker 60% Mechanical Keyboard RGB PCB + +A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. + +* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) +* Hardware Supported: BM60 POKER RGB +* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) + +Make example for this keyboard (after setting up your build environment): + + make kprepublic/bm60hsrgb_poker/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_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c new file mode 100644 index 000000000000..d832e2f275db --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -0,0 +1,162 @@ +/* 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 . + */ +#include "rev2.h" + +#ifdef RGB_MATRIX_ENABLE +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_11, J_11, L_11 }, + { 0, K_13, J_13, L_13 }, + + { 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_16, J_16, L_16 }, + { 0, K_12, J_12, L_12 }, + { 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, 51, NO_LED, NO_LED, 52 }, + { 53, 54, 55, NO_LED, NO_LED, 56, NO_LED, NO_LED, NO_LED, 57, 58, 59, NO_LED, 60 } + }, { + // 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, J, 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 }, + // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right + { 3, 64 }, { 22, 64 }, { 33, 64 }, { 101, 64 }, { 135, 64 }, { 153, 64 }, { 210, 64 }, { 225, 64 } +}, { + // 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, 1, + // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter + 1, 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, 4, 1, + // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right + 1, 1, 1, 4, 1, 1, 1, 1 + } +}; + +__attribute__ ((weak)) +void rgb_matrix_indicators_user(void) { + if (host_keyboard_led_state().caps_lock) { + rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); + } +} +#endif + +bool process_record_kb(uint16_t keycode, keyrecord_t *record) { + if (!process_record_user(keycode, record)) { return false; } + if (record->event.pressed) { + switch(keycode) { +#if defined(RGB_MATRIX_DISABLE_KEYCODES) + case RGB_MATRIX_TOGGLE: // toggle rgb matrix + rgb_matrix_toggle(); + return false; + case RGB_MATRIX_STEP: + rgb_matrix_step(); + return false; + case RGB_MATRIX_INC_HUE: + rgb_matrix_increase_hue(); + return false; + case RGB_MATRIX_DEC_HUE: + rgb_matrix_decrease_hue(); + return false; + case RGB_MATRIX_INC_SAT: + rgb_matrix_increase_sat(); + return false; + case RGB_MATRIX_DEC_SAT: + rgb_matrix_decrease_sat(); + return false; + case RGB_MATRIX_INC_VAL: + rgb_matrix_increase_val(); + return false; + case RGB_MATRIX_DEC_VAL: + rgb_matrix_decrease_val(); + return false; +#endif + default: + break; + } + } + return true; +} diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h new file mode 100644 index 000000000000..55edce2ed3d9 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h @@ -0,0 +1,62 @@ +/* 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 . + */ +#pragma once + +#include "quantum.h" + +#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, K1D, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, \ + K40, K41, K42, K45, K49, K4A, K4B, 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, K3A, KC_NO, KC_NO, K3D }, \ + { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D }, \ +} + +#if defined(RGB_MATRIX_DISABLE_KEYCODES) +# ifndef RGB_MATRIX_TOGGLE +# define RGB_MATRIX_TOGGLE KC_F16 +# endif +# ifndef RGB_MATRIX_STEP +# define RGB_MATRIX_STEP KC_F17 +# endif +# ifndef RGB_MATRIX_INC_HUE +# define RGB_MATRIX_INC_HUE KC_F18 +# endif +# ifndef RGB_MATRIX_DEC_HUE +# define RGB_MATRIX_DEC_HUE KC_F19 +# endif +# ifndef RGB_MATRIX_INC_SAT +# define RGB_MATRIX_INC_SAT KC_F20 +# endif +# ifndef RGB_MATRIX_DEC_SAT +# define RGB_MATRIX_DEC_SAT KC_F21 +# endif +# ifndef RGB_MATRIX_INC_VAL +# define RGB_MATRIX_INC_VAL KC_F22 +# endif +# ifndef RGB_MATRIX_DEC_VAL +# define RGB_MATRIX_DEC_VAL KC_F23 +# endif +#endif + + + diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk new file mode 100644 index 000000000000..552fb1554881 --- /dev/null +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -0,0 +1,26 @@ +# 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 +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = yes # Use RGB matrix +RGB_MATRIX_DRIVER = IS31FL3733 +LTO_ENABLE = yes + +LAYOUTS = 60_ansi From 421b2e37c6e49561dc84953d629a759bef447832 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Fri, 19 Nov 2021 14:41:58 +0800 Subject: [PATCH 02/15] change rgb matrix implementation --- .../kprepublic/bm60hsrgb_poker/rev2/config.h | 45 +++++-- .../rev2/keymaps/default/keymap.c | 2 +- .../bm60hsrgb_poker/rev2/keymaps/via/keymap.c | 2 +- .../kprepublic/bm60hsrgb_poker/rev2/rev2.c | 114 ++++++++++++------ .../kprepublic/bm60hsrgb_poker/rev2/rev2.h | 27 +---- .../kprepublic/bm60hsrgb_poker/rev2/rules.mk | 26 +++- 6 files changed, 139 insertions(+), 77 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h index abd712c062af..91e974e9138e 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h @@ -39,7 +39,7 @@ * */ #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 MATRIX_COL_PINS { B2, B3, B7, B0, B1, F7, D4, D6, D7, B4, B5, B6, C6, C7 } #define UNUSED_PINS /* COL2ROW, ROW2COL*/ @@ -73,20 +73,47 @@ # 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 RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL # define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN # define DISABLE_RGB_MATRIX_BAND_SAT # define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT # define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT # define DISABLE_RGB_MATRIX_RAINDROPS # define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define DRIVER_ADDR_1 0b1010000 -# define DRIVER_COUNT 1 -# define DRIVER_1_LED_TOTAL 61 -# 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 180 + + + + +// Note: The RGB LED driver configuration is not inside #ifdef blocks, so that +// the driver code would still compile even without RGBLIGHT_ENABLE and +// RGB_MATRIX_ENABLE (usually this is not required, but with the custom +// IS31FL3733+WS2812 driver setup used by this board the LED controller drivers +// are compiled unconditionally). + +// Configure the IS31FL3733 driver for per-key RGB LEDs +#define DRIVER_COUNT 1 +#define DRIVER_ADDR_1 0b1010000 +#define DRIVER_1_LED_TOTAL 61 + +#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 RGBLED_NUM +#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_poker/rev2/keymaps/default/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c index 38fd852b3122..b1c5c57ea48f 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/default/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi( _______, 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, _______, _______, _______, _______, _______, - _______, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c index c21cb234f17d..f74fa21de834 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_60_ansi( _______, 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, _______, _______, _______, _______, _______, - _______, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index d832e2f275db..43a697f9a5bc 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -16,6 +16,14 @@ #include "rev2.h" #ifdef RGB_MATRIX_ENABLE + +# include +# include +# include + + + + const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { { 0, B_1, A_1, C_1 }, { 0, B_2, A_2, C_2 }, @@ -102,6 +110,9 @@ led_config_t g_led_config = { { 18, 48 }, { 30, 48 }, { 45, 48 }, { 60, 48 }, { 75, 48 }, { 90, 48 }, { 105, 48 }, { 120, 48 }, { 135, 48 }, { 150, 48 }, { 165, 48 }, { 191, 48 }, // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right { 3, 64 }, { 22, 64 }, { 33, 64 }, { 101, 64 }, { 135, 64 }, { 153, 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, @@ -113,6 +124,9 @@ led_config_t g_led_config = { 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right 1, 1, 1, 4, 1, 1, 1, 1 +# if WS2812_LED_TOTAL > 0 + ,2, 2, 2, 2, 2, 2 +# endif } }; @@ -122,41 +136,69 @@ void rgb_matrix_indicators_user(void) { rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF); } } -#endif - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - if (!process_record_user(keycode, record)) { return false; } - if (record->event.pressed) { - switch(keycode) { -#if defined(RGB_MATRIX_DISABLE_KEYCODES) - case RGB_MATRIX_TOGGLE: // toggle rgb matrix - rgb_matrix_toggle(); - return false; - case RGB_MATRIX_STEP: - rgb_matrix_step(); - return false; - case RGB_MATRIX_INC_HUE: - rgb_matrix_increase_hue(); - return false; - case RGB_MATRIX_DEC_HUE: - rgb_matrix_decrease_hue(); - return false; - case RGB_MATRIX_INC_SAT: - rgb_matrix_increase_sat(); - return false; - case RGB_MATRIX_DEC_SAT: - rgb_matrix_decrease_sat(); - return false; - case RGB_MATRIX_INC_VAL: - rgb_matrix_increase_val(); - return false; - case RGB_MATRIX_DEC_VAL: - rgb_matrix_decrease_val(); - return false; -#endif - default: - break; - } + + + + +// 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); } - return true; + 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_poker/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h index 55edce2ed3d9..7fe9dd0eb5b0 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h @@ -31,32 +31,7 @@ { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D }, \ } -#if defined(RGB_MATRIX_DISABLE_KEYCODES) -# ifndef RGB_MATRIX_TOGGLE -# define RGB_MATRIX_TOGGLE KC_F16 -# endif -# ifndef RGB_MATRIX_STEP -# define RGB_MATRIX_STEP KC_F17 -# endif -# ifndef RGB_MATRIX_INC_HUE -# define RGB_MATRIX_INC_HUE KC_F18 -# endif -# ifndef RGB_MATRIX_DEC_HUE -# define RGB_MATRIX_DEC_HUE KC_F19 -# endif -# ifndef RGB_MATRIX_INC_SAT -# define RGB_MATRIX_INC_SAT KC_F20 -# endif -# ifndef RGB_MATRIX_DEC_SAT -# define RGB_MATRIX_DEC_SAT KC_F21 -# endif -# ifndef RGB_MATRIX_INC_VAL -# define RGB_MATRIX_INC_VAL KC_F22 -# endif -# ifndef RGB_MATRIX_DEC_VAL -# define RGB_MATRIX_DEC_VAL KC_F23 -# endif -#endif + diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index 552fb1554881..8d58b68f9c18 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -17,10 +17,28 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3733 -LTO_ENABLE = yes + LAYOUTS = 60_ansi + +LTO_ENABLE = yes + +# RGB Matrix is required to support per-key LEDs connected to IS31FL3733. +RGB_MATRIX_ENABLE = yes + +# The simpler RGB Lighting code can be enabled to control just the underglow +# LEDs from it; leave it disabled to make the RGB Matrix code control all LEDs, +# including underglow. +RGBLIGHT_ENABLE = no + +# The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are +# normally done by common_features.mk for both of these drivers need to be done +# here manually. +RGB_MATRIX_DRIVER = custom +COMMON_VPATH += $(DRIVER_PATH)/led/issi +SRC += is31fl3733.c +QUANTUM_LIB_SRC += i2c_master.c +WS2812_DRIVER_REQUIRED = yes + + From 2182d76655357f7f0506b5b591b431e834d3e2d1 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Fri, 19 Nov 2021 19:12:16 +0800 Subject: [PATCH 03/15] add readme --- .../kprepublic/bm60hsrgb_poker/readme.md | 22 +++++++++++++++++-- .../kprepublic/bm60hsrgb_poker/rev1/readme.md | 2 +- .../kprepublic/bm60hsrgb_poker/rev2/readme.md | 4 ++-- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md index 7dfbf2da6c97..88e0d6cf32ae 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md @@ -1,2 +1,20 @@ -For boards with bm60v2_poker written on the pcb, use rev2 -Otherwise, use rev1 +# BM60 Poker 60% Mechanical Keyboard RGB PCB + +A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. + +* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123) +* Hardware Supported: BM60HSRGB_Poker/rev2 +* Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) + +Make example for this keyboard (after setting up your build environment): + + for rev1: make kprepublic/bm60hsrgb_poker/rev1:default + for rev2: make kprepublic/bm60hsrgb_poker/rev2:default + + +To determine your board revision, check the PCB. For boards with bm60v2_poker printed on the PCB, use rev2. Otherwise, use 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_poker/rev1/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md index ef29166df8ea..f21ef45da761 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev1/readme.md @@ -3,7 +3,7 @@ A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. * Keyboard Maintainer: [ipetepete](https://github.com/ipetepete) -* Hardware Supported: BM60HSRGB_Poker +* Hardware Supported: BM60HSRGB_Poker/rev1 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md index 3818c8c8db59..18a074cdb0b1 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/readme.md @@ -2,8 +2,8 @@ A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. -* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee) -* Hardware Supported: BM60 POKER RGB +* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123) +* Hardware Supported: BM60HSRGB_Poker/rev2 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) Make example for this keyboard (after setting up your build environment): From 112f8862775ddc1a53a59a70240c1552a4966b19 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Fri, 19 Nov 2021 19:13:29 +0800 Subject: [PATCH 04/15] amend readme --- keyboards/kprepublic/bm60hsrgb_poker/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md index 88e0d6cf32ae..c6b84b9db211 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md @@ -2,7 +2,6 @@ A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. -* Keyboard Maintainer: [bdtc123](https://github.com/bdtc123) * Hardware Supported: BM60HSRGB_Poker/rev2 * Hardware Availability: [KP Republic](https://kprepublic.com/products/bm60-rgb-poker-60-gh60-hot-swap-custom-mechanical-keyboard-pcb-program-qmk-underglow-type-c) From 1ca1f3512424139bc0bfcb977749825a061ca4e9 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Tue, 23 Nov 2021 15:53:01 +0800 Subject: [PATCH 05/15] Apply suggestions from code review --- keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json | 2 -- keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json index ffa2c0bd123d..0ad2aa9d3c1c 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json @@ -2,8 +2,6 @@ "keyboard_name": "bm60v2_poker", "url": "", "maintainer": "qmk", - "width": 15, - "height": 5, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index 43a697f9a5bc..56b1c477e871 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -17,9 +17,9 @@ #ifdef RGB_MATRIX_ENABLE -# include -# include -# include +# include "i2c_master.h" +# include "is31fl3733.h" +# include "ws2812.h" From ae0c331887abc0551d853ca1fb5bfb93c414d0bb Mon Sep 17 00:00:00 2001 From: peepeetee Date: Mon, 29 Nov 2021 00:23:16 +0800 Subject: [PATCH 06/15] apply suggestions from code review --- .../kprepublic/bm60hsrgb_poker/rev2/config.h | 50 ++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h index 91e974e9138e..d9bcdab3f3c2 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h @@ -73,12 +73,50 @@ # 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 RGB_MATRIX_KEYPRESSES -# define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define DISABLE_RGB_MATRIX_BAND_SAT -# define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define DISABLE_RGB_MATRIX_RAINDROPS -# define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_SAT +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#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_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +#define ENABLE_RGB_MATRIX_PIXEL_RAIN + +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_DIGITAL_RAIN + +#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 From 7d9702537c2a9ddd51ae82faefb6a06566114fcc Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Thu, 2 Dec 2021 23:22:22 +0800 Subject: [PATCH 07/15] Update readme.md --- keyboards/kprepublic/bm60hsrgb_poker/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md index c6b84b9db211..cba45ec01000 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md @@ -1,4 +1,4 @@ -# BM60 Poker 60% Mechanical Keyboard RGB PCB +# BM60HSRGB_POKER 60% Mechanical Keyboard RGB PCB A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. From e1f0e083b8df0618aeaeeee96f2f1d2306f25d0f Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Thu, 2 Dec 2021 23:23:00 +0800 Subject: [PATCH 08/15] Update readme.md --- keyboards/kprepublic/bm60hsrgb_poker/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md index cba45ec01000..f880edb6fab3 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md @@ -1,4 +1,4 @@ -# BM60HSRGB_POKER 60% Mechanical Keyboard RGB PCB +# BM60HSRGB_Poker 60% Mechanical Keyboard RGB PCB A 60% hotswap inswitch RGB (north facing) keyboard from KP Republic. From c85346663844cd045b9c514fe29c86c5230066d6 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Thu, 2 Dec 2021 23:23:42 +0800 Subject: [PATCH 09/15] Update rules.mk --- keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index 8d58b68f9c18..e3c43067c855 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -12,8 +12,6 @@ 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 -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality From 397333fcece7c4920e5e1485286a1d8762746f26 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Fri, 3 Dec 2021 13:22:35 +0800 Subject: [PATCH 10/15] Update RGB flags --- keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index 56b1c477e871..aebff6b20ca3 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -116,10 +116,10 @@ led_config_t g_led_config = { }, { // 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, 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, J, K, L, ;, ', Enter - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, + 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, 4, 1, // Ctrl, GUI, Alt, Space, RAlt, FN, Left, Down, Right From 74bc02738f34579d8bc0c76baa3f02ea4fd9d29c Mon Sep 17 00:00:00 2001 From: peepeetee Date: Fri, 3 Dec 2021 16:43:54 +0800 Subject: [PATCH 11/15] fix escape character --- keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index aebff6b20ca3..b20ed5c917fb 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -116,7 +116,7 @@ led_config_t g_led_config = { }, { // 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, [, ], \ + // Tab, Q, W, E, R, T, Y, U, I, O, P, [, ], backslash 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // Capslock, A, S, D, F, G, H, J, K, L, ;, ', Enter 9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, From 8e0c0fb7a6ffcbff78bab843b38935020371cbd6 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Thu, 9 Dec 2021 13:19:03 +0800 Subject: [PATCH 12/15] Tidy up NKRO_ENABLE rules --- .../kprepublic/bm60hsrgb_poker/rev2/rules.mk | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index e3c43067c855..08f9f38bbc3a 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -8,18 +8,14 @@ BOOTLOADER = atmel-dfu # 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 -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -AUDIO_ENABLE = no # Audio output - - +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 +AUDIO_ENABLE = no # Audio output LAYOUTS = 60_ansi - LTO_ENABLE = yes # RGB Matrix is required to support per-key LEDs connected to IS31FL3733. From 4d1ed67f6fb0b6256def4500e6e714dc31717aed Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Fri, 10 Dec 2021 12:39:41 +0800 Subject: [PATCH 13/15] Apply suggestions from code review Co-authored-by: Ryan --- keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h | 5 ----- keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk | 5 ----- 2 files changed, 10 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h index 7fe9dd0eb5b0..6b4344586a11 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.h @@ -30,8 +30,3 @@ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \ { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D }, \ } - - - - - diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index 08f9f38bbc3a..a6d661c63dbe 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -21,11 +21,6 @@ LTO_ENABLE = yes # RGB Matrix is required to support per-key LEDs connected to IS31FL3733. RGB_MATRIX_ENABLE = yes -# The simpler RGB Lighting code can be enabled to control just the underglow -# LEDs from it; leave it disabled to make the RGB Matrix code control all LEDs, -# including underglow. -RGBLIGHT_ENABLE = no - # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are # normally done by common_features.mk for both of these drivers need to be done # here manually. From a8d894248dee419ffd78eae8f8c69dd6d305401d Mon Sep 17 00:00:00 2001 From: peepeetee Date: Fri, 10 Dec 2021 12:50:51 +0800 Subject: [PATCH 14/15] Apply suggestions from code review --- keyboards/kprepublic/bm60hsrgb_poker/readme.md | 3 --- keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h | 4 ---- keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c | 8 -------- keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk | 2 -- 4 files changed, 17 deletions(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/readme.md b/keyboards/kprepublic/bm60hsrgb_poker/readme.md index f880edb6fab3..5c9a843d1cc0 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/readme.md +++ b/keyboards/kprepublic/bm60hsrgb_poker/readme.md @@ -10,10 +10,7 @@ Make example for this keyboard (after setting up your build environment): for rev1: make kprepublic/bm60hsrgb_poker/rev1:default for rev2: make kprepublic/bm60hsrgb_poker/rev2:default - To determine your board revision, check the PCB. For boards with bm60v2_poker printed on the PCB, use rev2. Otherwise, use 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_poker/rev2/config.h b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h index d9bcdab3f3c2..b5efc1f59610 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/config.h @@ -118,8 +118,6 @@ #define ENABLE_RGB_MATRIX_SOLID_SPLASH #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - - #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 @@ -153,5 +151,3 @@ # define RGB_MATRIX_KEYPRESSES # define RGB_MATRIX_FRAMEBUFFER_EFFECTS #endif - - diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index b20ed5c917fb..3e0f3c373187 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -21,9 +21,6 @@ # 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 }, @@ -137,9 +134,6 @@ void rgb_matrix_indicators_user(void) { } } - - - // clang-format on // ========================================================================== @@ -200,5 +194,3 @@ const rgb_matrix_driver_t rgb_matrix_driver = { // clang-format on #endif /* RGB_MATRIX_ENABLE */ - - diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk index a6d661c63dbe..cd9c25149a77 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rules.mk @@ -29,5 +29,3 @@ COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3733.c QUANTUM_LIB_SRC += i2c_master.c WS2812_DRIVER_REQUIRED = yes - - From cea0d9ae1b2f55b2631a821fda67f0eca356162f Mon Sep 17 00:00:00 2001 From: peepeetee Date: Sat, 11 Dec 2021 19:57:56 +0800 Subject: [PATCH 15/15] apply #15268 --- keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c index 3e0f3c373187..32cfce362f0a 100644 --- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c @@ -21,7 +21,7 @@ # include "is31fl3733.h" # include "ws2812.h" -const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { +const is31_led PROGMEM 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 },