summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2018-07-09 08:57:34 -0400
committerGitHub <noreply@github.com>2018-07-09 08:57:34 -0400
commit4a6d668f8a157382da9519caf4bcd7ff03e2ea59 (patch)
tree36c707b20c783ec1d26d964d6f2e1426eb335ec7
parentc6042a2636d591acf4991a02d68ddee72222c3b7 (diff)
parent4081288da1818144c35ac283c031024b393e9390 (diff)
Merge pull request #3354 from drashna/shiny_dox_fix
Fix Ergodox EZ issues introduced with ShinyDox merge (#3229)
-rw-r--r--keyboards/ergodox_ez/config.h4
-rw-r--r--keyboards/ergodox_ez/rules.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 1285cbe1c9..07a9b54977 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -81,9 +81,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* fix space cadet rollover issue */
#define DISABLE_SPACE_CADET_ROLLOVER
-// #define RGBW_BB_TWI
+#define RGBW_BB_TWI
-// #define RGBW 1
+#define RGBW 1
/* "debounce" is measured in keyboard scans. Some users reported
* needing values as high as 15, which was at the time around 50ms.
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index 0e0b3cdefd..dfbdba10d6 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -82,7 +82,7 @@ UNICODE_ENABLE = yes # Unicode
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
SLEEP_LED_ENABLE = no
API_SYSEX_ENABLE = no
-RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+RGB_MATRIX_ENABLE = no // enable later
LAYOUTS = ergodox