diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-09-14 15:21:01 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-09-14 15:21:01 -0400 |
| commit | b9e42a87538644cd8f7a426d28be9b770e63d73b (patch) | |
| tree | 9d7ab79506dc98631c9d635df11ec7064f48b0da | |
| parent | 5bb7ef0012378cd800bff74680b08c587e6338e4 (diff) | |
| parent | 6a4ee574bcc8b67a5b842411eec45d351b14d1ed (diff) | |
| download | qmk_firmware-b9e42a87538644cd8f7a426d28be9b770e63d73b.tar.gz qmk_firmware-b9e42a87538644cd8f7a426d28be9b770e63d73b.zip | |
Merge pull request #29 from kaymmm/nobacklight
use preprocessor conditional on backlight initialization
| -rw-r--r-- | keyboard/planck/Makefile | 1 | ||||
| -rw-r--r-- | keyboard/planck/matrix.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/keyboard/planck/Makefile b/keyboard/planck/Makefile index ad0c82437..482c0cdb3 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile | |||
| @@ -126,7 +126,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration | |||
| 126 | # NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA | 126 | # NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA |
| 127 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | 127 | BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality |
| 128 | MIDI_ENABLE = YES # MIDI controls | 128 | MIDI_ENABLE = YES # MIDI controls |
| 129 | BACKLIGHT_ENABLE = yes | ||
| 130 | 129 | ||
| 131 | ifdef MIDI_ENABLE | 130 | ifdef MIDI_ENABLE |
| 132 | SRC += keymap_midi.c | 131 | SRC += keymap_midi.c |
diff --git a/keyboard/planck/matrix.c b/keyboard/planck/matrix.c index 8a021719c..d335a8fbe 100644 --- a/keyboard/planck/matrix.c +++ b/keyboard/planck/matrix.c | |||
| @@ -65,7 +65,9 @@ void matrix_init(void) | |||
| 65 | MCUCR |= (1<<JTD); | 65 | MCUCR |= (1<<JTD); |
| 66 | MCUCR |= (1<<JTD); | 66 | MCUCR |= (1<<JTD); |
| 67 | 67 | ||
| 68 | #if BACKLIGHT_ENABLE == 'yes' | ||
| 68 | backlight_init_ports(); | 69 | backlight_init_ports(); |
| 70 | #endif | ||
| 69 | 71 | ||
| 70 | // Turn status LED on | 72 | // Turn status LED on |
| 71 | DDRE |= (1<<6); | 73 | DDRE |= (1<<6); |
