Merge branch 'master' of github.com:jackhumbert/qmk_firmware

2016-12-19 11:18:22 -05:00
parent 06c64bbff3 ea926369b8
commit 101416eb82
54 changed files with 2270 additions and 223 deletions
@@ -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
@@ -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.
@@ -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