diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-01-07 08:45:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 08:45:19 -0600 |
| commit | 0fb82c15a5c9a69e17cff8dcd04c652d21381958 (patch) | |
| tree | dd7a441ad7d086bb7cb4b093bd8d0cbd4d39d69d /keyboards/ergodox/ez | |
| parent | db48b28eeb5ebe5252cc04495d5eb326fa62dc26 (diff) | |
| parent | e7df488a92da56cf160ac64c8cc7302ab717e145 (diff) | |
Merge pull request #15 from jackhumbert/master
Merge from qmk
Diffstat (limited to 'keyboards/ergodox/ez')
| -rw-r--r-- | keyboards/ergodox/ez/Makefile | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/config.h | 3 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/rules.mk | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/ergodox/ez/Makefile b/keyboards/ergodox/ez/Makefile index 9b6121e2c2..1098332b8a 100644 --- a/keyboards/ergodox/ez/Makefile +++ b/keyboards/ergodox/ez/Makefile @@ -1,7 +1,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend COMMAND_ENABLE = no # Commands for debug and configuration RGBLIGHT_ENABLE ?= yes -MIDI_ENABLE ?= yes +MIDI_ENABLE ?= no ifndef MAKEFILE_INCLUDED include ../../../Makefile diff --git a/keyboards/ergodox/ez/config.h b/keyboards/ergodox/ez/config.h index a3dc5bf152..6a8c66d7d4 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -52,11 +52,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGB_MIDI #define RGBW_BB_TWI +#define RGBW 1 /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 -#define USB_MAX_POWER_CONSUMPTION 50 +#define USB_MAX_POWER_CONSUMPTION 500 /* * Feature disable options diff --git a/keyboards/ergodox/ez/rules.mk b/keyboards/ergodox/ez/rules.mk index 893cfa7a84..64b2db8158 100644 --- a/keyboards/ergodox/ez/rules.mk +++ b/keyboards/ergodox/ez/rules.mk @@ -72,7 +72,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512 # SLEEP_LED_ENABLE = no -API_SYSEX_ENABLE ?= yes +API_SYSEX_ENABLE ?= no RGBLIGHT_ENABLE ?= yes ifndef QUANTUM_DIR |