diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2016-12-17 22:28:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-17 22:28:45 +0100 |
| commit | c9803f78b2409cfaf6a1be0a4b6c1a37778a3f37 (patch) | |
| tree | 5d48ab69b311a5ae4eb25cc84ab9c47e98655fb4 /tmk_core | |
| parent | 13c4080a1d77cb1dfdf48df8a42e78b9dc483912 (diff) | |
| parent | 8a65c640ecdaacfd57b86b684ec80b481f5d4b3b (diff) | |
| download | qmk_firmware-c9803f78b2409cfaf6a1be0a4b6c1a37778a3f37.tar.gz qmk_firmware-c9803f78b2409cfaf6a1be0a4b6c1a37778a3f37.zip | |
Merge pull request #14 from jackhumbert/master
Merged from jackhumbert/qmk_firmware
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/adafruit_ble.cpp | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/descriptor.c | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index b48173341a..5df539def5 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -26,7 +26,7 @@ CFLAGS += -fno-inline-small-functions CFLAGS += -fno-strict-aliasing CPPFLAGS += $(COMPILEFLAGS) -CPPFLAGS += -fno-exceptions +CPPFLAGS += -fno-exceptions -std=c++11 LDFLAGS +=-Wl,--gc-sections diff --git a/tmk_core/protocol/lufa/adafruit_ble.cpp b/tmk_core/protocol/lufa/adafruit_ble.cpp index 37194e77a9..fd6edd42cf 100644 --- a/tmk_core/protocol/lufa/adafruit_ble.cpp +++ b/tmk_core/protocol/lufa/adafruit_ble.cpp @@ -86,7 +86,7 @@ struct queue_item { uint16_t consumer; struct __attribute__((packed)) { - uint8_t x, y, scroll, pan; + int8_t x, y, scroll, pan; } mousemove; }; }; diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c index bf47787d29..14d99b50bd 100644 --- a/tmk_core/protocol/lufa/descriptor.c +++ b/tmk_core/protocol/lufa/descriptor.c @@ -40,6 +40,9 @@ #include "report.h" #include "descriptor.h" +#ifndef USB_MAX_POWER_CONSUMPTION +#define USB_MAX_POWER_CONSUMPTION 500 +#endif /******************************************************************************* * HID Report Descriptors @@ -294,7 +297,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .ConfigAttributes = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_REMOTEWAKEUP), - .MaxPowerConsumption = USB_CONFIG_POWER_MA(500) + .MaxPowerConsumption = USB_CONFIG_POWER_MA(USB_MAX_POWER_CONSUMPTION) }, /* |