diff --git a/keyboards/tada68/keymaps/dlg/keymap.c b/keyboards/tada68/keymaps/dlg/keymap.c index 9cd6cb2f12..32532e0f3f 100755 --- a/keyboards/tada68/keymaps/dlg/keymap.c +++ b/keyboards/tada68/keymaps/dlg/keymap.c @@ -3,11 +3,8 @@ #define _BL 0 #define _FL 1 #define _MAC 2 +#define _LA 3 -// investigate later - use lctl / lsft as up/down. -// https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/fakb -#define LCTL_MA LCTL_T(KC_UP) -#define LSFT_MA LSFT_T(KC_DOWN) const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _BL: (Base Layer) Default Layer @@ -27,19 +24,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * Win + Esc = ` */ [_BL] = LAYOUT_ansi( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, \ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_ESC, \ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL , \ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, \ - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_UP, KC_PGDN, \ - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT), + 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_UP, KC_PGDN, \ + KC_LCTL, KC_LGUI, LM(_LA, MOD_LALT), KC_SPC, KC_RALT, MO(_FL), KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT), /* Keymap _FL: Function Layer * ,----------------------------------------------------------------. * |`swp|F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| Del |`swp| * |----------------------------------------------------------------| - * | |BL |BL-|BL+|Brt| | | |mac| |PSc| | | |Ins | + * | |BL |BL-|BL+| | | | |mac| |PSc| | | |Ins | * |----------------------------------------------------------------| - * | | | | | | |<- |Dn |Up | ->| | | |Hme | + * | | | | | | |Lef|Dn |Up |Rig| | | |Hme | * |----------------------------------------------------------------| * | | | | | | | |MUT|V- |V+ | | |PUp|End | * |----------------------------------------------------------------| @@ -48,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_FL] = LAYOUT_ansi( MAGIC_UNSWAP_GRAVE_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, MAGIC_SWAP_GRAVE_ESC, \ - _______, BL_TOGG, BL_DEC, BL_INC , BL_BRTG, _______, _______, _______, TG(_MAC),_______, KC_PSCR, _______, _______, _______, KC_INS, \ + _______, BL_TOGG, BL_DEC, BL_INC , _______, _______, _______, _______, TG(_MAC),_______, KC_PSCR, _______, _______, _______, KC_INS, \ _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, KC_HOME, \ _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, KC_END , \ _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), @@ -73,4 +70,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ KC_LCTL, KC_LALT, KC_LGUI, _______, KC_RGUI, _______, KC_RALT, _______, _______, _______), + /* Keymap _LA: Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps + * ,----------------------------------------------------------------. + * | | | | |F4 | | | | | | | | | | | + * |----------------------------------------------------------------| + * | | | | | | | | | | | | | | | | + * |----------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |----------------------------------------------------------------| + * | | | | | | | | | | | | | | | + * |----------------------------------------------------------------| + * | | | | | | | | | | | + * `----------------------------------------------------------------' + */ +[_LA] = LAYOUT_ansi( + _______, _______, _______, _______, KC_F4, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), }; diff --git a/keyboards/tada68/keymaps/dlg/readme.md b/keyboards/tada68/keymaps/dlg/readme.md index 1f1ae18671..9bb9d2496e 100755 --- a/keyboards/tada68/keymaps/dlg/readme.md +++ b/keyboards/tada68/keymaps/dlg/readme.md @@ -4,13 +4,14 @@ + Mac layer + Press Fn-I to align the bottom row to mac standards + volume controls moved to Fn+ M<> - + [Space Cadet Shift](https://docs.qmk.fm/#/feature_space_cadet_shift) enabled - + Fn+R for LED breathing + Fn+Del for Insert + `GRAVE_ESC_ALT_OVERRIDE` so cmd-opt-esc still works (thx [mattdicarlo](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/mattdicarlo)) + + `LALT` layer - LALT-4 maps to LALT-F4 so you can close windows in Windows + + +### Base Layer ``` - Base Layer ,----------------------------------------------------------------. |Esc | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp |~ ` | |----------------------------------------------------------------| @@ -22,15 +23,19 @@ |----------------------------------------------------------------| |Ctrl|Win |Alt | Space |Alt|Fn |Ctrl|<- |Dn | -> | `----------------------------------------------------------------' -Note: Shift + Esc = ~ (tilde) - Win + Esc = ` (grave) +``` +Note: +* Shift + Esc = ~ (tilde) +* Win + Esc = ` (grave) - Fn Layer +### Fn Layer + +``` ,----------------------------------------------------------------. | |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12| Del | | |----------------------------------------------------------------| -| |BL |BL-|BL+|Brt| | | |mac| |PSc| | | |Ins | +| |BL |BL-|BL+| | | | |mac| |PSc| | | |Ins | |----------------------------------------------------------------| | | | | | | |<- |Dn |Up | ->| | | |Hme | |----------------------------------------------------------------| @@ -38,8 +43,11 @@ Note: Shift + Esc = ~ (tilde) |----------------------------------------------------------------| | | | | | | | |Hme|PDn|End | `----------------------------------------------------------------' +``` -Mac Layer +### Mac Layer + +``` ,----------------------------------------------------------------. | | | | | | | | | | | | | | | | |----------------------------------------------------------------| @@ -52,3 +60,19 @@ Mac Layer |Ctrl|Alt |Win | |Win | |Alt| | | | `----------------------------------------------------------------' ``` + +### `LALT` Layer + +``` +,----------------------------------------------------------------. +| | | | |F4 | | | | | | | | | | | +|----------------------------------------------------------------| +| | | | | | | | | | | | | | | | +|----------------------------------------------------------------| +| | | | | | | | | | | | | | | +|----------------------------------------------------------------| +| | | | | | | | | | | | | | | +|----------------------------------------------------------------| +| |Alt | | | | | | | | | +`----------------------------------------------------------------' +```