diff options
| author | xyverz <xyverz@gmail.com> | 2016-12-14 03:06:49 +0100 |
|---|---|---|
| committer | xyverz <xyverz@gmail.com> | 2016-12-14 03:06:49 +0100 |
| commit | 0523657923d2bc8e9515fcb8125d8ceb7a70d862 (patch) | |
| tree | c52a29838a67eb6c032b1950839ac889a1a6330c /tmk_core | |
| parent | 592b90dd221d3847d359b9a4dbd258b9ceb2b3ce (diff) | |
| parent | 20892bf706219f19a5f9cd34abd4f772ab4ee570 (diff) | |
| download | qmk_firmware-0523657923d2bc8e9515fcb8125d8ceb7a70d862.tar.gz qmk_firmware-0523657923d2bc8e9515fcb8125d8ceb7a70d862.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 2 | ||||
| -rw-r--r-- | tmk_core/protocol/lufa/adafruit_ble.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index b48173341..5df539def 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 37194e77a..fd6edd42c 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; }; }; |