mirror of
https://github.com/firewalkwithm3/qmk_firmware.git
synced 2024-11-22 11:30:30 +08:00
fixed de_osx prefix in keymap include to avoid conflicts
This commit is contained in:
Stephan Bösebeck
parent
ac22d1c185
commit
dbd4ab3457
|
|
@ -13,8 +13,8 @@
|
|||
#define M_CTRL_CMDV 1
|
||||
#define M_CTRL_CMDC 2
|
||||
#define M_MEH_SH_ACUT 3
|
||||
#define M_DE_PLUS_CTRLALT 12
|
||||
#define M_DE_CIRC_CTRLCMD 13
|
||||
#define M_DE_OSX_PLUS_CTRLALT 12
|
||||
#define M_DE_OSX_CIRC_CTRLCMD 13
|
||||
#define M_TOGGLE_5 14
|
||||
#define M_CTL_SFT_HASH 15
|
||||
|
||||
|
|
@ -54,21 +54,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
// Otherwise, it needs KC_*
|
||||
[BASE] = KEYMAP( // layer 0 : default
|
||||
// left hand
|
||||
KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTL_SFT_HASH),
|
||||
KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,
|
||||
KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,
|
||||
KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,
|
||||
LT(SYMB,DE_LESS), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), KC_UP, KC_DOWN,
|
||||
KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(M_CTL_SFT_HASH),
|
||||
KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI,
|
||||
KC_LALT, DE_OSX_A, DE_OSX_S, DE_OSX_D, DE_OSX_F, DE_OSX_G,
|
||||
KC_LSFT, CTL_T(DE_OSX_Y), DE_OSX_X, DE_OSX_C, DE_OSX_V, DE_OSX_B, KC_LALT,
|
||||
LT(SYMB,DE_OSX_LESS), M(M_DE_OSX_CIRC_CTRLCMD), M(M_DE_OSX_PLUS_CTRLALT), KC_UP, KC_DOWN,
|
||||
M(M_MEH_SH_ACUT), TG(2),
|
||||
KC_HOME,
|
||||
KC_BSPC,KC_DEL, LT(SMLY,KC_END),
|
||||
// right hand
|
||||
M(M_CTL_SFT_HASH), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,
|
||||
KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UE,
|
||||
DE_H, DE_J, DE_K, DE_L, DE_OE, ALT_T(DE_AE),
|
||||
KC_RALT, DE_N, DE_M, DE_COMM,DE_DOT, CTL_T(DE_MINS), KC_RSFT,
|
||||
KC_LEFT, KC_RIGHT,LGUI(KC_LSFT),LALT(KC_LSFT), LT(SYMB,DE_PLUS),
|
||||
TG(4), ALL_T(DE_ACUT),
|
||||
M(M_CTL_SFT_HASH), DE_OSX_6, DE_OSX_7, DE_OSX_8, DE_OSX_9, DE_OSX_0, DE_OSX_SS,
|
||||
KC_RGUI, DE_OSX_Z, DE_OSX_U, DE_OSX_I, DE_OSX_O, DE_OSX_P, DE_OSX_UE,
|
||||
DE_OSX_H, DE_OSX_J, DE_OSX_K, DE_OSX_L, DE_OSX_OE, ALT_T(DE_OSX_AE),
|
||||
KC_RALT, DE_OSX_N, DE_OSX_M, DE_OSX_COMM,DE_OSX_DOT, CTL_T(DE_OSX_MINS), KC_RSFT,
|
||||
KC_LEFT, KC_RIGHT,LGUI(KC_LSFT),LALT(KC_LSFT), LT(SYMB,DE_OSX_PLUS),
|
||||
TG(4), ALL_T(DE_OSX_ACUT),
|
||||
KC_PGUP,
|
||||
KC_PGDN,KC_ENT, KC_SPC
|
||||
),
|
||||
|
|
@ -97,19 +97,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
[SYMB] = KEYMAP(
|
||||
// left hand
|
||||
KC_TRNS,KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,
|
||||
KC_TRNS,DE_LESS,DE_MORE,DE_EXLM,DE_QST, KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,DE_HASH,DE_DLR, DE_BSLS,DE_SLSH,KC_DOT,
|
||||
KC_TRNS,KC_TRNS,DE_LESS,DE_PERC,DE_PIPE,DE_TILD,KC_TRNS,
|
||||
KC_TRNS,DE_OSX_LESS,DE_OSX_MORE,DE_OSX_EXLM,DE_OSX_QST, KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,DE_OSX_HASH,DE_OSX_DLR, DE_OSX_BSLS,DE_OSX_SLSH,KC_DOT,
|
||||
KC_TRNS,KC_TRNS,DE_OSX_LESS,DE_OSX_PERC,DE_OSX_PIPE,DE_OSX_TILD,KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,KC_TRNS,
|
||||
KC_TRNS,
|
||||
KC_TRNS,KC_DEL,KC_TRNS,
|
||||
// right hand
|
||||
M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
|
||||
KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_LESS, DE_MORE, DE_EXLM,
|
||||
DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), DE_HASH,
|
||||
KC_TRNS, DE_PIPE, DE_TILD, DE_CIRC, KC_UP, DE_MINS, LSFT(KC_4),
|
||||
DE_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
|
||||
KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM,
|
||||
DE_OSX_SLSH, DE_OSX_LPRN, DE_OSX_RPRN, LALT(KC_8), LALT(KC_9), DE_OSX_HASH,
|
||||
KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD, DE_OSX_CIRC, KC_UP, DE_OSX_MINS, LSFT(KC_4),
|
||||
DE_OSX_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,
|
||||
KC_F13, KC_F12,
|
||||
KC_F14,
|
||||
KC_F15, KC_TRNS, KC_TRNS
|
||||
|
|
@ -210,9 +210,9 @@ KEYMAP(
|
|||
// right hand
|
||||
KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
|
||||
KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,
|
||||
KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS,
|
||||
KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_OSX_MINS,
|
||||
KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,
|
||||
KC_0,KC_DOT, KC_COMM, DE_EQL, KC_TRNS,
|
||||
KC_0,KC_DOT, KC_COMM, DE_OSX_EQL, KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,
|
||||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS
|
||||
|
|
@ -309,7 +309,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
if (timer_elapsed(start) > 150){
|
||||
return MACRO(U(LCTRL),U(LSFT),U(LALT),END);
|
||||
} else {
|
||||
return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); //cannot use DE_ACUT here, as macro needs KC_ prefix
|
||||
return MACRO(U(LCTRL),U(LALT),T(EQL),U(LSFT),END); //cannot use DE_OSX_ACUT here, as macro needs KC_ prefix
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -325,7 +325,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
}
|
||||
}
|
||||
break;
|
||||
case M_DE_CIRC_CTRLCMD:
|
||||
case M_DE_OSX_CIRC_CTRLCMD:
|
||||
if (record->event.pressed) {
|
||||
start = timer_read();
|
||||
return MACRO(D(LCTRL),D(LGUI),END);
|
||||
|
|
@ -337,7 +337,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
}
|
||||
}
|
||||
break;
|
||||
case M_DE_PLUS_CTRLALT:
|
||||
case M_DE_OSX_PLUS_CTRLALT:
|
||||
if (record->event.pressed) {
|
||||
start = timer_read();
|
||||
return MACRO(D(LCTRL),D(LALT),END);
|
||||
|
|
|
|||
|
|
@ -9,92 +9,92 @@
|
|||
// Alt gr
|
||||
|
||||
// normal characters
|
||||
#define DE_Z KC_Y
|
||||
#define DE_Y KC_Z
|
||||
#define DE_OSX_Z KC_Y
|
||||
#define DE_OSX_Y KC_Z
|
||||
|
||||
#define DE_A KC_A
|
||||
#define DE_B KC_B
|
||||
#define DE_C KC_C
|
||||
#define DE_D KC_D
|
||||
#define DE_E KC_E
|
||||
#define DE_F KC_F
|
||||
#define DE_G KC_G
|
||||
#define DE_H KC_H
|
||||
#define DE_I KC_I
|
||||
#define DE_J KC_J
|
||||
#define DE_K KC_K
|
||||
#define DE_L KC_L
|
||||
#define DE_M KC_M
|
||||
#define DE_N KC_N
|
||||
#define DE_O KC_O
|
||||
#define DE_P KC_P
|
||||
#define DE_Q KC_Q
|
||||
#define DE_R KC_R
|
||||
#define DE_S KC_S
|
||||
#define DE_T KC_T
|
||||
#define DE_U KC_U
|
||||
#define DE_V KC_V
|
||||
#define DE_W KC_W
|
||||
#define DE_X KC_X
|
||||
#define DE_OSX_A KC_A
|
||||
#define DE_OSX_B KC_B
|
||||
#define DE_OSX_C KC_C
|
||||
#define DE_OSX_D KC_D
|
||||
#define DE_OSX_E KC_E
|
||||
#define DE_OSX_F KC_F
|
||||
#define DE_OSX_G KC_G
|
||||
#define DE_OSX_H KC_H
|
||||
#define DE_OSX_I KC_I
|
||||
#define DE_OSX_J KC_J
|
||||
#define DE_OSX_K KC_K
|
||||
#define DE_OSX_L KC_L
|
||||
#define DE_OSX_M KC_M
|
||||
#define DE_OSX_N KC_N
|
||||
#define DE_OSX_O KC_O
|
||||
#define DE_OSX_P KC_P
|
||||
#define DE_OSX_Q KC_Q
|
||||
#define DE_OSX_R KC_R
|
||||
#define DE_OSX_S KC_S
|
||||
#define DE_OSX_T KC_T
|
||||
#define DE_OSX_U KC_U
|
||||
#define DE_OSX_V KC_V
|
||||
#define DE_OSX_W KC_W
|
||||
#define DE_OSX_X KC_X
|
||||
|
||||
#define DE_0 KC_0
|
||||
#define DE_1 KC_1
|
||||
#define DE_2 KC_2
|
||||
#define DE_3 KC_3
|
||||
#define DE_4 KC_4
|
||||
#define DE_5 KC_5
|
||||
#define DE_6 KC_6
|
||||
#define DE_7 KC_7
|
||||
#define DE_8 KC_8
|
||||
#define DE_9 KC_9
|
||||
#define DE_OSX_0 KC_0
|
||||
#define DE_OSX_1 KC_1
|
||||
#define DE_OSX_2 KC_2
|
||||
#define DE_OSX_3 KC_3
|
||||
#define DE_OSX_4 KC_4
|
||||
#define DE_OSX_5 KC_5
|
||||
#define DE_OSX_6 KC_6
|
||||
#define DE_OSX_7 KC_7
|
||||
#define DE_OSX_8 KC_8
|
||||
#define DE_OSX_9 KC_9
|
||||
|
||||
#define DE_DOT KC_DOT
|
||||
#define DE_COMM KC_COMM
|
||||
#define DE_OSX_DOT KC_DOT
|
||||
#define DE_OSX_COMM KC_COMM
|
||||
|
||||
#define DE_SS KC_MINS
|
||||
#define DE_AE KC_QUOT
|
||||
#define DE_UE KC_LBRC
|
||||
#define DE_OE KC_SCLN
|
||||
#define DE_OSX_SS KC_MINS
|
||||
#define DE_OSX_AE KC_QUOT
|
||||
#define DE_OSX_UE KC_LBRC
|
||||
#define DE_OSX_OE KC_SCLN
|
||||
|
||||
#define DE_CIRC KC_NUBS // accent circumflex ^ and ring °
|
||||
#define DE_ACUT KC_EQL // accent acute ´ and grave `
|
||||
#define DE_PLUS KC_RBRC // + and * and ~
|
||||
#define DE_HASH KC_BSLS // # and '
|
||||
#define DE_LESS KC_GRV // < and > and |
|
||||
#define DE_MINS KC_SLSH // - and _
|
||||
#define DE_OSX_CIRC KC_NUBS // accent circumflex ^ and ring °
|
||||
#define DE_OSX_ACUT KC_EQL // accent acute ´ and grave `
|
||||
#define DE_OSX_PLUS KC_RBRC // + and * and ~
|
||||
#define DE_OSX_HASH KC_BSLS // # and '
|
||||
#define DE_OSX_LESS KC_GRV // < and > and |
|
||||
#define DE_OSX_MINS KC_SLSH // - and _
|
||||
|
||||
// shifted characters
|
||||
#define DE_RING LSFT(DE_CIRC) // °
|
||||
#define DE_EXLM LSFT(KC_1) // !
|
||||
#define DE_DQOT LSFT(KC_2) // "
|
||||
#define DE_PARA LSFT(KC_3) // §
|
||||
#define DE_DLR LSFT(KC_4) // $
|
||||
#define DE_PERC LSFT(KC_5) // %
|
||||
#define DE_AMPR LSFT(KC_6) // &
|
||||
#define DE_SLSH LSFT(KC_7) // /
|
||||
#define DE_LPRN LSFT(KC_8) // (
|
||||
#define DE_RPRN LSFT(KC_9) // )
|
||||
#define DE_EQL LSFT(KC_0) // =
|
||||
#define DE_QST LSFT(DE_SS) // ?
|
||||
#define DE_GRV LSFT(DE_ACUT) // `
|
||||
#define DE_ASTR LSFT(DE_PLUS) // *
|
||||
#define DE_QUOT LSFT(DE_HASH) // '
|
||||
#define DE_MORE LSFT(DE_LESS) // >
|
||||
#define DE_COLN LSFT(KC_DOT) // :
|
||||
#define DE_SCLN LSFT(KC_COMM) // ;
|
||||
#define DE_UNDS LSFT(DE_MINS) // _
|
||||
#define DE_OSX_RING LSFT(DE_OSX_CIRC) // °
|
||||
#define DE_OSX_EXLM LSFT(KC_1) // !
|
||||
#define DE_OSX_DQOT LSFT(KC_2) // "
|
||||
#define DE_OSX_PARA LSFT(KC_3) // §
|
||||
#define DE_OSX_DLR LSFT(KC_4) // $
|
||||
#define DE_OSX_PERC LSFT(KC_5) // %
|
||||
#define DE_OSX_AMPR LSFT(KC_6) // &
|
||||
#define DE_OSX_SLSH LSFT(KC_7) // /
|
||||
#define DE_OSX_LPRN LSFT(KC_8) // (
|
||||
#define DE_OSX_RPRN LSFT(KC_9) // )
|
||||
#define DE_OSX_EQL LSFT(KC_0) // =
|
||||
#define DE_OSX_QST LSFT(DE_OSX_SS) // ?
|
||||
#define DE_OSX_GRV LSFT(DE_OSX_ACUT) // `
|
||||
#define DE_OSX_ASTR LSFT(DE_OSX_PLUS) // *
|
||||
#define DE_OSX_QUOT LSFT(DE_OSX_HASH) // '
|
||||
#define DE_OSX_MORE LSFT(DE_OSX_LESS) // >
|
||||
#define DE_OSX_COLN LSFT(KC_DOT) // :
|
||||
#define DE_OSX_SCLN LSFT(KC_COMM) // ;
|
||||
#define DE_OSX_UNDS LSFT(DE_OSX_MINS) // _
|
||||
|
||||
// Alt-ed characters
|
||||
#define DE_SQ2 LALT(KC_2) // ²
|
||||
#define DE_SQ3 LALT(KC_3) // ³
|
||||
#define DE_LCBR LALT(KC_8) // {
|
||||
#define DE_LBRC LALT(KC_5) // [
|
||||
#define DE_RBRC LALT(KC_6) // ]
|
||||
#define DE_RCBR LALT(KC_9) // }
|
||||
#define DE_BSLS LALT(LSFT(KC_7)) // backslash
|
||||
#define DE_AT LALT(DE_L) // @
|
||||
#define DE_EURO LALT(KC_E) // €
|
||||
#define DE_TILD LALT(DE_N) // ~
|
||||
#define DE_PIPE LALT(DE_7) // |
|
||||
#define DE_OSX_SQ2 LALT(KC_2) // ²
|
||||
#define DE_OSX_SQ3 LALT(KC_3) // ³
|
||||
#define DE_OSX_LCBR LALT(KC_8) // {
|
||||
#define DE_OSX_LBRC LALT(KC_5) // [
|
||||
#define DE_OSX_RBRC LALT(KC_6) // ]
|
||||
#define DE_OSX_RCBR LALT(KC_9) // }
|
||||
#define DE_OSX_BSLS LALT(LSFT(KC_7)) // backslash
|
||||
#define DE_OSX_AT LALT(DE_OSX_L) // @
|
||||
#define DE_OSX_EURO LALT(KC_E) // €
|
||||
#define DE_OSX_TILD LALT(DE_OSX_N) // ~
|
||||
#define DE_OSX_PIPE LALT(DE_OSX_7) // |
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue