Skip to content

Commit

Permalink
Refactor the KBD67 Mk.II RGB (#6799)
Browse files Browse the repository at this point in the history 
* move kbd67mkiirgb into kbd67 directory as mkiirgb

* rename files

* rename LAYOUT to LAYOUT_65_ansi_blocker

* add support for default layout

* update readme for new build target

* update parent readme with the fourth variant
  • Loading branch information
@mechmerlin @noroadsleft
mechmerlin authored and noroadsleft committed Sep 24, 2019
1 parent efb7f3c commit 37b6a2a
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 14 deletions.
0 keyboards/kbdfans/kbd67mkiirgb/config.h → keyboards/kbdfans/kbd67/mkiirgb/config.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion keyboards/kbdfans/kbd67mkiirgb/info.json → keyboards/kbdfans/kbd67/mkiirgb/info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"width": 15,
"height": 5,
"layouts": {
"LAYOUT": {
"LAYOUT_65_ansi_blocker": {
"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":15, "y":0}, {"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":15, "y":1}, {"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":15, "y":2}, {"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":12.25, "y":3, "w":1.75},{"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...ans/kbd67mkiirgb/keymaps/default/keymap.c → ...ns/kbd67/mkiirgb/keymaps/default/keymap.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#define _LAYER0 0
#define _LAYER1 1
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAYER0] = LAYOUT( /* Base */
[_LAYER0] = LAYOUT_65_ansi_blocker( /* Base */
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_HOME,\
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_BSLASH, KC_PGUP,\
CTL_T(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_PGDN,\
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_END,\
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
[_LAYER1] = LAYOUT( /* FN */
[_LAYER1] = LAYOUT_65_ansi_blocker( /* FN */
KC_GESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,\
KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET, KC_PGUP,\
CTL_T(KC_CAPS),RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, EEP_RST, KC_PGDN,\
Expand Down
2 changes: 1 addition & 1 deletion ...oards/kbdfans/kbd67mkiirgb/kbd67mkiirgb.c → keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "kbd67mkiirgb.h"
#include "mkiirgb.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {

Expand Down
2 changes: 1 addition & 1 deletion ...oards/kbdfans/kbd67mkiirgb/kbd67mkiirgb.h → keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once
#define XXX KC_NO
#include "quantum.h"
#define LAYOUT( \
#define LAYOUT_65_ansi_blocker( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
Expand Down
4 changes: 2 additions & 2 deletions keyboards/kbdfans/kbd67mkiirgb/readme.md → keyboards/kbdfans/kbd67/mkiirgb/readme.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# kbd67mkiirgb
# KBD67 Mk.II RGB

A customizable 65% RGB keyboard.

Expand All @@ -9,6 +9,6 @@ Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)

Make example for this keyboard (after setting up your build environment):

make kbdfans/kbd67mkiirgb:default
make kbdfans/kbd67/mkiirgb: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).
2 changes: 2 additions & 0 deletions keyboards/kbdfans/kbd67mkiirgb/rules.mk → keyboards/kbdfans/kbd67/mkiirgb/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # USB Nkey Rollover
AUDIO_ENABLE = no
RGB_MATRIX_ENABLE = yes # Use RGB matrix

LAYOUTS = 65_ansi_blocker
14 changes: 7 additions & 7 deletions keyboards/kbdfans/kbd67/readme.md
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# KBD67

A 65% keyboard sold in three variants.
1. Rev1: Typical keyboard that had to be soldered together, supporting multiple layouts.
A 65% keyboard sold in four variants.
1. Rev1: Typical keyboard that had to be soldered together, supporting multiple layouts. The rev1 PCB is sold under the name "KBD65".
2. HotSwap: Released in late 2018, Hotswap single layout keyboard.
3. Rev2: Released in April/May 2019, the Rev2 also needs to be soldered together and supports multiple layouts.
4. MKII RGB: Released in September 2019. ARM powered hotswap board.

**Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the other.** Please use the `.hex` appropriate for your board.
**Firmware files are SPECIFIC to each board. Firmware files from one, will not work on the other.** Please use the `.hex` or `.bin` appropriate for your board.

The rev1 PCB is sold under the name "KBD65".

Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
Hardware Supported: KBD67 rev1, rev2, hotswap
Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin), [moyi4681](https://github.com/moyi4681)
Hardware Supported: KBD67 rev1, rev2, hotswap, mkiirgb
Hardware Availability: KBDFans

Make examples for this keyboard (after setting up your build environment):

make kbdfans/kbd67/rev1:default
make kbdfans/kbd67/rev2:default
make kbdfans/kbd67/hotswap:default
make kbdfans/kbd67/mkiirgb: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).

0 comments on commit 37b6a2a

Please sign in to comment.