diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-26 12:37:54 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-26 12:37:54 +0000 |
| commit | 3d957a33faef93d2e1a9e346b295f387b0e92894 (patch) | |
| tree | 60e1c9658ca4620c7a433c657df9b45f9960a603 | |
| parent | 0eb36b5e9a677f758b8e7404aa43a1694c4508ed (diff) | |
| parent | f028dbf179b6e9eb9bbc58b14c38c35ddd0e73ea (diff) | |
| download | qmk_firmware-3d957a33faef93d2e1a9e346b295f387b0e92894.tar.gz qmk_firmware-3d957a33faef93d2e1a9e346b295f387b0e92894.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/redox/keymaps/finex/keymap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/redox/keymaps/finex/keymap.c b/keyboards/redox/keymaps/finex/keymap.c index 5a508815b..8cc822f1c 100644 --- a/keyboards/redox/keymaps/finex/keymap.c +++ b/keyboards/redox/keymaps/finex/keymap.c | |||
| @@ -232,7 +232,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 232 | 232 | ||
| 233 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 233 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 234 | 234 | ||
| 235 | // Colemak DM-MK Mod | 235 | // Colemak DH-MK Mod |
| 236 | [_COLEMAKDHMK] = LAYOUT( | 236 | [_COLEMAKDHMK] = LAYOUT( |
| 237 | //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ | 237 | //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ |
| 238 | XXXXXXX ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_ESC , | 238 | XXXXXXX ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_ESC , |
| @@ -247,7 +247,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 247 | //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘ | 247 | //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘ |
| 248 | ), | 248 | ), |
| 249 | 249 | ||
| 250 | // Colemak DM-MK Mod, Mac version (CTRL and GUI are swapped) | 250 | // Colemak DH-MK Mod, Mac version (CTRL and GUI are swapped) |
| 251 | [_COLEMAKDHMK_MAC] = LAYOUT( | 251 | [_COLEMAKDHMK_MAC] = LAYOUT( |
| 252 | //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ | 252 | //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ |
| 253 | XXXXXXX ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_ESC , | 253 | XXXXXXX ,KC_1 ,KC_2 ,KC_3 ,KC_4 ,KC_5 , KC_6 ,KC_7 ,KC_8 ,KC_9 ,KC_0 ,KC_ESC , |