Merge remote-tracking branch 'origin/master' into develop
5 files changed, 55 insertions(+), 16 deletions(-) M keyboards/jadookb/jkb65/config.h M keyboards/jadookb/jkb65/keymaps/default/keymap.c M keyboards/jadookb/jkb65/keymaps/via/rules.mk A keyboards/jadookb/jkb65/r2/config.h A keyboards/jadookb/jkb65/r2/readme.md
M keyboards/jadookb/jkb65/config.h => keyboards/jadookb/jkb65/config.h +3 -1
@@ 42,7 42,9 @@ #define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_MATRIX_KEYPRESSES #define RGB_DISABLE_TIMEOUT 90000 #define RGB_MATRIX_LED_PROCESS_LIMIT 4 #define RGB_MATRIX_LED_FLUSH_LIMIT 26 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL #define DEBOUNCE 5 #define LOCKING_SUPPORT_ENABLE
M keyboards/jadookb/jkb65/keymaps/default/keymap.c => keyboards/jadookb/jkb65/keymaps/default/keymap.c +1 -15
@@ 33,19 33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, MAGIC_UNNO_GUI,MAGIC_NO_GUI, _______, RGB_TOG, _______, MO(2), RGB_SPD, RGB_VAD, RGB_SPI ), [2] = LAYOUT_67_ansi( RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [3] = LAYOUT_67_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), ) };
M keyboards/jadookb/jkb65/keymaps/via/rules.mk => keyboards/jadookb/jkb65/keymaps/via/rules.mk +1 -0
A keyboards/jadookb/jkb65/r2/config.h => keyboards/jadookb/jkb65/r2/config.h +27 -0
@@ 0,0 1,27 @@ /* Copyright 2022 Wizad-GG * * 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 #undef DEVICE_VER #define DEVICE_VER 0x0002 #undef PRODUCT #define PRODUCT JKB65 RGB R2 #undef MATRIX_COL_PINS #define MATRIX_COL_PINS { F6,B0,F1,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3,D2,D1,D0 } \ No newline at end of file
A keyboards/jadookb/jkb65/r2/readme.md => keyboards/jadookb/jkb65/r2/readme.md +23 -0
@@ 0,0 1,23 @@ # JKB65 RGB R2  R2 version of JKB65 * Keyboard Maintainer: [Wizard-GG](https://github.com/wizard-gg) * Hardware Supported: JKB65 RGB R2 * Hardware Availability: [Jadoo Keyboard](https://jadookb.com/jkb65) Make example for this keyboard (after setting up your build environment): make jadookb/jkb65/r2:default Flashing example for this keyboard: make jadookb/jkb65/r2:default:flash To reset the board into bootloader mode, do the following step: * Hold the **Esc** key while connecting the USB cable 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).