diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2012-06-27 13:51:16 +0200 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2012-06-27 13:51:16 +0200 |
| commit | 2d2050eabeaff7109ba89fdd0100556c981cf373 (patch) | |
| tree | 1f6d9725b59aa02e5400a8117eeec3206d88047d /libraries/Wire/utility/twi.h | |
| parent | 324023a67afd1691f12ead4388d7cdf1a9d1a6ef (diff) | |
| parent | 31c24577835b0a9c7a1291ffbda1b61d96818511 (diff) | |
Merged master
Diffstat (limited to 'libraries/Wire/utility/twi.h')
| -rwxr-xr-x | libraries/Wire/utility/twi.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/Wire/utility/twi.h b/libraries/Wire/utility/twi.h index 831b928..6526593 100755 --- a/libraries/Wire/utility/twi.h +++ b/libraries/Wire/utility/twi.h @@ -40,8 +40,8 @@ void twi_init(void); void twi_setAddress(uint8_t); - uint8_t twi_readFrom(uint8_t, uint8_t*, uint8_t); - uint8_t twi_writeTo(uint8_t, uint8_t*, uint8_t, uint8_t); + uint8_t twi_readFrom(uint8_t, uint8_t*, uint8_t, uint8_t); + uint8_t twi_writeTo(uint8_t, uint8_t*, uint8_t, uint8_t, uint8_t); uint8_t twi_transmit(const uint8_t*, uint8_t); void twi_attachSlaveRxEvent( void (*)(uint8_t*, int) ); void twi_attachSlaveTxEvent( void (*)(void) ); |