diff options
| author | IBNobody <IBNobody@users.noreply.github.com> | 2016-04-13 22:08:00 -0500 |
|---|---|---|
| committer | IBNobody <IBNobody@users.noreply.github.com> | 2016-04-13 22:08:00 -0500 |
| commit | 7ff57503c61d72be62bb737af5f0efc5ad74b82a (patch) | |
| tree | e5a4513740d4629203d3a663f1c39895cc842267 | |
| parent | e0ddbba1ef273af2b62d4c79c2cba74169d6f1e5 (diff) | |
| parent | 2900b4884598b06ed59371c48ecea9d3f0bff5ac (diff) | |
| download | qmk_firmware-7ff57503c61d72be62bb737af5f0efc5ad74b82a.tar.gz qmk_firmware-7ff57503c61d72be62bb737af5f0efc5ad74b82a.zip | |
Merge pull request #1 from IBNobody/pc_planck
Corrected minor spacing issues
| -rw-r--r-- | keyboard/atomic/Makefile | 22 | ||||
| -rw-r--r-- | keyboard/planck/Makefile | 28 | ||||
| -rw-r--r-- | keyboard/planck/config.h | 4 | ||||
| -rw-r--r-- | quantum/keymap_midi.h | 2 |
4 files changed, 29 insertions, 27 deletions
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile index 2b017446d..20cf4fff1 100644 --- a/keyboard/atomic/Makefile +++ b/keyboard/atomic/Makefile | |||
| @@ -114,19 +114,19 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
| 114 | # Build Options | 114 | # Build Options |
| 115 | # comment out to disable the options. | 115 | # comment out to disable the options. |
| 116 | # | 116 | # |
| 117 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | 117 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) |
| 118 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 118 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) |
| 119 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 119 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 120 | CONSOLE_ENABLE = yes # Console for debug(+400) | 120 | CONSOLE_ENABLE = yes # Console for debug(+400) |
| 121 | COMMAND_ENABLE = yes # Commands for debug and configuration | 121 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 122 | #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | 122 | #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA |
| 123 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 123 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 124 | #MIDI_ENABLE = yes # MIDI controls | 124 | #MIDI_ENABLE = yes # MIDI controls |
| 125 | #UNICODE_ENABLE = yes # Unicode | 125 | #UNICODE_ENABLE = yes # Unicode |
| 126 | #BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID | 126 | #BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID |
| 127 | 127 | ||
| 128 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 128 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 129 | #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 129 | #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend |
| 130 | 130 | ||
| 131 | # Optimize size but this may cause error "relocation truncated to fit" | 131 | # Optimize size but this may cause error "relocation truncated to fit" |
| 132 | #EXTRALDFLAGS = -Wl,--relax | 132 | #EXTRALDFLAGS = -Wl,--relax |
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index 17e5cd45c..ae637fc29 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile | |||
| @@ -130,20 +130,22 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 | |||
| 130 | # Build Options | 130 | # Build Options |
| 131 | # comment out to disable the options. | 131 | # comment out to disable the options. |
| 132 | # | 132 | # |
| 133 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) | 133 | BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) |
| 134 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) | 134 | MOUSEKEY_ENABLE = yes # Mouse keys(+4700) |
| 135 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) | 135 | EXTRAKEY_ENABLE = yes # Audio control and System control(+450) |
| 136 | CONSOLE_ENABLE = yes # Console for debug(+400) | 136 | CONSOLE_ENABLE = yes # Console for debug(+400) |
| 137 | COMMAND_ENABLE = yes # Commands for debug and configuration | 137 | COMMAND_ENABLE = yes # Commands for debug and configuration |
| 138 | # NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | ||
| 139 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | ||
| 140 | # MIDI_ENABLE = yes # MIDI controls | ||
| 141 | # AUDIO_ENABLE = yes # Audio output on port C6 | ||
| 142 | # UNICODE_ENABLE = yes # Unicode | ||
| 143 | # BLUETOOTH_ENABLE = ye # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 144 | # RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | ||
| 145 | |||
| 138 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 146 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 139 | # SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend | 147 | #SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend |
| 140 | NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 148 | |
| 141 | # BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | ||
| 142 | # MIDI_ENABLE = YES # MIDI controls | ||
| 143 | # AUDIO_ENABLE = YES # Audio output on port C6 | ||
| 144 | # UNICODE_ENABLE = YES # Unicode | ||
| 145 | # BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID | ||
| 146 | # RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. | ||
| 147 | 149 | ||
| 148 | ifdef BACKLIGHT_ENABLE | 150 | ifdef BACKLIGHT_ENABLE |
| 149 | SRC += backlight.c | 151 | SRC += backlight.c |
diff --git a/keyboard/planck/config.h b/keyboard/planck/config.h index 7d64f0977..d3719e0cb 100644 --- a/keyboard/planck/config.h +++ b/keyboard/planck/config.h | |||
| @@ -73,10 +73,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 73 | */ | 73 | */ |
| 74 | 74 | ||
| 75 | /* disable debug print */ | 75 | /* disable debug print */ |
| 76 | //#define NO_DEBUG | 76 | #define NO_DEBUG |
| 77 | 77 | ||
| 78 | /* disable print */ | 78 | /* disable print */ |
| 79 | //#define NO_PRINT | 79 | #define NO_PRINT |
| 80 | 80 | ||
| 81 | /* disable action features */ | 81 | /* disable action features */ |
| 82 | //#define NO_ACTION_LAYER | 82 | //#define NO_ACTION_LAYER |
diff --git a/quantum/keymap_midi.h b/quantum/keymap_midi.h index 436fb2eb5..795f26380 100644 --- a/quantum/keymap_midi.h +++ b/quantum/keymap_midi.h | |||
| @@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | 20 | ||
| 21 | #include <lufa.h> | 21 | #include <lufa.h> |
| 22 | 22 | ||
| 23 | #define MIDI(n) (n | 0x6000) | 23 | #define MIDI(n) ((n) | 0x6000) |
| 24 | #define MIDI12 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000 | 24 | #define MIDI12 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000 |
| 25 | 25 | ||
| 26 | #define CHNL(note, channel) (note + (channel << 8)) | 26 | #define CHNL(note, channel) (note + (channel << 8)) |
