diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-04-03 21:06:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 21:06:40 -0400 |
| commit | 27aa185222b709dc53a1478e46d6e04271dc199c (patch) | |
| tree | fd6311aa6fb2b10fc01d2562e819817d798668b2 /keyboards/lets_split/keymaps/OLED_sample | |
| parent | 4e51c1e3ca75c9abe45673866d026cc0f810a410 (diff) | |
| parent | 3ac9259742bfd428f71c31dbf2bfedace2a7f91b (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'keyboards/lets_split/keymaps/OLED_sample')
| -rw-r--r-- | keyboards/lets_split/keymaps/OLED_sample/config.h | 17 | ||||
| -rw-r--r-- | keyboards/lets_split/keymaps/OLED_sample/keymap.c | 3 |
2 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/lets_split/keymaps/OLED_sample/config.h b/keyboards/lets_split/keymaps/OLED_sample/config.h index 353ea368c6..8389ba111d 100644 --- a/keyboards/lets_split/keymaps/OLED_sample/config.h +++ b/keyboards/lets_split/keymaps/OLED_sample/config.h @@ -27,19 +27,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_FORCE_HOLD #define TAPPING_TERM 100 +#ifdef SUBPROJECT_rev1 + #include "../../rev1/config.h" +#endif +#ifdef SUBPROJECT_rev2 + #include "../../rev2/config.h" +#endif + #undef RGBLED_NUM #define RGBLIGHT_ANIMATIONS #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 - - - - -#ifdef SUBPROJECT_rev1 - #include "../../rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "../../rev2/config.h" -#endif
\ No newline at end of file diff --git a/keyboards/lets_split/keymaps/OLED_sample/keymap.c b/keyboards/lets_split/keymaps/OLED_sample/keymap.c index 072b825abe..493ebcd3f2 100644 --- a/keyboards/lets_split/keymaps/OLED_sample/keymap.c +++ b/keyboards/lets_split/keymaps/OLED_sample/keymap.c @@ -6,6 +6,9 @@ #ifdef AUDIO_ENABLE #include "audio.h" #endif +#ifdef SSD1306OLED + #include "ssd1306.h" +#endif extern keymap_config_t keymap_config; |