aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIBNobody <IBNobody@users.noreply.github.com>2016-04-13 22:08:00 -0500
committerIBNobody <IBNobody@users.noreply.github.com>2016-04-13 22:08:00 -0500
commit7ff57503c61d72be62bb737af5f0efc5ad74b82a (patch)
treee5a4513740d4629203d3a663f1c39895cc842267
parente0ddbba1ef273af2b62d4c79c2cba74169d6f1e5 (diff)
parent2900b4884598b06ed59371c48ecea9d3f0bff5ac (diff)
downloadfirmware-7ff57503c61d72be62bb737af5f0efc5ad74b82a.tar.gz
firmware-7ff57503c61d72be62bb737af5f0efc5ad74b82a.tar.bz2
firmware-7ff57503c61d72be62bb737af5f0efc5ad74b82a.zip
Merge pull request #1 from IBNobody/pc_planck
Corrected minor spacing issues
-rw-r--r--keyboard/atomic/Makefile22
-rw-r--r--keyboard/planck/Makefile28
-rw-r--r--keyboard/planck/config.h4
-rw-r--r--quantum/keymap_midi.h2
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
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = yes # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
-#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-#MIDI_ENABLE = yes # MIDI controls
-#UNICODE_ENABLE = yes # Unicode
-#BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = yes # Console for debug(+400)
+COMMAND_ENABLE = yes # Commands for debug and configuration
+#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+#MIDI_ENABLE = yes # MIDI controls
+#UNICODE_ENABLE = yes # Unicode
+#BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
+#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
# Optimize size but this may cause error "relocation truncated to fit"
#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
# Build Options
# comment out to disable the options.
#
-BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
-CONSOLE_ENABLE = yes # Console for debug(+400)
-COMMAND_ENABLE = yes # Commands for debug and configuration
+BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
+CONSOLE_ENABLE = yes # Console for debug(+400)
+COMMAND_ENABLE = yes # Commands for debug and configuration
+# NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
+# MIDI_ENABLE = yes # MIDI controls
+# AUDIO_ENABLE = yes # Audio output on port C6
+# UNICODE_ENABLE = yes # Unicode
+# BLUETOOTH_ENABLE = ye # Enable Bluetooth with the Adafruit EZ-Key HID
+# RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
-NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-# MIDI_ENABLE = YES # MIDI controls
-# AUDIO_ENABLE = YES # Audio output on port C6
-# UNICODE_ENABLE = YES # Unicode
-# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID
-# RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
+
ifdef BACKLIGHT_ENABLE
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/>.
*/
/* disable debug print */
-//#define NO_DEBUG
+#define NO_DEBUG
/* disable print */
-//#define NO_PRINT
+#define NO_PRINT
/* disable action features */
//#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/>.
#include <lufa.h>
-#define MIDI(n) (n | 0x6000)
+#define MIDI(n) ((n) | 0x6000)
#define MIDI12 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000, 0x6000
#define CHNL(note, channel) (note + (channel << 8))