diff options
| author | Maarten Dekkers <maartenwut@gmail.com> | 2018-03-07 23:06:04 +0100 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-03-07 17:06:04 -0500 |
| commit | 03df19d3f6968f0dc3041b39b7ae8b85198aaa56 (patch) | |
| tree | 6e9fe66eb54c666902dc55ff5a6979e4dd2d1c7e | |
| parent | 42e85d2b92f78577211c87ff27ad58e5f97f3fda (diff) | |
| download | qmk_firmware-03df19d3f6968f0dc3041b39b7ae8b85198aaa56.tar.gz qmk_firmware-03df19d3f6968f0dc3041b39b7ae8b85198aaa56.zip | |
Fixed keymap, added capslock led for maartenwut's kbd66 keymap (#2473)
* Fixed keymap, added capslock led
* Removed macro
| -rwxr-xr-x | keyboards/kbd66/keymaps/maartenwut/keymap.c | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/keyboards/kbd66/keymaps/maartenwut/keymap.c b/keyboards/kbd66/keymaps/maartenwut/keymap.c index 762bed221..4ca794c96 100755 --- a/keyboards/kbd66/keymaps/maartenwut/keymap.c +++ b/keyboards/kbd66/keymaps/maartenwut/keymap.c | |||
| @@ -4,9 +4,6 @@ | |||
| 4 | #define _GA 1 | 4 | #define _GA 1 |
| 5 | #define _FL 2 | 5 | #define _FL 2 |
| 6 | #define _AR 3 | 6 | #define _AR 3 |
| 7 | #define _LE 4 | ||
| 8 | #define _LO 5 | ||
| 9 | #define _UL 6 | ||
| 10 | 7 | ||
| 11 | #define TRNS KC_TRNS | 8 | #define TRNS KC_TRNS |
| 12 | #define ______ KC_NO | 9 | #define ______ KC_NO |
| @@ -14,56 +11,52 @@ | |||
| 14 | 11 | ||
| 15 | #define LSHIFT OSM(MOD_LSFT) | 12 | #define LSHIFT OSM(MOD_LSFT) |
| 16 | #define SPACE LT(_AR, KC_SPC) | 13 | #define SPACE LT(_AR, KC_SPC) |
| 17 | #define CAPS LT(_LE, KC_CAPS) | ||
| 18 | 14 | ||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 15 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | // Main Layer | 16 | // Main Layer |
| 21 | [_MA] = KEYMAP_ANSI( | 17 | [_MA] = KEYMAP( |
| 22 | KC_GESC, 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_MPLY, KC_BSPC, KC_PSCR, | 18 | KC_GESC, 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_MPLY, |
| 23 | 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, | 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_DEL, |
| 24 | 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, | 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, |
| 25 | LSHIFT, TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TRNS, KC_UP, | 21 | LSHIFT, TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, TRNS, KC_UP, |
| 26 | KC_LCTL, KC_LGUI, KC_LALT, SPACE, SPACE, KC_RALT, KC_RCTRL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), | 22 | KC_LCTL, KC_LGUI, KC_LALT, SPACE, SPACE, KC_RALT, KC_RCTRL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT), |
| 27 | 23 | ||
| 28 | //Function Layer | 24 | //Function Layer |
| 29 | [_FL] = KEYMAP_ANSI( | 25 | [_FL] = KEYMAP( |
| 30 | 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, TRNS, RESET, KC_PGUP, | 26 | 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, TRNS, RESET, KC_PSCR, |
| 31 | TRNS, KC_BTN1, KC_MS_U, KC_BTN2, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_PGDN, | 27 | TRNS, ______, ______, ______, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, ______, |
| 32 | TRNS, KC_MS_L, KC_MS_D, KC_MS_R, TRNS, TG(_GA), TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 28 | TRNS, ______, ______, ______, TRNS, TG(_GA), TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 33 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_VOLD, KC_VOLU, KC_MUTE, TRNS, TRNS, KC_WH_U, | 29 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_VOLD, KC_VOLU, KC_MUTE, TRNS, TRNS, KC_PGUP, |
| 34 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, KC_WH_L, KC_WH_D, KC_WH_R), | 30 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, ______, KC_PGDN, ______), |
| 35 | 31 | ||
| 36 | //Arrow keys layer (space bar) | 32 | //Arrow keys layer (space bar) |
| 37 | [_AR] = KEYMAP_ANSI( | 33 | [_AR] = KEYMAP( |
| 38 | 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, TRNS, TRNS, TRNS, | 34 | 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, TRNS, TRNS, TRNS, |
| 39 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 35 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 40 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 36 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 41 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 37 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 42 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, M(0), TRNS, TRNS, TRNS), | ||
| 43 | //LED control layer (caps) | ||
| 44 | [_LE] = KEYMAP_ANSI( | ||
| 45 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 46 | TRNS, BL_TOGG, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 47 | TRNS, BL_INC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 48 | TRNS, TRNS, BL_DEC, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | ||
| 49 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), | 38 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS), |
| 50 | 39 | ||
| 51 | //Game layer (fn + g) | 40 | //Game layer (fn + g) |
| 52 | [_GA] = KEYMAP_ANSI( | 41 | [_GA] = KEYMAP( |
| 53 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 42 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 54 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 43 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 55 | KC_CAPS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 44 | TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 56 | KC_LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, | 45 | KC_LSFT, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, TRNS, |
| 57 | TRNS, TRNS, TRNS, KC_SPC, KC_SPC, TRNS, TRNS, MO(_FL), TRNS, TRNS, TRNS), | 46 | TRNS, TRNS, TRNS, KC_SPC, KC_SPC, TRNS, TRNS, MO(_FL), TRNS, TRNS, TRNS), |
| 58 | }; | 47 | }; |
| 59 | 48 | ||
| 60 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { | 49 | void matrix_init_user() { |
| 61 | switch (id) { | 50 | //Set led port to output |
| 62 | case 0: | 51 | DDRB |= (1<<2); |
| 63 | if (record->event.pressed) { | 52 | } |
| 64 | SEND_STRING("AdminF123!"); | 53 | |
| 65 | } | 54 | void led_set_user(uint8_t usb_led) { |
| 66 | break; | 55 | if (usb_led & (1<<USB_LED_CAPS_LOCK)) { |
| 56 | // Turn capslock on | ||
| 57 | PORTB &= ~(1<<2); | ||
| 58 | } else { | ||
| 59 | // Turn capslock off | ||
| 60 | PORTB |= (1<<2); | ||
| 67 | } | 61 | } |
| 68 | return MACRO_NONE; | 62 | } |
| 69 | }; \ No newline at end of file | ||
