diff options
| -rw-r--r-- | keyboards/rgbkb/sol/common/glcdfont.c (renamed from keyboards/sol/common/glcdfont.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/config.h (renamed from keyboards/sol/config.h) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | keyboards/rgbkb/sol/keymaps/brianweyer/config.h (renamed from keyboards/sol/keymaps/brianweyer/config.h) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c (renamed from keyboards/sol/keymaps/brianweyer/keymap.c) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk (renamed from keyboards/sol/keymaps/brianweyer/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/danielhklein/config.h (renamed from keyboards/sol/keymaps/danielhklein/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c (renamed from keyboards/sol/keymaps/danielhklein/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/danielhklein/rules.mk (renamed from keyboards/sol/keymaps/danielhklein/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/config.h (renamed from keyboards/sol/keymaps/default/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/keymap.c (renamed from keyboards/sol/keymaps/default/keymap.c) | 111 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/readme.md (renamed from keyboards/sol/keymaps/default/readme.md) | 54 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/default/rules.mk (renamed from keyboards/sol/keymaps/default/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c (renamed from keyboards/sol/keymaps/kageurufu/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk (renamed from keyboards/sol/keymaps/kageurufu/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/xulkal/keymap.c (renamed from keyboards/sol/keymaps/xulkal/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/keymaps/xulkal/rules.mk (renamed from keyboards/sol/keymaps/xulkal/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/readme.md (renamed from keyboards/sol/readme.md) | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev1/config.h (renamed from keyboards/sol/rev1/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev1/info.json (renamed from keyboards/sol/rev1/info.json) | 6 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev1/rev1.c (renamed from keyboards/sol/rev1/rev1.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev1/rev1.h (renamed from keyboards/sol/rev1/rev1.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rev1/rules.mk (renamed from keyboards/sol/rev1/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/rules.mk (renamed from keyboards/sol/rules.mk) | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/sol.c (renamed from keyboards/sol/sol.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/sol/sol.h (renamed from keyboards/sol/sol.h) | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/common/glcdfont.c (renamed from keyboards/zen/common/glcdfont.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/config.h (renamed from keyboards/zen/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/readme.md (renamed from keyboards/zen/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/config.h (renamed from keyboards/zen/rev1/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/info.json (renamed from keyboards/zen/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h (renamed from keyboards/zen/rev1/keymaps/333fred/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c (renamed from keyboards/zen/rev1/keymaps/333fred/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk (renamed from keyboards/zen/rev1/keymaps/333fred/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/default/config.h (renamed from keyboards/zen/rev1/keymaps/default/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c (renamed from keyboards/zen/rev1/keymaps/default/keymap.c) | 6 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/default/rules.mk (renamed from keyboards/zen/rev1/keymaps/default/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h (renamed from keyboards/zen/rev1/keymaps/jwlawrence/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c (renamed from keyboards/zen/rev1/keymaps/jwlawrence/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk (renamed from keyboards/zen/rev1/keymaps/jwlawrence/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c (renamed from keyboards/zen/rev1/keymaps/kageurufu/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h (renamed from keyboards/zen/rev1/keymaps/xyverz/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c (renamed from keyboards/zen/rev1/keymaps/xyverz/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/keymaps/xyverz/rules.mk (renamed from keyboards/zen/rev1/keymaps/xyverz/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/rev1.c (renamed from keyboards/zen/rev1/rev1.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/rev1.h (renamed from keyboards/zen/rev1/rev1.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev1/rules.mk (renamed from keyboards/zen/rev1/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/config.h (renamed from keyboards/zen/rev2/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/info.json | 345 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/keymaps/debug/keymap.c (renamed from keyboards/zen/rev2/keymaps/debug/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c (renamed from keyboards/zen/rev2/keymaps/default/keymap.c) | 10 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/rev2.c (renamed from keyboards/zen/rev2/rev2.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/rev2.h (renamed from keyboards/zen/rev2/rev2.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rev2/rules.mk (renamed from keyboards/zen/rev2/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/rules.mk (renamed from keyboards/zen/rules.mk) | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/zen.c (renamed from keyboards/zen/zen.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zen/zen.h (renamed from keyboards/zen/zen.h) | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/common/glcdfont.c (renamed from keyboards/zygomorph/common/glcdfont.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/config.h (renamed from keyboards/zygomorph/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c (renamed from keyboards/zygomorph/keymaps/5x6pad/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk (renamed from keyboards/zygomorph/keymaps/5x6pad/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default/config.h (renamed from keyboards/zygomorph/keymaps/default/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default/keymap.c (renamed from keyboards/zygomorph/keymaps/default/keymap.c) | 74 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default/readme.md (renamed from keyboards/zygomorph/keymaps/default/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default/rules.mk (renamed from keyboards/zygomorph/keymaps/default/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default_oled/config.h (renamed from keyboards/zygomorph/keymaps/default_oled/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c (renamed from keyboards/zygomorph/keymaps/default_oled/keymap.c) | 68 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk (renamed from keyboards/zygomorph/keymaps/default_oled/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/kageurufu/config.h (renamed from keyboards/zygomorph/keymaps/kageurufu/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c (renamed from keyboards/zygomorph/keymaps/kageurufu/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/kageurufu/readme.md (renamed from keyboards/zygomorph/keymaps/kageurufu/readme.md) | 4 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk (renamed from keyboards/zygomorph/keymaps/kageurufu/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/xulkal/config.h (renamed from keyboards/zygomorph/keymaps/xulkal/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/xulkal/keymap.c (renamed from keyboards/zygomorph/keymaps/xulkal/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk (renamed from keyboards/zygomorph/keymaps/xulkal/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/readme.md (renamed from keyboards/zygomorph/readme.md) | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/rev1/config.h (renamed from keyboards/zygomorph/rev1/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/rev1/info.json (renamed from keyboards/zygomorph/rev1/info.json) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/rev1/rev1.c (renamed from keyboards/zygomorph/rev1/rev1.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/rev1/rev1.h (renamed from keyboards/zygomorph/rev1/rev1.h) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/rev1/rules.mk (renamed from keyboards/zygomorph/rev1/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/rules.mk (renamed from keyboards/zygomorph/rules.mk) | 2 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/zygomorph.c (renamed from keyboards/zygomorph/zygomorph.c) | 0 | ||||
| -rw-r--r-- | keyboards/rgbkb/zygomorph/zygomorph.h (renamed from keyboards/zygomorph/zygomorph.h) | 0 |
83 files changed, 477 insertions, 227 deletions
diff --git a/keyboards/sol/common/glcdfont.c b/keyboards/rgbkb/sol/common/glcdfont.c index f772e31811..f772e31811 100644 --- a/keyboards/sol/common/glcdfont.c +++ b/keyboards/rgbkb/sol/common/glcdfont.c diff --git a/keyboards/sol/config.h b/keyboards/rgbkb/sol/config.h index a7317d9d9c..a7317d9d9c 100644 --- a/keyboards/sol/config.h +++ b/keyboards/rgbkb/sol/config.h diff --git a/keyboards/sol/keymaps/brianweyer/config.h b/keyboards/rgbkb/sol/keymaps/brianweyer/config.h index 452cdda823..452cdda823 100755..100644 --- a/keyboards/sol/keymaps/brianweyer/config.h +++ b/keyboards/rgbkb/sol/keymaps/brianweyer/config.h diff --git a/keyboards/sol/keymaps/brianweyer/keymap.c b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c index 3ba52081d2..3ba52081d2 100755..100644 --- a/keyboards/sol/keymaps/brianweyer/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/brianweyer/keymap.c diff --git a/keyboards/sol/keymaps/brianweyer/rules.mk b/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk index 12c8779467..12c8779467 100755..100644 --- a/keyboards/sol/keymaps/brianweyer/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/brianweyer/rules.mk diff --git a/keyboards/sol/keymaps/danielhklein/config.h b/keyboards/rgbkb/sol/keymaps/danielhklein/config.h index 452cdda823..452cdda823 100644 --- a/keyboards/sol/keymaps/danielhklein/config.h +++ b/keyboards/rgbkb/sol/keymaps/danielhklein/config.h diff --git a/keyboards/sol/keymaps/danielhklein/keymap.c b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c index 860361e810..860361e810 100644 --- a/keyboards/sol/keymaps/danielhklein/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/danielhklein/keymap.c diff --git a/keyboards/sol/keymaps/danielhklein/rules.mk b/keyboards/rgbkb/sol/keymaps/danielhklein/rules.mk index 09b0e201d5..09b0e201d5 100644 --- a/keyboards/sol/keymaps/danielhklein/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/danielhklein/rules.mk diff --git a/keyboards/sol/keymaps/default/config.h b/keyboards/rgbkb/sol/keymaps/default/config.h index 452cdda823..452cdda823 100644 --- a/keyboards/sol/keymaps/default/config.h +++ b/keyboards/rgbkb/sol/keymaps/default/config.h diff --git a/keyboards/sol/keymaps/default/keymap.c b/keyboards/rgbkb/sol/keymaps/default/keymap.c index c101a9bd8e..ca73524822 100644 --- a/keyboards/sol/keymaps/default/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/default/keymap.c @@ -1,5 +1,5 @@ #include QMK_KEYBOARD_H -#include "bootloader.h" + #ifdef PROTOCOL_LUFA #include "lufa.h" #include "split_util.h" @@ -41,80 +41,55 @@ enum macro_keycodes { #define FN_ESC LT(_FN, KC_ESC) #define FN_CAPS LT(_FN, KC_CAPS) -// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns - /* Base Layout +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Qwerty * ,------------------------------------------------. ,------------------------------------------------. - * | GESC | | | | | | - | | = | | | | | | BkSp | + * | GESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | Tab | | | | | | [ | | ] | | | | | | \ | + * | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * |FN(CAPS)| | | | | | ( | | ) | | | | | | ' | + * |FN(CAPS)| A | S | D | F | G | ( | | ) | H | J | K | L | ; | ' | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * |Shift | | | | | | { | | } | | | | | |Shift | + * |Shift | Z | X | C | V | B | { | | } | N | M | , | . | / |Shift | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| * | Ctrl | Win | Alt | RGB | ADJ | Space| DEL | | Enter| Space| FN | Left | Down | Up |Right | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------' * | Space| DEL | | Enter| Space| * `-------------' `-------------' */ -#define BASE_LAYOUT( \ - _00, _01, _02, _03, _04, _05, _06, _07, _08, _09, \ - _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, \ - _20, _21, _22, _23, _24, _25, _26, _27, _28, _29 \ -) \ -LAYOUT( \ - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ - KC_TAB, _00, _01, _02, _03, _04, KC_LBRC, KC_RBRC, _05, _06, _07, _08, _09, KC_BSLS, \ - FN_CAPS, _10, _11, _12, _13, _14, KC_LPRN, KC_RPRN, _15, _16, _17, _18, _19, KC_QUOT, \ - KC_LSFT, _20, _21, _22, _23, _24, KC_LCBR, KC_RCBR, _25, _26, _27, _28, _29, KC_ENT, \ - KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_DEL, KC_ENT, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, \ - KC_SPC, KC_DEL, KC_ENT, KC_SPC \ -) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Qwerty - * ,------------------------------------------------. ,------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | Q | W | E | R | T | | | | Y | U | I | O | P | | - * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | A | S | D | F | G | | | | H | J | K | L | ; | | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | Z | X | C | V | B | | | | N | M | , | . | / | | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' - * | | | | | | - * `-------------' `--------=----' - */ - [_QWERTY] = BASE_LAYOUT( \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH \ + [_QWERTY] = LAYOUT( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, \ + FN_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LPRN, KC_RPRN, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCBR, KC_RCBR, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_DEL, KC_ENT, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, \ + KC_SPC, KC_DEL, KC_ENT, KC_SPC \ ), /* Colemak * ,------------------------------------------------. ,------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | GESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | Q | W | F | P | G | | | | J | L | U | Y | ; | | + * | Tab | Q | W | F | P | B | [ | | ] | J | L | U | Y | ; | \ | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | A | R | S | T | D | | | | H | N | E | I | O | | + * |FN(CAPS)| A | R | S | T | G | ( | | ) | K | N | E | I | O | ' | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | Z | X | C | V | B | | | | K | M | , | . | / | | + * |Shift | Z | X | C | D | V | { | | } | M | H | , | . | / |Shift | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' - * | | | | | | - * `-------------' `--------=----' + * | Ctrl | Win | Alt | RGB | ADJ | Space| DEL | | Enter| Space| FN | Left | Down | Up |Right | + * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------' + * | Space| DEL | | Enter| Space| + * `-------------' `-------------' */ - [_COLEMAK] = BASE_LAYOUT( \ - KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ - KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \ - KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH \ + [_COLEMAK] = LAYOUT( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_LBRC, KC_RBRC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS, \ + FN_CAPS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_LPRN, KC_RPRN, KC_K, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_LCBR, KC_RCBR, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_DEL, KC_ENT, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, \ + KC_SPC, KC_DEL, KC_ENT, KC_SPC \ ), - /* FN * ,------------------------------------------------. ,------------------------------------------------. * | F1 | F2 | F3 | F4 | F5 | F6 | | | | F7 | F8 | F9 | F10 | F11 | F12 | @@ -131,13 +106,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-------------' `-------------' */ [_FN] = LAYOUT( \ - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ - _______, KC_PGDN, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, KC_PGDN, KC_UP, KC_PGUP, KC_PSCR, KC_HOME, \ - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_END, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, \ - _______, _______, _______, _______ \ - ), + KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ + _______, KC_PGDN, KC_UP, KC_PGUP, _______, _______, _______, _______, _______, KC_PGDN, KC_UP, KC_PGUP, KC_PSCR, KC_HOME, \ + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_END, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, \ + _______, _______, _______, _______ \ + ), /* ADJ * ,------------------------------------------------. ,------------------------------------------------. @@ -156,13 +131,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJ] = 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, \ - _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ - _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, \ - _______, _______, _______, _______ \ - ) + 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_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, _______, _______, QWERTY, COLEMAK, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ + _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, \ + _______, _______, _______, _______ \ + ) }; diff --git a/keyboards/sol/keymaps/default/readme.md b/keyboards/rgbkb/sol/keymaps/default/readme.md index f5f3845551..75182c06fc 100644 --- a/keyboards/sol/keymaps/default/readme.md +++ b/keyboards/rgbkb/sol/keymaps/default/readme.md @@ -1,16 +1,16 @@ # The Default Sol Layout ## Layout -### Base modifier layout +### Qwerty layout ``` * ,------------------------------------------------. ,------------------------------------------------. - * | GESC | | | | | | - | | = | | | | | | BkSp | + * | GESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | Tab | | | | | | [ | | ] | | | | | | \ | + * | Tab | Q | W | E | R | T | [ | | ] | Y | U | I | O | P | \ | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * |FN(CAPS)| | | | | | ( | | ) | | | | | | ' | + * |FN(CAPS)| A | S | D | F | G | ( | | ) | H | J | K | L | ; | ' | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * |Shift | | | | | | { | | } | | | | | |Shift | + * |Shift | Z | X | C | V | B | { | | } | N | M | , | . | / |Shift | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| * | Ctrl | Win | Alt | RGB | ADJ | Space| DEL | | Enter| Space| FN | Left | Down | Up |Right | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------' @@ -18,37 +18,20 @@ * `-------------' `-------------' ``` -### Qwerty alphas +### Colemak layout ``` * ,------------------------------------------------. ,------------------------------------------------. - * | | | | | | | | | | | | | | | | - * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | Q | W | E | R | T | | | | Y | U | I | O | P | | - * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | A | S | D | F | G | | | | H | J | K | L | ; | | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | Z | X | C | V | B | | | | N | M | , | . | / | | - * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' - * | | | | | | - * `-------------' `-------------' -``` - -### Colemak alphas -``` - * ,------------------------------------------------. ,------------------------------------------------. - * | | | | | | | | | | | | | | | | + * | GESC | 1 | 2 | 3 | 4 | 5 | - | | = | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | Q | W | F | P | B | | | | J | L | U | Y | ; | | + * | Tab | Q | W | F | P | B | [ | | ] | J | L | U | Y | ; | \ | * |------+------+------+------+------+------|------| |------|------+------+------+------+------+------| - * | | A | R | S | T | G | | | | K | N | E | I | O | | + * |FN(CAPS)| A | R | S | T | G | ( | | ) | K | N | E | I | O | ' | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | Z | X | C | D | V | | | | M | H | , | . | / | | + * |Shift | Z | X | C | D | V | { | | } | M | H | , | . | / |Shift | * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------| - * | | | | | | | | | | | | | | | | - * `------+------+------+------+------+------+------| |------+------+------+------+------+------+------' - * | | | | | | + * | Ctrl | Win | Alt | RGB | ADJ | Space| DEL | | Enter| Space| FN | Left | Down | Up |Right | + * |------+------+------+------+------+------+------| |------+------+------+------+------+------+------' + * | Space| DEL | | Enter| Space| * `-------------' `-------------' ``` @@ -101,16 +84,15 @@ CONSOLE_ENABLE = yes # Console for debug(+400) COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not enable with RGB Matrix -LED_ANIMATIONS = yes # LED animations -LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) +RGBLIGHT_ANIMATIONS = yes # LED animations +LED_MIRRORED = yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500) RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. Can be very laggy (+1500) RGBLIGHT_FULL_POWER = no # Allow maximum RGB brightness. Otherwise, limited to a safe level for a normal USB-A port UNICODE_ENABLE = no # Unicode SWAP_HANDS_ENABLE = no # Enable one-hand typing -ENCODER_ENABLE_CUSTOM = yes # Enable rotary encoder (+90) -OLED_ENABLE = no # OLED_ENABLE (+5000) +OLED_DRIVER_ENABLE = no # Enable the OLED Driver (+5000) IOS_DEVICE_ENABLE = no # Limit max brightness to connect to IOS device (iPad,iPhone) @@ -124,10 +106,10 @@ $ cd qmk_firmware build ``` -$ make sol:default +$ make rgbkb/sol:default ``` After the initial flash with AVRdudess, you should be able to flash using this: ``` -$ make sol:default:dfu +$ make rgbkb/sol:default:dfu ``` diff --git a/keyboards/sol/keymaps/default/rules.mk b/keyboards/rgbkb/sol/keymaps/default/rules.mk index 09b0e201d5..09b0e201d5 100644 --- a/keyboards/sol/keymaps/default/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/default/rules.mk diff --git a/keyboards/sol/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c index b587ef2b3d..b587ef2b3d 100644 --- a/keyboards/sol/keymaps/kageurufu/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/kageurufu/keymap.c diff --git a/keyboards/sol/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk index 21dca0b116..21dca0b116 100644 --- a/keyboards/sol/keymaps/kageurufu/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk diff --git a/keyboards/sol/keymaps/xulkal/keymap.c b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c index 5c560abad8..5c560abad8 100644 --- a/keyboards/sol/keymaps/xulkal/keymap.c +++ b/keyboards/rgbkb/sol/keymaps/xulkal/keymap.c diff --git a/keyboards/sol/keymaps/xulkal/rules.mk b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk index ad0c480349..ad0c480349 100644 --- a/keyboards/sol/keymaps/xulkal/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk diff --git a/keyboards/sol/readme.md b/keyboards/rgbkb/sol/readme.md index 65e89ff635..391189095c 100644 --- a/keyboards/sol/readme.md +++ b/keyboards/rgbkb/sol/readme.md @@ -10,6 +10,6 @@ Hardware Availability: [RGBKB](https://www.rgbkb.net) Make example for this keyboard (after setting up your build environment): - make sol:default + make rgbkb/sol: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/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h index 056869daa0..056869daa0 100644 --- a/keyboards/sol/rev1/config.h +++ b/keyboards/rgbkb/sol/rev1/config.h diff --git a/keyboards/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index 40bc01f7ff..e252ea2e2d 100644 --- a/keyboards/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -77,14 +77,10 @@ {"label":"R43", "x":13.5, "y":4}, {"label":"R44", "x":14.5, "y":4}, {"label":"R45", "x":15.5, "y":4, "w":1.5}, - {"label":"Left Encoder, Counter-Clockwise", "x":2.5, "y":5.5}, - {"label":"Left Encoder, Clockwise", "x":3.5, "y":5.5}, {"label":"L55", "x":6, "y":5.5}, {"label":"L56", "x":7, "y":5.5}, {"label":"R56", "x":9, "y":5.5}, - {"label":"R50", "x":10, "y":5.5}, - {"label":"Right Encoder, Counter-Clockwise", "x":12.5, "y":5.5}, - {"label":"Right Encoder, Clockwise", "x":13.5, "y":5.5} + {"label":"R50", "x":10, "y":5.5} ] } } diff --git a/keyboards/sol/rev1/rev1.c b/keyboards/rgbkb/sol/rev1/rev1.c index 68e64af79e..68e64af79e 100644 --- a/keyboards/sol/rev1/rev1.c +++ b/keyboards/rgbkb/sol/rev1/rev1.c diff --git a/keyboards/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h index 6f70f09bee..6f70f09bee 100644 --- a/keyboards/sol/rev1/rev1.h +++ b/keyboards/rgbkb/sol/rev1/rev1.h diff --git a/keyboards/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk index e69de29bb2..e69de29bb2 100644 --- a/keyboards/sol/rev1/rules.mk +++ b/keyboards/rgbkb/sol/rev1/rules.mk diff --git a/keyboards/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk index b7d689c034..62dd969aa7 100644 --- a/keyboards/sol/rules.mk +++ b/keyboards/rgbkb/sol/rules.mk @@ -63,4 +63,4 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. -DEFAULT_FOLDER = sol/rev1 +DEFAULT_FOLDER = rgbkb/sol/rev1 diff --git a/keyboards/sol/sol.c b/keyboards/rgbkb/sol/sol.c index 5945cc60a4..5945cc60a4 100644 --- a/keyboards/sol/sol.c +++ b/keyboards/rgbkb/sol/sol.c diff --git a/keyboards/sol/sol.h b/keyboards/rgbkb/sol/sol.h index 8a41702df9..d26546006c 100644 --- a/keyboards/sol/sol.h +++ b/keyboards/rgbkb/sol/sol.h @@ -1,10 +1,8 @@ #pragma once #include "quantum.h" -#ifdef KEYBOARD_sol_rev1 +#ifdef KEYBOARD_rgbkb_sol_rev1 #include "rev1.h" -#elif KEYBOARD_sol_rev2 -#include "rev2.h" #endif diff --git a/keyboards/zen/common/glcdfont.c b/keyboards/rgbkb/zen/common/glcdfont.c index 3b4ccfa95c..3b4ccfa95c 100644 --- a/keyboards/zen/common/glcdfont.c +++ b/keyboards/rgbkb/zen/common/glcdfont.c diff --git a/keyboards/zen/config.h b/keyboards/rgbkb/zen/config.h index 6868dc1354..6868dc1354 100644 --- a/keyboards/zen/config.h +++ b/keyboards/rgbkb/zen/config.h diff --git a/keyboards/zen/readme.md b/keyboards/rgbkb/zen/readme.md index 7ca7c69fe5..0a2f9e3edf 100644 --- a/keyboards/zen/readme.md +++ b/keyboards/rgbkb/zen/readme.md @@ -16,11 +16,11 @@ A build guide and more info for this keyboard can be found here: [Zen Build Guid Make example for this keyboard (after setting up your build environment): - make zen/rev2:default + make rgbkb/zen/rev2:default To build for a Proton-C: - make zen/rev2:default CTPC=yes + make rgbkb/zen/rev2:default CTPC=yes **Note:** The Proton-C does not have split keyboard, or encoder support. Also OLED driver support is untested. Will update as status changes. diff --git a/keyboards/zen/rev1/config.h b/keyboards/rgbkb/zen/rev1/config.h index 88f39af484..88f39af484 100644 --- a/keyboards/zen/rev1/config.h +++ b/keyboards/rgbkb/zen/rev1/config.h diff --git a/keyboards/zen/info.json b/keyboards/rgbkb/zen/rev1/info.json index f312529edc..f312529edc 100644 --- a/keyboards/zen/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json diff --git a/keyboards/zen/rev1/keymaps/333fred/config.h b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h index 1634f368cc..1634f368cc 100644 --- a/keyboards/zen/rev1/keymaps/333fred/config.h +++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/config.h diff --git a/keyboards/zen/rev1/keymaps/333fred/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c index 3dd7698039..3dd7698039 100644 --- a/keyboards/zen/rev1/keymaps/333fred/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/keymap.c diff --git a/keyboards/zen/rev1/keymaps/333fred/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk index 1359e81c09..1359e81c09 100644 --- a/keyboards/zen/rev1/keymaps/333fred/rules.mk +++ b/keyboards/rgbkb/zen/rev1/keymaps/333fred/rules.mk diff --git a/keyboards/zen/rev1/keymaps/default/config.h b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h index 4a549c5b1f..4a549c5b1f 100644 --- a/keyboards/zen/rev1/keymaps/default/config.h +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/config.h diff --git a/keyboards/zen/rev1/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c index b2adffd1e7..54462ec0ff 100644 --- a/keyboards/zen/rev1/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/keymap.c @@ -6,8 +6,10 @@ extern keymap_config_t keymap_config; // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. -#define _QWERTY 0 -#define _NAV 2 +enum layer_number { + _QWERTY = 0, + _NAV +}; enum custom_keycodes { diff --git a/keyboards/zen/rev1/keymaps/default/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/default/rules.mk index 1e3cebb145..1e3cebb145 100644 --- a/keyboards/zen/rev1/keymaps/default/rules.mk +++ b/keyboards/rgbkb/zen/rev1/keymaps/default/rules.mk diff --git a/keyboards/zen/rev1/keymaps/jwlawrence/config.h b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h index d813085e46..d813085e46 100644 --- a/keyboards/zen/rev1/keymaps/jwlawrence/config.h +++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/config.h diff --git a/keyboards/zen/rev1/keymaps/jwlawrence/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c index 13edd0db8d..13edd0db8d 100644 --- a/keyboards/zen/rev1/keymaps/jwlawrence/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/keymap.c diff --git a/keyboards/zen/rev1/keymaps/jwlawrence/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk index 1e3cebb145..1e3cebb145 100644 --- a/keyboards/zen/rev1/keymaps/jwlawrence/rules.mk +++ b/keyboards/rgbkb/zen/rev1/keymaps/jwlawrence/rules.mk diff --git a/keyboards/zen/rev1/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c index 75884635cd..75884635cd 100644 --- a/keyboards/zen/rev1/keymaps/kageurufu/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/kageurufu/keymap.c diff --git a/keyboards/zen/rev1/keymaps/xyverz/config.h b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h index d3e21ea172..d3e21ea172 100644 --- a/keyboards/zen/rev1/keymaps/xyverz/config.h +++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/config.h diff --git a/keyboards/zen/rev1/keymaps/xyverz/keymap.c b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c index 6250086ed9..6250086ed9 100644 --- a/keyboards/zen/rev1/keymaps/xyverz/keymap.c +++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/keymap.c diff --git a/keyboards/zen/rev1/keymaps/xyverz/rules.mk b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/rules.mk index 1e3cebb145..1e3cebb145 100644 --- a/keyboards/zen/rev1/keymaps/xyverz/rules.mk +++ b/keyboards/rgbkb/zen/rev1/keymaps/xyverz/rules.mk diff --git a/keyboards/zen/rev1/rev1.c b/keyboards/rgbkb/zen/rev1/rev1.c index 5f4cd32f69..5f4cd32f69 100644 --- a/keyboards/zen/rev1/rev1.c +++ b/keyboards/rgbkb/zen/rev1/rev1.c diff --git a/keyboards/zen/rev1/rev1.h b/keyboards/rgbkb/zen/rev1/rev1.h index a12f2ea789..a12f2ea789 100644 --- a/keyboards/zen/rev1/rev1.h +++ b/keyboards/rgbkb/zen/rev1/rev1.h diff --git a/keyboards/zen/rev1/rules.mk b/keyboards/rgbkb/zen/rev1/rules.mk index 58e9a76b23..58e9a76b23 100644 --- a/keyboards/zen/rev1/rules.mk +++ b/keyboards/rgbkb/zen/rev1/rules.mk diff --git a/keyboards/zen/rev2/config.h b/keyboards/rgbkb/zen/rev2/config.h index c56956108d..c56956108d 100644 --- a/keyboards/zen/rev2/config.h +++ b/keyboards/rgbkb/zen/rev2/config.h diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json new file mode 100644 index 0000000000..b3015388c1 --- /dev/null +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -0,0 +1,345 @@ +{ + "keyboard_name": "Zen", + "url": "", + "maintainer": "qmk", + "width": 17, + "height": 6.5, + "layouts": { + "LAYOUT": { + "layout": [ + { + "label": "k00", + "x": 0.5, + "y": 0 + }, + { + "label": "k01", + "x": 1.5, + "y": 0 + }, + { + "label": "k02", + "x": 2.5, + "y": 0 + }, + { + "label": "k03", + "x": 3.5, + "y": 0 + }, + { + "label": "k04", + "x": 4.5, + "y": 0 + }, + { + "label": "k05", + "x": 5.5, + "y": 0 + }, + { + "label": "k55", + "x": 10.5, + "y": 0 + }, + { + "label": "k54", + "x": 11.5, + "y": 0 + }, + { + "label": "k53", + "x": 12.5, + "y": 0 + }, + { + "label": "k52", + "x": 13.5, + "y": 0 + }, + { + "label": "k51", + "x": 14.5, + "y": 0 + }, + { + "label": "k50", + "x": 15.5, + "y": 0 + }, + { + "label": "k10", + "x": 0, + "y": 1, + "w": 1.5 + }, + { + "label": "k11", + "x": 1.5, + "y": 1 + }, + { + "label": "k12", + "x": 2.5, + "y": 1 + }, + { + "label": "k13", + "x": 3.5, + "y": 1 + }, + { + "label": "k14", + "x": 4.5, + "y": 1 + }, + { + "label": "k15", + "x": 5.5, + "y": 1 + }, + { + "label": "k65", + "x": 10.5, + "y": 1 + }, + { + "label": "k64", + "x": 11.5, + "y": 1 + }, + { + "label": "k63", + "x": 12.5, + "y": 1 + }, + { + "label": "k62", + "x": 13.5, + "y": 1 + }, + { + "label": "k61", + "x": 14.5, + "y": 1 + }, + { + "label": "k60", + "x": 15.5, + "y": 1, + "w": 1.5 + }, + { + "label": "k20", + "x": 0, + "y": 2, + "w": 1.5 + }, + { + "label": "k21", + "x": 1.5, + "y": 2 + }, + { + "label": "k22", + "x": 2.5, + "y": 2 + }, + { + "label": "k23", + "x": 3.5, + "y": 2 + }, + { + "label": "k24", + "x": 4.5, + "y": 2 + }, + { + "label": "k25", + "x": 5.5, + "y": 2 + }, + { + "label": "k75", + "x": 10.5, + "y": 2 + }, + { + "label": "k74", + "x": 11.5, + "y": 2 + }, + { + "label": "k73", + "x": 12.5, + "y": 2 + }, + { + "label": "k72", + "x": 13.5, + "y": 2 + }, + { + "label": "k71", + "x": 14.5, + "y": 2 + }, + { + "label": "k70", + "x": 15.5, + "y": 2, + "w": 1.5 + }, + { + "label": "k30", + "x": 0, + "y": 3, + "w": 1.5 + }, + { + "label": "k31", + "x": 1.5, + "y": 3 + }, + { + "label": "k32", + "x": 2.5, + "y": 3 + }, + { + "label": "k33", + "x": 3.5, + "y": 3 + }, + { + "label": "k34", + "x": 4.5, + "y": 3 + }, + { + "label": "k35", + "x": 5.5, + "y": 3 + }, + { + "label": "k16", + "x": 6.5, + "y": 3 + }, + { + "label": "k66", + "x": 9.5, + "y": 3 + }, + { + "label": "k85", + "x": 10.5, + "y": 3 + }, + { + "label": "k84", + "x": 11.5, + "y": 3 + }, + { + "label": "k83", + "x": 12.5, + "y": 3 + }, + { + "label": "k82", + "x": 13.5, + "y": 3 + }, + { + "label": "k81", + "x": 14.5, + "y": 3 + }, + { + "label": "k80", + "x": 15.5, + "y": 3, + "w": 1.5 + }, + { + "label": "k40", + "x": 0, + "y": 4, + "w": 1.5 + }, + { + "label": "k41", + "x": 1.5, + "y": 4 + }, + { + "label": "k42", + "x": 2.5, + "y": 4 + }, + { + "label": "k43", + "x": 3.5, + "y": 4 + }, + { + "label": "k44", + "x": 4.5, + "y": 4 + }, + { + "label": "k36", + "x": 6, + "y": 4.5, + "h": 2 + }, + { + "label": "k26", + "x": 7, + "y": 4.5, + "h": 2 + }, + { + "label": "k76", + "x": 9, + "y": 4.5, + "h": 2 + }, + { + "label": "k86", + "x": 10, + "y": 4.5, + "h": 2 + }, + { + "label": "k94", + "x": 11.5, + "y": 4 + }, + { + "label": "k93", + "x": 12.5, + "y": 4 + }, + { + "label": "k92", + "x": 13.5, + "y": 4 + }, + { + "label": "k91", + "x": 14.5, + "y": 4 + }, + { + "label": "k90", + "x": 15.5, + "y": 4, + "w": 1.5 + } + ] + } + } + } diff --git a/keyboards/zen/rev2/keymaps/debug/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/debug/keymap.c index e2d3d6a356..e2d3d6a356 100644 --- a/keyboards/zen/rev2/keymaps/debug/keymap.c +++ b/keyboards/rgbkb/zen/rev2/keymaps/debug/keymap.c diff --git a/keyboards/zen/rev2/keymaps/default/keymap.c b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c index 41003e4a55..dba4a2ddd8 100644 --- a/keyboards/zen/rev2/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zen/rev2/keymaps/default/keymap.c @@ -6,14 +6,14 @@ extern keymap_config_t keymap_config; // The underscores don't mean anything - you can have a layer called STUFF or any other name. // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. -#define _QWERTY 0 -#define _NAV 2 - +enum layer_number { + _QWERTY = 0, + _NAV +}; enum custom_keycodes { QWERTY = SAFE_RANGE, - NAV, - + NAV }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c index 28a5a9f203..28a5a9f203 100644 --- a/keyboards/zen/rev2/rev2.c +++ b/keyboards/rgbkb/zen/rev2/rev2.c diff --git a/keyboards/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h index 101622988d..101622988d 100644 --- a/keyboards/zen/rev2/rev2.h +++ b/keyboards/rgbkb/zen/rev2/rev2.h diff --git a/keyboards/zen/rev2/rules.mk b/keyboards/rgbkb/zen/rev2/rules.mk index e9d19a69aa..e9d19a69aa 100644 --- a/keyboards/zen/rev2/rules.mk +++ b/keyboards/rgbkb/zen/rev2/rules.mk diff --git a/keyboards/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index f5d64a7f03..7473b61cfc 100644 --- a/keyboards/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -39,4 +39,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -DEFAULT_FOLDER = zen/rev2 +DEFAULT_FOLDER = rgbkb/zen/rev2 diff --git a/keyboards/zen/zen.c b/keyboards/rgbkb/zen/zen.c index 22131ef5c7..22131ef5c7 100644 --- a/keyboards/zen/zen.c +++ b/keyboards/rgbkb/zen/zen.c diff --git a/keyboards/zen/zen.h b/keyboards/rgbkb/zen/zen.h index cee7652d62..e51c3c831f 100644 --- a/keyboards/zen/zen.h +++ b/keyboards/rgbkb/zen/zen.h @@ -1,8 +1,8 @@ #pragma once -#if KEYBOARD_zen_rev1 +#if KEYBOARD_rgbkb_zen_rev1 #include "rev1.h" -#elif KEYBOARD_zen_rev2 +#elif KEYBOARD_rgbkb_zen_rev2 #include "rev2.h" #endif #include "quantum.h" diff --git a/keyboards/zygomorph/common/glcdfont.c b/keyboards/rgbkb/zygomorph/common/glcdfont.c index 89665ba074..89665ba074 100644 --- a/keyboards/zygomorph/common/glcdfont.c +++ b/keyboards/rgbkb/zygomorph/common/glcdfont.c diff --git a/keyboards/zygomorph/config.h b/keyboards/rgbkb/zygomorph/config.h index 93fd2261b1..93fd2261b1 100644 --- a/keyboards/zygomorph/config.h +++ b/keyboards/rgbkb/zygomorph/config.h diff --git a/keyboards/zygomorph/keymaps/5x6pad/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c index c6138b43a3..c6138b43a3 100644 --- a/keyboards/zygomorph/keymaps/5x6pad/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/keymap.c diff --git a/keyboards/zygomorph/keymaps/5x6pad/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk index 55d52d58e5..55d52d58e5 100644 --- a/keyboards/zygomorph/keymaps/5x6pad/rules.mk +++ b/keyboards/rgbkb/zygomorph/keymaps/5x6pad/rules.mk diff --git a/keyboards/zygomorph/keymaps/default/config.h b/keyboards/rgbkb/zygomorph/keymaps/default/config.h index 452cdda823..452cdda823 100644 --- a/keyboards/zygomorph/keymaps/default/config.h +++ b/keyboards/rgbkb/zygomorph/keymaps/default/config.h diff --git a/keyboards/zygomorph/keymaps/default/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c index 98bc1b9a66..f236e20a43 100644 --- a/keyboards/zygomorph/keymaps/default/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/default/keymap.c @@ -26,71 +26,47 @@ enum custom_keycodes { #define FN_CAPS LT(_FN, KC_CAPS) -// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns - /* / Base Layout \ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* / QWERTY \ * /-----------------------------------------\ /-----------------------------------------\ * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | | | | | | | | | | | | \ | + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |FNCAPS| | | | | | | | | | | | ' | + * |FNCAPS| A | S | D | F | G | | H | J | K | L | ; | ' | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |Shift | | | | | | | | | | | |Shift | + * |Shift | Z | X | C | V | B | | N | M | , | . | / |Enter | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Ctrl | Win | Alt | RGB | ADJ | Space| | Space| FN | Left | Down | Up |Right | * \------+------+------+------+------+------/ \------+------+------+------+------+------/ */ -#define BASE_LAYOUT( \ - _00, _01, _02, _03, _04, _05, _06, _07, _08, _09, \ - _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, \ - _20, _21, _22, _23, _24, _25, _26, _27, _28, _29 \ -) \ -LAYOUT_ortho_5x12( \ - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ - KC_TAB, _00, _01, _02, _03, _04, _05, _06, _07, _08, _09, KC_BSLS, \ - FN_CAPS, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, KC_QUOT, \ - KC_LSFT, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, KC_ENT, \ - KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \ -) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* / QWERTY \ - * /-----------------------------------------\ /-----------------------------------------\ - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Q | W | E | R | T | | Y | U | O | P | \ | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | A | S | D | F | G | | H | J | K | L | ; | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Z | X | C | V | B | | N | M | , | . | / | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | - * \------+------+------+------+------+------/ \------+------+------+------+------+------/ - */ - [_QWERTY] = BASE_LAYOUT( \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH \ + [_QWERTY] = LAYOUT_ortho_5x12( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSLS, \ + FN_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT \ ), /* / Colemak \ * /-----------------------------------------\ /-----------------------------------------\ - * | | | | | | | | | | | | | | + * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Q | W | F | P | G | | J | L | U | Y | ; | | + * | Tab | Q | W | F | P | B | | J | L | U | Y | ; | \ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | A | R | S | T | D | | H | N | E | I | O | | + * |FNCAPS| A | R | S | T | G | | K | N | E | I | O | ' | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Z | X | C | V | B | | K | M | , | . | / | | + * |Shift | Z | X | C | D | V | | M | H | , | . | / |Enter | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | + * | Ctrl | Win | Alt | RGB | ADJ | Space| | Space| FN | Left | Down | Up |Right | * \------+------+------+------+------+------/ \------+------+------+------+------+------/ */ - [_COLEMAK] = BASE_LAYOUT( \ - KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ - KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \ - KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH \ + [_COLEMAK] = LAYOUT_ortho_5x12( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS, \ + FN_CAPS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT \ ), /* / FN \ @@ -107,9 +83,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * \------+------+------+------+------+------/ \------+------+------+------+------+------/ */ [_FN] = LAYOUT_ortho_5x12( \ - 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ _______, KC_PGDN, KC_UP, KC_PGUP, _______, _______, _______, KC_PGDN, KC_UP, KC_PGUP, KC_PSCR, KC_HOME, \ - _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_END, \ + _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS, KC_END, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, RGB_MOD, _______, _______, _______, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU \ ), @@ -128,7 +104,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * \------+------+------+------+------+------/ \------+------+------+------+------+------/ */ [_ADJ] = LAYOUT_ortho_5x12( \ - 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_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET, _______, _______, _______, _______, _______, _______, _______, \ _______, RGB_HUD, RGB_VAD, RGB_HUI, RGBRST, _______, _______, QWERTY, COLEMAK, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, \ diff --git a/keyboards/zygomorph/keymaps/default/readme.md b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md index 4cbe61d127..e1d30b36b6 100644 --- a/keyboards/zygomorph/keymaps/default/readme.md +++ b/keyboards/rgbkb/zygomorph/keymaps/default/readme.md @@ -112,10 +112,10 @@ $ cd qmk_firmware build ``` -$ make zygomorph:default +$ make rgbkb/zygomorph:default ``` After the initial flash with AVRdudess, you should be able to flash using this: ``` -$ make zygomorph:default:dfu +$ make rgbkb/zygomorph:default:dfu ``` diff --git a/keyboards/zygomorph/keymaps/default/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/default/rules.mk index 55d52d58e5..55d52d58e5 100644 --- a/keyboards/zygomorph/keymaps/default/rules.mk +++ b/keyboards/rgbkb/zygomorph/keymaps/default/rules.mk diff --git a/keyboards/zygomorph/keymaps/default_oled/config.h b/keyboards/rgbkb/zygomorph/keymaps/default_oled/config.h index 452cdda823..452cdda823 100644 --- a/keyboards/zygomorph/keymaps/default_oled/config.h +++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/config.h diff --git a/keyboards/zygomorph/keymaps/default_oled/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c index 89ed92ecdc..d313bec8b0 100644 --- a/keyboards/zygomorph/keymaps/default_oled/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/keymap.c @@ -26,71 +26,47 @@ enum custom_keycodes { #define FN_CAPS LT(_FN, KC_CAPS) -// Define your non-alpha grouping in this define's LAYOUT, and all your BASE_LAYERS will share the same mod/macro columns - /* / Base Layout \ +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* / QWERTY \ * /-----------------------------------------\ /-----------------------------------------\ * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | | | | | | | | | | | | \ | + * | Tab | Q | W | E | R | T | | Y | U | O | P | \ | \ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |FNCAPS| | | | | | | | | | | | ' | + * |FNCAPS| A | S | D | F | G | | H | J | K | L | ; | ' | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |Shift | | | | | | | | | | | |Shift | + * |Shift | Z | X | C | V | B | | N | M | , | . | / |Shift | * |------+------+------+------+------+------| |------+------+------+------+------+------| * | Ctrl | Win | Alt | RGB | ADJ | Space| | Space| FN | Left | Down | Up |Right | * \------+------+------+------+------+------/ \------+------+------+------+------+------/ */ -#define BASE_LAYOUT( \ - _00, _01, _02, _03, _04, _05, _06, _07, _08, _09, \ - _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, \ - _20, _21, _22, _23, _24, _25, _26, _27, _28, _29 \ -) \ -LAYOUT_ortho_5x12( \ - KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ - KC_TAB, _00, _01, _02, _03, _04, _05, _06, _07, _08, _09, KC_BSLS, \ - FN_CAPS, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, KC_QUOT, \ - KC_LSFT, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, KC_ENT, \ - KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \ -) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* / QWERTY \ - * /-----------------------------------------\ /-----------------------------------------\ - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Q | W | E | R | T | | Y | U | O | P | \ | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | A | S | D | F | G | | H | J | K | L | ; | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Z | X | C | V | B | | N | M | , | . | / | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | - * \------+------+------+------+------+------/ \------+------+------+------+------+------/ - */ - [_QWERTY] = BASE_LAYOUT( \ - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ - KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, \ - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH \ + [_QWERTY] = LAYOUT_ortho_5x12( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, 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_BSLS, \ + FN_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT \ ), /* / Colemak \ * /-----------------------------------------\ /-----------------------------------------\ - * | | | | | | | | | | | | | | + * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BkSp | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Q | W | F | P | G | | J | L | U | Y | ; | | + * | Tab | Q | W | F | P | B | | J | L | U | Y | ; | \ | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | A | R | S | T | D | | H | N | E | I | O | | + * |FNCAPS| A | R | S | T | G | | K | N | E | I | O | ' | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | Z | X | C | V | B | | K | M | , | . | / | | + * |Shift | Z | X | C | D | V | | M | H | , | . | / |Enter | * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | + * | Ctrl | Win | Alt | RGB | ADJ | Space| | Space| FN | Left | Down | Up |Right | * \------+------+------+------+------+------/ \------+------+------+------+------+------/ */ - [_COLEMAK] = BASE_LAYOUT( \ - KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, \ - KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, \ - KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH \ + [_COLEMAK] = LAYOUT_ortho_5x12( \ + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ + KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSLS, \ + FN_CAPS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_K, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ + KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_M, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ + KC_LCTL, KC_LGUI, KC_LALT, RGB_TOG, ADJ, KC_SPC, KC_SPC, FN, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT \ ), /* / FN \ diff --git a/keyboards/zygomorph/keymaps/default_oled/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk index 961edb6e2d..961edb6e2d 100644 --- a/keyboards/zygomorph/keymaps/default_oled/rules.mk +++ b/keyboards/rgbkb/zygomorph/keymaps/default_oled/rules.mk diff --git a/keyboards/zygomorph/keymaps/kageurufu/config.h b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/config.h index dc06487ce8..dc06487ce8 100644 --- a/keyboards/zygomorph/keymaps/kageurufu/config.h +++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/config.h diff --git a/keyboards/zygomorph/keymaps/kageurufu/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c index 29702b614a..29702b614a 100644 --- a/keyboards/zygomorph/keymaps/kageurufu/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/keymap.c diff --git a/keyboards/zygomorph/keymaps/kageurufu/readme.md b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/readme.md index f79c70d22c..77e88a078f 100644 --- a/keyboards/zygomorph/keymaps/kageurufu/readme.md +++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/readme.md @@ -123,10 +123,10 @@ $ cd qmk_firmware build ``` -$ make sol:default +$ make rgbkb/sol:default ``` After the initial flash with AVRdudess, you should be able to flash using this: ``` -$ make sol:default:dfu +$ make rgbkb/sol:default:dfu ``` diff --git a/keyboards/zygomorph/keymaps/kageurufu/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk index 61c7a07d6e..61c7a07d6e 100644 --- a/keyboards/zygomorph/keymaps/kageurufu/rules.mk +++ b/keyboards/rgbkb/zygomorph/keymaps/kageurufu/rules.mk diff --git a/keyboards/zygomorph/keymaps/xulkal/config.h b/keyboards/rgbkb/zygomorph/keymaps/xulkal/config.h index 452cdda823..452cdda823 100644 --- a/keyboards/zygomorph/keymaps/xulkal/config.h +++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/config.h diff --git a/keyboards/zygomorph/keymaps/xulkal/keymap.c b/keyboards/rgbkb/zygomorph/keymaps/xulkal/keymap.c index f886cb4543..f886cb4543 100644 --- a/keyboards/zygomorph/keymaps/xulkal/keymap.c +++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/keymap.c diff --git a/keyboards/zygomorph/keymaps/xulkal/rules.mk b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk index dc687cbbd3..dc687cbbd3 100644 --- a/keyboards/zygomorph/keymaps/xulkal/rules.mk +++ b/keyboards/rgbkb/zygomorph/keymaps/xulkal/rules.mk diff --git a/keyboards/zygomorph/readme.md b/keyboards/rgbkb/zygomorph/readme.md index c669fba65e..72ca737d35 100644 --- a/keyboards/zygomorph/readme.md +++ b/keyboards/rgbkb/zygomorph/readme.md @@ -10,6 +10,6 @@ Hardware Availability: [RGBKB](https://www.rgbkb.net) Make example for this keyboard (after setting up your build environment): - make zygomorph:default + make rgbkb/zygomorph: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/zygomorph/rev1/config.h b/keyboards/rgbkb/zygomorph/rev1/config.h index 107e58c123..107e58c123 100644 --- a/keyboards/zygomorph/rev1/config.h +++ b/keyboards/rgbkb/zygomorph/rev1/config.h diff --git a/keyboards/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index b79c028ec7..b79c028ec7 100644 --- a/keyboards/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json diff --git a/keyboards/zygomorph/rev1/rev1.c b/keyboards/rgbkb/zygomorph/rev1/rev1.c index 3edf48c5d5..3edf48c5d5 100644 --- a/keyboards/zygomorph/rev1/rev1.c +++ b/keyboards/rgbkb/zygomorph/rev1/rev1.c diff --git a/keyboards/zygomorph/rev1/rev1.h b/keyboards/rgbkb/zygomorph/rev1/rev1.h index c667088d05..c667088d05 100644 --- a/keyboards/zygomorph/rev1/rev1.h +++ b/keyboards/rgbkb/zygomorph/rev1/rev1.h diff --git a/keyboards/zygomorph/rev1/rules.mk b/keyboards/rgbkb/zygomorph/rev1/rules.mk index e69de29bb2..e69de29bb2 100644 --- a/keyboards/zygomorph/rev1/rules.mk +++ b/keyboards/rgbkb/zygomorph/rev1/rules.mk diff --git a/keyboards/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk index 0d6b01bbe9..9bafc7b1d6 100644 --- a/keyboards/zygomorph/rules.mk +++ b/keyboards/rgbkb/zygomorph/rules.mk @@ -66,4 +66,4 @@ HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400) SPLIT_KEYBOARD = yes LAYOUTS = ortho_4x12 ortho_5x12 -DEFAULT_FOLDER = zygomorph/rev1 +DEFAULT_FOLDER = rgbkb/zygomorph/rev1 diff --git a/keyboards/zygomorph/zygomorph.c b/keyboards/rgbkb/zygomorph/zygomorph.c index 9f029813bc..9f029813bc 100644 --- a/keyboards/zygomorph/zygomorph.c +++ b/keyboards/rgbkb/zygomorph/zygomorph.c diff --git a/keyboards/zygomorph/zygomorph.h b/keyboards/rgbkb/zygomorph/zygomorph.h index 24198ed4c9..24198ed4c9 100644 --- a/keyboards/zygomorph/zygomorph.h +++ b/keyboards/rgbkb/zygomorph/zygomorph.h |