aboutsummaryrefslogtreecommitdiff
path: root/cores
diff options
context:
space:
mode:
authorZach Eveland <zeveland@blacklabel-development.com>2012-03-03 13:26:57 -0500
committerZach Eveland <zeveland@blacklabel-development.com>2012-03-03 13:26:57 -0500
commit8f5869009ccddad8698969ff2ebe204d7b574b37 (patch)
treef8738d9f7edb5a6313e92f564b81f81969b9b8d9 /cores
parent351817af47ce8bb7b288407cf3ea74562b259748 (diff)
fixed minor compilation warnings for Leonardo
Diffstat (limited to 'cores')
-rw-r--r--cores/arduino/HID.cpp3
-rw-r--r--cores/arduino/USBAPI.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/cores/arduino/HID.cpp b/cores/arduino/HID.cpp
index e6fb5f7..b60b3c0 100644
--- a/cores/arduino/HID.cpp
+++ b/cores/arduino/HID.cpp
@@ -144,7 +144,6 @@ u8 _hid_protocol = 1;
u8 _hid_idle = 1;
#define WEAK __attribute__ ((weak))
-#define WEAK
int WEAK HID_GetInterface(u8* interfaceNum)
{
@@ -245,7 +244,7 @@ void Mouse_::release(uint8_t b)
bool Mouse_::isPressed(uint8_t b)
{
- if (b & _buttons > 0)
+ if ((b & _buttons) > 0)
return true;
return false;
}
diff --git a/cores/arduino/USBAPI.h b/cores/arduino/USBAPI.h
index 6a0b989..3c97ff1 100644
--- a/cores/arduino/USBAPI.h
+++ b/cores/arduino/USBAPI.h
@@ -104,7 +104,7 @@ private:
void setKeyMap(KeyMap* keyMap);
public:
Keyboard_();
- virtual size_t write(uint8_t c) {type(c);};
+ virtual size_t write(uint8_t c) {return type(c);};
virtual size_t type(uint8_t c);
};
extern Keyboard_ Keyboard;