summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatriel Müller <catrielmuller@gmail.com>2019-10-15 19:29:33 -0300
committerJoel Challis <git@zvecr.com>2019-10-15 23:29:33 +0100
commit45225190794b438129d5b27d4fe5b756fdf2efc4 (patch)
tree8bfb50b194818013091793b79b2e5359ec3851c4
parentfeb116c4f33d1c4f451f3eecbf3d8f80be80e557 (diff)
Milk 2% - Unicode Keymap Fix and Improvements (#7013)
* - Enabled Unicode Feature to fix the build - Added TapDance Feature to improve the functionality of the Keyboard - Added the ability to switch between the Unicodes Modes - Added more Emojis thanks to the tap dance feature * Fix Format
-rw-r--r--keyboards/2_milk/keymaps/emoji/config.h2
-rw-r--r--keyboards/2_milk/keymaps/emoji/keymap.c70
-rw-r--r--keyboards/2_milk/keymaps/emoji/readme.md37
-rw-r--r--keyboards/2_milk/keymaps/emoji/rules.mk2
4 files changed, 87 insertions, 24 deletions
diff --git a/keyboards/2_milk/keymaps/emoji/config.h b/keyboards/2_milk/keymaps/emoji/config.h
new file mode 100644
index 0000000000..90e4d63102
--- /dev/null
+++ b/keyboards/2_milk/keymaps/emoji/config.h
@@ -0,0 +1,2 @@
+#define UNICODE_SELECTED_MODES UC_LNX, UC_OSX, UC_WIN, UC_WINC
+#define TAPPING_TERM 300 \ No newline at end of file
diff --git a/keyboards/2_milk/keymaps/emoji/keymap.c b/keyboards/2_milk/keymaps/emoji/keymap.c
index 9b84df5c2c..024a6a054b 100644
--- a/keyboards/2_milk/keymaps/emoji/keymap.c
+++ b/keyboards/2_milk/keymaps/emoji/keymap.c
@@ -1,31 +1,53 @@
#include QMK_KEYBOARD_H
-enum custom_keycodes {
- DISSA,
- SHRUG
+enum tapdance_keycodes {
+ TD_KEY_1,
+ TD_KEY_2,
};
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT(
- SHRUG,
- DISSA
- )
+void dance_key_one (qk_tap_dance_state_t *state, void *user_data) {
+ if (state->count == 1) {
+ send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF"); // ¯\_(ツ)_/¯
+ SEND_STRING(SS_TAP(X_ENTER));
+ reset_tap_dance (state);
+ } else if (state->count == 2) {
+ cycle_unicode_input_mode(+1);
+ reset_tap_dance (state);
+ }
+}
+
+void dance_key_two (qk_tap_dance_state_t *state, void *user_data) {
+ if (state->count == 1) {
+ send_unicode_hex_string("0CA0 005F 0CA0"); // ಠ_ಠ
+ SEND_STRING(SS_TAP(X_ENTER));
+ reset_tap_dance (state);
+ } else if (state->count == 2) {
+ send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B"); // (ノಠ痊ಠ)ノ彡┻━┻
+ SEND_STRING(SS_TAP(X_ENTER));
+ reset_tap_dance (state);
+ } else if (state->count == 3) {
+ send_unicode_hex_string("256D 2229 256E 0028 002D 005F 002D 0029 256D 2229 256E"); // ╭∩╮(-_-)╭∩╮
+ SEND_STRING(SS_TAP(X_ENTER));
+ reset_tap_dance (state);
+ } else if (state->count == 4) {
+ send_unicode_hex_string("0028 3065 FFE3 0020 00B3 FFE3 0029 3065"); // (づ ̄ ³ ̄)づ
+ SEND_STRING(SS_TAP(X_ENTER));
+ reset_tap_dance (state);
+ } else if (state->count == 5) {
+ send_unicode_hex_string("0028 FE3A FE39 FE3A 0029"); // (︺︹︺)
+ SEND_STRING(SS_TAP(X_ENTER));
+ reset_tap_dance (state);
+ }
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+ [TD_KEY_1] = ACTION_TAP_DANCE_FN(dance_key_one),
+ [TD_KEY_2] = ACTION_TAP_DANCE_FN(dance_key_two),
};
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case SHRUG:
- if (record->event.pressed) {
- send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
- } else {
- }
- break;
- case DISSA:
- if (record->event.pressed) {
- send_unicode_hex_string("0CA0 005F 0CA0");
- } else {
- }
- break;
- }
- return true;
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ TD(TD_KEY_1),
+ TD(TD_KEY_2)
+ ),
};
diff --git a/keyboards/2_milk/keymaps/emoji/readme.md b/keyboards/2_milk/keymaps/emoji/readme.md
index 980be7dd5c..1d5a08730d 100644
--- a/keyboards/2_milk/keymaps/emoji/readme.md
+++ b/keyboards/2_milk/keymaps/emoji/readme.md
@@ -1,2 +1,39 @@
# Emoji Keymap
![Picture](https://i.imgur.com/1zEZ9Lq.png)
+
+# Unicode Setup
+
+Unicode input in QMK works by inputting a sequence of characters to the
+OS, sort of like a macro. Unfortunately, the way this is done differs
+for each platform. Specifically, each platform requires a different
+combination of keys to trigger Unicode input. Therefore, a
+corresponding input mode has to be set in QMK.
+
+Documentation: [Feature Unicode](https://beta.docs.qmk.fm/features/feature_unicode#input-modes)
+
+On this keymap the default unicode mode it's `UC_LNX`.
+You can change it permanently tapping 2 times the KeyOne to select the next mode.
+
+## Unicode Mode List
+- UC_LNX
+- UC_OSX
+- UC_WIN
+- UC_WINC
+
+# Keymap
+To add more functionality to this Minimal Keyboard,
+it's implemented the tap dance feature, so pressing the same key
+multiples times will produce different emojis.
+
+## Key One
+
+- 1 Tap: `¯\_(ツ)_/¯`
+- 2 Taps: Switch Unicode Input Type
+
+## Key Two
+
+- 1 Tap: `ಠ_ಠ`
+- 2 Taps: `(ノಠ痊ಠ)ノ彡┻━┻`
+- 3 Taps: `╭∩╮(-_-)╭∩╮`
+- 4 Taps: `(づ ̄ ³ ̄)づ`
+- 5 Taps: `(︺︹︺)` \ No newline at end of file
diff --git a/keyboards/2_milk/keymaps/emoji/rules.mk b/keyboards/2_milk/keymaps/emoji/rules.mk
new file mode 100644
index 0000000000..7a64eb9023
--- /dev/null
+++ b/keyboards/2_milk/keymaps/emoji/rules.mk
@@ -0,0 +1,2 @@
+UNICODE_ENABLE = yes # Unicode
+TAP_DANCE_ENABLE = yes # Tap Dance \ No newline at end of file