From 17200f47123b839ee0a5e4f2dfd33a00dff09e90 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 1 Jan 2018 14:21:01 -0800 Subject: Clean up and tweaks of drashna keymaps and userspace (#2200) * Minor tweaks modified: users/drashna/drashna.c * Fix Workman ASCII art * Add OSM for shifts * Make Viterbi's 00 code consistant * Minor Cleanup off Userspace * Change Tapping Term on Ergodox * Re-add EEPROM code * Minor updates and tweaks * Use QMK_H variables to make keymaps more universal * Forgot 'break;' for covecube layer * Tweak Viterbi files now that I have hands on * Add secrets to Ergodox * RGB tweaks to Viterbi * Viterbi RGB layout tweeks * Minor tweaks * Add One Shot Mod tap toggle * Add Faux Clicky to Viterbi, and disable controller's LEDs * Minor tweaks * Move D3 keycode defines into userspace * Updated Userspace Readme --- keyboards/orthodox/keymaps/drashna/config.h | 13 +++++++++---- keyboards/orthodox/keymaps/drashna/keymap.c | 8 ++++---- keyboards/orthodox/keymaps/drashna/rules.mk | 6 +----- keyboards/orthodox/rev3/rules.mk | 3 --- 4 files changed, 14 insertions(+), 16 deletions(-) (limited to 'keyboards/orthodox') diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h index 4dee43905b..f39c34e76d 100644 --- a/keyboards/orthodox/keymaps/drashna/config.h +++ b/keyboards/orthodox/keymaps/drashna/config.h @@ -22,7 +22,7 @@ along with this program. If not, see . #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "config_common.h" +#include QMK_KEYBOARD_CONFIG_H /* Use I2C or Serial, not both */ @@ -35,9 +35,14 @@ along with this program. If not, see . // #define MASTER_RIGHT #define EE_HANDS -#ifndef TAPPING_TERM -#define TAPPING_TERM 200 +#ifdef TAPPING_TERM +#undef TAPPING_TERM #endif +#define TAPPING_TERM 150 +#undef PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) +#define ONESHOT_TAP_TOGGLE 2 + /* key combination for command */ @@ -63,7 +68,7 @@ along with this program. If not, see . #ifdef AUDIO_ENABLE #define C6_AUDIO -#define STARTUP_SONG SONG(ZELDA_PUZZLE) +#define STARTUP_SONG SONG(ZELDA_TREASURE) #endif #endif diff --git a/keyboards/orthodox/keymaps/drashna/keymap.c b/keyboards/orthodox/keymaps/drashna/keymap.c index f5a18033ec..af235f55d5 100644 --- a/keyboards/orthodox/keymaps/drashna/keymap.c +++ b/keyboards/orthodox/keymaps/drashna/keymap.c @@ -50,24 +50,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = KEYMAP(\ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ - KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \ + OSM(MOD_LSFT),CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \ ), [_COLEMAK] = KEYMAP(\ KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ KC_TAB, KC_A, KC_R, KC_S, KC_T, KC_D, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ - KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_K, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \ + OSM(MOD_LSFT), CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_K, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLASH), KC_LGUI \ ), [_DVORAK] = KEYMAP(\ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ + OSM(MOD_LSFT), CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ ), [_WORKMAN] = KEYMAP(\ KC_ESC, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ KC_TAB, KC_A, KC_O, KC_E, KC_U, KC_I, KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, \ - KC_LSFT, CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ + OSM(MOD_LSFT), CTL_T(KC_SCLN), KC_Q, KC_J, KC_K, KC_X, LOWER, KC_SPACE, KC_BSPC, KC_DEL, KC_ENT, RAISE, KC_B, KC_M, KC_W, KC_V, CTL_T(KC_Z), KC_LGUI \ ), [_LOWER] = KEYMAP(\ diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk index 293faf13e5..53a44424b4 100644 --- a/keyboards/orthodox/keymaps/drashna/rules.mk +++ b/keyboards/orthodox/keymaps/drashna/rules.mk @@ -4,8 +4,4 @@ RGBLIGHT_ENABLE = yes AUDIO_ENABLE = no MOUSEKEY_ENABLE = no NKRO_ENABLE = yes -FAUXCLICKY_ENABLE = yes - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif +FAUXCLICKY_ENABLE = no diff --git a/keyboards/orthodox/rev3/rules.mk b/keyboards/orthodox/rev3/rules.mk index a0825b4ef6..549b6a2532 100644 --- a/keyboards/orthodox/rev3/rules.mk +++ b/keyboards/orthodox/rev3/rules.mk @@ -1,5 +1,2 @@ BACKLIGHT_ENABLE = no -ifndef QUANTUM_DIR - include ../../../Makefile -endif \ No newline at end of file -- cgit v1.2.1