From 7ccd7afce2a158eb852b5f7c61cd51e8febe56a9 Mon Sep 17 00:00:00 2001 From: Marti Bolivar Date: Fri, 31 Aug 2012 16:12:14 -0400 Subject: Fixups for Wire library builds. Add libraries directory to global include path, so Wire sub-headers can be included in a directory-independent way. Tweak Wire global declaration and definition so it builds. Signed-off-by: Marti Bolivar --- libraries/Wire/Wire.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libraries/Wire/Wire.h') diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h index 812132b..d455b11 100644 --- a/libraries/Wire/Wire.h +++ b/libraries/Wire/Wire.h @@ -40,7 +40,7 @@ #ifndef _WIRE_H_ #define _WIRE_H_ -#include "WireBase.h" +#include #include /* @@ -116,7 +116,7 @@ class TwoWire : public WireBase { * Accept pin numbers for SCL and SDA lines. Set the delay needed * to create the timing for I2C's Standard Mode and Fast Mode. */ - TwoWire(uint8 = SCL, uint8 = SDA, uint8 = SOFT_STANDARD); + TwoWire(uint8 scl=SCL, uint8 sda=SDA, uint8 delay=SOFT_STANDARD); /* * Sets pins SDA and SCL to OUPTUT_OPEN_DRAIN, joining I2C bus as @@ -131,6 +131,6 @@ class TwoWire : public WireBase { ~TwoWire(); }; -extern TwoWire Wire(); +extern TwoWire Wire; #endif // _WIRE_H_ -- cgit v1.2.3