diff options
author | coderkun <olli@coderkun.de> | 2017-05-06 12:19:45 +0200 |
---|---|---|
committer | coderkun <olli@coderkun.de> | 2017-05-06 12:19:45 +0200 |
commit | 49046f621bc8304c8c7ba7a065d2568f45ecc616 (patch) | |
tree | 4a1fc5d37e012502ff4732c801381eec814a2e01 /keyboards/ergodox/ez | |
parent | 9e7448ea89a1a88317f0acb805819af79d0a76e3 (diff) | |
parent | c5cef025ec39e67408f000825747d88c6aaa86eb (diff) | |
download | qmk_firmware-49046f621bc8304c8c7ba7a065d2568f45ecc616.tar.gz qmk_firmware-49046f621bc8304c8c7ba7a065d2568f45ecc616.zip |
Merge tag '0.5.43' into coderkun_neo2
Diffstat (limited to 'keyboards/ergodox/ez')
-rw-r--r-- | keyboards/ergodox/ez/config.h | 3 | ||||
-rw-r--r-- | keyboards/ergodox/ez/rules.mk | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h index e4f95c302c..a3347de45e 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -49,6 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 255 #define RGBLIGHT_VAL_STEP 12 +/* fix space cadet rollover issue */ +#define DISABLE_SPACE_CADET_ROLLOVER + // #define RGB_MIDI #define RGBW_BB_TWI diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk index 64b2db8158..6cd1c0c4f7 100644 --- a/keyboards/ergodox/ez/rules.mk +++ b/keyboards/ergodox/ez/rules.mk @@ -74,7 +74,3 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512 SLEEP_LED_ENABLE = no API_SYSEX_ENABLE ?= no RGBLIGHT_ENABLE ?= yes - -ifndef QUANTUM_DIR - include ../../../Makefile -endif |