diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 18:05:06 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-11-21 18:05:06 -0500 |
| commit | c1037b1dc060d14a09a59f697fefe2b5b91bf373 (patch) | |
| tree | 93f58765647a1c2befc839db2ab20e269623c9f5 | |
| parent | b57cf3c0c851f2fb0e32c955b16fc6f0ad236e54 (diff) | |
| download | qmk_firmware-c1037b1dc060d14a09a59f697fefe2b5b91bf373.tar.gz qmk_firmware-c1037b1dc060d14a09a59f697fefe2b5b91bf373.zip | |
working with helper, qmk_helper_windows@05b0105
| -rw-r--r-- | keyboards/planck/keymaps/default/Makefile | 8 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/lufa.c | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/keyboards/planck/keymaps/default/Makefile b/keyboards/planck/keymaps/default/Makefile index 0f4953888..267a087ea 100644 --- a/keyboards/planck/keymaps/default/Makefile +++ b/keyboards/planck/keymaps/default/Makefile | |||
| @@ -5,17 +5,17 @@ | |||
| 5 | # the appropriate keymap folder that will get included automatically | 5 | # the appropriate keymap folder that will get included automatically |
| 6 | # | 6 | # |
| 7 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 7 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) |
| 8 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 8 | MOUSEKEY_ENABLE = no # Mouse keys(+4700) |
| 9 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 9 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 10 | CONSOLE_ENABLE = no # Console for debug(+400) | 10 | CONSOLE_ENABLE = no # Console for debug(+400) |
| 11 | COMMAND_ENABLE = yes # Commands for debug and configuration | 11 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 12 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 12 | NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 13 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 13 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 14 | MIDI_ENABLE = no # MIDI controls | 14 | MIDI_ENABLE = yes # MIDI controls |
| 15 | AUDIO_ENABLE = yes # Audio output on port C6 | 15 | AUDIO_ENABLE = yes # Audio output on port C6 |
| 16 | UNICODE_ENABLE = no # Unicode | 16 | UNICODE_ENABLE = no # Unicode |
| 17 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 17 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 18 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | 18 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight |
| 19 | 19 | ||
| 20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 20 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 21 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c index 5f71ae7d1..ddbe4d7b2 100644 --- a/keyboards/planck/keymaps/default/keymap.c +++ b/keyboards/planck/keymaps/default/keymap.c | |||
| @@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 107 | [_LOWER] = { | 107 | [_LOWER] = { |
| 108 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, | 108 | {KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC}, |
| 109 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, | 109 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE}, |
| 110 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______}, | 110 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______}, |
| 111 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 111 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} |
| 112 | }, | 112 | }, |
| 113 | 113 | ||
| @@ -125,7 +125,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 125 | [_RAISE] = { | 125 | [_RAISE] = { |
| 126 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, | 126 | {KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC}, |
| 127 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, | 127 | {KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS}, |
| 128 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______}, | 128 | {_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______}, |
| 129 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} | 129 | {_______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY} |
| 130 | }, | 130 | }, |
| 131 | 131 | ||
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c index cc00b3b89..35739e321 100644 --- a/tmk_core/protocol/lufa/lufa.c +++ b/tmk_core/protocol/lufa/lufa.c | |||
| @@ -1207,6 +1207,12 @@ void sysex_buffer_callback(MidiDevice * device, uint8_t length, uint8_t * data) | |||
| 1207 | data++; | 1207 | data++; |
| 1208 | 1208 | ||
| 1209 | switch (*data++) { | 1209 | switch (*data++) { |
| 1210 | case 0x07: ; // Quantum action | ||
| 1211 | break; | ||
| 1212 | case 0x08: ; // Keyboard acion | ||
| 1213 | break; | ||
| 1214 | case 0x09: ; // User action | ||
| 1215 | break; | ||
| 1210 | case 0x12: ; // Set info on keyboard | 1216 | case 0x12: ; // Set info on keyboard |
| 1211 | switch (*data++) { | 1217 | switch (*data++) { |
| 1212 | case 0x02: ; // set default layer | 1218 | case 0x02: ; // set default layer |
