From 87cbb1c552934de5573334ff56544137a37fcb2e Mon Sep 17 00:00:00 2001 From: Fredric Silberberg Date: Wed, 30 Jan 2019 22:27:46 -0800 Subject: [PATCH] Generalized nyquist layout for 5x12 boards. Removed duplicate readme.md that was cased the same and caused issues. --- keyboards/sirius/unigo66/readme.md | 17 ------------- .../community/ortho_5x12}/333fred/README.md | 8 +++--- .../community/ortho_5x12}/333fred/config.h | 1 - .../community/ortho_5x12}/333fred/keymap.c | 25 ++++++++----------- .../community/ortho_5x12}/333fred/rules.mk | 0 5 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 keyboards/sirius/unigo66/readme.md rename {keyboards/nyquist/keymaps => layouts/community/ortho_5x12}/333fred/README.md (92%) rename {keyboards/nyquist/keymaps => layouts/community/ortho_5x12}/333fred/config.h (83%) rename {keyboards/nyquist/keymaps => layouts/community/ortho_5x12}/333fred/keymap.c (88%) rename {keyboards/nyquist/keymaps => layouts/community/ortho_5x12}/333fred/rules.mk (100%) diff --git a/keyboards/sirius/unigo66/readme.md b/keyboards/sirius/unigo66/readme.md deleted file mode 100644 index 78a02ed09e..0000000000 --- a/keyboards/sirius/unigo66/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# UniGo66 - -![UniGo66](https://i.imgur.com/ZKlcncg.png) - -The UniGo66 is an ergonomic wireless keyboard designed by Sirius and manufactured by ALF Studios. - -Join ALF Studios on [Discord](https://discord.gg/GJ8bdM) - -Make example: - - make sirius/unigo66: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). - -To get the U2U into DFU flashing mode, insert the U2U into the computer and press the button in the red circle shown below - -![U2U](https://i.imgur.com/WKwgDjZ.png) \ No newline at end of file diff --git a/keyboards/nyquist/keymaps/333fred/README.md b/layouts/community/ortho_5x12/333fred/README.md similarity index 92% rename from keyboards/nyquist/keymaps/333fred/README.md rename to layouts/community/ortho_5x12/333fred/README.md index fa354bb4d3..f619effc61 100644 --- a/keyboards/nyquist/keymaps/333fred/README.md +++ b/layouts/community/ortho_5x12/333fred/README.md @@ -1,6 +1,6 @@ -# 333fred's Nyquist Layout +# 333fred's 5x12 Layout -This nyquist layout is based on my Ergodox Infinity Layout, which is [here](../../../../layouts/community/ergodox/333fred/README.md). It doesn't have all of my VS extensions, as I have my nyquist at home, not at work. +This 5x12 layout is based on my Ergodox Infinity Layout, which is [here](../../ergodox/333fred/README.md). It doesn't have all of my VS extensions. ## Layers @@ -18,7 +18,7 @@ Qwerty |------+------+------+------+------+------|------+------+------+------+------+------| | Shift| Z | X | C | V | B | N | M | , | . |/ Ctrl| Shift| |------+------+------+------+------+------+------+------+------+------+------+------| -| Ctrl | Alt | F4 | GUI |LwrVIM| Bksp | Spc | Ent | Lock | = | RAlt | Del | +| Ctrl | Alt | F4 | GUI | Bksp |LwrVIM| Spc | Ent | Lock | = | RAlt | Del | `-----------------------------------------------------------------------------------' ``` @@ -66,7 +66,7 @@ Gaming mode (Raise) |------+------+------+------+------+------+------+------+------+------+------+------| | | | | | | | | | | | | | |------+------+------+------+------+------+------+------+------+------+------+------| -| CTRL | | | | F | | | | | | | | +| CTRL | | | | | | | | | | | | |------+------+------+------+------+------+------+------+------+------+------+------| | Shift| Z | | | | | | | | | | GUI | |------+------+------+------+------+------+------+------+------+------+------+------| diff --git a/keyboards/nyquist/keymaps/333fred/config.h b/layouts/community/ortho_5x12/333fred/config.h similarity index 83% rename from keyboards/nyquist/keymaps/333fred/config.h rename to layouts/community/ortho_5x12/333fred/config.h index 575ec9ac52..7835fa1f07 100644 --- a/keyboards/nyquist/keymaps/333fred/config.h +++ b/layouts/community/ortho_5x12/333fred/config.h @@ -1,6 +1,5 @@ #pragma once -#include "../../config.h" #include "333fred_config.h" #define USE_SERIAL diff --git a/keyboards/nyquist/keymaps/333fred/keymap.c b/layouts/community/ortho_5x12/333fred/keymap.c similarity index 88% rename from keyboards/nyquist/keymaps/333fred/keymap.c rename to layouts/community/ortho_5x12/333fred/keymap.c index c25bf1c5ff..cc699dfc54 100644 --- a/keyboards/nyquist/keymaps/333fred/keymap.c +++ b/layouts/community/ortho_5x12/333fred/keymap.c @@ -9,11 +9,6 @@ enum custom_macros { PSCREEN_APP }; -// Tap dance for layer transitions -// Fillers to make layering more clear -#define _______ KC_TRNS -#define XXXXXXX KC_NO - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Qwerty @@ -26,15 +21,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | Shift| Z | X | C | V | B | N | M | , | . |/ Ctrl| Shift| * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | F4 | GUI |Lwr/VM| Bksp | Spc | Ent | Lock | = | Alt | Del | + * | Ctrl | Alt | F4 | GUI | Bksp |Lwr/VM| Spc | Ent | Lock | = | Alt | Del | * `-----------------------------------------------------------------------------------' */ -[BASE] = LAYOUT( \ - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ - KC_LCTL, KC_LALT, KC_F4, KC_LGUI, TD(TD_SYM_VIM), KC_BSPC, KC_SPC, KC_ENT, KC_LOCK, KC_EQL, KC_RALT, KC_DEL \ +[BASE] = LAYOUT_ortho_5x12( \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, \ + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLASH, \ + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ + OSM(MOD_LSFT), LCTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RCTL_T(KC_SLSH), OSM(MOD_RSFT), \ + KC_LCTL, KC_LALT, KC_F4, KC_LGUI, KC_BSPC, TD(TD_SYM_VIM), KC_SPC, KC_ENT, KC_LOCK, KC_EQL, KC_RALT, KC_DEL \ ), /* Symbols @@ -50,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Pscr | | | | | GAME | 0 | . | = | Prev | Next | Play | * `-----------------------------------------------------------------------------------' */ -[SYMB] = LAYOUT( \ +[SYMB] = LAYOUT_ortho_5x12( \ KC_CAPS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, \ _______, KC_EXLM, KC_AT, KC_LPRN, KC_RPRN, KC_PIPE, KC_7, KC_8, KC_9, KC_ASTR, KC_RPRN, KC_F12, \ _______, KC_HASH, KC_DLR, KC_LCBR, KC_RCBR, KC_GRV, KC_4, KC_5, KC_6, KC_PLUS, KC_RCBR, KC_PIPE, \ @@ -71,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | | | | | | | | | | | | | * `-----------------------------------------------------------------------------------' */ -[VIM] = LAYOUT( \ +[VIM] = LAYOUT_ortho_5x12( \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, KC_LSFT, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, M(DLEFT), M(DRIGHT), KC_LCTL, KC_LGUI, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, \ @@ -93,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Enter| | Lock | Bksp | Alt | Spc | Lower| Left | Up | Down | Right|QWERTY| * `-----------------------------------------------------------------------------------' */ -[GAME] = LAYOUT( \ +[GAME] = LAYOUT_ortho_5x12( \ KC_ESC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_LCTL, _______, _______, _______, KC_F, _______, _______, _______, _______, _______, _______, _______, \ diff --git a/keyboards/nyquist/keymaps/333fred/rules.mk b/layouts/community/ortho_5x12/333fred/rules.mk similarity index 100% rename from keyboards/nyquist/keymaps/333fred/rules.mk rename to layouts/community/ortho_5x12/333fred/rules.mk