diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2012-05-21 01:56:06 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2012-05-22 11:23:47 +0200 |
| commit | 3786e337e0211ca1ef94b37b03e891adfb3b5f9a (patch) | |
| tree | dd7f8f6fd396243460ec22da89bfbd71d552f484 /libraries/Wire/Wire.h | |
| parent | 324023a67afd1691f12ead4388d7cdf1a9d1a6ef (diff) | |
| parent | 9a8976ce56bcdb70815dd58c1764d9e5c3b6fe95 (diff) | |
Pre-merge upstream Arduino
Diffstat (limited to 'libraries/Wire/Wire.h')
| -rwxr-xr-x | libraries/Wire/Wire.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libraries/Wire/Wire.h b/libraries/Wire/Wire.h index 9ea4afd..a93d0f5 100755 --- a/libraries/Wire/Wire.h +++ b/libraries/Wire/Wire.h @@ -15,6 +15,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Modified 2012 by Todd Krein (todd@krein.org) to implement repeated starts */ #ifndef TwoWire_h @@ -50,8 +52,11 @@ class TwoWire : public Stream void beginTransmission(uint8_t); void beginTransmission(int); uint8_t endTransmission(void); + uint8_t endTransmission(uint8_t); uint8_t requestFrom(uint8_t, uint8_t); + uint8_t requestFrom(uint8_t, uint8_t, uint8_t); uint8_t requestFrom(int, int); + uint8_t requestFrom(int, int, int); virtual size_t write(uint8_t); virtual size_t write(const uint8_t *, size_t); virtual int available(void); |