From 1ed03f498fa204178c2696c510ac6a2cd8524e2d Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 26 Nov 2023 18:36:45 +0000 Subject: Remove userspace keymaps (#22544) --- users/yet-another-developer/.gitignore | 2 - users/yet-another-developer/README.md | 7 - users/yet-another-developer/combo.c | 27 --- users/yet-another-developer/combo.h | 20 --- users/yet-another-developer/config.h | 46 ----- users/yet-another-developer/leader_user.c | 41 ----- users/yet-another-developer/leader_user.h | 6 - users/yet-another-developer/process_records.c | 193 --------------------- users/yet-another-developer/process_records.h | 109 ------------ users/yet-another-developer/rules.mk | 50 ------ users/yet-another-developer/tap_dances.c | 55 ------ users/yet-another-developer/tap_dances.h | 26 --- users/yet-another-developer/unicode.c | 62 ------- users/yet-another-developer/unicode.h | 64 ------- users/yet-another-developer/wrappers.h | 166 ------------------ .../yet-another-developer/yet-another-developer.c | 160 ----------------- .../yet-another-developer/yet-another-developer.h | 87 ---------- 17 files changed, 1121 deletions(-) delete mode 100644 users/yet-another-developer/.gitignore delete mode 100644 users/yet-another-developer/README.md delete mode 100644 users/yet-another-developer/combo.c delete mode 100644 users/yet-another-developer/combo.h delete mode 100644 users/yet-another-developer/config.h delete mode 100644 users/yet-another-developer/leader_user.c delete mode 100644 users/yet-another-developer/leader_user.h delete mode 100644 users/yet-another-developer/process_records.c delete mode 100644 users/yet-another-developer/process_records.h delete mode 100644 users/yet-another-developer/rules.mk delete mode 100644 users/yet-another-developer/tap_dances.c delete mode 100644 users/yet-another-developer/tap_dances.h delete mode 100644 users/yet-another-developer/unicode.c delete mode 100644 users/yet-another-developer/unicode.h delete mode 100644 users/yet-another-developer/wrappers.h delete mode 100644 users/yet-another-developer/yet-another-developer.c delete mode 100644 users/yet-another-developer/yet-another-developer.h (limited to 'users/yet-another-developer') diff --git a/users/yet-another-developer/.gitignore b/users/yet-another-developer/.gitignore deleted file mode 100644 index d815569141..0000000000 --- a/users/yet-another-developer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -secrets.c -secrets.h \ No newline at end of file diff --git a/users/yet-another-developer/README.md b/users/yet-another-developer/README.md deleted file mode 100644 index 3e528bcf5d..0000000000 --- a/users/yet-another-developer/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# User Space for yet-another-developer - - -## Reference / Inspiration - - /u/kuchosauronad0 - - /u/drashna - - /u/not-quite-neo \ No newline at end of file diff --git a/users/yet-another-developer/combo.c b/users/yet-another-developer/combo.c deleted file mode 100644 index 0a58e02770..0000000000 --- a/users/yet-another-developer/combo.c +++ /dev/null @@ -1,27 +0,0 @@ -#include "combo.h" - -void process_combo_event(uint16_t combo_index, bool pressed){ - switch(combo_index) { - case ZV_COPY: - if (pressed) { - tap_code16(LCTL(KC_C)); - } - break; - case XV_CUT: - if (pressed) { - tap_code16(LCTL(KC_X)); - } - break; - - case CV_PASTE: - if (pressed) { - tap_code16(LCTL(KC_V)); - } - break; - case QP_SLEEP: - if (pressed) { - tap_code16(KC_SYSTEM_SLEEP); - } - break; - } -} diff --git a/users/yet-another-developer/combo.h b/users/yet-another-developer/combo.h deleted file mode 100644 index 6fb3eaf58c..0000000000 --- a/users/yet-another-developer/combo.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -#include "quantum.h" -enum combo_events { - ZV_COPY, - XV_CUT, - CV_PASTE, - QP_SLEEP -}; - -const uint16_t PROGMEM copy_combo[] = {KC_Z, KC_V, COMBO_END}; -const uint16_t PROGMEM cut_combo[] = {KC_X, KC_V, COMBO_END}; -const uint16_t PROGMEM paste_combo[] = {KC_C, KC_V, COMBO_END}; -const uint16_t PROGMEM sleep_combo[] = {KC_Q, KC_P, COMBO_END}; - -combo_t key_combos[] = { - [ZV_COPY] = COMBO_ACTION(copy_combo), - [XV_CUT] = COMBO_ACTION(cut_combo), - [CV_PASTE] = COMBO_ACTION(paste_combo), - [QP_SLEEP] = COMBO_ACTION(sleep_combo), -}; diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h deleted file mode 100644 index 4836822eb4..0000000000 --- a/users/yet-another-developer/config.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once - -/* Set Polling rate to 1000Hz */ -#define USB_POLLING_INTERVAL_MS 1 - -#ifndef ONESHOT_TAP_TOGGLE - #define ONESHOT_TAP_TOGGLE 2 -#endif // !ONESHOT_TAP_TOGGLE - -#ifndef ONESHOT_TIMEOUT - #define ONESHOT_TIMEOUT 2000 -#endif // !ONESHOT_TIMEOUT - -#if defined(LEADER_ENABLE) - #define LEADER_PER_KEY_TIMING - #define LEADER_TIMEOUT 250 -#endif // !LEADER_ENABLE - -#if defined(COMBO_ENABLE) - #define COMBO_TERM 150 -#endif // !COMBO_ENABLE - -#if defined(NKRO_ENABLE) - #define FORCE_NKRO -#endif // !NKRO_ENABLE - -#undef PERMISSIVE_HOLD -//#define QUICK_TAP_TERM 0 -//#define RETRO_TAPPING - -#ifndef TAPPING_TOGGLE - #define TAPPING_TOGGLE 1 -#endif - -#ifdef TAPPING_TERM -# undef TAPPING_TERM -#endif // !TAPPING_TERM -#if defined(KEYBOARD_ergodash) - #define TAPPING_TERM 240 -#else - #define TAPPING_TERM 200 -#endif - -#define TAP_CODE_DELAY 5 //DEFAULT: 100 - -#define MACRO_TIMER 5 diff --git a/users/yet-another-developer/leader_user.c b/users/yet-another-developer/leader_user.c deleted file mode 100644 index 53a7e2d7e5..0000000000 --- a/users/yet-another-developer/leader_user.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "leader_user.h" - -void leader_end_user(void) { - if (leader_sequence_two_keys(KC_V, KC_Z)){ - // vim: Zoom pane - tap_code16(LCTL(KC_W)); - tap_code16(LSFT(KC_BSLS)); - } - - if (leader_sequence_two_keys(KC_V, KC_R)) { - // vim: Substitute and place cursor - SEND_STRING(":%s///g" SS_TAP(X_LEFT)); - tap_code(KC_LEFT); - tap_code(KC_LEFT); - } - - if (leader_sequence_two_keys(KC_V, KC_T)) { - // vim: move current pane to new tab - tap_code16(LCTL(KC_W)); - tap_code16(LSFT(KC_T)); - } - - if (leader_sequence_three_keys(KC_BSPC, KC_BSPC, KC_BSPC)){ - // Reset the keyboard - reset_keyboard(); - } -} - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void){ - -#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. -// run_diablo_macro_check(); -#endif // TAP_DANCE_ENABLE - -#ifdef RGBLIGHT_ENABLE - matrix_scan_rgb(); -#endif // RGBLIGHT_ENABLE - - matrix_scan_keymap(); -} diff --git a/users/yet-another-developer/leader_user.h b/users/yet-another-developer/leader_user.h deleted file mode 100644 index 84cc6f65fa..0000000000 --- a/users/yet-another-developer/leader_user.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once -#include "yet-another-developer.h" - -#include "leader_user.h" - -void matrix_scan_user(void); diff --git a/users/yet-another-developer/process_records.c b/users/yet-another-developer/process_records.c deleted file mode 100644 index 7dba702bf5..0000000000 --- a/users/yet-another-developer/process_records.c +++ /dev/null @@ -1,193 +0,0 @@ -#include "yet-another-developer.h" - -uint16_t copy_paste_timer; - -__attribute__ ((weak)) -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { - return true; -} - -__attribute__ ((weak)) -bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { - return true; -} - -// Defines actions for my global custom keycodes. Defined in yet-another-developer.h file -// Then runs the _keymap's record handier if not processed here -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_keebio_iris_rev2) - 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: 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 ... KC_UNICODE: - if (record->event.pressed) { - set_single_persistent_default_layer(keycode - KC_QWERTY); - } - break; - - case KC_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader - if (!record->event.pressed) { - clear_mods(); - clear_oneshot_mods(); - send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), TAP_CODE_DELAY); - { - send_string_with_delay_P(PSTR(":flash"), TAP_CODE_DELAY); - } - } - break; - - /* Tap Dance */ - case MC_QT1: // "" - if(record->event.pressed){ - SEND_STRING("\"\""); - tap_code(KC_LEFT); - } - break; - case MC_QT2: // '' - if(record->event.pressed){ - SEND_STRING("''"); - tap_code(KC_LEFT); - } - break; - case MC_QT3: // `' - if(record->event.pressed){ - SEND_STRING("`'"); - tap_code(KC_LEFT); - } - break; - case MC_PAR: // Parenthesis - if(record->event.pressed){ - SEND_STRING("()"); - tap_code(KC_LEFT); - } - break; - case MC_CUR: // Curly bracket - if(record->event.pressed){ - SEND_STRING("{}"); - tap_code(KC_LEFT); - } - break; - case MC_SQR: // Square bracket - if(record->event.pressed){ - SEND_STRING("[]"); - tap_code(KC_LEFT); - } - break; - case MC_ABR: // Angle bracket - if(record->event.pressed){ - SEND_STRING("<>"); - tap_code(KC_LEFT); - } - break; - case MCT_NEW: // New Tmux Session - if(record->event.pressed){ - SEND_STRING(":neww"); - tap_code(KC_ENT); - } - break; - case MCT_SH: // Tmux horizontal split - if(record->event.pressed){ - SEND_STRING("%"); - } - break; - case MCT_SV: // Tmux vertical split - if(record->event.pressed){ - SEND_STRING("\""); - } - break; - case MCT_ZM: // Tmux zoom - if(record->event.pressed){ - tap_code(KC_Z); - } - break; - case MCT_SCR: // Tmux scroll mode - if(record->event.pressed){ - tap_code(KC_PGUP); - } - break; - case MCT_UP: // Tmux up - break; - case MCT_DW: // Tmux down - break; - case MCT_LFT: // Tmux left - break; - case MCT_RGT: // Tmux right - tap_code(KC_RIGHT); - break; - case MCV_B: // Vim begin of line - if(record->event.pressed){ - tap_code(KC_0); - } - break; - case MCV_E: // Vim end of line - if(record->event.pressed){ - SEND_STRING(":vsplit"); - tap_code(KC_ENT); - } - break; - case MCT_F: // Vim for loop - if(record->event.pressed){ - SEND_STRING(":help"); - tap_code(KC_ENT); - } - break; - - case VRSN: // Prints firmware version - if (record->event.pressed) { - send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY); - } - break; - - - case KC_CCCV: // One key copy/paste - if (record->event.pressed) { - copy_paste_timer = timer_read(); - } else { - if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy - register_code(KC_LCTL); - tap_code(KC_C); - unregister_code(KC_LCTL); - } else { // Tap, paste - register_code(KC_LCTL); - tap_code(KC_V); - unregister_code(KC_LCTL); - } - } - break; -#ifdef UNICODE_ENABLE - case UC_FLIP: - if (record->event.pressed) { - send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻"); - } - break; - case UC_TABL: - if (record->event.pressed) { - send_unicode_string("┬─┬ノ( º _ ºノ)"); - } - break; - case UC_SHRG: - if (record->event.pressed) { - send_unicode_string("¯\\_(ツ)_/¯"); - } - break; - case UC_DISA: - if (record->event.pressed) { - send_unicode_string("ಠ_ಠ"); - } - break; -#endif // UNICODE_ENABLE - } - - return process_record_keymap(keycode, record) && -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - process_record_user_rgb(keycode, record) && -#endif // RGBLIGHT_ENABLE - process_record_secrets(keycode, record); -} diff --git a/users/yet-another-developer/process_records.h b/users/yet-another-developer/process_records.h deleted file mode 100644 index d4b9e21326..0000000000 --- a/users/yet-another-developer/process_records.h +++ /dev/null @@ -1,109 +0,0 @@ -#pragma once -#include "yet-another-developer.h" - -#if defined(KEYMAP_SAFE_RANGE) -# define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE -#else -# define PLACEHOLDER_SAFE_RANGE SAFE_RANGE -#endif - -enum userspace_custom_keycodes { - VRSN = PLACEHOLDER_SAFE_RANGE, // Prints QMK Firmware and board info - KC_QWERTY, // Sets default layer to QWERTY - KC_COLEMAK, // Sets default layer to COLEMAK - KC_DVORAK, // Sets default layer to DVORAK - KC_WORKMAN, // Sets default layer to WORKMAN - KC_UNICODE, // Sets default layer to UNICOD - - KC_MAKE, // Run keyboard's customized make command - KC_SECRET_1, // test1 - KC_SECRET_2, // test2 - KC_SECRET_3, // test3 - KC_SECRET_4, // test4 - KC_SECRET_5, // test5 - KC_CCCV, // Hold to copy, tap to paste - KC_NUKE, // NUCLEAR LAUNCH DETECTED!!! - UC_FLIP, // (ಠ痊ಠ)┻━┻ - UC_TABL, // ┬─┬ノ( º _ ºノ) - UC_SHRG, // ¯\_(ツ)_/¯ - UC_DISA, // ಠ_ಠ - - MC_QT1, // "" - MC_QT2, // '' - MC_QT3, // `' - MC_PAR, // Parenthesis - MC_CUR, // Curly bracket - MC_SQR, // Square bracket - MC_ABR, // Angle bracket - MCT_NEW, // New Tmux Session - MCT_SH, // Tmux horizontal split - MCT_SV, // Tmux vertical split - MCT_ZM, // Tmux zoom - MCT_SCR, // Tmux scroll mode - MCT_UP, // Tmux up - MCT_DW, // Tmux down - MCT_LFT, // Tmux left - MCT_RGT, // Tmux right - MCV_B, // Vim begin of line - MCV_E, // Vim end of line - MCT_F, // Vim for loop - MCG_A, // Git add - MCG_C, // Git commit - MCG_P, // Git push - MCG_R, // Git revert - MCG_L, // Git log - MCG_S, // Git status - - NEW_SAFE_RANGE // use "NEWPLACEHOLDER for keymap specific codes -}; - -bool process_record_secrets(uint16_t keycode, keyrecord_t *record); -bool process_record_keymap( uint16_t keycode, keyrecord_t *record); - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define ADJUST MO(_ADJUST) -#define TG_MODS TG(_MODS) -#define OS_LWR OSL(_LOWER) -#define OS_RSE OSL(_RAISE) -#define OS_UNI OSL(_UNICODE) - -#define KC_SEC1 KC_SECRET_1 -#define KC_SEC2 KC_SECRET_2 -#define KC_SEC3 KC_SECRET_3 -#define KC_SEC4 KC_SECRET_4 -#define KC_SEC5 KC_SECRET_5 - -#define QWERTY KC_QWERTY -#define DVORAK KC_DVORAK -#define COLEMAK KC_COLEMAK -#define WORKMAN KC_WORKMAN -#define UNICODE KC_UNICODE - -#define KC_RESET QK_BOOT -#define KC_RST KC_RESET - -#define BK_LWER LT(_LOWER, KC_BSPC) -#define SP_LWER LT(_LOWER, KC_SPC) -#define DL_RAIS LT(_RAISE, KC_DEL) -#define ET_RAIS LT(_RAISE, KC_ENTER) - -/* OSM keycodes, to keep things clean and easy to change */ -#define KC_MLSF OSM(MOD_LSFT) -#define KC_MRSF OSM(MOD_RSFT) - -#define OS_LGUI OSM(MOD_LGUI) -#define OS_RGUI OSM(MOD_RGUI) -#define OS_LSFT OSM(MOD_LSFT) -#define OS_RSFT OSM(MOD_RSFT) -#define OS_LCTL OSM(MOD_LCTL) -#define OS_RCTL OSM(MOD_RCTL) -#define OS_LALT OSM(MOD_LALT) -#define OS_RALT OSM(MOD_RALT) -#define OS_MEH OSM(MOD_MEH) -#define OS_HYPR OSM(MOD_HYPR) - -#define ALT_APP ALT_T(KC_APP) - -#define UC_IRNY UC(0x2E2E) -#define UC_CLUE UC(0x203D) diff --git a/users/yet-another-developer/rules.mk b/users/yet-another-developer/rules.mk deleted file mode 100644 index 9afa78e3f7..0000000000 --- a/users/yet-another-developer/rules.mk +++ /dev/null @@ -1,50 +0,0 @@ -SRC += yet-another-developer.c \ - process_records.c - -LTO_ENABLE = yes -SPACE_CADET_ENABLE = no - -ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) - SRC += tap_dances.c -endif - -ifeq ($(strip $(COMBO_ENABLE)), yes) - SRC += combo.c -endif - - -ifeq ($(strip $(LEADER_ENABLE)), yes) - SRC += leader_user.c -endif - - -ifneq ("$(wildcard $(USER_PATH)/secrets.c)","") - SRC += secrets.c -endif - - -ifeq ($(strip $(NO_SECRETS)), yes) - OPT_DEFS += -DNO_SECRETS -endif - - -ifeq ($(strip $(UNICODEMAP_ENABLE)), yes) - SRC += unicode.c -endif - - -ifeq ($(strip $(MACROS_ENABLED)), yes) - OPT_DEFS += -DMACROS_ENABLED -endif - - -ifdef CONSOLE_ENABLE - ifeq ($(strip $(KEYLOGGER_ENABLE)), yes) - OPT_DEFS += -DKEYLOGGER_ENABLE - endif -endif - - -ifeq ($(strip $(MAKE_BOOTLOADER)), yes) - OPT_DEFS += -DMAKE_BOOTLOADER -endif diff --git a/users/yet-another-developer/tap_dances.c b/users/yet-another-developer/tap_dances.c deleted file mode 100644 index cde0cb832e..0000000000 --- a/users/yet-another-developer/tap_dances.c +++ /dev/null @@ -1,55 +0,0 @@ -#include "tap_dances.h" - -void td_parenthesis (tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { -// SEND_STRING ("\("); - tap_code(KC_QUOT); - reset_tap_dance (state); - } - else if (state->count == 2) { - SEND_STRING("()" SS_TAP(X_LEFT)); - reset_tap_dance (state); - } - else if (state->count == 3) { - SEND_STRING("[]" SS_TAP(X_LEFT)); - reset_tap_dance (state); - } - else if (state->count == 4) { - SEND_STRING("{}" SS_TAP(X_LEFT)); - reset_tap_dance (state); - } - else if (state->count >= 5) { - SEND_STRING("<>" SS_TAP(X_LEFT)); - reset_tap_dance (state); - } -} - -void safe_reset(tap_dance_state_t *state, void *user_data) { - if (state->count >= 3) { - // Reset the keyboard if you tap the key more than three times - reset_keyboard(); - reset_tap_dance(state); - } -} - -tap_dance_action_t tap_dance_actions[] = { - [TD_RESET] = ACTION_TAP_DANCE_FN(safe_reset), - [TD_NUM1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_4), - [TD_NUM2] = ACTION_TAP_DANCE_DOUBLE(KC_2, KC_5), - [TD_NUM3] = ACTION_TAP_DANCE_DOUBLE(KC_3, KC_6), - [TD_QT1] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, MC_QT1), - [TD_QT2] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_QUOT), MC_QT2), - [TD_QT3] = ACTION_TAP_DANCE_DOUBLE(KC_GRV, MC_QT3), - - [TD_EOL] = ACTION_TAP_DANCE_DOUBLE(KC_E, MC_EOL), // end of line - [TD_BOL] = ACTION_TAP_DANCE_DOUBLE(KC_A, MC_BOL), // beginning of line - [TD_NW] = ACTION_TAP_DANCE_DOUBLE(KC_F, MC_NW), // next word - [TD_PW] = ACTION_TAP_DANCE_DOUBLE(KC_B, MC_PW), // pevious word - [TD_DW] = ACTION_TAP_DANCE_DOUBLE(KC_W, MC_DW), // pevious word - - [TD_SPC] = ACTION_TAP_DANCE_FN(td_parenthesis), // \(, (), [], {}, <> - [TD_PAR] = ACTION_TAP_DANCE_DOUBLE(KC_LPRN, MC_PAR), // () - [TD_SQR] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, MC_SQR), // [] - [TD_CUR] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_LCBR), MC_CUR),// {} - [TD_ABR] = ACTION_TAP_DANCE_DOUBLE(LSFT(KC_COMM), MC_ABR),// -}; diff --git a/users/yet-another-developer/tap_dances.h b/users/yet-another-developer/tap_dances.h deleted file mode 100644 index ca925e71bd..0000000000 --- a/users/yet-another-developer/tap_dances.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once -#include "yet-another-developer.h" - -#ifdef TAP_DANCE_ENABLE -enum { - TD_RESET = 0, - TD_SPC, // for special function td_parenthesis testing - TD_NUM1, // compact gaming numpad - TD_NUM2, // - TD_NUM3, // - TD_TMX, // tmux control sequence - TD_EOL, // end of line - TD_BOL, // beginning of line - TD_NW, // next word - TD_PW, // pevious word - TD_DW, // delete word - TD_QT1, // single double quote for ' - TD_QT2, // single double quote for " - TD_QT3, // single double quote for ` - TD_PAR, // single double parenthesis - TD_CUR, // single double curly braces - TD_SQR, // single double square brackets - TD_ABR // single double angle brackets -}; -#endif // TAP_DANCE_ENABLE -void td_parenthesis (tap_dance_state_t *state, void *user_data); diff --git a/users/yet-another-developer/unicode.c b/users/yet-another-developer/unicode.c deleted file mode 100644 index f0168cef9f..0000000000 --- a/users/yet-another-developer/unicode.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "unicode.h" - -//#ifdef UNICODEMAP_ENABLE -const uint32_t unicode_map[] PROGMEM = { - [BANG] = 0x0203D,// ‽ - [IRONY] = 0x02E2E,// ⸮ - [DEGREE] = 0x000B0,// ° - [THINK] = 0x1F914,// 🤔 - [GRIN] = 0x1F600,// � - [MONOCL] = 0x1F9D0,// 🧐 - [DRUG0] = 0x1F92A,// 🤪 - [DRUG1] = 0x1F974,// 🥴 - [CLOWN] = 0x1F921,// 🤡 - [MNDBLWN] = 0x1F92F,// 🤯 - [MONEY] = 0x1F911,// 🤑 - [SHTUP] = 0x1F910,// 🤐 - [PARTY] = 0x1F973,// 🥳 - [SMRK] = 0x1F60F,// 😏 - [WEARY] = 0x1F629,// 😩 - [UNAMU] = 0x1F612,// 😒 - [SPY] = 0x1F575,//🕵 - [DAFUQ] = 0x1F47A,// 👺 - [FIST0] = 0x1F91B,// 🤛 - [FIST1] = 0x1F91C,// 🤜 - [FIST2] = 0x270A, // ✊ - [FIST3] = 0x1F44A,// 👊 - [WIFIHAND] = 0x1F44B,// 👋 - [OKOK] = 0x1F44C,// 👌 - [EFFU] = 0x1F595,// 🖕 - [SPOCK] = 0x1F596,// 🖖 - [INUP] = 0x1F446,// 👆 - [THDN] = 0x1F44E,// 👎 - [THUP] = 0x1F44D,// 👍 - [TUMBLER] = 0x1F943,// 🥃 - [DRAGON0] = 0x1F409,// 🐉 - [DRAGON1] = 0x1F432,// 🐲 - [TIGER0] = 0x1F405,// 🐅 - [TIGER1] = 0x1F42F,// 🐯 - [COOL] = 0x1F192,// 🆒 - [UCHART] = 0x1F4C8,// 📈 - [DCHART] = 0x1F4C9,// 📉 - [BCHART] = 0x1F4CA,// 📊 - [NOPRCY] = 0x1F572,// 🕲 - [PRCY] = 0x1F571,// 🕱 - [BBB] = 0x1F171,// 🅱 - [POO] = 0x1F4A9,// 💩 - [HUNDR] = 0x1F4AF,// 💯 - [EGGPL] = 0x1F346,// 🍆 - [WATER] = 0x1F4A6,// 💦 - [LIT] = 0x1F525,// 🔥 - [SNEK] = 0x1F40D,// 🐍 - [PENGUIN] = 0x1F427,// 🐧 - [BOAR] = 0x1F417,// 🐗 - [MONKEY] = 0x1F412,// 🐒 - [CHICK] = 0x1F425,// 🐥 - [DASH] = 0x1F4A8,// 💨 - [DIZZY] = 0x1F4AB,// 💫 - [KEEB] = 0x1F5AE,// 🖮 - [HOLE] = 0x1F573,// 🕳 - [SAUCER] = 0x1F6F8// 🛸 - }; -//#endif // UNICODEMAP_ENABLE diff --git a/users/yet-another-developer/unicode.h b/users/yet-another-developer/unicode.h deleted file mode 100644 index 340b4cf94b..0000000000 --- a/users/yet-another-developer/unicode.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef UNICODEMAP_ENABLE -enum unicode_name { -OKOK, // -BANG, // ‽ -IRONY, // ⸮ -DEGREE, // ° -THINK, // 🤔 -GRIN, // � -MONOCL, // 🧐 -DRUG0, // 🤪 -DRUG1, // 🥴 -CLOWN, // 🤡 -MNDBLWN, // 🤯 -MONEY, // 🤑 -SHTUP, // 🤐 -PARTY, // 🥳 -SMRK, // 😏 -WEARY, // 😩 -UNAMU, // 😒 -SPY, // 🕵 -DAFUQ, // 👺 -FIST0, // 🤛 -FIST1, // 🤜 -FIST2, // ✊ -FIST3, // 👊 -WIFIHAND, // 👌 -EFFU, // 🖕 -SPOCK, // 🖖 -INUP, // 👆 -THDN, // 👎 -THUP, // 👍 -TUMBLER, // 🥃 -DRAGON0, // 🐉 -DRAGON1, // 🐅 -TIGER0, // 🐅 -TIGER1, // 🐯 -COOL, // 🆒 -UCHART, // 📈 -DCHART, // 📉 -BCHART, // 📊 -NOPRCY, // 🕲 -PRCY, // 🕱 -BBB, // 🅱 -POO, // 💩 -HUNDR, // 💯 -EGGPL, // 🍆 -WATER, // 💦 -LIT, // 🔥 -SNEK, // 🐍 -PENGUIN, // 🐧 -BOAR, // 🐗 -MONKEY, // 🐒 -CHICK, // 🐥 -DASH, // 💨 -DIZZY, // 💫 -KEEB, // 🖮 -HOLE, // 🕳 -SAUCER // 🛸 -}; -#endif diff --git a/users/yet-another-developer/wrappers.h b/users/yet-another-developer/wrappers.h deleted file mode 100644 index 776da0c77e..0000000000 --- a/users/yet-another-developer/wrappers.h +++ /dev/null @@ -1,166 +0,0 @@ -#pragma once -#include "yet-another-developer.h" - -/* -Since our quirky block definitions are basically a list of comma separated -arguments, we need a wrapper in order for these definitions to be -expanded before being used as arguments to the LAYOUT_xxx macro. -*/ -#if (!defined(LAYOUT) && defined(KEYMAP)) -# define LAYOUT KEYMAP -#endif - -// clang-format off - -#define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) -#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) -#define LAYOUT_ortho_5x14_wrapper(...) LAYOUT_ortho_5x14(__VA_ARGS__) - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT_ergodash_pretty( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, R43, R44, R45, R46, \ - L36, R30, \ - L44, L45, L46, R40, R41, R42 \ - ) \ - { \ - { 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 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ - } - -/* -Blocks for each of the four major keyboard layouts -Organized so we can quickly adapt and modify all of them -at once, rather than for each keyboard, one at a time. -And this allows for much cleaner blocks in the keymaps. -For instance Tap/Hold for Control on all of the layouts - -NOTE: These are all the same length. If you do a search/replace - then you need to add/remove underscores to keep the - lengths consistent. -*/ - -#define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T -#define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G -#define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B - -#define _________________QWERTY_R1_________________ KC_Y, KC_U, KC_I, KC_O, KC_P -#define _________________QWERTY_R2_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN -#define _________________QWERTY_R3_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH - - -#ifdef TAP_DANCE_ENABLE - #define _________________COLEMAK_L1________________ KC_Q, KC_W, KC_F, KC_P, KC_G - #define _________________COLEMAK_L2________________ KC_BOL, KC_R, KC_S, KC_T, KC_D - #define _________________COLEMAK_L3________________ KC_Z, KC_X, KC_C, KC_V, KC_B - - #define _________________COLEMAK_R1________________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN - #define _________________COLEMAK_R2________________ KC_H, KC_N, KC_E, KC_I, KC_O - #define _________________COLEMAK_R3________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH -#else - #define _________________COLEMAK_L1________________ KC_Q, KC_W, KC_F, KC_P, KC_G - #define _________________COLEMAK_L2________________ KC_A, KC_R, KC_S, KC_T, KC_D - #define _________________COLEMAK_L3________________ KC_Z, KC_X, KC_C, KC_V, KC_B - - #define _________________COLEMAK_R1________________ KC_J, KC_L, KC_U, KC_Y, KC_SCLN - #define _________________COLEMAK_R2________________ KC_H, KC_N, KC_E, KC_I, KC_O - #define _________________COLEMAK_R3________________ KC_K, KC_M, KC_COMM, KC_DOT, KC_SLASH -#endif - - - - -#define _________________DVORAK_L1_________________ KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y -#define _________________DVORAK_L2_________________ KC_A, KC_O, KC_E, KC_U, KC_I -#define _________________DVORAK_L3_________________ KC_SCLN, KC_Q, KC_J, KC_K, KC_X - -#define _________________DVORAK_R1_________________ KC_F, KC_G, KC_C, KC_R, KC_L -#define _________________DVORAK_R2_________________ KC_D, KC_H, KC_T, KC_N, KC_S -#define _________________DVORAK_R3_________________ KC_B, KC_M, KC_W, KC_V, KC_Z - - -#define _________________WORKMAN_L1________________ KC_Q, KC_D, KC_R, KC_W, KC_B -#define _________________WORKMAN_L2________________ KC_A, KC_S, KC_H, KC_T, KC_G -#define _________________WORKMAN_L3________________ KC_Z, KC_X, KC_M, KC_C, KC_V - -#define _________________WORKMAN_R1________________ KC_J, KC_F, KC_U, KC_P, KC_SCLN -#define _________________WORKMAN_R2________________ KC_Y, KC_N, KC_E, KC_O, KC_I -#define _________________WORKMAN_R3________________ KC_K, KC_L, KC_COMM, KC_DOT, KC_SLASH - -// #define _________________WHITE_R1__________________ KC_V, KC_Y, KC_D, KC_COMM, KC_QUOT -// #define _________________WHITE_R2__________________ KC_A, KC_T, KC_H, KC_E, KC_B -// #define _________________WHITE_R3__________________ KC_P, KC_K, KC_G, KC_W, KC_Q - -// #define _________________WHITE_L1__________________ KC_INT1, KC_J, KC_M, KC_L, KC_U -// #define _________________WHITE_L2__________________ KC_MINS, KC_C, KC_S, KC_N, KC_O // KC_I -// #define _________________WHITE_L3__________________ KC_X, KC_R, KC_F, KC_DOT, KC_Z - - -#ifdef UNICODE_ENABLE -#define _______________UNICODE_L1__________________ UC_DISA,UC_DISA, UC_DISA, UC_DISA, UC_DISA -#define _______________UNICODE_L2__________________ UC_DISA,UC_DISA, UC_DISA, UC_DISA, UC_DISA -#define _______________UNICODE_L3__________________ UC_DISA,UC_DISA, UC_DISA, UC_DISA, UC_DISA - -#define _______________UNICODE_R1__________________ UC_SHRG, UC_SHRG, UC_SHRG, UC_SHRG, UC_SHRG -#define _______________UNICODE_R2__________________ UC_SHRG, UC_SHRG, UC_SHRG, UC_SHRG, UC_SHRG -#define _______________UNICODE_R3__________________ UC_SHRG, UC_SHRG, UC_SHRG, UC_SHRG, UC_SHRG -#endif - -#ifdef UNICODEMAP_ENABLE -#define _______________UNICODE_L1__________________ UM(SMRK), UM(THINK), UM(CLOWN), UM(HUNDR), UM(BANG) -#define _______________UNICODE_L2__________________ UM(GRIN), UM(MONKEY), UM(OKOK), UM(EGGPL), UM(LIT) -#define _______________UNICODE_L3__________________ UM(WEARY), UM(UNAMU), UM(EFFU), UM(MONOCL), UM(IRONY) - -#define _______________UNICODE_R1__________________ UM(DRUG0), UM(THUP), UM(INUP), UM(DIZZY), UM(COOL) -#define _______________UNICODE_R2__________________ UM(FIST0), UM(FIST2),UM(FIST3),UM(FIST1), UM(OKOK) -#define _______________UNICODE_R3__________________ UM(MNDBLWN), UM(THDN), UM(SPOCK),UM(HOLE), UM(DASH) -#endif - -#define ________________NUMBER_LEFT________________ KC_1, KC_2, KC_3, KC_4, KC_5 -#define ________________NUMBER_RIGHT_______________ KC_6, KC_7, KC_8, KC_9, KC_0 -#define _________________FUNC_LEFT_________________ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 -#define _________________FUNC_RIGHT________________ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 - -#define ___________________BLANK___________________ _______, _______, _______, _______, _______ - - -#define _________________LOWER_L1__________________ KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC -#define _________________LOWER_L2__________________ _________________FUNC_LEFT_________________ -#define _________________LOWER_L3__________________ _________________FUNC_RIGHT________________ - -#define _________________LOWER_R1__________________ KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN -#define _________________LOWER_R2__________________ OS_UNI, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR -#define _________________LOWER_R3__________________ _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - - - -#define _________________RAISE_L1__________________ ________________NUMBER_LEFT________________ -#define _________________RAISE_L2__________________ ___________________BLANK___________________ -#define _________________RAISE_L3__________________ ___________________BLANK___________________ - -#define _________________RAISE_R1__________________ ________________NUMBER_RIGHT_______________ -#define _________________RAISE_R2__________________ _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC -#define _________________RAISE_R3__________________ _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END - - - -#define _________________ADJUST_L1_________________ ___________________BLANK___________________ -#define _________________ADJUST_L2_________________ _________________FUNC_LEFT_________________ -#define _________________ADJUST_L3_________________ _______, QWERTY, COLEMAK, DVORAK, WORKMAN - -#define _________________ADJUST_R1_________________ KC_SEC1, KC_SEC2, KC_SEC3, KC_SEC4, KC_SEC5 -#define _________________ADJUST_R2_________________ _________________FUNC_RIGHT________________ -#define _________________ADJUST_R3_________________ KC_MUTE, KC_MUTE, KC_VOLD, KC_VOLU, KC_MNXT - -// clang-format on diff --git a/users/yet-another-developer/yet-another-developer.c b/users/yet-another-developer/yet-another-developer.c deleted file mode 100644 index 0e62d0cc88..0000000000 --- a/users/yet-another-developer/yet-another-developer.c +++ /dev/null @@ -1,160 +0,0 @@ -#include "quantum.h" -#include "yet-another-developer.h" - -userspace_config_t userspace_config; - -#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) - #define YAD_UNICODE_MODE UNICODE_MODE_WINDOWS -#else -// set to 2 for UNICODE_MODE_WINDOWS, set to 4 for UNICODE_MODE_WINCOMPOSE - #define YAD_UNICODE_MODE 2 -#endif - - -bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed) { - static uint16_t this_timer; - if (pressed) { - this_timer = timer_read(); - } else { - if (timer_elapsed(this_timer) < TAPPING_TERM) { - tap_code(code); - } else { - register_code(mod_code); - tap_code(code); - unregister_code(mod_code); - } - } - return false; -} - -bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer) { - if (pressed) { - this_timer = timer_read(); - } else { - if (timer_elapsed(this_timer) < TAPPING_TERM) { - tap_code(code); - } else { - register_code(mod_code); - tap_code(code); - unregister_code(mod_code); - } - } - return false; -} - -// Add reconfigurable functions here, for keymap customization -// This allows for a global, userspace functions, and continued -// customization of the keymap. Use _keymap instead of _user -// functions in the keymaps -__attribute__ ((weak)) -void matrix_init_keymap(void) {} - -// Call user matrix init, set default RGB colors and then -// call the keymap's init function -void matrix_init_user(void) { - userspace_config.raw = eeconfig_read_user(); - - #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) - set_unicode_input_mode(YAD_UNICODE_MODE); - get_unicode_input_mode(); - #endif //UNICODE_ENABLE - - matrix_init_keymap(); -} - -__attribute__((weak)) -void keyboard_post_init_keymap(void) {} - -void keyboard_post_init_user(void) { -#ifdef RGBLIGHT_ENABLE - keyboard_post_init_rgb(); -#endif - keyboard_post_init_keymap(); -} - -__attribute__((weak)) -void suspend_power_down_keymap(void) {} - -void suspend_power_down_user(void) { - suspend_power_down_keymap(); -} - -__attribute__((weak)) -void suspend_wakeup_init_keymap(void) {} - -void suspend_wakeup_init_user(void) { - suspend_wakeup_init_keymap(); -} - -__attribute__((weak)) -void matrix_scan_keymap(void) {} - -__attribute__ ((weak)) -void matrix_scan_user(void){ - -#ifdef TAP_DANCE_ENABLE // Run Diablo 3 macro checking code. -// run_diablo_macro_check(); -#endif // TAP_DANCE_ENABLE - -#ifdef RGBLIGHT_ENABLE - matrix_scan_rgb(); -#endif // RGBLIGHT_ENABLE - - matrix_scan_keymap(); -} - -__attribute__((weak)) -layer_state_t layer_state_set_keymap(layer_state_t state) { - return state; -} - -// on layer change, no matter where the change was initiated -// Then runs keymap's layer change check -layer_state_t layer_state_set_user(layer_state_t state) { - state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); -#ifdef RGBLIGHT_ENABLE - state = layer_state_set_rgb(state); -#endif // RGBLIGHT_ENABLE - return layer_state_set_keymap(state); -} - -__attribute__((weak)) -layer_state_t default_layer_state_set_keymap(layer_state_t state) { - return state; -} - -// Runs state check and changes underglow color and animation -layer_state_t default_layer_state_set_user(layer_state_t state) { - state = default_layer_state_set_keymap(state); -#if 0 -#ifdef RGBLIGHT_ENABLE - state = default_layer_state_set_rgb(state); -#endif // RGBLIGHT_ENABLE -#endif - return state; -} - -__attribute__ ((weak)) -void led_set_keymap(uint8_t usb_led) {} - -// Any custom LED code goes here. -// So far, I only have keyboard specific code, -// So nothing goes here. -void led_set_user(uint8_t usb_led) { - led_set_keymap(usb_led); -} - -__attribute__ ((weak)) -void eeconfig_init_keymap(void) {} - -void eeconfig_init_user(void) { - userspace_config.raw = 0; - userspace_config.rgb_layer_change = true; - eeconfig_update_user(userspace_config.raw); - #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE)) - set_unicode_input_mode(YAD_UNICODE_MODE); - get_unicode_input_mode(); - #else - eeprom_update_byte(EECONFIG_UNICODEMODE, YAD_UNICODE_MODE); - #endif -} diff --git a/users/yet-another-developer/yet-another-developer.h b/users/yet-another-developer/yet-another-developer.h deleted file mode 100644 index e0d02f707f..0000000000 --- a/users/yet-another-developer/yet-another-developer.h +++ /dev/null @@ -1,87 +0,0 @@ -#pragma once -#include "quantum.h" -#include "version.h" -#include "eeprom.h" -#include "wrappers.h" -#include "process_records.h" - -#ifdef TAP_DANCE_ENABLE - #include "tap_dances.h" - #define KC_TMX TD(TD_TMX) // tap1: 't' tap2: +b - #define KC_EOL TD(TD_EOL) // tap1: 'e' tap2: +e - #define KC_BOL TD(TD_BOL) // tap1: 'a' tap2: +a - #define KC_NW TD(TD_NW) // tap1: 'f' tap2: +f - #define KC_PW TD(TD_PW) // tap1: 'b' tap2: +b - #define KC_DW TD(TD_DW) // tap1: 'w' tap2: +w -#endif //!TAP_DANCE_ENABLE -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - #include "rgb_stuff.h" -#endif -#if defined(UNICODEMAP_ENABLE) || defined(UNICODE_ENABLE) - #include "unicode.h" -#endif //!UNICODE_ENABLE - -#define MC_BOL LCTL(KC_A) // jump to beginning of line -#define MC_EOL LCTL(KC_E) // jump to end of line -#define MC_NW LALT(KC_F) // next word -#define MC_PW LALT(KC_B) // previous word -#define MC_DW LCTL(KC_W) // delete word - -/* Define layer names */ -enum userspace_layers { - _QWERTY = 0, - _NUMLOCK = 0, - _COLEMAK, - _DVORAK, - _WORKMAN, - _UNICODE, - _MODS, /* layer 8 */ - _MACROS, - _MEDIA, - _LOWER, - _RAISE, - _ADJUST, -}; - -bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed); -bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer); -void matrix_init_keymap(void); -void suspend_power_down_keymap(void); -void suspend_wakeup_init_keymap(void); -void matrix_scan_keymap(void); -layer_state_t layer_state_set_keymap(layer_state_t state); -layer_state_t default_layer_state_set_keymap(layer_state_t state); -void led_set_keymap(uint8_t usb_led); -void eeconfig_init_keymap(void); - -typedef union { - uint32_t raw; - struct { - bool rgb_layer_change :1; - bool is_overwatch :1; - bool nuke_switch :1; - uint8_t unicode_mod :4; - bool swapped_numbers :1; - }; -} userspace_config_t; - -extern userspace_config_t userspace_config; - -/* -Custom Keycodes for Diablo 3 layer -But since TD() doesn't work when tap dance is disabled -We use custom codes here, so we can substitute the right stuff -*/ -#ifdef TAP_DANCE_ENABLE -#define KC_D3_1 TD(TD_D3_1) -#define KC_D3_2 TD(TD_D3_2) -#define KC_D3_3 TD(TD_D3_3) -#define KC_D3_4 TD(TD_D3_4) -#else // TAP_DANCE_ENABLE -#define KC_D3_1 KC_1 -#define KC_D3_2 KC_2 -#define KC_D3_3 KC_3 -#define KC_D3_4 KC_4 -#endif // TAP_DANCE_ENABLE - - -- cgit v1.2.3