From cccf229248d6b1d7adf20dead49b36768ae89547 Mon Sep 17 00:00:00 2001 From: bdtc123 <810997916@qq.com> Date: Mon, 1 Nov 2021 20:57:19 +0800 Subject: [PATCH 01/27] 1 --- keyboards/bm60v2_poker/bm60v2_poker.c | 146 ++++++++++++++++++ keyboards/bm60v2_poker/bm60v2_poker.h | 47 ++++++ keyboards/bm60v2_poker/config.h | 71 +++++++++ keyboards/bm60v2_poker/info.json | 78 ++++++++++ .../bm60v2_poker/keymaps/default/keymap.c | 36 +++++ keyboards/bm60v2_poker/keymaps/via/keymap.c | 36 +++++ keyboards/bm60v2_poker/keymaps/via/rules.mk | 2 + keyboards/bm60v2_poker/readme.md | 1 + keyboards/bm60v2_poker/rules.mk | 33 ++++ 9 files changed, 450 insertions(+) create mode 100644 keyboards/bm60v2_poker/bm60v2_poker.c create mode 100644 keyboards/bm60v2_poker/bm60v2_poker.h create mode 100644 keyboards/bm60v2_poker/config.h create mode 100644 keyboards/bm60v2_poker/info.json create mode 100644 keyboards/bm60v2_poker/keymaps/default/keymap.c create mode 100644 keyboards/bm60v2_poker/keymaps/via/keymap.c create mode 100644 keyboards/bm60v2_poker/keymaps/via/rules.mk create mode 100644 keyboards/bm60v2_poker/readme.md create mode 100644 keyboards/bm60v2_poker/rules.mk diff --git a/keyboards/bm60v2_poker/bm60v2_poker.c b/keyboards/bm60v2_poker/bm60v2_poker.c new file mode 100644 index 000000000000..2aa539fd9f82 --- /dev/null +++ b/keyboards/bm60v2_poker/bm60v2_poker.c @@ -0,0 +1,146 @@ +#include "bm60v2_poker.h" + +#ifdef RGB_MATRIX_ENABLE +const is31_led 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 (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/bm60v2_poker/bm60v2_poker.h b/keyboards/bm60v2_poker/bm60v2_poker.h new file mode 100644 index 000000000000..c424feb11800 --- /dev/null +++ b/keyboards/bm60v2_poker/bm60v2_poker.h @@ -0,0 +1,47 @@ +#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, 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/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h new file mode 100644 index 000000000000..ca93f14d128a --- /dev/null +++ b/keyboards/bm60v2_poker/config.h @@ -0,0 +1,71 @@ +#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 +#define DESCRIPTION BM60V2_poker RGB keyboard + +/* 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 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_ADDR_2 0b1010000 // this is here for compliancy reasons. +# define DRIVER_COUNT 2 +# 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/bm60v2_poker/info.json b/keyboards/bm60v2_poker/info.json new file mode 100644 index 000000000000..ad5adb8d6e4d --- /dev/null +++ b/keyboards/bm60v2_poker/info.json @@ -0,0 +1,78 @@ +{ + "keyboard_name": "bm60v2_poker", + "url": "", + "maintainer": "kp republic", + "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/bm60v2_poker/keymaps/default/keymap.c b/keyboards/bm60v2_poker/keymaps/default/keymap.c new file mode 100644 index 000000000000..3bb589fe1653 --- /dev/null +++ b/keyboards/bm60v2_poker/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +#include QMK_KEYBOARD_H +/* Copyright 2021 REPLACE_WITH_YOUR_NAME + * + * 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( + 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( + _______, 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/bm60v2_poker/keymaps/via/keymap.c b/keyboards/bm60v2_poker/keymaps/via/keymap.c new file mode 100644 index 000000000000..3bb589fe1653 --- /dev/null +++ b/keyboards/bm60v2_poker/keymaps/via/keymap.c @@ -0,0 +1,36 @@ +#include QMK_KEYBOARD_H +/* Copyright 2021 REPLACE_WITH_YOUR_NAME + * + * 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( + 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( + _______, 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/bm60v2_poker/keymaps/via/rules.mk b/keyboards/bm60v2_poker/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/bm60v2_poker/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/bm60v2_poker/readme.md b/keyboards/bm60v2_poker/readme.md new file mode 100644 index 000000000000..83c32a60b4df --- /dev/null +++ b/keyboards/bm60v2_poker/readme.md @@ -0,0 +1 @@ +# bm60v2_poker diff --git a/keyboards/bm60v2_poker/rules.mk b/keyboards/bm60v2_poker/rules.mk new file mode 100644 index 000000000000..f9f221450fd5 --- /dev/null +++ b/keyboards/bm60v2_poker/rules.mk @@ -0,0 +1,33 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# 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 +MIDI_ENABLE = no # MIDI support +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +AUDIO_ENABLE = no # Audio output on port C6 +RGB_MATRIX_ENABLE = yes # Use RGB matrix +RGB_MATRIX_DRIVER = IS31FL3733 +NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in From 5b170c687fcfa1ab10343f7825ba297bfe271ce0 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:33:28 +0800 Subject: [PATCH 02/27] Update keyboards/bm60v2_poker/rules.mk Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/rules.mk b/keyboards/bm60v2_poker/rules.mk index f9f221450fd5..a04f25c54452 100644 --- a/keyboards/bm60v2_poker/rules.mk +++ b/keyboards/bm60v2_poker/rules.mk @@ -30,4 +30,5 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output on port C6 RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3733 -NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in + +LAYOUTS = 60_ansi From 32af580dcbd079eeb20ce033dd31ea9afbbdb3ba Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:34:43 +0800 Subject: [PATCH 03/27] Update keyboards/bm60v2_poker/rules.mk Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/rules.mk b/keyboards/bm60v2_poker/rules.mk index a04f25c54452..594073e5426f 100644 --- a/keyboards/bm60v2_poker/rules.mk +++ b/keyboards/bm60v2_poker/rules.mk @@ -27,7 +27,7 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow MIDI_ENABLE = no # MIDI support BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE = no # Audio output on port C6 +AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3733 From a2366a2979ff71e2c1e4db6879ae11fd3cbbee62 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:35:35 +0800 Subject: [PATCH 04/27] Update keyboards/bm60v2_poker/rules.mk Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/bm60v2_poker/rules.mk b/keyboards/bm60v2_poker/rules.mk index 594073e5426f..3e58adfd9e85 100644 --- a/keyboards/bm60v2_poker/rules.mk +++ b/keyboards/bm60v2_poker/rules.mk @@ -25,8 +25,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix RGB_MATRIX_DRIVER = IS31FL3733 From 07b542d03116d0918d745b21fe40e7e924760835 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:35:58 +0800 Subject: [PATCH 05/27] Update keyboards/bm60v2_poker/rules.mk Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/bm60v2_poker/rules.mk b/keyboards/bm60v2_poker/rules.mk index 3e58adfd9e85..6835ec573f33 100644 --- a/keyboards/bm60v2_poker/rules.mk +++ b/keyboards/bm60v2_poker/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u4 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From f84a06dbdadf62e204f70386a3869fa5a44a724b Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:36:50 +0800 Subject: [PATCH 06/27] Update keyboards/bm60v2_poker/keymaps/via/keymap.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/keymaps/via/keymap.c b/keyboards/bm60v2_poker/keymaps/via/keymap.c index 3bb589fe1653..2d7081c533ce 100644 --- a/keyboards/bm60v2_poker/keymaps/via/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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( + [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, _______, _______, _______, _______, From 52bf529a7f4c1a12c2dbe142d5c87d39bd9171c6 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:37:22 +0800 Subject: [PATCH 07/27] Update keyboards/bm60v2_poker/bm60v2_poker.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/bm60v2_poker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/bm60v2_poker.c b/keyboards/bm60v2_poker/bm60v2_poker.c index 2aa539fd9f82..5739f22390fe 100644 --- a/keyboards/bm60v2_poker/bm60v2_poker.c +++ b/keyboards/bm60v2_poker/bm60v2_poker.c @@ -1,7 +1,7 @@ #include "bm60v2_poker.h" #ifdef RGB_MATRIX_ENABLE -const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { +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 }, From 4e6fbb9658bff71906eb49577f0453caa149cb5f Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:45:28 +0800 Subject: [PATCH 08/27] Update keyboards/bm60v2_poker/bm60v2_poker.h Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/bm60v2_poker.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/bm60v2_poker.h b/keyboards/bm60v2_poker/bm60v2_poker.h index c424feb11800..7bf700b098cc 100644 --- a/keyboards/bm60v2_poker/bm60v2_poker.h +++ b/keyboards/bm60v2_poker/bm60v2_poker.h @@ -2,7 +2,7 @@ #include "quantum.h" -#define LAYOUT( \ +#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, \ From 4a7b2ad57c792ba09724ba31d33340b2954ee03e Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:47:27 +0800 Subject: [PATCH 09/27] Update keyboards/bm60v2_poker/config.h Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index ca93f14d128a..aaf1095c3a8c 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -6,7 +6,7 @@ #define VENDOR_ID 0x4B50 #define PRODUCT_ID 0x1122 #define DEVICE_VER 0x0002 -#define MANUFACTURER KP REPUBLIC +#define MANUFACTURER KP Republic #define PRODUCT BM60V2_poker #define DESCRIPTION BM60V2_poker RGB keyboard From 4bc665d1312d5009b2a485302929fdce15dec54b Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:47:44 +0800 Subject: [PATCH 10/27] Update keyboards/bm60v2_poker/config.h Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index aaf1095c3a8c..e839f453f635 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -8,7 +8,6 @@ #define DEVICE_VER 0x0002 #define MANUFACTURER KP Republic #define PRODUCT BM60V2_poker -#define DESCRIPTION BM60V2_poker RGB keyboard /* key matrix size */ #define MATRIX_ROWS 5 From 5e1600452298dbf50ba18a0127f31b0455dedb8b Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:48:02 +0800 Subject: [PATCH 11/27] Update keyboards/bm60v2_poker/config.h Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index e839f453f635..64762ee9eaef 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -32,7 +32,7 @@ #define USB_POLLING_INTERVAL_MS 1 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 3 +#define DEBOUNCE 5 /* disable these deprecated features by default */ #define NO_ACTION_MACRO From 7bc76d728dc2a592955a89e549f944f5d036de09 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:50:02 +0800 Subject: [PATCH 12/27] Update keyboards/bm60v2_poker/config.h Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/config.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index 64762ee9eaef..d9f33612d56d 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -58,8 +58,7 @@ # define DISABLE_RGB_MATRIX_RAINDROPS # define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS # define DRIVER_ADDR_1 0b1010000 -# define DRIVER_ADDR_2 0b1010000 // this is here for compliancy reasons. -# define DRIVER_COUNT 2 +# define DRIVER_COUNT 1 # define DRIVER_1_LED_TOTAL 61 # define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL From dcf88344426233f95353b1f036605dd348077a8a Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:51:18 +0800 Subject: [PATCH 13/27] Update keyboards/bm60v2_poker/info.json Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/info.json b/keyboards/bm60v2_poker/info.json index ad5adb8d6e4d..ffa2c0bd123d 100644 --- a/keyboards/bm60v2_poker/info.json +++ b/keyboards/bm60v2_poker/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "bm60v2_poker", "url": "", - "maintainer": "kp republic", + "maintainer": "qmk", "width": 15, "height": 5, "layouts": { From f123d89ec4b4218240feadf44a14f00011ee257e Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 10:58:36 +0800 Subject: [PATCH 14/27] Update keyboards/bm60v2_poker/bm60v2_poker.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/bm60v2_poker.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/bm60v2_poker/bm60v2_poker.c b/keyboards/bm60v2_poker/bm60v2_poker.c index 5739f22390fe..283af644452d 100644 --- a/keyboards/bm60v2_poker/bm60v2_poker.c +++ b/keyboards/bm60v2_poker/bm60v2_poker.c @@ -110,6 +110,7 @@ void rgb_matrix_indicators_user(void) { #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) From e871e0677d534d1941c88ce003aefdc936b1d59d Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 11:00:35 +0800 Subject: [PATCH 15/27] Update keyboards/bm60v2_poker/keymaps/via/keymap.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/keymaps/via/keymap.c b/keyboards/bm60v2_poker/keymaps/via/keymap.c index 2d7081c533ce..6b454f508522 100644 --- a/keyboards/bm60v2_poker/keymaps/via/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/via/keymap.c @@ -18,7 +18,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [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, From 89a1353a378d71520797b26bd4bd008460744a69 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 11:02:10 +0800 Subject: [PATCH 16/27] Update keyboards/bm60v2_poker/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/keymaps/default/keymap.c b/keyboards/bm60v2_poker/keymaps/default/keymap.c index 3bb589fe1653..2d7081c533ce 100644 --- a/keyboards/bm60v2_poker/keymaps/default/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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( + [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, _______, _______, _______, _______, From 87fcef3168bc1bc7ada9c028987e9e86535f9149 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 11:50:52 +0800 Subject: [PATCH 17/27] Update bm60v2_poker.c --- keyboards/bm60v2_poker/bm60v2_poker.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/bm60v2_poker/bm60v2_poker.c b/keyboards/bm60v2_poker/bm60v2_poker.c index 283af644452d..249d1943af10 100644 --- a/keyboards/bm60v2_poker/bm60v2_poker.c +++ b/keyboards/bm60v2_poker/bm60v2_poker.c @@ -1,3 +1,18 @@ +/* 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 "bm60v2_poker.h" #ifdef RGB_MATRIX_ENABLE From b5674f08c5c8b5c2e3ca8c357ca9fc8329906ce0 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 11:53:27 +0800 Subject: [PATCH 18/27] Update bm60v2_poker.h --- keyboards/bm60v2_poker/bm60v2_poker.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/bm60v2_poker/bm60v2_poker.h b/keyboards/bm60v2_poker/bm60v2_poker.h index 7bf700b098cc..55edce2ed3d9 100644 --- a/keyboards/bm60v2_poker/bm60v2_poker.h +++ b/keyboards/bm60v2_poker/bm60v2_poker.h @@ -1,3 +1,18 @@ +/* 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" From 5fd95c5a070c52a996414ca156910eea40b56172 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:18:35 +0800 Subject: [PATCH 19/27] Update keymap.c --- keyboards/bm60v2_poker/keymaps/via/keymap.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/keyboards/bm60v2_poker/keymaps/via/keymap.c b/keyboards/bm60v2_poker/keymaps/via/keymap.c index 6b454f508522..ed1909a570ce 100644 --- a/keyboards/bm60v2_poker/keymaps/via/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/via/keymap.c @@ -32,5 +32,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), + [2] = LAYOUT_60_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_60_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), }; From 1159754c22329d9e3a1410e57c6fd14418b8f74d Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:18:52 +0800 Subject: [PATCH 20/27] Update keyboards/bm60v2_poker/keymaps/via/keymap.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/keymaps/via/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/bm60v2_poker/keymaps/via/keymap.c b/keyboards/bm60v2_poker/keymaps/via/keymap.c index ed1909a570ce..d41bf9d12b84 100644 --- a/keyboards/bm60v2_poker/keymaps/via/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/via/keymap.c @@ -1,4 +1,3 @@ -#include QMK_KEYBOARD_H /* Copyright 2021 REPLACE_WITH_YOUR_NAME * * This program is free software: you can redistribute it and/or modify From 7ae8bfe7f7670d36bcd28531aa1943c0d4e3e202 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:19:14 +0800 Subject: [PATCH 21/27] Update keyboards/bm60v2_poker/keymaps/default/keymap.c Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/keymaps/default/keymap.c b/keyboards/bm60v2_poker/keymaps/default/keymap.c index 2d7081c533ce..6b454f508522 100644 --- a/keyboards/bm60v2_poker/keymaps/default/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/default/keymap.c @@ -18,7 +18,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [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, From 758d2ca3dfe82b90f88e4acc42577ddab58c32b7 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:20:53 +0800 Subject: [PATCH 22/27] Update keymap.c --- keyboards/bm60v2_poker/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/keymaps/via/keymap.c b/keyboards/bm60v2_poker/keymaps/via/keymap.c index d41bf9d12b84..c21cb234f17d 100644 --- a/keyboards/bm60v2_poker/keymaps/via/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2021 REPLACE_WITH_YOUR_NAME +/* 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 From 7b125b6f9716fc2eb00df217b97821097d961931 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:21:55 +0800 Subject: [PATCH 23/27] Update keymap.c --- keyboards/bm60v2_poker/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/bm60v2_poker/keymaps/default/keymap.c b/keyboards/bm60v2_poker/keymaps/default/keymap.c index 6b454f508522..38fd852b3122 100644 --- a/keyboards/bm60v2_poker/keymaps/default/keymap.c +++ b/keyboards/bm60v2_poker/keymaps/default/keymap.c @@ -1,5 +1,4 @@ -#include QMK_KEYBOARD_H -/* Copyright 2021 REPLACE_WITH_YOUR_NAME +/* 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 From 84aadb637b3b58552270bc6d3dc46027e298c46c Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Tue, 2 Nov 2021 15:25:04 +0800 Subject: [PATCH 24/27] Update keyboards/bm60v2_poker/config.h Co-authored-by: Sergey Vlasov --- keyboards/bm60v2_poker/config.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index d9f33612d56d..4f3d48e09c71 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -41,7 +41,15 @@ #define RGBLIGHT_LIMIT_VAL 150 #define RGBLED_NUM 6 #define RGB_DI_PIN F0 -#define RGBLIGHT_ANIMATIONS +#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 From 7e362f054c1d55b65daba1651ee7a6cfd3e150e0 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Fri, 5 Nov 2021 10:42:47 +0800 Subject: [PATCH 25/27] Update keyboards/bm60v2_poker/config.h Co-authored-by: Drashna Jaelre --- keyboards/bm60v2_poker/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index 4f3d48e09c71..c4de85791d61 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -71,7 +71,7 @@ # define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL #if defined(RGB_MATRIX_ENABLE) && defined(RGBLIGHT_ENABLE) - #define RGB_MATRIX_DISABLE_KEYCODES +# define RGB_MATRIX_DISABLE_KEYCODES #endif #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 From bd79e661fb7229a93193845f7c7bf0f75f23a88e Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Fri, 5 Nov 2021 10:43:02 +0800 Subject: [PATCH 26/27] Update keyboards/bm60v2_poker/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/bm60v2_poker/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/bm60v2_poker/rules.mk b/keyboards/bm60v2_poker/rules.mk index 6835ec573f33..9ba7865a5e90 100644 --- a/keyboards/bm60v2_poker/rules.mk +++ b/keyboards/bm60v2_poker/rules.mk @@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +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 From 6a69eb65224ea821e23681e3cbdb350afb3b21c2 Mon Sep 17 00:00:00 2001 From: bdtc123 <93507097+bdtc123@users.noreply.github.com> Date: Fri, 5 Nov 2021 11:01:09 +0800 Subject: [PATCH 27/27] Update config.h --- keyboards/bm60v2_poker/config.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/keyboards/bm60v2_poker/config.h b/keyboards/bm60v2_poker/config.h index c4de85791d61..abd712c062af 100644 --- a/keyboards/bm60v2_poker/config.h +++ b/keyboards/bm60v2_poker/config.h @@ -1,3 +1,18 @@ +/* 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"