diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-08-15 10:33:45 +0200 |
| commit | 7476b03543f879df5ea29d44be147ff4926f8216 (patch) | |
| tree | e1c056fa3e12b2c2c3ae601ae2835ac086b60338 /src/drivers/device/i2c.h | |
| parent | 39ae01dd07d53e3509826ae3737fc6a509adec34 (diff) | |
| parent | d2f19c7d84030ad6ed1f6c17538fa96864c5dcef (diff) | |
| download | px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.gz px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.tar.bz2 px4-firmware-7476b03543f879df5ea29d44be147ff4926f8216.zip | |
Merge branch 'master' into new_state_machine_drton
Diffstat (limited to 'src/drivers/device/i2c.h')
| -rw-r--r-- | src/drivers/device/i2c.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/drivers/device/i2c.h b/src/drivers/device/i2c.h index b4a9cdd53..549879352 100644 --- a/src/drivers/device/i2c.h +++ b/src/drivers/device/i2c.h @@ -55,13 +55,11 @@ class __EXPORT I2C : public CDev public: - /** - * Get the address - */ - uint16_t get_address() { - return _address; - } - + /** + * Get the address + */ + int16_t get_address() { return _address; } + protected: /** * The number of times a read or write operation will be retried on @@ -90,7 +88,7 @@ protected: uint16_t address, uint32_t frequency, int irq = 0); - ~I2C(); + virtual ~I2C(); virtual int init(); |