[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
This commit is contained in:
Drashna Jaelre
MechMerlin
parent
9841c64de9
commit
54f18ce0f7
22 changed files with 383 additions and 248 deletions
|
|
@ -2,43 +2,50 @@
|
|||
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
#define AUDIO_CLICKY
|
||||
#define STARTUP_SONG SONG(RICK_ROLL)
|
||||
#define GOODBYE_SONG SONG(SONIC_RING)
|
||||
#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
|
||||
SONG(COLEMAK_SOUND), \
|
||||
SONG(DVORAK_SOUND), \
|
||||
SONG(OVERWATCH_THEME) \
|
||||
}
|
||||
#define AUDIO_CLICKY
|
||||
#define STARTUP_SONG SONG(RICK_ROLL)
|
||||
#define GOODBYE_SONG SONG(SONIC_RING)
|
||||
#define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
|
||||
SONG(COLEMAK_SOUND), \
|
||||
SONG(DVORAK_SOUND), \
|
||||
SONG(OVERWATCH_THEME) \
|
||||
}
|
||||
|
||||
#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
|
||||
// #ifdef RGBLIGHT_ENABLE
|
||||
// #define NO_MUSIC_MODE
|
||||
// #endif //RGBLIGHT_ENABLE/
|
||||
#ifndef __arm__
|
||||
#undef NOTE_REST
|
||||
#define NOTE_REST 1.00f
|
||||
#endif // !__arm__
|
||||
|
||||
#define UNICODE_SONG_OSX SONG(RICK_ROLL)
|
||||
#define UNICODE_SONG_LNX SONG(RICK_ROLL)
|
||||
#define UNICODE_SONG_WIN SONG(RICK_ROLL)
|
||||
#define UNICODE_SONG_BSD SONG(RICK_ROLL)
|
||||
#define UNICODE_SONG_WINC SONG(RICK_ROLL)
|
||||
|
||||
#define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
|
||||
// #ifdef RGBLIGHT_ENABLE
|
||||
// #define NO_MUSIC_MODE
|
||||
// #endif //RGBLIGHT_ENABLE/
|
||||
#ifndef __arm__
|
||||
#undef NOTE_REST
|
||||
#define NOTE_REST 1.00f
|
||||
#endif // !__arm__
|
||||
#endif // !AUDIO_ENABLE
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGBLIGHT_SLEEP
|
||||
#undef RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
#define RGBLIGHT_EFFECT_SNAKE
|
||||
#define RGBLIGHT_EFFECT_KNIGHT
|
||||
#define RGBLIGHT_SLEEP
|
||||
#undef RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
#define RGBLIGHT_EFFECT_SNAKE
|
||||
#define RGBLIGHT_EFFECT_KNIGHT
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
|
||||
#ifndef ONESHOT_TAP_TOGGLE
|
||||
#define ONESHOT_TAP_TOGGLE 2
|
||||
#define ONESHOT_TAP_TOGGLE 2
|
||||
#endif // !ONESHOT_TAP_TOGGLE
|
||||
|
||||
#ifndef ONESHOT_TIMEOUT
|
||||
#define ONESHOT_TIMEOUT 3000
|
||||
#define ONESHOT_TIMEOUT 3000
|
||||
#endif// !ONESHOT_TIMEOUT
|
||||
|
||||
#ifndef QMK_KEYS_PER_SCAN
|
||||
#define QMK_KEYS_PER_SCAN 4
|
||||
#define QMK_KEYS_PER_SCAN 4
|
||||
#endif // !QMK_KEYS_PER_SCAN
|
||||
|
||||
|
||||
|
|
@ -48,18 +55,18 @@
|
|||
// and when this option isn't enabled, z rapidly followed by x
|
||||
// actually sends Ctrl-x. That's bad.)
|
||||
#define IGNORE_MOD_TAP_INTERRUPT
|
||||
#undef PERMISSIVE_HOLD
|
||||
// #define PERMISSIVE_HOLD
|
||||
//#define TAPPING_FORCE_HOLD
|
||||
//#define RETRO_TAPPING
|
||||
|
||||
#define FORCE_NKRO
|
||||
|
||||
#ifndef TAPPING_TOGGLE
|
||||
#define TAPPING_TOGGLE 1
|
||||
#define TAPPING_TOGGLE 1
|
||||
#endif
|
||||
|
||||
#ifdef TAPPING_TERM
|
||||
#undef TAPPING_TERM
|
||||
#undef TAPPING_TERM
|
||||
#endif // TAPPING_TERM
|
||||
#if defined(KEYBOARD_ergodox_ez)
|
||||
#define TAPPING_TERM 185
|
||||
|
|
|
|||
|
|
@ -36,7 +36,11 @@ enum userspace_layers {
|
|||
_COLEMAK,
|
||||
_DVORAK,
|
||||
_WORKMAN,
|
||||
_MODS,
|
||||
_NORMAN,
|
||||
_MALTRON,
|
||||
_EUCALYN,
|
||||
_CARPLAX,
|
||||
_MODS, /* layer 8 */
|
||||
_GAMEPAD,
|
||||
_DIABLO,
|
||||
_MACROS,
|
||||
|
|
@ -76,6 +80,7 @@ typedef union {
|
|||
bool is_overwatch :1;
|
||||
bool nuke_switch :1;
|
||||
uint8_t unicode_mod :4;
|
||||
bool swapped_numbers :1;
|
||||
};
|
||||
} userspace_config_t;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,34 +20,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
// If console is enabled, it will print the matrix position and status of each key pressed
|
||||
#ifdef KEYLOGGER_ENABLE
|
||||
#if defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_iris_rev2)
|
||||
xprintf("KL: col: %u, row: %u, pressed: %u\n", record->event.key.row, record->event.key.col, record->event.pressed);
|
||||
xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.row, record->event.key.col, record->event.pressed);
|
||||
#else
|
||||
xprintf("KL: col: %u, row: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
|
||||
xprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
|
||||
#endif
|
||||
#endif //KEYLOGGER_ENABLE
|
||||
|
||||
switch (keycode) {
|
||||
case KC_QWERTY:
|
||||
case KC_QWERTY ... KC_CARPLAX:
|
||||
if (record->event.pressed) {
|
||||
set_single_persistent_default_layer(_QWERTY);
|
||||
set_single_persistent_default_layer(keycode - KC_QWERTY);
|
||||
}
|
||||
break;
|
||||
case KC_COLEMAK:
|
||||
if (record->event.pressed) {
|
||||
set_single_persistent_default_layer(_COLEMAK);
|
||||
}
|
||||
break;
|
||||
case KC_DVORAK:
|
||||
if (record->event.pressed) {
|
||||
set_single_persistent_default_layer(_DVORAK);
|
||||
}
|
||||
break;
|
||||
case KC_WORKMAN:
|
||||
if (record->event.pressed) {
|
||||
set_single_persistent_default_layer(_WORKMAN);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader
|
||||
if (!record->event.pressed) {
|
||||
|
|
|
|||
|
|
@ -13,6 +13,10 @@ enum userspace_custom_keycodes {
|
|||
KC_COLEMAK, // Sets default layer to COLEMAK
|
||||
KC_DVORAK, // Sets default layer to DVORAK
|
||||
KC_WORKMAN, // Sets default layer to WORKMAN
|
||||
KC_NORMAN, // Sets default layer to NORMAN
|
||||
KC_MALTRON, // Sets default layer to MALTRON
|
||||
KC_EUCALYN, // Sets default layer to EUCALYN
|
||||
KC_CARPLAX, // Sets default layer to CARPLAX
|
||||
KC_DIABLO_CLEAR, // Clears all Diablo Timers
|
||||
KC_OVERWATCH, // Toggles game macro input mode (so in OW, it defaults to game chat)
|
||||
KC_SALT, // See drashna.c for details
|
||||
|
|
|
|||
|
|
@ -315,6 +315,14 @@ uint32_t layer_state_set_rgb(uint32_t state) {
|
|||
rgblight_sethsv_noeeprom_springgreen(); break;
|
||||
case _WORKMAN:
|
||||
rgblight_sethsv_noeeprom_goldenrod(); break;
|
||||
case _NORMAN:
|
||||
rgblight_sethsv_noeeprom_coral(); break;
|
||||
case _MALTRON:
|
||||
rgblight_sethsv_noeeprom_yellow(); break;
|
||||
case _EUCALYN:
|
||||
rgblight_sethsv_noeeprom_pink(); break;
|
||||
case _CARPLAX:
|
||||
rgblight_sethsv_noeeprom_blue(); break;
|
||||
default:
|
||||
rgblight_sethsv_noeeprom_cyan(); break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,11 +91,11 @@ NOTE: These are all the same length. If you do a search/replace
|
|||
|
||||
#define _________________MALTRON_L1________________ KC_Q, KC_P, KC_Y, KC_C, KC_B
|
||||
#define _________________MALTRON_L2________________ KC_A, KC_N, KC_I, KC_S, KC_F
|
||||
#define _________________MALTRON_L3________________ KC_SCLN, KC_SLSH, KC_J KC_G, KC_COMM
|
||||
#define _________________MALTRON_L3________________ KC_SCLN, KC_SLSH, KC_J, KC_G, KC_COMM
|
||||
|
||||
#define _________________MALTRON_R1________________ KC_V, KC_M, KC_U, KC_Z, KC_L
|
||||
#define _________________MALTRON_R2________________ KC_D, KC_T, KC_D, KC_O, KC_R
|
||||
#define _________________MALTRON_R3________________ KC_DOT, KC_W, KC_K, KC_MINS, KC_X
|
||||
#define _________________MALTRON_R3________________ KC_DOT, KC_W, KC_K, KC_MINS, KC_X
|
||||
|
||||
|
||||
#define _________________EUCALYN_L1________________ KC_SLSH, KC_COMM, KC_DOT, KC_F, KC_Q
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue