From 7d409df4fdd90b0c79dc5c69855ed74d09e0be17 Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Sun, 17 Nov 2019 20:18:21 -0500 Subject: [PATCH 1/7] Added userspace for d4mation. Included their keymap for the Atreus62 --- keyboards/atreus62/keymaps/d4mation/keymap.c | 194 +++++++++++++++ keyboards/atreus62/keymaps/d4mation/readme.md | 40 ++++ keyboards/atreus62/keymaps/d4mation/rules.mk | 2 + users/d4mation/config.h | 13 + users/d4mation/d4mation.c | 27 +++ users/d4mation/d4mation.h | 17 ++ users/d4mation/macros.c | 224 ++++++++++++++++++ users/d4mation/macros.h | 23 ++ users/d4mation/rules.mk | 15 ++ users/d4mation/tap-dance.c | 6 + users/d4mation/tap-dance.h | 7 + users/d4mation/tap-hold.c | 28 +++ users/d4mation/tap-hold.h | 5 + users/d4mation/zalgo.c | 21 ++ users/d4mation/zalgo.h | 5 + 15 files changed, 627 insertions(+) create mode 100644 keyboards/atreus62/keymaps/d4mation/keymap.c create mode 100644 keyboards/atreus62/keymaps/d4mation/readme.md create mode 100644 keyboards/atreus62/keymaps/d4mation/rules.mk create mode 100644 users/d4mation/config.h create mode 100644 users/d4mation/d4mation.c create mode 100644 users/d4mation/d4mation.h create mode 100644 users/d4mation/macros.c create mode 100644 users/d4mation/macros.h create mode 100644 users/d4mation/rules.mk create mode 100644 users/d4mation/tap-dance.c create mode 100644 users/d4mation/tap-dance.h create mode 100644 users/d4mation/tap-hold.c create mode 100644 users/d4mation/tap-hold.h create mode 100644 users/d4mation/zalgo.c create mode 100644 users/d4mation/zalgo.h diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c new file mode 100644 index 000000000000..41008790174b --- /dev/null +++ b/keyboards/atreus62/keymaps/d4mation/keymap.c @@ -0,0 +1,194 @@ +#include QMK_KEYBOARD_H +#include "d4mation.h" + +#define _DVR 0 +#define _QWR 1 +#define _LOWER 2 +#define _RAISE 3 +#define _NUM 4 +#define _ADJUST 16 + +enum keymap_custom_keycodes { + LOWER = NEW_SAFE_RANGE, + RAISE +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* Default/Dvorak layer + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | / | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | ' | , | . | P | Y | | F | G | C | R | L | = | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Ctrl | A | O | E | U | I |,------.,------.| D | H | T | N | S | - | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * |Shift | ; | Q | J | K | X ||Super ||Enter || B | M | W | V | Z | \ | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | NUM | Alt | Home | End |Lower | Bksp |`------'`------'|Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------' `-----------------------------------------' + */ + + [_DVR] = LAYOUT( + _GRAVE_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_SLSH, + KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_EQL, + KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, + TD(SHIFT_CAPS), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_BSLS, + TG(_NUM), KC_RALT, KC_HOME, KC_END, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ), + + /* Qwerty layer, more "standard" for other people who may need to use my keyboard or for games where using Qwerty is just easier + * ,-----------------------------------------. ,-----------------------------------------. + * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | - | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | Ctrl | A | S | D | F | G |,------.,------.| H | J | K | L | ; | ' | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * |Shift | Z | X | C | V | B ||Super ||Enter || N | M | , | . | / | = | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | NUM | Alt | Home | End |Lower | Bksp |`------'`------'|Space |Raise | Left | Down | Up |Right | + * `-----------------------------------------' `-----------------------------------------' + */ + + [_QWR] = LAYOUT( + _GRAVE_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + TD(SHIFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_EQL, + TG(_NUM), KC_RALT, KC_HOME, KC_END, LOWER, KC_BSPC, KC_LGUI, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT + ), + + /* "Lower" layer + * ,-----------------------------------------. ,-----------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | |SLEEP | | | | | SCRGB| | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | | | | | |,------.,------.| | | | { | } | | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | | | | | | || || || | Mute | VolD | VolU | | | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | | |PageUp|PgDown| | Del |`------'`------'| Ins | | | | | | + * `-----------------------------------------' `-----------------------------------------' + */ + + [_LOWER] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, + _______, _______, _______, _______, SLEEP, _______, _______, _______, SCRGB, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, _______, + _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, + _______, _______, KC_PGUP, KC_PGDN, _______, KC_DEL, _______, _______, KC_INS, _______, _______, _______, _______, _______ + ), + + /* "Raise" layer + * ,-----------------------------------------. ,-----------------------------------------. + * | F11 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F12 | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | || ?> | | | |ZALGO | | | | | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | Shrug|Lenny |Magic |Disfac| |,------.,------.| | | | [ | ] | | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | | Ameno| Tflip| Tput | | || || || | Prev | Play | Next | | | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | | |PageUp|PgDown| | Del |`------'`------'| Ins | | | | | | + * `-----------------------------------------' `-----------------------------------------' + */ + + [_RAISE] = LAYOUT( + KC_F11, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F12, + _______, _______, PHPOPEN, PHPCLSE, _______, _______, ZALGO, _______, _______, _______, _______, _______, + _______, SHRUG, LENNY, MAGIC, DISFACE, _______, _______, _______, _______, KC_LBRC, KC_RBRC,_______, + _______, AMENO, TFLIP, TPUT, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, + _______, _______, KC_PGUP, KC_PGDN, _______, KC_DEL, _______, _______, KC_INS, _______, _______, _______, _______, _______ + ), + + /* "Numpad" layer + * ,-----------------------------------------. ,-----------------------------------------. + * | | | / | * | - | | | | | / | * | - | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | 7 | 8 | 9 | + | | | | 7 | 8 | 9 | + | | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | | 4 | 5 | 6 | + | |,------.,------.| | 4 | 5 | 6 | + | | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | | 1 | 2 | 3 | Enter| || || || | 1 | 2 | 3 | Enter| | + * |------+------+------+------+------+------|| || ||------+------+------+------+------+------| + * | | 0 | 0 | . | Enter| |`------'`------'| | 0 | 0 | . | Enter| | + * `-----------------------------------------' `-----------------------------------------' + */ + + [_NUM] = LAYOUT( + _______, _______, KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, KC_PSLS, KC_PAST, KC_PMNS, _______, + _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, _______, + _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, + _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, _______, + _______, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, _______, _______, _______, _______, KC_KP_0, KC_KP_0, KC_PDOT, KC_PENT, _______ + ), + + /* "Adjust" layer, only active if both "Lower" and "Raise" are active at the same time + * All unused keys are blanked out for this layer + * ,-----------------------------------------. ,-----------------------------------------. + * | NO | NO | NO | NO | NO | NO | | NO | NO | NO | NO | NO | NO | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | NO |RESET | NO | NO | NO | NO | | NO | NO | NO | NO | NO | NO | + * |------+------+------+------+------+------| |------+------+------+------+------+------| + * | NO | NO | NO |UC WIN|UC OSX| NO |,------.,------.| NO |Dvorak|Qwerty| NO | NO | NO | + * |------+------+------+------+------+------|| Swap || ||------+------+------+------+------+------| + * | NO | NO | NO | NO | NO | NO || to || Swap || NO | NO | NO | NO | NO | NO | + * |------+------+------+------+------+------|| Ctrl || Back ||------+------+------+------+------+------| + * | NO | NO | NO | NO | | NO |`------'`------'| NO | | NO | NO | NO | NO | + * `-----------------------------------------' `-----------------------------------------' + */ + + [_ADJUST] = LAYOUT( + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, UC_M_WI, UC_M_OS, XXXXXXX, XXXXXXX, DF(_DVR),DF(_QWR),XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, CG_SWAP, CG_NORM, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + ), + +}; + +/* Runs just one time when the keyboard initializes. */ +void matrix_init_keymap( void ) { + set_unicode_input_mode( UC_OSX ); +}; + +bool process_record_keymap( uint16_t keycode, keyrecord_t *record ) { + + switch ( keycode ) { + + case LOWER: + + if ( record->event.pressed ) { + layer_on( _LOWER ); + update_tri_layer( _LOWER, _RAISE, _ADJUST ); + } + else { + layer_off( _LOWER ); + update_tri_layer( _LOWER, _RAISE, _ADJUST ); + } + + return false; + break; + + case RAISE : + + if ( record->event.pressed ) { + layer_on( _RAISE ); + update_tri_layer( _LOWER, _RAISE, _ADJUST ); + } + else { + layer_off( _RAISE ); + update_tri_layer( _LOWER, _RAISE, _ADJUST ); + } + + return false; + break; + + } + + return true; + +}; \ No newline at end of file diff --git a/keyboards/atreus62/keymaps/d4mation/readme.md b/keyboards/atreus62/keymaps/d4mation/readme.md new file mode 100644 index 000000000000..5642e8e43289 --- /dev/null +++ b/keyboards/atreus62/keymaps/d4mation/readme.md @@ -0,0 +1,40 @@ +# d4mation's keymap for the Atreus62 + +This is a bit of a work in-progress, but for the most part I like what I have done here. + +I switched to Dvorak some time ago and software-based support in most OS's for Dvorak isn't very great, so this keymap by default is set to Dvorak. + +## Table of Contents + +* [Layers](#layers) + - [Base layer](#base) + - [Num](#num) + - [Lower](#lower) + - [Raise](#raise) + - [Adjust](#adjust) + +# Layers + +## Base + +* By default, this layer is Dvorak. But using the Adjust layer you can switch to Qwerty +* Double-tapping Shift enables and disables Caps Lock +* Quickly tapping the Grave accent key will output a Grave Accent, but holding it for 200ms will output the ESC key instead + +## Num + +This layer gets toggled off and on to place a numpad on both the left and right sides of the keyboard. + +## Lower + +This layer holds some handy shortcuts that I use often, like the screen grab shortcut and sleep shortcut in OS X. + +It also has quick access to {} as they are inaccessible in the base layer + +## Raise + +Aside from quick access to [] and Play/Pause/Next/Previous, this layer is mostly just goofy things I decided to program into the keyboard because I could. There's a bunch of [kaomoji](https://en.wikipedia.org/wiki/Emoticon#Japanese_style_(kaomoji))/"unicode smileys" and I added a toggle switch to enable a [Zalgo Text](https://zalgo.org/) mode. + +## Adjust + +This layer is a "here be dragons" layer. It can only be accessed by holding down the keys for Lower and Raise at the same time. I added exclusively keys that drastically transformed the keyboard's layout or function on this layer. The ability to switch to Qwerty is on this layer, a way to switch CTRL and CMD back and forth is on this layer, and a hotkey to enter bootloader mode also exists. diff --git a/keyboards/atreus62/keymaps/d4mation/rules.mk b/keyboards/atreus62/keymaps/d4mation/rules.mk new file mode 100644 index 000000000000..517f2700e142 --- /dev/null +++ b/keyboards/atreus62/keymaps/d4mation/rules.mk @@ -0,0 +1,2 @@ +UNICODE_ENABLE = yes +TAP_DANCE_ENABLE = yes \ No newline at end of file diff --git a/users/d4mation/config.h b/users/d4mation/config.h new file mode 100644 index 000000000000..7862994464d0 --- /dev/null +++ b/users/d4mation/config.h @@ -0,0 +1,13 @@ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +#define DISABLE_LEADER +#define FORCE_NKRO + +#ifndef NO_DEBUG +#define NO_DEBUG +#endif // !NO_DEBUG + +#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) +#define NO_PRINT +#endif // !NO_PRINT \ No newline at end of file diff --git a/users/d4mation/d4mation.c b/users/d4mation/d4mation.c new file mode 100644 index 000000000000..b9e08a2db3c6 --- /dev/null +++ b/users/d4mation/d4mation.c @@ -0,0 +1,27 @@ +#include "d4mation.h" + +__attribute__ ((weak)) +bool process_record_keymap( uint16_t keycode, keyrecord_t *record ) { + /* If you want macros specific to your keymap, you need to define this function in your keymap */ + return true; +} + +__attribute__ ((weak)) +void matrix_init_keymap() { + /* If you want a matrix init specific to your keymap, you need to define this function in your keymap */ +} + +__attribute__ ((weak)) +void matrix_scan_keymap() { + /* If you want a matrix scan specific to your keymap, you need to define this function in your keymap */ +} + +/* process_record_user() is called in macros.c */ + +void matrix_init_user( void ) { + matrix_init_keymap(); +} + +void matrix_scan_user( void ) { + matrix_scan_keymap(); +} \ No newline at end of file diff --git a/users/d4mation/d4mation.h b/users/d4mation/d4mation.h new file mode 100644 index 000000000000..94c63526dbda --- /dev/null +++ b/users/d4mation/d4mation.h @@ -0,0 +1,17 @@ +#pragma once + +#include "quantum.h" + +#ifdef UNICODE_ENABLE +#include "macros.h" +#endif + +#ifdef TAP_DANCE_ENABLE +#include "tap-dance.h" +#endif + +bool process_record_keymap( uint16_t keycode, keyrecord_t *record ); + +void matrix_init_keymap( void ); + +void matrix_scan_keymap( void ); \ No newline at end of file diff --git a/users/d4mation/macros.c b/users/d4mation/macros.c new file mode 100644 index 000000000000..bd9bb38e21db --- /dev/null +++ b/users/d4mation/macros.c @@ -0,0 +1,224 @@ +#include "d4mation.h" +#include "tap-hold.h" +#include "zalgo.h" +#include "macros.h" + +bool zalgo_enabled = false; + +bool process_record_user( uint16_t keycode, keyrecord_t *record ) { + + switch ( keycode ) { + + case _GRAVE_ESC: + + /* Send ` on Tap, Esc on Hold */ + tap_or_hold( record, KC_GRAVE, KC_ESC ); + + return false; + break; + + case PHPOPEN: + + if ( record->event.pressed ) { + + tap_code16( S( KC_COMMA ) ); + tap_code16( S( KC_SLASH ) ); + + tap_code( KC_P ); + tap_code( KC_H ); + tap_code( KC_P ); + + } + + return false; + break; + + case PHPCLSE: + + if ( record->event.pressed ) { + tap_code16( S( KC_SLASH ) ); + tap_code16( S( KC_DOT ) ); + } + + return false; + break; + + case AMENO: /* ༼ つ ◕_◕ ༽つ */ + + if ( record->event.pressed ) { + + process_unicode( ( 0x0F3C|QK_UNICODE ), record ); /* Head */ + tap_code( KC_SPACE ); + process_unicode( ( 0x3064|QK_UNICODE ), record ); /* Hand */ + tap_code( KC_SPACE ); + process_unicode( ( 0x25D5|QK_UNICODE ), record ); /* Eye */ + tap_code16( S( KC_MINS ) ); /* Mouth */ + process_unicode( ( 0x25D5|QK_UNICODE ), record ); /* Eye */ + tap_code( KC_SPACE ); + process_unicode( ( 0x0F3D|QK_UNICODE ), record ); /* Head */ + process_unicode( ( 0x3064|QK_UNICODE ), record ); /* Hand */ + + } + + return false; + break; + + case MAGIC: /* (∩ ͡° ͜ʖ ͡°)⊃━☆ﾟ. * */ + + if ( record->event.pressed ) { + + tap_code16( S( KC_9 ) ); // Head + process_unicode( ( 0x2229|QK_UNICODE ), record ); /* Hand */ + tap_code( KC_SPC ); + process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ + process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ + tap_code( KC_SPC ); + process_unicode( ( 0x035C|QK_UNICODE ), record ); /* Mouth */ + process_unicode( ( 0x0296|QK_UNICODE ), record ); /* Nose */ + tap_code( KC_SPC ); + process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ + process_unicode((0x00B0 | QK_UNICODE), record); /* Eye */ + tap_code16( S( KC_0 ) ); /* Head */ + process_unicode( ( 0x2283|QK_UNICODE ), record ); /* Hand */ + process_unicode( ( 0x2501|QK_UNICODE ), record ); /* Wand Shaft */ + process_unicode( ( 0x2606|QK_UNICODE ), record ); /* Wand Star */ + unicode_input_start(); + register_hex( 0xFF9F ); /* Magic. If we use process_unicode() here it does a bitwise AND operation on it and changes the character on us */ + unicode_input_finish(); + tap_code( KC_DOT ); /* Magic */ + tap_code( KC_SPACE ); + tap_code16( S( KC_8 ) ); /* Magic */ + + } + + return false; + break; + + case LENNY: /* ( ͡° ͜ʖ ͡°) */ + + if ( record->event.pressed ) { + + tap_code16( S( KC_9 ) ); /* Head */ + tap_code( KC_SPC ); + process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ + process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ + tap_code( KC_SPC ); + process_unicode( ( 0x035C|QK_UNICODE ), record ); /* Mouth */ + process_unicode( ( 0x0296|QK_UNICODE ), record ); /* Nose */ + tap_code( KC_SPC ); + process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ + process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ + tap_code16( S( KC_0 ) ); /* Head */ + + } + + return false; + break; + + case DISFACE: /* ಠ_ಠ */ + + if ( record->event.pressed ) { + process_unicode( ( 0x0CA0|QK_UNICODE ), record ); /* Eye */ + tap_code16( S( KC_MINS ) ); + process_unicode( ( 0x0CA0|QK_UNICODE ), record ); /* Eye */ + } + + return false; + break; + + case TFLIP: /* (╯°□°)╯ ︵ ┻━┻ */ + + if ( record->event.pressed ) { + + tap_code16( S( KC_9 ) ); + process_unicode( ( 0x256F|QK_UNICODE ), record ); /* Arm */ + process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ + process_unicode( ( 0x25A1|QK_UNICODE ), record ); /* Mouth */ + process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ + tap_code16( S( KC_0 ) ); + process_unicode( ( 0x256F|QK_UNICODE ), record ); /* Arm */ + tap_code( KC_SPC ); + process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Flippy */ + tap_code( KC_SPC ); + process_unicode( ( 0x253B|QK_UNICODE ), record ); /* Table */ + process_unicode( ( 0x2501|QK_UNICODE ), record ); /* Table */ + process_unicode( ( 0x253B|QK_UNICODE ), record ); /* Table */ + + } + + return false; + break; + + case TPUT: /* ┬──┬ ノ( ゜-゜ノ) */ + + if ( record->event.pressed ) { + + process_unicode( ( 0x252C|QK_UNICODE ), record ); /* Table */ + process_unicode( ( 0x2500|QK_UNICODE ), record ); /* Table */ + process_unicode( ( 0x2500|QK_UNICODE ), record ); /* Table */ + process_unicode( ( 0x252C|QK_UNICODE ), record ); /* Table */ + tap_code( KC_SPC ); + process_unicode( ( 0x30CE|QK_UNICODE ), record ); /* Arm */ + tap_code16( S( KC_9 ) ); + tap_code( KC_SPC ); + process_unicode( ( 0x309C|QK_UNICODE ), record ); /* Eye */ + tap_code( KC_MINS ); + process_unicode( ( 0x309C|QK_UNICODE ), record ); /* Eye */ + process_unicode( ( 0x30CE|QK_UNICODE ), record ); /* Arm */ + tap_code16( S( KC_0 ) ); + } + + return false; + break; + + case SHRUG: /* ¯\_(ツ)_/¯ */ + + if ( record->event.pressed ) { + + process_unicode( ( 0x00AF|QK_UNICODE ), record ); /* Hand */ + tap_code( KC_BSLS ); /* Arm */ + tap_code16( S( KC_MINS ) ); /* Arm */ + tap_code16( S( KC_9 ) ); /* Head */ + process_unicode( ( 0x30C4|QK_UNICODE ), record ); /* Face */ + tap_code16( S( KC_0 ) ); /* Head */ + tap_code16( S( KC_MINS ) ); /* Arm */ + tap_code( KC_SLSH ); /* Arm */ + process_unicode( ( 0x00AF|QK_UNICODE ), record ); /* Hand */ + + } + + return false; + break; + + case ZALGO: /* Toggles Zalgo Text mode */ + + if ( record->event.pressed ) { + zalgo_enabled = ! zalgo_enabled; + } + + return false; + break; + + default: + + if ( zalgo_enabled ) { + + if ( keycode < KC_A || ( keycode > KC_0 && keycode < KC_MINUS ) || keycode > KC_SLASH ) { + process_record_keymap( keycode, record ); + return true; + } + + if ( record->event.pressed ) { + zalgo_text( keycode ); + } + + return false; + } + + break; + } + + process_record_keymap( keycode, record ); + return true; + +}; \ No newline at end of file diff --git a/users/d4mation/macros.h b/users/d4mation/macros.h new file mode 100644 index 000000000000..290b7f6531d8 --- /dev/null +++ b/users/d4mation/macros.h @@ -0,0 +1,23 @@ +#pragma once + +#include "quantum.h" +#include "tap-hold.h" +#include "zalgo.h" + +#define SCRGB LCTL( LSFT( LGUI( KC_4 ) ) ) // Mac Screen Area Grab shortcut (Puts into Clipboard) +#define SLEEP LALT( LGUI( KC_SYSTEM_POWER ) ) // Instant sleep on Mac, rather than having to hold down the button + +enum custom_keycodes { + _GRAVE_ESC = SAFE_RANGE, // Prefixed with underscore to prevent conflicts + PHPOPEN, // + AMENO, + MAGIC, + LENNY, + DISFACE, + TFLIP, + TPUT, + SHRUG, + ZALGO, + NEW_SAFE_RANGE +}; \ No newline at end of file diff --git a/users/d4mation/rules.mk b/users/d4mation/rules.mk new file mode 100644 index 000000000000..fdbc126258b4 --- /dev/null +++ b/users/d4mation/rules.mk @@ -0,0 +1,15 @@ +SRC += d4mation.c + +BOOTMAGIC_ENABLE = no +EXTRAFLAGS += -flto +MOUSEKEY_ENABLE = no + +ifeq ($(strip $(UNICODE_ENABLE)), yes) + SRC += zalgo.c \ + tap-hold.c \ + macros.c +endif + +ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) + SRC += tap-dance.c +endif \ No newline at end of file diff --git a/users/d4mation/tap-dance.c b/users/d4mation/tap-dance.c new file mode 100644 index 000000000000..46f2274f5f08 --- /dev/null +++ b/users/d4mation/tap-dance.c @@ -0,0 +1,6 @@ +#include "tap-dance.h" + +qk_tap_dance_action_t tap_dance_actions[] = { + /* Tap once/hold for Shift, tap twice for Caps Lock */ + [SHIFT_CAPS] = ACTION_TAP_DANCE_DOUBLE( KC_LSHIFT, KC_CAPS ) +}; \ No newline at end of file diff --git a/users/d4mation/tap-dance.h b/users/d4mation/tap-dance.h new file mode 100644 index 000000000000..0087c4a6e7a8 --- /dev/null +++ b/users/d4mation/tap-dance.h @@ -0,0 +1,7 @@ +#pragma once + +#include "quantum.h" + +enum tap_dance { + SHIFT_CAPS = 0 +}; \ No newline at end of file diff --git a/users/d4mation/tap-hold.c b/users/d4mation/tap-hold.c new file mode 100644 index 000000000000..0c5119f995dd --- /dev/null +++ b/users/d4mation/tap-hold.c @@ -0,0 +1,28 @@ +#include "tap-hold.h" + +#ifndef TAP_HOLD_TIME +#define TAP_HOLD_TIME 200 +#endif + +uint16_t tap_hold_timer; + +void tap_or_hold( keyrecord_t *record, uint16_t tap, uint16_t hold ) { + + if ( record->event.pressed ) { + tap_hold_timer = timer_read(); + } else { + + if ( tap_hold_timer && + timer_elapsed( tap_hold_timer ) > TAP_HOLD_TIME ) { + /* Held down then released */ + tap_code( hold ); + } else { + /* Quickly Tapped */ + tap_code( tap ); + } + + tap_hold_timer = 0; + + } + +} \ No newline at end of file diff --git a/users/d4mation/tap-hold.h b/users/d4mation/tap-hold.h new file mode 100644 index 000000000000..52dc0830f8b5 --- /dev/null +++ b/users/d4mation/tap-hold.h @@ -0,0 +1,5 @@ +#pragma once + +#include "quantum.h" + +void tap_or_hold( keyrecord_t *record, uint16_t tap, uint16_t hold ); \ No newline at end of file diff --git a/users/d4mation/zalgo.c b/users/d4mation/zalgo.c new file mode 100644 index 000000000000..3a1688e05385 --- /dev/null +++ b/users/d4mation/zalgo.c @@ -0,0 +1,21 @@ +#include "zalgo.h" + +void zalgo_text( uint16_t keycode ) { + + tap_code( keycode ); + + int number = ( rand() % ( 8 + 1 - 2 ) ) + 2; + unsigned int index; + + unicode_input_start(); + + for ( index = 0; index < number; index++ ) { + + uint16_t hex = ( rand() % ( 0x036F + 1 - 0x0300 ) ) + 0x0300; + register_hex( hex ); + + } + + unicode_input_finish(); + +} \ No newline at end of file diff --git a/users/d4mation/zalgo.h b/users/d4mation/zalgo.h new file mode 100644 index 000000000000..f59fc035b9e1 --- /dev/null +++ b/users/d4mation/zalgo.h @@ -0,0 +1,5 @@ +#pragma once + +#include "quantum.h" + +void zalgo_text( uint16_t keycode ); \ No newline at end of file From 6c0e7f2fb1cfc28efbbd9dd3b9955ad8dacc89bc Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Mon, 25 Nov 2019 19:46:13 -0500 Subject: [PATCH 2/7] Do not assign layer numbers manually --- keyboards/atreus62/keymaps/d4mation/keymap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c index 41008790174b..b23a80e31117 100644 --- a/keyboards/atreus62/keymaps/d4mation/keymap.c +++ b/keyboards/atreus62/keymaps/d4mation/keymap.c @@ -1,12 +1,14 @@ #include QMK_KEYBOARD_H #include "d4mation.h" -#define _DVR 0 -#define _QWR 1 -#define _LOWER 2 -#define _RAISE 3 -#define _NUM 4 -#define _ADJUST 16 +enum layer_names { + _DVR, + _QWR, + _LOWER, + _RAISE, + _NUM, + _ADJUST +}; enum keymap_custom_keycodes { LOWER = NEW_SAFE_RANGE, From b6cbe4eb6c0e0769b2bda3182f03b6716d17b0ce Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Tue, 3 Dec 2019 08:36:08 -0500 Subject: [PATCH 3/7] Remove some unneeded things per @drashna's recommendation --- users/d4mation/config.h | 14 +------------- users/d4mation/rules.mk | 2 +- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/users/d4mation/config.h b/users/d4mation/config.h index 7862994464d0..3140a036f718 100644 --- a/users/d4mation/config.h +++ b/users/d4mation/config.h @@ -1,13 +1 @@ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION - -#define DISABLE_LEADER -#define FORCE_NKRO - -#ifndef NO_DEBUG -#define NO_DEBUG -#endif // !NO_DEBUG - -#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE) -#define NO_PRINT -#endif // !NO_PRINT \ No newline at end of file +#define FORCE_NKRO \ No newline at end of file diff --git a/users/d4mation/rules.mk b/users/d4mation/rules.mk index fdbc126258b4..c66cb41561ab 100644 --- a/users/d4mation/rules.mk +++ b/users/d4mation/rules.mk @@ -1,7 +1,7 @@ SRC += d4mation.c BOOTMAGIC_ENABLE = no -EXTRAFLAGS += -flto +LTO_ENABLE = yes MOUSEKEY_ENABLE = no ifeq ($(strip $(UNICODE_ENABLE)), yes) From 2f16e0b16e2987551496e97c6b042ecd92140785 Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Tue, 3 Dec 2019 08:37:31 -0500 Subject: [PATCH 4/7] Fix some single line comments I missed --- users/d4mation/macros.c | 2 +- users/d4mation/macros.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/users/d4mation/macros.c b/users/d4mation/macros.c index bd9bb38e21db..6f6800ae64e1 100644 --- a/users/d4mation/macros.c +++ b/users/d4mation/macros.c @@ -67,7 +67,7 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { if ( record->event.pressed ) { - tap_code16( S( KC_9 ) ); // Head + tap_code16( S( KC_9 ) ); /* Head */ process_unicode( ( 0x2229|QK_UNICODE ), record ); /* Hand */ tap_code( KC_SPC ); process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ diff --git a/users/d4mation/macros.h b/users/d4mation/macros.h index 290b7f6531d8..e69d30dec27b 100644 --- a/users/d4mation/macros.h +++ b/users/d4mation/macros.h @@ -4,13 +4,13 @@ #include "tap-hold.h" #include "zalgo.h" -#define SCRGB LCTL( LSFT( LGUI( KC_4 ) ) ) // Mac Screen Area Grab shortcut (Puts into Clipboard) -#define SLEEP LALT( LGUI( KC_SYSTEM_POWER ) ) // Instant sleep on Mac, rather than having to hold down the button +#define SCRGB LCTL( LSFT( LGUI( KC_4 ) ) ) /* Mac Screen Area Grab shortcut (Puts into Clipboard) */ +#define SLEEP LALT( LGUI( KC_SYSTEM_POWER ) ) /* Instant sleep on Mac, rather than having to hold down the button */ enum custom_keycodes { - _GRAVE_ESC = SAFE_RANGE, // Prefixed with underscore to prevent conflicts - PHPOPEN, // + _GRAVE_ESC = SAFE_RANGE, /* Prefixed with underscore to prevent conflicts */ + PHPOPEN, /* */ AMENO, MAGIC, LENNY, From 4d7d21708fa9853f32234a47dd306c9e9cf15a2d Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Mon, 16 Dec 2019 11:24:50 -0500 Subject: [PATCH 5/7] Update unicode macros to use send_unicode_hex_string() instead of process_unicode() --- users/d4mation/macros.c | 90 +++++------------------------------------ 1 file changed, 9 insertions(+), 81 deletions(-) diff --git a/users/d4mation/macros.c b/users/d4mation/macros.c index 6f6800ae64e1..4b8029867cc0 100644 --- a/users/d4mation/macros.c +++ b/users/d4mation/macros.c @@ -47,16 +47,7 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { if ( record->event.pressed ) { - process_unicode( ( 0x0F3C|QK_UNICODE ), record ); /* Head */ - tap_code( KC_SPACE ); - process_unicode( ( 0x3064|QK_UNICODE ), record ); /* Hand */ - tap_code( KC_SPACE ); - process_unicode( ( 0x25D5|QK_UNICODE ), record ); /* Eye */ - tap_code16( S( KC_MINS ) ); /* Mouth */ - process_unicode( ( 0x25D5|QK_UNICODE ), record ); /* Eye */ - tap_code( KC_SPACE ); - process_unicode( ( 0x0F3D|QK_UNICODE ), record ); /* Head */ - process_unicode( ( 0x3064|QK_UNICODE ), record ); /* Hand */ + send_unicode_hex_string( "0F3C 0020 3064 0020 25D5 005F 25D5 0020 0F3D 3064" ); } @@ -66,28 +57,8 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { case MAGIC: /* (∩ ͡° ͜ʖ ͡°)⊃━☆ﾟ. * */ if ( record->event.pressed ) { - - tap_code16( S( KC_9 ) ); /* Head */ - process_unicode( ( 0x2229|QK_UNICODE ), record ); /* Hand */ - tap_code( KC_SPC ); - process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ - process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ - tap_code( KC_SPC ); - process_unicode( ( 0x035C|QK_UNICODE ), record ); /* Mouth */ - process_unicode( ( 0x0296|QK_UNICODE ), record ); /* Nose */ - tap_code( KC_SPC ); - process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ - process_unicode((0x00B0 | QK_UNICODE), record); /* Eye */ - tap_code16( S( KC_0 ) ); /* Head */ - process_unicode( ( 0x2283|QK_UNICODE ), record ); /* Hand */ - process_unicode( ( 0x2501|QK_UNICODE ), record ); /* Wand Shaft */ - process_unicode( ( 0x2606|QK_UNICODE ), record ); /* Wand Star */ - unicode_input_start(); - register_hex( 0xFF9F ); /* Magic. If we use process_unicode() here it does a bitwise AND operation on it and changes the character on us */ - unicode_input_finish(); - tap_code( KC_DOT ); /* Magic */ - tap_code( KC_SPACE ); - tap_code16( S( KC_8 ) ); /* Magic */ + + send_unicode_hex_string( "0028 2229 0020 0361 00B0 0020 035C 0296 0020 0361 00B0 0029 2283 2501 2606 FF9F 002E 0020 002A" ); } @@ -98,17 +69,7 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { if ( record->event.pressed ) { - tap_code16( S( KC_9 ) ); /* Head */ - tap_code( KC_SPC ); - process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ - process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ - tap_code( KC_SPC ); - process_unicode( ( 0x035C|QK_UNICODE ), record ); /* Mouth */ - process_unicode( ( 0x0296|QK_UNICODE ), record ); /* Nose */ - tap_code( KC_SPC ); - process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Eyebrow */ - process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ - tap_code16( S( KC_0 ) ); /* Head */ + send_unicode_hex_string( "0028 0020 0361 00B0 0020 035C 0296 0020 0361 00b0 0029" ); } @@ -118,9 +79,7 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { case DISFACE: /* ಠ_ಠ */ if ( record->event.pressed ) { - process_unicode( ( 0x0CA0|QK_UNICODE ), record ); /* Eye */ - tap_code16( S( KC_MINS ) ); - process_unicode( ( 0x0CA0|QK_UNICODE ), record ); /* Eye */ + send_unicode_hex_string( "0CA0 005F 0CA0" ); } return false; @@ -130,19 +89,7 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { if ( record->event.pressed ) { - tap_code16( S( KC_9 ) ); - process_unicode( ( 0x256F|QK_UNICODE ), record ); /* Arm */ - process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ - process_unicode( ( 0x25A1|QK_UNICODE ), record ); /* Mouth */ - process_unicode( ( 0x00B0|QK_UNICODE ), record ); /* Eye */ - tap_code16( S( KC_0 ) ); - process_unicode( ( 0x256F|QK_UNICODE ), record ); /* Arm */ - tap_code( KC_SPC ); - process_unicode( ( 0x0361|QK_UNICODE ), record ); /* Flippy */ - tap_code( KC_SPC ); - process_unicode( ( 0x253B|QK_UNICODE ), record ); /* Table */ - process_unicode( ( 0x2501|QK_UNICODE ), record ); /* Table */ - process_unicode( ( 0x253B|QK_UNICODE ), record ); /* Table */ + send_unicode_hex_string( "0028 256F 00b0 25A1 00B0 0029 256F FE35 253B 2501 253B" ); } @@ -153,19 +100,8 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { if ( record->event.pressed ) { - process_unicode( ( 0x252C|QK_UNICODE ), record ); /* Table */ - process_unicode( ( 0x2500|QK_UNICODE ), record ); /* Table */ - process_unicode( ( 0x2500|QK_UNICODE ), record ); /* Table */ - process_unicode( ( 0x252C|QK_UNICODE ), record ); /* Table */ - tap_code( KC_SPC ); - process_unicode( ( 0x30CE|QK_UNICODE ), record ); /* Arm */ - tap_code16( S( KC_9 ) ); - tap_code( KC_SPC ); - process_unicode( ( 0x309C|QK_UNICODE ), record ); /* Eye */ - tap_code( KC_MINS ); - process_unicode( ( 0x309C|QK_UNICODE ), record ); /* Eye */ - process_unicode( ( 0x30CE|QK_UNICODE ), record ); /* Arm */ - tap_code16( S( KC_0 ) ); + send_unicode_hex_string( "252C 2500 2500 252C 0020 30CE 0028 0020 309C 002D 309C 30CE 0029" ); + } return false; @@ -175,15 +111,7 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { if ( record->event.pressed ) { - process_unicode( ( 0x00AF|QK_UNICODE ), record ); /* Hand */ - tap_code( KC_BSLS ); /* Arm */ - tap_code16( S( KC_MINS ) ); /* Arm */ - tap_code16( S( KC_9 ) ); /* Head */ - process_unicode( ( 0x30C4|QK_UNICODE ), record ); /* Face */ - tap_code16( S( KC_0 ) ); /* Head */ - tap_code16( S( KC_MINS ) ); /* Arm */ - tap_code( KC_SLSH ); /* Arm */ - process_unicode( ( 0x00AF|QK_UNICODE ), record ); /* Hand */ + send_unicode_hex_string( "00AF 005C 005F 0028 30C4 0029 005F 002F 00AF" ); } From 7a58080d10b51081c0738dd26a6deeeced681819 Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Mon, 16 Dec 2019 12:24:50 -0500 Subject: [PATCH 6/7] OBetter check for Unicode Enabled. Moved some checks into macros.c --- users/d4mation/macros.c | 122 +++++++++++++++++++++------------------- users/d4mation/rules.mk | 8 +-- 2 files changed, 69 insertions(+), 61 deletions(-) diff --git a/users/d4mation/macros.c b/users/d4mation/macros.c index 4b8029867cc0..3c115d7ead55 100644 --- a/users/d4mation/macros.c +++ b/users/d4mation/macros.c @@ -43,105 +43,113 @@ bool process_record_user( uint16_t keycode, keyrecord_t *record ) { return false; break; - case AMENO: /* ༼ つ ◕_◕ ༽つ */ + #ifdef UNICODE_ENABLE - if ( record->event.pressed ) { + case AMENO: /* ༼ つ ◕_◕ ༽つ */ - send_unicode_hex_string( "0F3C 0020 3064 0020 25D5 005F 25D5 0020 0F3D 3064" ); + if ( record->event.pressed ) { - } + send_unicode_hex_string( "0F3C 0020 3064 0020 25D5 005F 25D5 0020 0F3D 3064" ); - return false; - break; + } - case MAGIC: /* (∩ ͡° ͜ʖ ͡°)⊃━☆ﾟ. * */ + return false; + break; - if ( record->event.pressed ) { + case MAGIC: /* (∩ ͡° ͜ʖ ͡°)⊃━☆ﾟ. * */ - send_unicode_hex_string( "0028 2229 0020 0361 00B0 0020 035C 0296 0020 0361 00B0 0029 2283 2501 2606 FF9F 002E 0020 002A" ); + if ( record->event.pressed ) { - } + send_unicode_hex_string( "0028 2229 0020 0361 00B0 0020 035C 0296 0020 0361 00B0 0029 2283 2501 2606 FF9F 002E 0020 002A" ); - return false; - break; + } - case LENNY: /* ( ͡° ͜ʖ ͡°) */ + return false; + break; - if ( record->event.pressed ) { + case LENNY: /* ( ͡° ͜ʖ ͡°) */ - send_unicode_hex_string( "0028 0020 0361 00B0 0020 035C 0296 0020 0361 00b0 0029" ); + if ( record->event.pressed ) { - } + send_unicode_hex_string( "0028 0020 0361 00B0 0020 035C 0296 0020 0361 00b0 0029" ); - return false; - break; + } - case DISFACE: /* ಠ_ಠ */ + return false; + break; - if ( record->event.pressed ) { - send_unicode_hex_string( "0CA0 005F 0CA0" ); - } + case DISFACE: /* ಠ_ಠ */ - return false; - break; + if ( record->event.pressed ) { + send_unicode_hex_string( "0CA0 005F 0CA0" ); + } - case TFLIP: /* (╯°□°)╯ ︵ ┻━┻ */ + return false; + break; - if ( record->event.pressed ) { + case TFLIP: /* (╯°□°)╯ ︵ ┻━┻ */ - send_unicode_hex_string( "0028 256F 00b0 25A1 00B0 0029 256F FE35 253B 2501 253B" ); + if ( record->event.pressed ) { - } + send_unicode_hex_string( "0028 256F 00b0 25A1 00B0 0029 256F FE35 253B 2501 253B" ); - return false; - break; + } - case TPUT: /* ┬──┬ ノ( ゜-゜ノ) */ + return false; + break; - if ( record->event.pressed ) { + case TPUT: /* ┬──┬ ノ( ゜-゜ノ) */ - send_unicode_hex_string( "252C 2500 2500 252C 0020 30CE 0028 0020 309C 002D 309C 30CE 0029" ); + if ( record->event.pressed ) { - } + send_unicode_hex_string( "252C 2500 2500 252C 0020 30CE 0028 0020 309C 002D 309C 30CE 0029" ); - return false; - break; + } - case SHRUG: /* ¯\_(ツ)_/¯ */ + return false; + break; - if ( record->event.pressed ) { + case SHRUG: /* ¯\_(ツ)_/¯ */ - send_unicode_hex_string( "00AF 005C 005F 0028 30C4 0029 005F 002F 00AF" ); + if ( record->event.pressed ) { - } + send_unicode_hex_string( "00AF 005C 005F 0028 30C4 0029 005F 002F 00AF" ); - return false; - break; + } - case ZALGO: /* Toggles Zalgo Text mode */ + return false; + break; - if ( record->event.pressed ) { - zalgo_enabled = ! zalgo_enabled; - } + case ZALGO: /* Toggles Zalgo Text mode */ - return false; - break; + if ( record->event.pressed ) { + zalgo_enabled = ! zalgo_enabled; + } + + return false; + break; + + #endif default: - if ( zalgo_enabled ) { + #ifdef UNICODE_ENABLE - if ( keycode < KC_A || ( keycode > KC_0 && keycode < KC_MINUS ) || keycode > KC_SLASH ) { - process_record_keymap( keycode, record ); - return true; - } + if ( zalgo_enabled ) { - if ( record->event.pressed ) { - zalgo_text( keycode ); + if ( keycode < KC_A || ( keycode > KC_0 && keycode < KC_MINUS ) || keycode > KC_SLASH ) { + process_record_keymap( keycode, record ); + return true; + } + + if ( record->event.pressed ) { + zalgo_text( keycode ); + } + + return false; } - return false; - } + #endif break; } diff --git a/users/d4mation/rules.mk b/users/d4mation/rules.mk index c66cb41561ab..3d65a2242b90 100644 --- a/users/d4mation/rules.mk +++ b/users/d4mation/rules.mk @@ -1,13 +1,13 @@ -SRC += d4mation.c +SRC += d4mation.c \ + tap-hold.c \ + macros.c BOOTMAGIC_ENABLE = no LTO_ENABLE = yes MOUSEKEY_ENABLE = no ifeq ($(strip $(UNICODE_ENABLE)), yes) - SRC += zalgo.c \ - tap-hold.c \ - macros.c + SRC += zalgo.c endif ifeq ($(strip $(TAP_DANCE_ENABLE)), yes) From 51ac96ef14b01bad1c171852890635aa8d2d9ed7 Mon Sep 17 00:00:00 2001 From: Eric Defore Date: Mon, 16 Dec 2019 12:41:18 -0500 Subject: [PATCH 7/7] Use eeconfig_init_user() to set default unicode input mode --- keyboards/atreus62/keymaps/d4mation/keymap.c | 2 +- users/d4mation/d4mation.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/keyboards/atreus62/keymaps/d4mation/keymap.c b/keyboards/atreus62/keymaps/d4mation/keymap.c index b23a80e31117..63b9d6142d29 100644 --- a/keyboards/atreus62/keymaps/d4mation/keymap.c +++ b/keyboards/atreus62/keymaps/d4mation/keymap.c @@ -153,7 +153,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; /* Runs just one time when the keyboard initializes. */ -void matrix_init_keymap( void ) { +void eeconfig_init_keymap( void ) { set_unicode_input_mode( UC_OSX ); }; diff --git a/users/d4mation/d4mation.c b/users/d4mation/d4mation.c index b9e08a2db3c6..5aa58a9f0d76 100644 --- a/users/d4mation/d4mation.c +++ b/users/d4mation/d4mation.c @@ -16,6 +16,9 @@ void matrix_scan_keymap() { /* If you want a matrix scan specific to your keymap, you need to define this function in your keymap */ } +__attribute__((weak)) +void eeconfig_init_keymap( void ) {} + /* process_record_user() is called in macros.c */ void matrix_init_user( void ) { @@ -24,4 +27,11 @@ void matrix_init_user( void ) { void matrix_scan_user( void ) { matrix_scan_keymap(); +} + +void eeconfig_init_user( void ) { + + eeconfig_init_keymap(); + keyboard_init(); + } \ No newline at end of file