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 /keyboard | |
| parent | 5bb7ef0012378cd800bff74680b08c587e6338e4 (diff) | |
| parent | 6a4ee574bcc8b67a5b842411eec45d351b14d1ed (diff) | |
Merge pull request #29 from kaymmm/nobacklight
use preprocessor conditional on backlight initialization
Diffstat (limited to 'keyboard')
| -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 ad0c824375..482c0cdb30 100644 --- a/keyboard/planck/Makefile +++ b/keyboard/planck/Makefile @@ -126,7 +126,6 @@ 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 -BACKLIGHT_ENABLE = yes ifdef MIDI_ENABLE SRC += keymap_midi.c diff --git a/keyboard/planck/matrix.c b/keyboard/planck/matrix.c index 8a021719ce..d335a8fbe1 100644 --- a/keyboard/planck/matrix.c +++ b/keyboard/planck/matrix.c @@ -65,7 +65,9 @@ void matrix_init(void) MCUCR |= (1<<JTD); MCUCR |= (1<<JTD); + #if BACKLIGHT_ENABLE == 'yes' backlight_init_ports(); + #endif // Turn status LED on DDRE |= (1<<6); |