diff options
Diffstat (limited to 'keyboard/ergodox_ez/keymaps/osx_de/keymap.c')
| -rw-r--r-- | keyboard/ergodox_ez/keymaps/osx_de/keymap.c | 127 |
1 files changed, 74 insertions, 53 deletions
diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c index b31d0edcd..dffcb21da 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c +++ b/keyboard/ergodox_ez/keymaps/osx_de/keymap.c | |||
| @@ -13,9 +13,11 @@ | |||
| 13 | #define M_CTRL_CMDV 1 | 13 | #define M_CTRL_CMDV 1 |
| 14 | #define M_CTRL_CMDC 2 | 14 | #define M_CTRL_CMDC 2 |
| 15 | #define M_MEH_SH_ACUT 3 | 15 | #define M_MEH_SH_ACUT 3 |
| 16 | #define M_DE_PLUS_CTRLALT 12 | 16 | #define M_DE_OSX_PLUS_CTRLALT 12 |
| 17 | #define M_DE_CIRC_CTRLCMD 13 | 17 | #define M_DE_OSX_CIRC_CTRLCMD 13 |
| 18 | #define M_TOGGLE_5 14 | 18 | #define M_TOGGLE_5 14 |
| 19 | #define M_CTL_SFT_HASH 15 | ||
| 20 | #define M_LGUI_SHFT 16 | ||
| 19 | 21 | ||
| 20 | #define SM_SMILE 4 | 22 | #define SM_SMILE 4 |
| 21 | #define SM_SMIRK 5 | 23 | #define SM_SMIRK 5 |
| @@ -30,19 +32,19 @@ | |||
| 30 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 32 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 31 | /* Keymap 0: Basic layer | 33 | /* Keymap 0: Basic layer |
| 32 | * | 34 | * |
| 33 | * ,--------------------------------------------------. ,--------------------------------------------------. | 35 | * ,-----------------------------------------------------. ,--------------------------------------------------. |
| 34 | * | ESC | 1 | 2 | 3 | 4 | 5 |CMD-V | |CMD-C | 6 | 7 | 8 | 9 | 0 | ß | | 36 | * | ESC | 1 | 2 | 3 | 4 | 5 |CTL_SFT/#| |CTL_SFT/#| 6 | 7 | 8 | 9 | 0 | ß | |
| 35 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 37 | * |--------+------+------+------+------+----------------| |---------+------+------+------+------+------+--------| |
| 36 | * | TAB | Q | W | E | R | T | CMD | | CMD | Z | U | I | O | P | ü | | 38 | * | TAB | Q | W | E | R | T | CMD | | CMD | Z | U | I | O | P | ü | |
| 37 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 39 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 38 | * | LALT | A | S | D | F | G |------| |------| H | J | K | L | ö | ä/RALT| | 40 | * | LALT | A | S | D | F | G |---------| |---------| H | J | K | L | ö | ä/RALT| |
| 39 | * |--------+------+------+------+------+------| LALT | | RALT |------+------+------+------+------+--------| | 41 | * |--------+------+------+------+------+------| LALT | | RALT |------+------+------+------+------+--------| |
| 40 | * | LShift |Y/Ctrl| X | C | V | B | | | | N | M | , | . |-/Ctrl| RShift | | 42 | * | LShift |Y/Ctrl| X | C | V | B | | | | N | M | , | . |-/Ctrl| RShift | |
| 41 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 43 | * `--------+------+------+------+------+----------------' `-------------+------+------+------+------+--------' |
| 42 | * |</L1| ^° |AltShf| Left | Right| | Up | Down | CMD-SHIFT | + | #/L1 | | 44 | * |</L1| ^°/CTRL_CMD | +/CTRL_ALT | UP | DOWN| | Left | Right | CMD-SHFT| ALT-SHIFT | +/L1 | |
| 43 | * `----------------------------------' `----------------------------------' | 45 | * `------------------------------------------' `---------------------------------------------' |
| 44 | * ,-------------. ,---------------. | 46 | * ,-------------. ,---------------. |
| 45 | * | MDIA | Meh | | Hyper| NUM | | 47 | * |`/Meh | Media| | NUM | ´/Hyper | |
| 46 | * ,------|------|------| |------+--------+------. | 48 | * ,------|------|------| |------+--------+------. |
| 47 | * | | | Home | | PgUp | | | | 49 | * | | | Home | | PgUp | | | |
| 48 | * | Back-| Del |------| |------| Enter | Space| | 50 | * | Back-| Del |------| |------| Enter | Space| |
| @@ -53,21 +55,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 53 | // Otherwise, it needs KC_* | 55 | // Otherwise, it needs KC_* |
| 54 | [BASE] = KEYMAP( // layer 0 : default | 56 | [BASE] = KEYMAP( // layer 0 : default |
| 55 | // left hand | 57 | // left hand |
| 56 | KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTRL_CMDV), | 58 | KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(M_CTL_SFT_HASH), |
| 57 | KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI, | 59 | KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI, |
| 58 | KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G, | 60 | KC_LALT, DE_OSX_A, DE_OSX_S, DE_OSX_D, DE_OSX_F, DE_OSX_G, |
| 59 | KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT, | 61 | KC_LSFT, CTL_T(DE_OSX_Y), DE_OSX_X, DE_OSX_C, DE_OSX_V, DE_OSX_B, KC_LALT, |
| 60 | LT(SYMB,DE_LESS), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LALT(KC_LSFT), LGUI(KC_LSFT), | 62 | LT(SYMB,DE_OSX_LESS), M(M_DE_OSX_CIRC_CTRLCMD), M(M_DE_OSX_PLUS_CTRLALT), KC_UP, KC_DOWN, |
| 61 | M(M_MEH_SH_ACUT), TG(2), | 63 | M(M_MEH_SH_ACUT), TG(MDIA), |
| 62 | KC_HOME, | 64 | KC_HOME, |
| 63 | KC_BSPC,KC_DEL, LT(SMLY,KC_END), | 65 | KC_BSPC,KC_DEL, LT(SMLY,KC_END), |
| 64 | // right hand | 66 | // right hand |
| 65 | M(M_CTRL_CMDC), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS, | 67 | M(M_CTL_SFT_HASH), DE_OSX_6, DE_OSX_7, DE_OSX_8, DE_OSX_9, DE_OSX_0, DE_OSX_SS, |
| 66 | KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UE, | 68 | KC_RGUI, DE_OSX_Z, DE_OSX_U, DE_OSX_I, DE_OSX_O, DE_OSX_P, DE_OSX_UE, |
| 67 | DE_H, DE_J, DE_K, DE_L, DE_OE, ALT_T(DE_AE), | 69 | DE_OSX_H, DE_OSX_J, DE_OSX_K, DE_OSX_L, DE_OSX_OE, ALT_T(DE_OSX_AE), |
| 68 | KC_RALT, DE_N, DE_M, DE_COMM,DE_DOT, CTL_T(DE_MINS), KC_RSFT, | 70 | KC_RALT, DE_OSX_N, DE_OSX_M, DE_OSX_COMM,DE_OSX_DOT, CTL_T(DE_OSX_MINS), KC_RSFT, |
| 69 | KC_LEFT, KC_UP,KC_DOWN,KC_RIGHT, LT(SYMB,DE_HASH), | 71 | KC_LEFT, KC_RIGHT,LGUI(KC_LSFT),LALT(KC_LSFT), LT(SYMB,DE_OSX_PLUS), |
| 70 | TG(4), ALL_T(DE_ACUT), | 72 | TG(NUMB), ALL_T(DE_OSX_ACUT), |
| 71 | KC_PGUP, | 73 | KC_PGUP, |
| 72 | KC_PGDN,KC_ENT, KC_SPC | 74 | KC_PGDN,KC_ENT, KC_SPC |
| 73 | ), | 75 | ), |
| @@ -76,42 +78,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 76 | * ,--------------------------------------------------. ,--------------------------------------------------. | 78 | * ,--------------------------------------------------. ,--------------------------------------------------. |
| 77 | * | | F1 | F2 | F3 | F4 | F5 | | | L5 | F6 | F7 | F8 | F9 | F10 | F11 | | 79 | * | | F1 | F2 | F3 | F4 | F5 | | | L5 | F6 | F7 | F8 | F9 | F10 | F11 | |
| 78 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| | 80 | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| |
| 79 | * | | < | > | ! | ? | | | | | \ | [ | ] | | | # | F12 | | 81 | * | | < | > | ! | ? | | | | | \ | [ | ] | < | > | ! | |
| 80 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 82 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 81 | * | | # | $ | \ | / | . |------| |------| / | ( | ) | { | } | | | 83 | * | | # | $ | \ | / | . |------| |------| / | ( | ) | { | } | # | |
| 82 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| | 84 | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| |
| 83 | * | | | ^ | % | | | ~ | | | | & | < | > | " | ' | ? | | 85 | * | | | ^ | % | | | ~ | | | | | | ~ | ^ | UP | | $ | |
| 84 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' | 86 | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' |
| 85 | * | | | | | | | | | . | ! | | | 87 | * | | | | | | | ' | LEFT| DOWN | RIGHT | | |
| 86 | * `----------------------------------' `----------------------------------' | 88 | * `----------------------------------' `----------------------------------' |
| 87 | * ,-------------. ,-------------. | 89 | * ,-------------. ,-------------. |
| 88 | * | | | | | | | 90 | * | | | | F13 | F12 | |
| 89 | * ,------|------|------| |------+------+------. | 91 | * ,------|------|------| |------+------+------. |
| 90 | * | | | | | | | | | 92 | * | | | | | F14 | | | |
| 91 | * | | |------| |------| | | | 93 | * | | |------| |------| | | |
| 92 | * | | | | | | | | | 94 | * | | | | | F15 | | | |
| 93 | * `--------------------' `--------------------' | 95 | * `--------------------' `--------------------' |
| 94 | */ | 96 | */ |
| 95 | // SYMBOLS | 97 | // SYMBOLS |
| 96 | [SYMB] = KEYMAP( | 98 | [SYMB] = KEYMAP( |
| 97 | // left hand | 99 | // left hand |
| 98 | KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, | 100 | KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, |
| 99 | KC_TRNS,DE_LESS,DE_MORE,DE_EXLM,DE_QST, KC_TRNS,KC_TRNS, | 101 | KC_TRNS,DE_OSX_LESS,DE_OSX_MORE,DE_OSX_EXLM,DE_OSX_QST, KC_TRNS,KC_TRNS, |
| 100 | KC_TRNS,DE_HASH,DE_DLR, DE_BSLS,DE_SLSH,KC_DOT, | 102 | KC_TRNS,DE_OSX_HASH,DE_OSX_DLR, DE_OSX_BSLS,DE_OSX_SLSH,KC_DOT, |
| 101 | KC_TRNS,KC_TRNS,DE_LESS,DE_PERC,DE_PIPE,DE_TILD,KC_TRNS, | 103 | KC_TRNS,KC_TRNS,DE_OSX_LESS,DE_OSX_PERC,DE_OSX_PIPE,DE_OSX_TILD,KC_TRNS, |
| 102 | KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, | 104 | KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, |
| 103 | KC_TRNS,KC_TRNS, | 105 | KC_TRNS,KC_TRNS, |
| 104 | KC_TRNS, | 106 | KC_TRNS, |
| 105 | KC_TRNS,KC_DEL,KC_TRNS, | 107 | KC_TRNS,KC_DEL,KC_TRNS, |
| 106 | // right hand | 108 | // right hand |
| 107 | M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 109 | M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 108 | KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), LALT(KC_7), DE_HASH, KC_F12, | 110 | KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, |
| 109 | DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), KC_TRNS, | 111 | DE_OSX_SLSH, DE_OSX_LPRN, DE_OSX_RPRN, LALT(KC_8), LALT(KC_9), DE_OSX_HASH, |
| 110 | KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQOT, DE_QUOT, DE_QST, | 112 | KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD, DE_OSX_CIRC, KC_UP, DE_OSX_MINS, LSFT(KC_4), |
| 111 | KC_TRNS,KC_DOT, KC_EXLM, KC_TRNS, KC_TRNS, | 113 | DE_OSX_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, |
| 112 | KC_TRNS, KC_TRNS, | 114 | KC_F13, KC_F12, |
| 113 | KC_TRNS, | 115 | KC_F14, |
| 114 | KC_TRNS, KC_TRNS, KC_TRNS | 116 | KC_F15, KC_TRNS, KC_TRNS |
| 115 | ), | 117 | ), |
| 116 | /* Keymap 2: Media and mouse keys | 118 | /* Keymap 2: Media and mouse keys |
| 117 | * | 119 | * |
| @@ -135,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 135 | * `--------------------' `--------------------' | 137 | * `--------------------' `--------------------' |
| 136 | */ | 138 | */ |
| 137 | // MEDIA AND MOUSE | 139 | // MEDIA AND MOUSE |
| 138 | KEYMAP( | 140 | [MDIA] = KEYMAP( |
| 139 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 141 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 140 | KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, | 142 | KC_TRNS, KC_TRNS, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_TRNS, |
| 141 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, | 143 | KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, |
| @@ -177,7 +179,7 @@ KEYMAP( | |||
| 177 | * | | | | | | | | | 179 | * | | | | | | | | |
| 178 | * `--------------------' `----------------------' | 180 | * `--------------------' `----------------------' |
| 179 | */ | 181 | */ |
| 180 | KEYMAP( | 182 | [SMLY] = KEYMAP( |
| 181 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 183 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 182 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 184 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 183 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 185 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| @@ -197,7 +199,7 @@ KEYMAP( | |||
| 197 | KC_TRNS, KC_TRNS, KC_TRNS | 199 | KC_TRNS, KC_TRNS, KC_TRNS |
| 198 | ), | 200 | ), |
| 199 | //number pad | 201 | //number pad |
| 200 | KEYMAP( | 202 | [NUMB] = KEYMAP( |
| 201 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 203 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 202 | KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, | 204 | KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, |
| 203 | KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, | 205 | KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, |
| @@ -209,9 +211,9 @@ KEYMAP( | |||
| 209 | // right hand | 211 | // right hand |
| 210 | KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, | 212 | KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, |
| 211 | KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12, | 213 | KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12, |
| 212 | KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS, | 214 | KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_OSX_MINS, |
| 213 | KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS, | 215 | KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS, |
| 214 | KC_0,KC_DOT, KC_0, DE_EQL, KC_TRNS, | 216 | KC_0,KC_DOT, KC_COMM, DE_OSX_EQL, KC_TRNS, |
| 215 | KC_TRNS, KC_TRNS, | 217 | KC_TRNS, KC_TRNS, |
| 216 | KC_TRNS, | 218 | KC_TRNS, |
| 217 | KC_TRNS, KC_TRNS, KC_TRNS | 219 | KC_TRNS, KC_TRNS, KC_TRNS |
| @@ -238,7 +240,7 @@ KEYMAP( | |||
| 238 | * | | | F4 | | | | | | 240 | * | | | F4 | | | | | |
| 239 | * `--------------------' `----------------------' | 241 | * `--------------------' `----------------------' |
| 240 | */ | 242 | */ |
| 241 | KEYMAP( | 243 | [EGOS] = KEYMAP( |
| 242 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 244 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 243 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 245 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| 244 | KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 246 | KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
| @@ -308,11 +310,30 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 308 | if (timer_elapsed(start) > 150){ | 310 | if (timer_elapsed(start) > 150){ |
| 309 | return MACRO(U(LCTRL),U(LSFT),U(LALT),END); | 311 | return MACRO(U(LCTRL),U(LSFT),U(LALT),END); |
| 310 | } else { | 312 | } else { |
| 311 | return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); //cannot use DE_ACUT here, as macro needs KC_ prefix | 313 | return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); //cannot use DE_OSX_ACUT here, as macro needs KC_ prefix |
| 312 | } | 314 | } |
| 313 | } | 315 | } |
| 314 | break; | 316 | break; |
| 315 | case M_DE_CIRC_CTRLCMD: | 317 | case M_LGUI_SHFT: |
| 318 | if (record->event.pressed){ | ||
| 319 | return MACRO(D(LGUI),D(LSFT),END); | ||
| 320 | }else{ | ||
| 321 | return MACRO(U(LGUI),U(LSFT),END); | ||
| 322 | } | ||
| 323 | break; | ||
| 324 | case M_CTL_SFT_HASH: | ||
| 325 | if (record->event.pressed) { | ||
| 326 | start=timer_read(); | ||
| 327 | return MACRO(D(LCTRL),D(LSFT),END); | ||
| 328 | } else { | ||
| 329 | if (timer_elapsed(start) > 150){ | ||
| 330 | return MACRO(U(LCTRL),U(LSFT),END); | ||
| 331 | } else { | ||
| 332 | return MACRO(U(LCTRL),U(LSFT),T(BSLS),END); | ||
| 333 | } | ||
| 334 | } | ||
| 335 | break; | ||
| 336 | case M_DE_OSX_CIRC_CTRLCMD: | ||
| 316 | if (record->event.pressed) { | 337 | if (record->event.pressed) { |
| 317 | start = timer_read(); | 338 | start = timer_read(); |
| 318 | return MACRO(D(LCTRL),D(LGUI),END); | 339 | return MACRO(D(LCTRL),D(LGUI),END); |
| @@ -324,7 +345,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | |||
| 324 | } | 345 | } |
| 325 | } | 346 | } |
| 326 | break; | 347 | break; |
| 327 | case M_DE_PLUS_CTRLALT: | 348 | case M_DE_OSX_PLUS_CTRLALT: |
| 328 | if (record->event.pressed) { | 349 | if (record->event.pressed) { |
| 329 | start = timer_read(); | 350 | start = timer_read(); |
| 330 | return MACRO(D(LCTRL),D(LALT),END); | 351 | return MACRO(D(LCTRL),D(LALT),END); |
