diff options
| author | Drashna Jaelre <drashna@live.com> | 2019-02-13 21:11:56 -0800 |
|---|---|---|
| committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-02-13 21:11:56 -0800 |
| commit | 54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc (patch) | |
| tree | 4f8b9b3434f54743031eab2c3fd0b7300739707c /keyboards/keebio/viterbi/keymaps/drashna | |
| parent | 9841c64de98a0d993e791137d5db482ee96e06ae (diff) | |
| download | firmware-54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc.tar.gz firmware-54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc.tar.bz2 firmware-54f18ce0f71efbcb1306cbfe620ed2ad42ee31bc.zip | |
[Keymap] Update to Drashna keymaps and Userspace (#5122)
* Proper rules include
* Minor tweaks
* Minor tweaks
* Add Desitny 2 Swapped layout support
* Add keycode to keylogger
* Convert my viterbi keymaps
* Fix Orthodox keyboard
* Add more default layers
* Make default layer keycodes more optimized
* Update gitlab CI yaml file
* Rev6 Cleanup
* Fix KC_MAKE macro
* Update GitLab CI yaml file
* More GitLab CI changes
* One final GitLab CI change
* Optimize KC_MAKE
* Reformatting of config
* Feature creeeeeeep
* Planck Rev6 updates
Diffstat (limited to 'keyboards/keebio/viterbi/keymaps/drashna')
| -rw-r--r-- | keyboards/keebio/viterbi/keymaps/drashna/config.h | 21 | ||||
| -rw-r--r-- | keyboards/keebio/viterbi/keymaps/drashna/keymap.c | 2 | ||||
| -rw-r--r-- | keyboards/keebio/viterbi/keymaps/drashna/rules.mk | 2 |
3 files changed, 13 insertions, 12 deletions
diff --git a/keyboards/keebio/viterbi/keymaps/drashna/config.h b/keyboards/keebio/viterbi/keymaps/drashna/config.h index 6eb871a50..c0a50cc04 100644 --- a/keyboards/keebio/viterbi/keymaps/drashna/config.h +++ b/keyboards/keebio/viterbi/keymaps/drashna/config.h @@ -17,6 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once +#undef MATRIX_ROWS +#define MATRIX_ROWS 5 + #ifdef RGBLIGHT_ENABLE #undef RGBLED_NUM #define RGBLED_NUM 16 @@ -44,15 +47,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #undef PRODUCT #define PRODUCT Drashnas Viterbi Macro Pad -#define USE_I2C - #ifdef AUDIO_ENABLE #define C6_AUDIO #define NO_MUSIC_MODE #endif -#define STRICT_LAYER_RELEASE - #define LAYOUT_ortho_5x7( \ L00, L01, L02, L03, L04, L05, L06, \ L10, L11, L12, L13, L14, L15, L16, \ @@ -60,13 +59,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. L30, L31, L32, L33, L34, L35, L36, \ L40, L41, L42, L43, L44, L45, L46 \ ) \ - LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ - L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ - L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ - L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ - L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO \ - ) + { \ + { L00, L01, L02, L03, L04, L05, L06 }, \ + { L10, L11, L12, L13, L14, L15, L16 }, \ + { L20, L21, L22, L23, L24, L25, L26 }, \ + { L30, L31, L32, L33, L34, L35, L36 }, \ + { L40, L41, L42, L43, L44, L45, L46 }, \ + } #define QMK_ESC_OUTPUT F5 // usually COL #define QMK_ESC_INPUT D4 // usually ROW diff --git a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c index 12f7fe25e..1afc59fb9 100644 --- a/keyboards/keebio/viterbi/keymaps/drashna/keymap.c +++ b/keyboards/keebio/viterbi/keymaps/drashna/keymap.c @@ -8,6 +8,8 @@ extern keymap_config_t keymap_config; // Layer names don't all need to be of the same length, obviously, and you can also skip them // entirely and just use numbers. + +// Fillers to make layering more clear #define LMACRO OSL(_MACROS) #define DIABLO TG(_DIABLO) #define GAMEPAD TG(_GAMEPAD) diff --git a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk index ec3befc0b..f28ecc533 100644 --- a/keyboards/keebio/viterbi/keymaps/drashna/rules.mk +++ b/keyboards/keebio/viterbi/keymaps/drashna/rules.mk @@ -7,12 +7,12 @@ TAP_DANCE_ENABLE = no RGBLIGHT_ENABLE = yes AUDIO_ENABLE = yes NKRO_ENABLE = yes +SPLIT_KEYBOARD = no NO_SECRETS = yes MACROS_ENABLED = yes INDICATOR_LIGHTS = no RGBLIGHT_TWINKLE = no - LAYOUTS = ortho_5x7 # SRC := $(filter-out serial.c matrix.c i2c.c split_util.c,$(SRC)) |