diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2012-06-29 12:37:10 -0400 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-06-29 12:40:05 -0400 |
| commit | 0df7e0dc26baf8afafc1aab595b416eb70bf2dd4 (patch) | |
| tree | e31620ca29e8a1f3469c951a39378e13792df365 /libraries/Wire/HardWire.h | |
| parent | ab43e6240c8e5ecbc805e19d056bca8b9ee3b6ca (diff) | |
| download | librambutan-0df7e0dc26baf8afafc1aab595b416eb70bf2dd4.tar.gz librambutan-0df7e0dc26baf8afafc1aab595b416eb70bf2dd4.zip | |
libraries/Wire: Cosmetics, include style touchups.
Switch to the new include style. Move includes in headers inside the
include guards, for the GCC multiple include parser optimization. Make
80-column clean. Add newlines at end of files.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libraries/Wire/HardWire.h')
| -rw-r--r-- | libraries/Wire/HardWire.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libraries/Wire/HardWire.h b/libraries/Wire/HardWire.h index 91e141d..d3f4ed8 100644 --- a/libraries/Wire/HardWire.h +++ b/libraries/Wire/HardWire.h @@ -36,13 +36,12 @@ * users easy interaction with the I2C Hardware in a familiar method. */ -#include "wirish.h" -#include "WireBase.h" - #ifndef _HARDWIRE_H_ #define _HARDWIRE_H_ -#include "i2c.h" +#include "WireBase.h" +#include <wirish/wirish.h> +#include <libmaple/i2c.h> class HardWire : public WireBase { private: @@ -50,8 +49,8 @@ private: uint8 dev_flags; protected: /* - * Processes the incoming I2C message defined by WireBase to the hardware. If - * an error occured, restart the I2C device. + * Processes the incoming I2C message defined by WireBase to the + * hardware. If an error occured, restart the I2C device. */ uint8 process(); public: @@ -67,4 +66,4 @@ public: ~HardWire(); }; -#endif // _HARDWIRE_H_
\ No newline at end of file +#endif // _HARDWIRE_H_ |