summaryrefslogtreecommitdiff
path: root/keyboards/vision_division
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2019-07-16 16:04:02 +1000
committerskullydazed <skullydazed@users.noreply.github.com>2019-07-15 23:04:02 -0700
commitf14629ed1cd7c7ec9089604d64f29a99981558e8 (patch)
treea3691f4f3cb0c941694c16a3a94f73befb6ef6ec /keyboards/vision_division
parent2a231457bd494079c36cf3e07c9b887016adb491 (diff)
Remove/migrate action_get_macro()s from default keymaps (#5625)
* Remove/migrate action_get_macro()s from default keymaps * Leave these breaks alone
Diffstat (limited to 'keyboards/vision_division')
-rw-r--r--keyboards/vision_division/keymaps/default/keymap.c368
1 files changed, 64 insertions, 304 deletions
diff --git a/keyboards/vision_division/keymaps/default/keymap.c b/keyboards/vision_division/keymaps/default/keymap.c
index 18fb7c16d7..1548ba995d 100644
--- a/keyboards/vision_division/keymaps/default/keymap.c
+++ b/keyboards/vision_division/keymaps/default/keymap.c
@@ -9,112 +9,20 @@ enum keyboard_layers {
LAYER_MOUSE,
LAYER_ADJUST,
};
-enum keyboard_macros {
- MACRO_QWERTY = 0,
- MACRO_UPPER,
- MACRO_LOWER,
- MACRO_FUNCTION,
- MACRO_MOUSE,
- MACRO_TIMBRE_1,
- MACRO_TIMBRE_2,
- MACRO_TIMBRE_3,
- MACRO_TIMBRE_4,
- MACRO_TEMPO_U,
- MACRO_TEMPO_D,
- MACRO_TONE_DEFAULT,
- MACRO_MUSIC_TOGGLE,
- MACRO_AUDIO_TOGGLE,
- MACRO_INC_VOICE,
- MACRO_DEC_VOICE,
- MACRO_BACKLIGHT,
- MACRO_BREATH_TOGGLE,
- MACRO_BREATH_SPEED_INC,
- MACRO_BREATH_SPEED_DEC,
- MACRO_BREATH_DEFAULT,
- MACRO_MOUSE_MOVE_UL,
- MACRO_MOUSE_MOVE_UR,
- MACRO_MOUSE_MOVE_DL,
- MACRO_MOUSE_MOVE_DR,
- MACRO_HELP,
- MACRO_HELP_1,
- MACRO_HELP_2,
- MACRO_HELP_3,
- MACRO_HELP_4,
- MACRO_HELP_5,
- MACRO_HELP_6,
- MACRO_HELP_7,
- MACRO_HELP_8,
- MACRO_HELP_9,
- MACRO_HELP_0,
- MACRO_GENERAL_1,
- MACRO_GENERAL_2,
- MACRO_GENERAL_3,
- MACRO_GENERAL_4,
- MACRO_GENERAL_5,
- MACRO_CURSOR_UL,
- MACRO_CURSOR_UR,
- MACRO_CURSOR_DL,
- MACRO_CURSOR_DR,
- MACRO_MUTE_APP,
- MACRO_COPY_CUT,
-};
-#define M_QWRTY M(MACRO_QWERTY)
-#define M_UPPER M(MACRO_UPPER)
-#define M_LOWER M(MACRO_LOWER)
-#define M_FUNCT M(MACRO_FUNCTION)
-#define M_MOUSE M(MACRO_MOUSE)
-
-#define TIMBR_1 M(MACRO_TIMBRE_1)
-#define TIMBR_2 M(MACRO_TIMBRE_2)
-#define TIMBR_3 M(MACRO_TIMBRE_3)
-#define TIMBR_4 M(MACRO_TIMBRE_4)
-#define TMPO_UP M(MACRO_TEMPO_U)
-#define TMPO_DN M(MACRO_TEMPO_D)
-#define TMPO_DF M(MACRO_TONE_DEFAULT)
-
-#define VC_UP M(MACRO_INC_VOICE)
-#define VC_DOWN M(MACRO_DEC_VOICE)
-
-#define M_BACKL M(MACRO_BACKLIGHT)
-#define M_BRTOG M(MACRO_BREATH_TOGGLE)
-#define M_BSPDU M(MACRO_BREATH_SPEED_INC)
-#define M_BSPDD M(MACRO_BREATH_SPEED_DEC)
-#define M_BDFLT M(MACRO_BREATH_DEFAULT)
-
-#define M_MS_UL M(MACRO_MOUSE_MOVE_UL)
-#define M_MS_UR M(MACRO_MOUSE_MOVE_UR)
-#define M_MS_DL M(MACRO_MOUSE_MOVE_DL)
-#define M_MS_DR M(MACRO_MOUSE_MOVE_DR)
-
-#define M_HELP M(MACRO_HELP)
-#define M_HELP1 M(MACRO_HELP_1)
-#define M_HELP2 M(MACRO_HELP_2)
-#define M_HELP3 M(MACRO_HELP_3)
-#define M_HELP4 M(MACRO_HELP_4)
-#define M_HELP5 M(MACRO_HELP_5)
-#define M_HELP6 M(MACRO_HELP_6)
-#define M_HELP7 M(MACRO_HELP_7)
-#define M_HELP8 M(MACRO_HELP_8)
-#define M_HELP9 M(MACRO_HELP_9)
-#define M_HELP0 M(MACRO_HELP_0)
-
-#define M_M1 M(MACRO_GENERAL_1)
-#define M_M2 M(MACRO_GENERAL_2)
-#define M_M3 M(MACRO_GENERAL_3)
-#define M_M4 M(MACRO_GENERAL_4)
-#define M_M5 M(MACRO_GENERAL_5)
-
-#define M_UL M(MACRO_CURSOR_UL)
-#define M_UR M(MACRO_CURSOR_UR)
-#define M_DL M(MACRO_CURSOR_DL)
-#define M_DR M(MACRO_CURSOR_DR)
-
-#define M_MUTEA M(MACRO_MUTE_APP)
-
-#define M_CP_CT M(MACRO_COPY_CUT)
-
-#define M_COPY MACROTAP(MACRO_COPY_CUT)
+enum custom_keycodes {
+ M_CP_CT = SAFE_RANGE,
+ M_UPPER,
+ M_LOWER,
+ M_MOUSE,
+ TIMBR_1,
+ TIMBR_2,
+ TIMBR_3,
+ TIMBR_4,
+ TMPO_UP,
+ TMPO_DN,
+ TMPO_DF
+};
#define SC_UNDO LCTL(KC_Z)
#define SC_REDO LCTL(KC_Y)
@@ -151,28 +59,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] =
| VOL DN | MUTE | VOL UP | BACKLT | | F1 | F2 | F3 | F4 | XXXXXX | F5 | F6 | F7 | F8 | XXXXXX | F9 | F10 | F11 | F12 | | PRINT | SCR LK | PAUSE | FN |
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
- | NUM LK | KP / | KP * | KP - | | ESC | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | BACKSP | | INS | HOME | PG UP | M1 |
+ | NUM LK | KP / | KP * | KP - | | ESC | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = | BACKSP | | INS | HOME | PG UP | XXXXXX |
|--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------|
- | KP 7 | KP 8 | KP 9 | KP + | | TAB | TAB | Q | W | E | R | T | Y | U | I | O | P | - | \ | | DEL | END | PG DN | M2 |
+ | KP 7 | KP 8 | KP 9 | KP + | | TAB | TAB | Q | W | E | R | T | Y | U | I | O | P | - | \ | | DEL | END | PG DN | XXXXXX |
|--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------|
- | KP 4 | KP 5 | KP 6 | KP + | | CAP LK | BACKSP | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | o | CP/CT | UNDO | PASTE | M3 |
+ | KP 4 | KP 5 | KP 6 | KP + | | CAP LK | BACKSP | A | S | D | F | G | H | J | K | L | ; | ' | ENTER | o | CP/CT | UNDO | PASTE | XXXXXX |
|--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| o |--------|--------|--------+--------|
- | KP 1 | KP 2 | KP 3 | KP Ent | | LSHIFT | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT | RSHIFT | | XXXXXX | UP | XXXXXX | M4 |
+ | KP 1 | KP 2 | KP 3 | KP Ent | | LSHIFT | LSHIFT | Z | X | C | V | B | N | M | , | . | / | RSHIFT | RSHIFT | | XXXXXX | UP | XXXXXX | XXXXXX |
|--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------|--------|--------+--------|
- | KP 0 | KP , | KP . | KP Ent | | LCTRL | XXXXXX | LWIN | XXXXXX | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | XXXXXX | RCTRL | | LEFT | DOWN | RIGHT | M5 |
+ | KP 0 | KP , | KP . | KP Ent | | LCTRL | XXXXXX | LWIN | XXXXXX | LALT | UPPER | SPACE . SPACE | LOWER | OSHIFT | RALT | APP | XXXXXX | RCTRL | | LEFT | DOWN | RIGHT | XXXXXX |
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/
KEYMAP(LAYER_QWERTY, \
- KC_VOLD, KC_MUTE, KC_VOLU, M_BACKL, KC_F1 , KC_F2 , KC_F3 , KC_F4 , XXXXXXX, KC_F5 , KC_F6 , KC_F7 , KC_F8 , XXXXXXX, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, KC_PAUS, M_HELP , \
- KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL , KC_BSPC, KC_INS , KC_HOME, KC_PGUP, M_M1 , \
- KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TAB , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, KC_BSLS, KC_DEL , KC_END , KC_PGDN, M_M2 , \
- KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_CAPS, KC_BSPC, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , M_CP_CT, SC_UNDO, SC_PSTE, M_M3 , \
- KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_LSFT, KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_RSFT, XXXXXXX, KC_UP , XXXXXXX, M_M4 , \
- KC_KP_0, KC_PCMM, KC_PDOT, KC_PENT, KC_LCTL, XXXXXXX, KC_LGUI, XXXXXXX, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , XXXXXXX, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, M_M5 \
+ KC_VOLD, KC_MUTE, KC_VOLU, BL_STEP, KC_F1 , KC_F2 , KC_F3 , KC_F4 , XXXXXXX, KC_F5 , KC_F6 , KC_F7 , KC_F8 , XXXXXXX, KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_PSCR, KC_SLCK, KC_PAUS, XXXXXXX , \
+ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, KC_ESC , KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_EQL , KC_BSPC, KC_INS , KC_HOME, KC_PGUP, XXXXXXX , \
+ KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TAB , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS, KC_BSLS, KC_DEL , KC_END , KC_PGDN, XXXXXXX , \
+ KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, KC_CAPS, KC_BSPC, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , M_CP_CT, SC_UNDO, SC_PSTE, XXXXXXX , \
+ KC_KP_1, KC_KP_2, KC_KP_3, KC_PENT, KC_LSFT, KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_RSFT, XXXXXXX, KC_UP , XXXXXXX, XXXXXXX , \
+ KC_KP_0, KC_PCMM, KC_PDOT, KC_PENT, KC_LCTL, XXXXXXX, KC_LGUI, XXXXXXX, KC_LALT, M_UPPER, KC_SPC , KC_SPC , M_LOWER, OS_SHFT, KC_RALT, KC_APP , XXXXXXX, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX \
),
/* LAYER = LAYER_LOWER
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
- | ______ | MUTE A | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | ______ | ______ | ______ |
+ | ______ | ______ | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | ______ | ______ | ______ |
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
| ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ |
@@ -187,7 +95,7 @@ KEYMAP(LAYER_QWERTY, \
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/
KEYMAP(LAYER_LOWER, \
- _______, M_MUTEA, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, _______, _______, _______, \
+ _______, _______, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, KC_DLR , KC_LCBR, KC_LBRC, KC_LPRN, KC_PERC, KC_HASH, KC_RPRN, KC_RBRC, KC_RCBR, KC_AT , _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, KC_CIRC, KC_ASTR, KC_PLUS, KC_MINS, KC_SLSH, KC_BSLS, KC_UNDS, KC_QUOT, KC_DQT , KC_GRV , _______, _______, _______, _______, _______, _______, \
@@ -196,7 +104,7 @@ KEYMAP(LAYER_LOWER, \
),
/* LAYER = LAYER_UPPER
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
- | ______ | MUTE A | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | ______ | ______ | ______ |
+ | ______ | ______ | ______ | ______ | | F13 | F14 | F15 | F16 | XXXXXX | F17 | F18 | F19 | F20 | XXXXXX | F21 | F22 | F23 | F24 | | ______ | ______ | ______ | ______ |
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
| ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | ______ | | ______ | ______ | ______ | ______ |
@@ -211,7 +119,7 @@ KEYMAP(LAYER_LOWER, \
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/
KEYMAP(LAYER_UPPER, \
- _______, M_MUTEA, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, _______, _______, _______, \
+ _______, _______, _______, _______, KC_F13 , KC_F14 , KC_F15 , KC_F16 , XXXXXXX, KC_F17 , KC_F18 , KC_F19 , KC_F20 , XXXXXXX, KC_F21 , KC_F22 , KC_F23 , KC_F24 , _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NLCK, KC_PSLS, KC_KP_7, KC_KP_8, KC_KP_9, KC_PMNS, _______, _______, _______, _______, _______, _______, \
_______, _______, _______, _______, _______, _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_CAPS, KC_PAST, KC_KP_4, KC_KP_5, KC_KP_6, KC_PPLS, _______, _______, _______, _______, _______, _______, \
@@ -244,7 +152,7 @@ KEYMAP(LAYER_MOUSE, \
),
/* LAYER = LAYER_ADJUST
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
- | VOICE- | AUDIO | VOICE+ | MUSIC | | HELP 1 | HELP 2 | HELP 3 | HELP 4 | XXXXXX | HELP 5 | HELP 6 | HELP 7 | HELP 8 | XXXXXX | HELP 9 | HELP 0 | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
+ | VOICE- | AUDIO | VOICE+ | MUSIC | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
.-----------------------------------. .-----------------------------------------------------------------------------------------------------------------------------. .-----------------------------------.
| XXXXXX | XXXXXX | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | XXXXXX | | XXXXXX | XXXXXX | XXXXXX | XXXXXX |
@@ -259,7 +167,7 @@ KEYMAP(LAYER_MOUSE, \
'-----------------------------------' '-----------------------------------------------------------------------------------------------------------------------------' '-----------------------------------'
*/
KEYMAP(LAYER_ADJUST, \
- MUV_DE , AU_TOG , MUV_IN , MU_TOG , M_HELP1, M_HELP2, M_HELP3, M_HELP4, XXXXXXX, M_HELP5, M_HELP6, M_HELP7, M_HELP8, XXXXXXX, M_HELP9, M_HELP0, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+ MUV_DE , AU_TOG , MUV_IN , MU_TOG , 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, 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, 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, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
@@ -296,233 +204,85 @@ void persistent_default_layer_set(uint16_t default_layer)
default_layer_set(default_layer);
}
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-
- // MACRODOWN only works in this function
- switch(id)
- {
-
- case MACRO_COPY_CUT:
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ switch(keycode) {
+ case M_CP_CT:
if (record->event.pressed) {
register_code(KC_LCTL);
if (record->tap.count == 1) {
register_code(KC_C);
unregister_code(KC_C);
- }
- else if (record->tap.count == 2) {
+ } else if (record->tap.count == 2) {
register_code(KC_X);
unregister_code(KC_X);
}
unregister_code(KC_LCTL);
}
- break;
-
-
- // case MACRO_HELP_1:
- // if (record->event.pressed)
- // {
- // uprint("H1");
- // }
- // break;
-
- // case MACRO_HELP_2:
- // if (record->event.pressed)
- // {
- // uprint("H2");
- // }
- // break;
-
- // case MACRO_HELP_3:
- // if (record->event.pressed)
- // {
- // uprint("H3");
- // }
- // break;
-
- // case MACRO_HELP_4:
- // if (record->event.pressed)
- // {
- // uprint("H4");
- // }
- // break;
-
- // case MACRO_HELP_5:
- // if (record->event.pressed)
- // {
- // uprint("H5");
- // }
- // break;
-
- // case MACRO_HELP_6:
- // if (record->event.pressed)
- // {
- // uprint("H6");
- // }
- // break;
-
- // case MACRO_HELP_7:
- // if (record->event.pressed)
- // {
- // uprint("H7");
- // }
- // break;
-
- // case MACRO_HELP_8:
- // if (record->event.pressed)
- // {
- // uprint("H8");
- // }
- // break;
-
- // case MACRO_HELP_9:
- // if (record->event.pressed)
- // {
- // uprint("H9");
- // }
- // break;
-
- case MACRO_BREATH_TOGGLE:
- if (record->event.pressed)
- {
- breathing_toggle();
- }
- break;
-
- case MACRO_BREATH_SPEED_INC:
- if (record->event.pressed)
- {
- breathing_period_inc();
- }
- break;
+ return false;
- case MACRO_BREATH_SPEED_DEC:
- if (record->event.pressed)
- {
- breathing_period_dec();
- }
- break;
-
- case MACRO_BREATH_DEFAULT:
- if (record->event.pressed)
- {
- breathing_period_default();
- }
- break;
-
- case MACRO_QWERTY:
- if (record->event.pressed)
- {
- persistent_default_layer_set(1UL<<LAYER_QWERTY);
- }
- break;
-
- case MACRO_UPPER:
- if (record->event.pressed)
- {
+ case M_UPPER:
+ if (record->event.pressed) {
layer_on(LAYER_UPPER);
breathing_period_set(2);
breathing_pulse();
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
- }
- else
- {
+ } else {
layer_off(LAYER_UPPER);
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
}
- break;
+ return false;
- case MACRO_LOWER:
- if (record->event.pressed)
- {
+ case M_LOWER:
+ if (record->event.pressed) {
layer_on(LAYER_LOWER);
breathing_period_set(2);
breathing_pulse();
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
- }
- else
- {
+ } else {
layer_off(LAYER_LOWER);
update_tri_layer(LAYER_LOWER, LAYER_UPPER, LAYER_ADJUST);
}
- break;
-
- case MACRO_FUNCTION:
- if (record->event.pressed)
- {
- breathing_period_set(3);
- breathing_enable();
- layer_on(LAYER_FUNCTION);
- }
- else
- {
- breathing_period_set(1);
- breathing_self_disable();
- layer_off(LAYER_FUNCTION);
- }
- break;
+ return false;
#ifdef MOUSEKEY_ENABLE
-
- case MACRO_MOUSE:
- if (record->event.pressed)
- {
+ case M_MOUSE:
+ if (record->event.pressed) {
layer_invert(LAYER_MOUSE);
}
- break;
-
+ return false;
#endif /* MOUSEKEY_ENABLE */
#ifdef AUDIO_ENABLE
-
- case MACRO_TIMBRE_1:
+ case TIMBR_1:
if (record->event.pressed) set_timbre(TIMBRE_12);
- break;
-
- case MACRO_TIMBRE_2:
+ return false;
+ case TIMBR_2:
if (record->event.pressed) set_timbre(TIMBRE_25);
- break;
-
- case MACRO_TIMBRE_3:
+ return false;
+ case TIMBR_3:
if (record->event.pressed) set_timbre(TIMBRE_50);
- break;
-
- case MACRO_TIMBRE_4:
+ return false;
+ case TIMBR_4:
if (record->event.pressed) set_timbre(TIMBRE_75);
- break;
-
- case MACRO_TEMPO_U:
+ return false;
+ case TMPO_UP:
if (record->event.pressed) increase_tempo(10);
- break;
-
- case MACRO_TEMPO_D:
+ return false;
+ case TMPO_DN:
if (record->event.pressed) decrease_tempo(10);
- break;
-
- case MACRO_TONE_DEFAULT:
- if (record->event.pressed)
- {
+ return false;
+ case TMPO_DF:
+ if (record->event.pressed) {
set_timbre(TIMBRE_DEFAULT);
set_tempo(TEMPO_DEFAULT);
}
- break;
-
+ return false;
#endif /* AUDIO_ENABLE */
-#ifdef BACKLIGHT_ENABLE
- case MACRO_BACKLIGHT:
- if (record->event.pressed)
- {
- backlight_step();
- }
- break;
-#endif /* BACKLIGHT_ENABLE */
-
default:
- break;
-
-}
-return MACRO_NONE;
+ return true;
+ }
+ return true;
};
#ifdef AUDIO_ENABLE