diff options
| author |  Xyverz <xyverz@gmail.com> | 2017-04-06 22:07:34 -0700 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2017-04-06 22:07:34 -0700 |
| commit | 303bc6999efc07f38a50c3cdc06503e6fce5fa6a (patch) | |
| tree | 42f46f79866f9e64254148cca77c20562e52c2f6 /keyboards/lets_split/keymaps/OLED_sample | |
| parent | 8813365ec5c091c0185563943bbf73ec53d846e0 (diff) | |
| parent | 154305ce1be16b2c8abce5e5d4dee421f295d6b3 (diff) | |
| download | qmk_firmware-303bc6999efc07f38a50c3cdc06503e6fce5fa6a.tar.gz | |
Merge remote-tracking branch 'upstream/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 353ea368c..8389ba111 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 072b825ab..493ebcd3f 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; |