mirror of
https://github.com/Keychron/qmk_firmware.git
synced 2024-11-25 18:06:34 +06:00
Merge pull request #157 from DidierLoiseau/typematrix
Small fixes and improvements to tm2030 layout
This commit is contained in:
commit
d33681aa22
|
@ -55,7 +55,7 @@ As on the original TM 2030, when `num` layer is activated, holding `fn` disables
|
|||
## Dvorak Layer
|
||||
Same as Layer 0 but with _Dvorak_ layout, to use with QWERTY OS layout.
|
||||
|
||||
Enable Dvorak layout with [`Magic`](/TMK_README.md#magic-commands+`1` (`LShift`+`RShift`+`1`), disable with `Magic`-`0`.
|
||||
Enable Dvorak layout with [`Magic`](/TMK_README.md#magic-commands)+`1` (`LShift`+`RShift`+`1`), disable with `Magic`-`0`.
|
||||
|
||||
The middle (green) led indicates when the Dvorak layer is activated.
|
||||
|
||||
|
|
|
@ -11,9 +11,6 @@
|
|||
|
||||
#define MDBL0 1
|
||||
#define MFNLR 2
|
||||
#define MCUT 3
|
||||
#define MCOPY 4
|
||||
#define MPSTE 5
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
/* Basic layer
|
||||
|
@ -142,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_TRNS,
|
||||
KC_TRNS, KC_TRNS,KC_TRNS,
|
||||
// right hand
|
||||
KC_INS, KC_F6, KC_F7, KC_TAB, KC_PSLS, KC_PAST, KC_PMNS,
|
||||
KC_TRNS, KC_F6, KC_F7, KC_TAB, KC_PSLS, KC_PAST, KC_PMNS,
|
||||
KC_TRNS, KC_TRNS, KC_HOME, KC_P7, KC_P8, KC_P9, KC_PPLS,
|
||||
KC_UP, KC_END, KC_P4, KC_P5, KC_P6, KC_PPLS,
|
||||
KC_LEFT, KC_DOWN, KC_RGHT, KC_P1, KC_P2, KC_P3, KC_PENT,
|
||||
|
@ -178,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_MAIL, KC_WHOM,
|
||||
KC_TRNS, KC_TRNS, M(MCUT), M(MCOPY), M(MPSTE), KC_MUTE, KC_VOLD,
|
||||
KC_TRNS, KC_TRNS, LSFT(KC_DELT),LCTL(KC_INS),LSFT(KC_INS), KC_MUTE, KC_VOLD,
|
||||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
|
||||
|
||||
KC_TRNS, KC_TRNS,
|
||||
|
@ -210,22 +207,8 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
}
|
||||
break;
|
||||
case MFNLR:
|
||||
layer_state ^= (1 << NUMR) | (1 << FNLR);
|
||||
break;
|
||||
case MCUT:
|
||||
if (record->event.pressed) {
|
||||
return MACRO(D(LSFT), T(DELT), U(LSFT), END);
|
||||
}
|
||||
break;
|
||||
case MCOPY:
|
||||
if (record->event.pressed) {
|
||||
return MACRO(D(LCTL), T(INS), U(LCTL), END);
|
||||
}
|
||||
break;
|
||||
case MPSTE:
|
||||
if (record->event.pressed) {
|
||||
return MACRO(D(LSFT), T(INS), U(LSFT), END);
|
||||
}
|
||||
layer_invert(NUMR);
|
||||
layer_invert(FNLR);
|
||||
break;
|
||||
}
|
||||
return MACRO_NONE;
|
||||
|
@ -233,7 +216,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
|
|||
|
||||
// Runs just one time when the keyboard initializes.
|
||||
void * matrix_init_user(void) {
|
||||
|
||||
return NULL;
|
||||
};
|
||||
|
||||
// Runs constantly in the background, in a loop.
|
||||
|
@ -255,4 +238,5 @@ void * matrix_scan_user(void) {
|
|||
if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
|
||||
ergodox_right_led_3_on();
|
||||
}
|
||||
return NULL;
|
||||
};
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user