summaryrefslogtreecommitdiff
path: root/users/mechmerlin
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-03-01 08:33:29 -0800
committerDrashna Jaelre <drashna@live.com>2019-03-01 08:33:29 -0800
commit5c491da0e7d1c107e549acc7449afc081ef1b8c5 (patch)
treeb94329f167345b8f79cc8e7beb14c405a4e474ee /users/mechmerlin
parent41d8be7e75e68f41cdc890d7b9f99ba8d58990d4 (diff)
downloadqmk_firmware-5c491da0e7d1c107e549acc7449afc081ef1b8c5.tar.gz
qmk_firmware-5c491da0e7d1c107e549acc7449afc081ef1b8c5.zip
[Keymap] Fix rgblight_enable ifdefs (#5283)
Diffstat (limited to 'users/mechmerlin')
-rw-r--r--users/mechmerlin/changelog.md5
-rw-r--r--users/mechmerlin/config.h18
2 files changed, 18 insertions, 5 deletions
diff --git a/users/mechmerlin/changelog.md b/users/mechmerlin/changelog.md
index d5877cfdfe..ec4b20108f 100644
--- a/users/mechmerlin/changelog.md
+++ b/users/mechmerlin/changelog.md
@@ -1,10 +1,13 @@
# Changelog
All notable changes to my userspace will be documented in this file.
+## [0.2.1] - 2019-03-01
+### Fixed
+- `config.h` usage of `#ifdef RGBLIGHT_ENABLE` caused problems for other of my boards that had `RGBLIGHT_ENABLE`.
+
## [0.2.0] - 2019-02-27
### Changed
- Moved `AUDIO_CLICKY` from community layout `66_ansi` into user space.
--
## [0.1.1] - 2018-10-26
### Added
diff --git a/users/mechmerlin/config.h b/users/mechmerlin/config.h
index 3c45162bcc..9ca39a12ac 100644
--- a/users/mechmerlin/config.h
+++ b/users/mechmerlin/config.h
@@ -18,10 +18,20 @@
// Enable features depending on keyboard
#if defined(KEYBOARD_clueboard_66_hotswap_prototype)
- #define RGBLIGHT_ENABLE
- #define AUDIO_CLICKY
+ #ifndef RGBLIGHT_ENABLE
+ #define RGBLIGHT_ENABLE
+ #endif
+
+ #ifndef AUDIO_CLICKY
+ #define AUDIO_CLICKY
+ #endif
+
#elif defined(KEYBOARD_clueboard_66_hotswap_gen1)
- #define AUDIO_CLICKY
+ #ifndef AUDIO_CLICKY
+ #define AUDIO_CLICKY
+ #endif
#else
- #define RGBLIGHT_ENABLE
+ #ifndef RGBLIGHT_ENABLE
+ #define RGBLIGHT_ENABLE
+ #endif
#endif