Merge pull request #3354 from drashna/shiny_dox_fix

Fix Ergodox EZ issues introduced with ShinyDox merge (#3229)
master
Erez Zukerman 2018-07-09 08:57:34 -04:00 committed by GitHub
commit 4a6d668f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -81,9 +81,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* fix space cadet rollover issue */ /* fix space cadet rollover issue */
#define DISABLE_SPACE_CADET_ROLLOVER #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 /* "debounce" is measured in keyboard scans. Some users reported
* needing values as high as 15, which was at the time around 50ms. * needing values as high as 15, which was at the time around 50ms.

View File

@ -82,7 +82,7 @@ UNICODE_ENABLE = yes # Unicode
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
SLEEP_LED_ENABLE = no SLEEP_LED_ENABLE = no
API_SYSEX_ENABLE = no API_SYSEX_ENABLE = no
RGBLIGHT_ENABLE = no RGBLIGHT_ENABLE = yes
RGB_MATRIX_ENABLE = yes RGB_MATRIX_ENABLE = no // enable later
LAYOUTS = ergodox LAYOUTS = ergodox