diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2012-08-31 16:12:14 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-08-31 16:12:14 -0400 |
| commit | 7ccd7afce2a158eb852b5f7c61cd51e8febe56a9 (patch) | |
| tree | 79ec4cecad1f07eb99eaa6fcf6977e92a5e3196b /libraries/Wire/Wire.h | |
| parent | ee22c3dc6d945262303d43e733eaac91bfcf0d9d (diff) | |
| download | librambutan-7ccd7afce2a158eb852b5f7c61cd51e8febe56a9.tar.gz librambutan-7ccd7afce2a158eb852b5f7c61cd51e8febe56a9.zip | |
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 <mbolivar@leaflabs.com>
Diffstat (limited to 'libraries/Wire/Wire.h')
| -rw-r--r-- | libraries/Wire/Wire.h | 6 |
1 files changed, 3 insertions, 3 deletions
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 <Wire/WireBase.h> #include <wirish/wirish.h> /* @@ -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_ |