From 6844b2f6592f72a288d8b4c73d288d0c2ecb83f9 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Sat, 23 Oct 2021 08:07:54 +0800 Subject: [PATCH] apply code review from #13361 --- keyboards/kprepublic/bm65rgb/info.json | 4 ++-- keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c | 6 +++--- keyboards/kprepublic/bm65rgb/rev1/info.json | 4 ++-- keyboards/kprepublic/bm65rgb/rev1/rules.mk | 2 +- keyboards/kprepublic/bm65rgb/rev2/info.json | 4 ++-- keyboards/kprepublic/bm65rgb/rev2/rules.mk | 3 +-- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/keyboards/kprepublic/bm65rgb/info.json b/keyboards/kprepublic/bm65rgb/info.json index a916d8d2cbf8..444d8cee8516 100644 --- a/keyboards/kprepublic/bm65rgb/info.json +++ b/keyboards/kprepublic/bm65rgb/info.json @@ -69,8 +69,8 @@ {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25}, {"label":"K49 (E6,B5)", "x":10, "y":4}, {"label":"K4A (E6,B6)", "x":11, "y":4}, - {"label":"K4C (E6,C7)", "x":13, "y":4}, - {"label":"K4D (E6,F7)", "x":14, "y":4}, + {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25}, + {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25}, {"label":"K4E (E6,F6)", "x":15, "y":4} ] } diff --git a/keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c b/keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c index 4c42f109bcf8..3548369d4520 100644 --- a/keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c +++ b/keyboards/kprepublic/bm65rgb/keymaps/default/keymap.c @@ -23,14 +23,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_65_ansi( + [0] = LAYOUT_65_ansi_blocker( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, 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_HOME, 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_PGUP, 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_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_65_ansi( + [1] = LAYOUT_65_ansi_blocker( KC_GRAVE, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Template - [ ] = LAYOUT_65_ansi( + [ ] = LAYOUT_65_ansi_blocker( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/kprepublic/bm65rgb/rev1/info.json b/keyboards/kprepublic/bm65rgb/rev1/info.json index a916d8d2cbf8..444d8cee8516 100644 --- a/keyboards/kprepublic/bm65rgb/rev1/info.json +++ b/keyboards/kprepublic/bm65rgb/rev1/info.json @@ -69,8 +69,8 @@ {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25}, {"label":"K49 (E6,B5)", "x":10, "y":4}, {"label":"K4A (E6,B6)", "x":11, "y":4}, - {"label":"K4C (E6,C7)", "x":13, "y":4}, - {"label":"K4D (E6,F7)", "x":14, "y":4}, + {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25}, + {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25}, {"label":"K4E (E6,F6)", "x":15, "y":4} ] } diff --git a/keyboards/kprepublic/bm65rgb/rev1/rules.mk b/keyboards/kprepublic/bm65rgb/rev1/rules.mk index 910923efd1dc..a0e70197150d 100644 --- a/keyboards/kprepublic/bm65rgb/rev1/rules.mk +++ b/keyboards/kprepublic/bm65rgb/rev1/rules.mk @@ -23,4 +23,4 @@ RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes -LAYOUTS = 65_ansi +LAYOUTS = 65_ansi_blocker diff --git a/keyboards/kprepublic/bm65rgb/rev2/info.json b/keyboards/kprepublic/bm65rgb/rev2/info.json index a916d8d2cbf8..444d8cee8516 100644 --- a/keyboards/kprepublic/bm65rgb/rev2/info.json +++ b/keyboards/kprepublic/bm65rgb/rev2/info.json @@ -69,8 +69,8 @@ {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25}, {"label":"K49 (E6,B5)", "x":10, "y":4}, {"label":"K4A (E6,B6)", "x":11, "y":4}, - {"label":"K4C (E6,C7)", "x":13, "y":4}, - {"label":"K4D (E6,F7)", "x":14, "y":4}, + {"label":"K49 (E6,B5)", "x":10, "y":4, "w":1.25}, + {"label":"K4A (E6,B6)", "x":11.25, "y":4, "w":1.25}, {"label":"K4E (E6,F6)", "x":15, "y":4} ] } diff --git a/keyboards/kprepublic/bm65rgb/rev2/rules.mk b/keyboards/kprepublic/bm65rgb/rev2/rules.mk index 976b338309cf..a0e70197150d 100644 --- a/keyboards/kprepublic/bm65rgb/rev2/rules.mk +++ b/keyboards/kprepublic/bm65rgb/rev2/rules.mk @@ -18,10 +18,9 @@ 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 = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes -LAYOUTS = 65_ansi +LAYOUTS = 65_ansi_blocker