diff options
| -rw-r--r-- | keyboards/xd68/keymaps/via/keymap.c | 41 | ||||
| -rw-r--r-- | keyboards/xd68/rules.mk | 2 | ||||
| -rwxr-xr-x | keyboards/xd68/xd68.h | 32 |
3 files changed, 47 insertions, 28 deletions
diff --git a/keyboards/xd68/keymaps/via/keymap.c b/keyboards/xd68/keymaps/via/keymap.c index 6ffed7750..64be6af3b 100644 --- a/keyboards/xd68/keymaps/via/keymap.c +++ b/keyboards/xd68/keymaps/via/keymap.c | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #define _BL 0 | ||
| 4 | #define _FL 1 | ||
| 5 | |||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 6 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | /* Keymap _BL: (Base Layer) Default Layer | 7 | /* Keymap _BL: (Base Layer) Default Layer |
| 5 | * ,----------------------------------------------------------------. | 8 | * ,----------------------------------------------------------------. |
| @@ -7,19 +10,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 7 | * |----------------------------------------------------------------| | 10 | * |----------------------------------------------------------------| |
| 8 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |PgUp| | 11 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \ |PgUp| |
| 9 | * |----------------------------------------------------------------| | 12 | * |----------------------------------------------------------------| |
| 10 | * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|Return |PgDn| | 13 | * |CAPS | A| S| D| F| G| H| J| K| L| ;| '|#| Rtrn|PgDn| |
| 11 | * |----------------------------------------------------------------| | 14 | * |----------------------------------------------------------------| |
| 12 | * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift | Up|End | | 15 | * |Shift| \| Z| X| C| V| B| N| M| ,| .| /|Shift | Up|End | |
| 13 | * |----------------------------------------------------------------| | 16 | * |----------------------------------------------------------------| |
| 14 | * |Ctrl|Win |Alt | Space |App|Ctrl|FN |Lef|Dow|Rig | | 17 | * |Ctrl|Win |Alt | Space |Alt|FN |Ctrl|Lef|Dow|Rig | |
| 15 | * `----------------------------------------------------------------' | 18 | * `----------------------------------------------------------------' |
| 16 | */ | 19 | */ |
| 17 | [0] = LAYOUT_65_ansi( | 20 | [_BL] = LAYOUT_all( |
| 18 | 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_HOME, | 21 | 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_HOME, |
| 19 | 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_PGUP, | 22 | 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_PGUP, |
| 20 | KC_CAPS, 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_PGDN, | 23 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_PGDN, |
| 21 | 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_END, | 24 | KC_LSFT, KC_BSLS, 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_END, |
| 22 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_APP, KC_RCTL, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 23 | ), | 26 | ), |
| 24 | 27 | ||
| 25 | /* Keymap _FL: Function Layer | 28 | /* Keymap _FL: Function Layer |
| @@ -35,27 +38,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 35 | * |HUD |SAD |VAD | RGB_Tog | | | | <M|V- |M> | | 38 | * |HUD |SAD |VAD | RGB_Tog | | | | <M|V- |M> | |
| 36 | * `----------------------------------------------------------------' | 39 | * `----------------------------------------------------------------' |
| 37 | */ | 40 | */ |
| 38 | [1] = LAYOUT_65_ansi( | 41 | [_FL] = LAYOUT_all( |
| 39 | KC_GRV, 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, KC_INS, | 42 | KC_GRV, 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, KC_INS, |
| 40 | RESET, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 43 | RESET, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 41 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 44 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 42 | RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD, BL_DEC, BL_TOGG, BL_INC, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, | 45 | RGB_HUI, _______, RGB_SAI, RGB_VAI, RGB_MOD, BL_DEC, BL_TOGG, BL_INC, _______, _______, _______, _______, KC_MPLY, KC_VOLU, KC_MUTE, |
| 43 | RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT | 46 | RGB_HUD, RGB_SAD, RGB_VAD, RGB_TOG, _______, _______, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT |
| 44 | ), | 47 | ) |
| 45 | |||
| 46 | [2] = LAYOUT_65_ansi( | ||
| 47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 48 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 49 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 50 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 51 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 52 | ), | ||
| 53 | |||
| 54 | [3] = LAYOUT_65_ansi( | ||
| 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 56 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 57 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 58 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
| 59 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
| 60 | ), | ||
| 61 | }; | 48 | }; |
diff --git a/keyboards/xd68/rules.mk b/keyboards/xd68/rules.mk index c8b7950c9..8d52ba327 100644 --- a/keyboards/xd68/rules.mk +++ b/keyboards/xd68/rules.mk | |||
| @@ -32,4 +32,4 @@ FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches | |||
| 32 | HD44780_ENABLE = no # Enable support for HD44780 based LCDs | 32 | HD44780_ENABLE = no # Enable support for HD44780 based LCDs |
| 33 | UNICODE_ENABLE = no # Unicode | 33 | UNICODE_ENABLE = no # Unicode |
| 34 | 34 | ||
| 35 | LAYOUTS = 65_ansi 65_iso \ No newline at end of file | 35 | LAYOUTS = 65_ansi 65_iso |
diff --git a/keyboards/xd68/xd68.h b/keyboards/xd68/xd68.h index 2916d72d4..f4347928f 100755 --- a/keyboards/xd68/xd68.h +++ b/keyboards/xd68/xd68.h | |||
| @@ -6,6 +6,38 @@ | |||
| 6 | // readability | 6 | // readability |
| 7 | #define XXX KC_NO | 7 | #define XXX KC_NO |
| 8 | 8 | ||
| 9 | /* XD68 ALL (VIA) layout | ||
| 10 | * ,----------------------------------------------------------------. | ||
| 11 | * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | | ||
| 12 | * |----------------------------------------------------------------| | ||
| 13 | * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e | | ||
| 14 | * |----------------------------------------------------------------| | ||
| 15 | * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d| 2e | | ||
| 16 | * |----------------------------------------------------------------| | ||
| 17 | * | 30 |31| 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e | | ||
| 18 | * |----------------------------------------------------------------| | ||
| 19 | * | 40 | 41 | 42 | 45 | 48| 4a| 4b| 4c| 4d| 4e | | ||
| 20 | * `----------------------------------------------------------------' | ||
| 21 | */ | ||
| 22 | // The first section contains all of the arguments | ||
| 23 | // The second converts the arguments into a two-dimensional array | ||
| 24 | |||
| 25 | #define LAYOUT_all( \ | ||
| 26 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ | ||
| 27 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ | ||
| 28 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ | ||
| 29 | k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ | ||
| 30 | k40, k41, k42, k45, k48, k4a, k4b, k4c, k4d, k4e \ | ||
| 31 | ) \ | ||
| 32 | { \ | ||
| 33 | {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ | ||
| 34 | {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ | ||
| 35 | {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \ | ||
| 36 | {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ | ||
| 37 | {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e} \ | ||
| 38 | } | ||
| 39 | |||
| 40 | |||
| 9 | /* XD68 ANSI layout | 41 | /* XD68 ANSI layout |
| 10 | * ,----------------------------------------------------------------. | 42 | * ,----------------------------------------------------------------. |
| 11 | * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | | 43 | * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | |
