diff options
| author | Peter Eichinger <peter.eichinger@gmail.com> | 2016-01-25 17:46:50 +0100 |
|---|---|---|
| committer | Peter Eichinger <peter.eichinger@gmail.com> | 2016-01-25 17:46:50 +0100 |
| commit | 78192791bc0bb98d7a469f88a77febb3250c5b93 (patch) | |
| tree | c20d43cfa5cc4980f8dcf967832e8c913bb84bbe /keyboard/planck/planck.h | |
| parent | c5f90eb99b282c7425e151b82f0ca22969a4a275 (diff) | |
| parent | e9356dcad5769bc917ab9d3366013b5f193c3ef3 (diff) | |
Merge branch 'master' into flicker-fix
Diffstat (limited to 'keyboard/planck/planck.h')
| -rw-r--r-- | keyboard/planck/planck.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/keyboard/planck/planck.h b/keyboard/planck/planck.h index 4e59aef566..00b01b54df 100644 --- a/keyboard/planck/planck.h +++ b/keyboard/planck/planck.h @@ -3,8 +3,16 @@ #include "matrix.h" #include "keymap_common.h" -#include "backlight.h" +#ifdef BACKLIGHT_ENABLE + #include "backlight.h" +#endif +#ifdef RGBLIGHT_ENABLE + #include "rgblight.h" +#endif #include <stddef.h> +#ifdef MIDI_ENABLE + #include <keymap_midi.h> +#endif #define PLANCK_MIT( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ @@ -17,7 +25,7 @@ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \ -} +} #define PLANCK_GRID( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ @@ -30,9 +38,9 @@ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ -} +} void * matrix_init_user(void); void * matrix_scan_user(void); -#endif
\ No newline at end of file +#endif |