Migrated most code from keymaps to userspace (#1980)
* Add woodpad * Cleanup * Remove misc layouts for woodpad * Move woodpad to handwired * Updated RGB Underglow info * Cleanup macros * Tweaked RGB lighting stuff * Start to merge orthodox/ergodox keymaps (persistant layers) * Add woodpad * Add forced NKRO * Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow * Updated macros and added workman keymaps * Fixed RGB lighting for Workman layout * Add leader keys * Remove force NKRO * Add Viterbi one handed layout and minor tweaks to others * Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts * Made "make" keystroke universal * Clean up and updates of drashna keymaps * Add workman layer to planck * Update to keymaps * Fix makefile toggle code in ez keymap Finish adding RGB code to orthodox * Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function * Remove unnecessary planck layout * Fixed Workman song * update make command and added lit reset * Fixed formatting to fall in line with official standards * Minor tweaks * Removed Leader Keys from Ergodox EZ Keymap Added KC_RESET that resets board and sets underglow to red * Tweak reset code * Cleanup * Remove misc layouts for woodpad * Move woodpad to handwired * Updated RGB Underglow info * Cleanup macros * Tweaked RGB lighting stuff * Start to merge orthodox/ergodox keymaps (persistant layers) * Add forced NKRO * Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow * Updated macros and added workman keymaps * Fixed RGB lighting for Workman layout * Add leader keys * Remove force NKRO * Add Viterbi one handed layout and minor tweaks to others * Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts * Made "make" keystroke universal * Clean up and updates of drashna keymaps * Add workman layer to planck * Update to keymaps * Fix makefile toggle code in ez keymap Finish adding RGB code to orthodox * Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function * Remove unnecessary planck layout * Fixed Workman song * update make command and added lit reset * Fixed formatting to fall in line with official standards * Minor tweaks * Removed Leader Keys from Ergodox EZ Keymap Added KC_RESET that resets board and sets underglow to red * Tweak reset code * Fix rebasing issues * remove head files * Fix "macro" issue * Rename ez keymaps for userspace * Revert "Rename ez keymaps for userspace" This reverts commit c25425911852e41711a5f0273b5741adb16e5bd4. * Renamed Ergodox EZ layouts so that all of my personal layouts are on the same name, in prep for using userspaces * Fix ergodox code * Remove "drashna-ez" keymap as it's no longer needed * Migrate majority of code to Userspace
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#include "viterbi.h"
|
||||
#include "action_layer.h"
|
||||
#include "eeconfig.h"
|
||||
#include "drashna.h"
|
||||
|
||||
extern keymap_config_t keymap_config;
|
||||
|
||||
@@ -8,56 +9,21 @@ 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 _NUMNAV 0
|
||||
#define _DIABLO 1
|
||||
#define _GAMEPAD 2
|
||||
#define _GMACRO 3
|
||||
#define _MEDIA 4
|
||||
#define _COVECUBE 5
|
||||
|
||||
|
||||
enum custom_keycodes {
|
||||
KC_DIABLO_CLEAR = SAFE_RANGE,
|
||||
KC_P00,
|
||||
KC_MAKE,
|
||||
KC_RESET,
|
||||
KC_OVERWATCH,
|
||||
KC_SALT,
|
||||
KC_MORESALT,
|
||||
KC_SALTHARD,
|
||||
KC_GOODGAME,
|
||||
KC_SYMM,
|
||||
KC_DOOMFIST,
|
||||
KC_JUSTGAME,
|
||||
KC_GLHF,
|
||||
KC_TORB,
|
||||
KC_AIM
|
||||
};
|
||||
|
||||
// Fillers to make layering more clear
|
||||
#define _______ KC_TRNS
|
||||
#define XXXXXXX KC_NO
|
||||
#define GMACRO TG(_GMACRO)
|
||||
|
||||
#define LMACRO TG(_MACROS)
|
||||
#define DIABLO TG(_DIABLO)
|
||||
#define GAMEPAD TG(_GAMEPAD)
|
||||
#define GAMEPAD TG(_OVERWATCH)
|
||||
#define MEDIA TG(_MEDIA)
|
||||
#define COVECUBE TG(_COVECUBE)
|
||||
|
||||
|
||||
bool is_overwatch = false;
|
||||
|
||||
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define rgblight_set_blue rgblight_sethsv (0xFF, 0xFF, 0xFF);
|
||||
#define rgblight_set_red rgblight_sethsv (0x00, 0xFF, 0xFF);
|
||||
#define rgblight_set_green rgblight_sethsv (0x78, 0xFF, 0xFF);
|
||||
#define rgblight_set_orange rgblight_sethsv (0x1E, 0xFF, 0xFF);
|
||||
#define rgblight_set_teal rgblight_sethsv (0xC3, 0xFF, 0xFF);
|
||||
#define rgblight_set_magenta rgblight_sethsv (0x12C, 0xFF, 0xFF);
|
||||
#define rgblight_set_yellow rgblight_sethsv (0x3C, 0xFF, 0xFF);
|
||||
#define rgblight_set_purple rgblight_sethsv (0x10E, 0xFF, 0xFF);
|
||||
#endif
|
||||
|
||||
#ifdef TAP_DANCE_ENABLE
|
||||
//define diablo macro timer variables
|
||||
static uint16_t diablo_timer[4];
|
||||
@@ -125,8 +91,8 @@ qk_tap_dance_action_t tap_dance_actions[] = {
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
[_NUMNAV] = KEYMAP(
|
||||
GMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
[_NUMLOCK] = KEYMAP(
|
||||
LMACRO, DIABLO, GAMEPAD, KC_NLCK, KC_SLCK, KC_COLN, KC_PSLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
MEDIA, KC_CALC, COVECUBE,KC_P7, KC_P8, KC_P9, KC_PAST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_HOME, KC_DEL, KC_PGUP, KC_P4, KC_P5, KC_P6, KC_PMNS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_END, KC_UP, KC_PGDN, KC_P1, KC_P2, KC_P3, KC_PPLS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
@@ -137,20 +103,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
KC_ESC, DIABLO, KC_V, KC_D, XXXXXXX, XXXXXXX, KC_L, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_TAB, KC_S, KC_F, KC_I, KC_M, KC_T, KC_J, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_Q, KC_1, KC_2, KC_3, KC_4, KC_G, KC_F, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_LCTL, (TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_DIABLO_CLEAR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z, KC_DIABLO_CLEAR, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_LALT, KC_F4, KC_F5, KC_F8, KC_F9, KC_F10, SFT_T(KC_SPACE), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
|
||||
),
|
||||
|
||||
[_GAMEPAD] = KEYMAP( // Game pad layout designed primarily for Overwatch
|
||||
GMACRO, KC_ESC, GAMEPAD, KC_1, KC_2, KC_3, KC_4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
[_OVERWATCH] = KEYMAP( // Game pad layout designed primarily for Overwatch
|
||||
LMACRO, KC_ESC, GAMEPAD, KC_1, KC_2, KC_3, KC_4, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
MEDIA, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_Z, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_Y, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_F1, KC_U, KC_I, KC_Y, KC_V, KC_SPC, KC_V, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
|
||||
),
|
||||
|
||||
[_GMACRO] = KEYMAP(
|
||||
GMACRO, XXXXXXX, GAMEPAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
[_MACROS] = KEYMAP(
|
||||
LMACRO, XXXXXXX, GAMEPAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_SYMM, KC_TORB, KC_DOOMFIST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
KC_GLHF, KC_GOODGAME, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
@@ -178,18 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
|
||||
|
||||
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
uint16_t kc;
|
||||
if (is_overwatch) {
|
||||
kc = KC_BSPC;
|
||||
}
|
||||
else {
|
||||
kc = KC_ENTER;
|
||||
}
|
||||
// Once a delay command is added to "SEND_STRING",
|
||||
// replace these with X_BSPC and X_ENTER instead.
|
||||
// and add "SS_TAP(kc) SS_DELAY(50)" to all of the
|
||||
// SEND_STRING commands, to compress things.
|
||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
switch (keycode) {
|
||||
#ifdef TAP_DANCE_ENABLE
|
||||
case KC_DIABLO_CLEAR: // reset all Diable timers, disabling them
|
||||
@@ -203,130 +158,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
return false;
|
||||
break;
|
||||
#endif
|
||||
case KC_P00:
|
||||
if (!record->event.pressed) {
|
||||
register_code(KC_P0);
|
||||
unregister_code(KC_P0);
|
||||
register_code(KC_P0);
|
||||
unregister_code(KC_P0);
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_MAKE:
|
||||
if (!record->event.pressed) {
|
||||
SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_RESET:
|
||||
if (!record->event.pressed) {
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
rgblight_enable();
|
||||
rgblight_mode(1);
|
||||
rgblight_setrgb(0xff, 0x00, 0x00);
|
||||
#endif
|
||||
reset_keyboard();
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
|
||||
case KC_OVERWATCH: // reset all Diable timers, disabling them
|
||||
if (record->event.pressed) {
|
||||
is_overwatch = !is_overwatch;
|
||||
}
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case KC_SALT:
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Salt, salt, salt..." SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_MORESALT:
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Please sir, can I have some more salt?!" SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_SALTHARD:
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Your salt only makes my penis that much harder, and even more aggressive!" SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_GOODGAME:
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Good game, everyone!" SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_GLHF:
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Good luck, have fun!!!" SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_SYMM:
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Left click to win!" SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_JUSTGAME:
|
||||
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("It may be a game, but if you don't want to actually try, please go play AI, so that people that actually want to take the game seriously and \"get good\" have a place to do so without trolls like you throwing games." SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_TORB:
|
||||
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("That was positively riveting! SS_TAP(X_ENTER)");
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
case KC_AIM:
|
||||
|
||||
if (!record->event.pressed) {
|
||||
register_code(kc);
|
||||
unregister_code(kc);
|
||||
_delay_ms(50);
|
||||
SEND_STRING("That aim is absolutely amazing. It's almost like you're a machine!" SS_TAP(X_ENTER));
|
||||
_delay_ms(50);
|
||||
SEND_STRING("Wait! That aim is TOO good! You're clearly using an aim hack! CHEATER!" SS_TAP(X_ENTER));
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
|
||||
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -369,51 +200,11 @@ void run_diablo_macro_check(void) {
|
||||
#endif
|
||||
|
||||
|
||||
void matrix_init_user(void) { // Runs boot tasks for keyboard
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
rgblight_enable();
|
||||
rgblight_set_teal;
|
||||
rgblight_mode(1);
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
void matrix_scan_user(void) { // runs frequently to update info
|
||||
void matrix_scan_keymap(void) { // runs frequently to update info
|
||||
#ifdef TAP_DANCE_ENABLE
|
||||
// Run Diablo 3 macro checking code.
|
||||
run_diablo_macro_check();
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
uint32_t layer_state_set_kb(uint32_t state) {
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
rgblight_enable();
|
||||
switch (biton32(state)) {
|
||||
case _NUMNAV:
|
||||
rgblight_set_teal;
|
||||
rgblight_mode(2);
|
||||
break;
|
||||
case _GMACRO:
|
||||
rgblight_set_orange;
|
||||
is_overwatch ? rgblight_mode(17) : rgblight_mode(18);
|
||||
break;
|
||||
case _DIABLO:
|
||||
rgblight_set_red;
|
||||
rgblight_mode(5);
|
||||
break;
|
||||
case _GAMEPAD:
|
||||
rgblight_set_yellow;
|
||||
rgblight_mode(1);
|
||||
break;
|
||||
case _MEDIA:
|
||||
rgblight_set_blue;
|
||||
rgblight_mode(1);
|
||||
break;
|
||||
case _COVECUBE:
|
||||
rgblight_set_green;
|
||||
rgblight_mode(2);
|
||||
}
|
||||
#endif
|
||||
return state;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user