summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/ez
diff options
context:
space:
mode:
authorcoderkun <olli@coderkun.de>2017-05-06 12:19:45 +0200
committercoderkun <olli@coderkun.de>2017-05-06 12:19:45 +0200
commit49046f621bc8304c8c7ba7a065d2568f45ecc616 (patch)
tree4a1fc5d37e012502ff4732c801381eec814a2e01 /keyboards/ergodox/ez
parent9e7448ea89a1a88317f0acb805819af79d0a76e3 (diff)
parentc5cef025ec39e67408f000825747d88c6aaa86eb (diff)
downloadqmk_firmware-49046f621bc8304c8c7ba7a065d2568f45ecc616.tar.gz
qmk_firmware-49046f621bc8304c8c7ba7a065d2568f45ecc616.tar.xz
Merge tag '0.5.43' into coderkun_neo2
Diffstat (limited to 'keyboards/ergodox/ez')
-rw-r--r--keyboards/ergodox/ez/config.h3
-rw-r--r--keyboards/ergodox/ez/rules.mk4
2 files changed, 3 insertions, 4 deletions
diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h
index e4f95c302..a3347de45 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 64b2db815..6cd1c0c4f 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