diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-12-19 11:18:22 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-12-19 11:18:22 -0500 |
| commit | 101416eb82c12c475da2feb124f74511f876b3fb (patch) | |
| tree | d96057d804266cf719d5fd18ea127a3b577bd786 /keyboards/ergodox/ez | |
| parent | 06c64bbff3e228df542149acde64eadaf59b9b0f (diff) | |
| parent | ea926369b80c446141edd16c892112fab69b20b6 (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Diffstat (limited to 'keyboards/ergodox/ez')
| -rw-r--r-- | keyboards/ergodox/ez/Makefile | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/config.h | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/ez/rules.mk | 2 |
3 files changed, 4 insertions, 2 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 f532b2d5af..2e273eb973 100644 --- a/keyboards/ergodox/ez/config.h +++ b/keyboards/ergodox/ez/config.h @@ -57,6 +57,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 +#define USB_MAX_POWER_CONSUMPTION 50 + /* * Feature disable options * These options are also useful to firmware size reduction. 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 |