Skip to content

Commit

Permalink
Merge pull request #13 from MickeyDelp/wire_fix
Browse files Browse the repository at this point in the history
Support alternate wire interfaces
  • Loading branch information
ladyada authored Nov 4, 2019
2 parents ab804b5 + c5746fa commit 10af0a9
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
48 changes: 24 additions & 24 deletions Adafruit_VL6180X.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -258,13 +258,13 @@ uint8_t Adafruit_VL6180X::read8(uint16_t address)
{
uint8_t data;

Wire.beginTransmission(_i2caddr);
Wire.write(address>>8);
Wire.write(address);
Wire.endTransmission();
_i2c->beginTransmission(_i2caddr);
_i2c->write(address>>8);
_i2c->write(address);
_i2c->endTransmission();

Wire.requestFrom(_i2caddr, (uint8_t)1);
data = Wire.read();
_i2c->requestFrom(_i2caddr, (uint8_t)1);
data = _i2c->read();

#if defined(I2C_DEBUG)
Serial.print("\t$"); Serial.print(address, HEX); Serial.print(": 0x"); Serial.println(data, HEX);
Expand All @@ -279,27 +279,27 @@ uint16_t Adafruit_VL6180X::read16(uint16_t address)
{
uint16_t data;

Wire.beginTransmission(_i2caddr);
Wire.write(address>>8);
Wire.write(address);
Wire.endTransmission();
_i2c->beginTransmission(_i2caddr);
_i2c->write(address>>8);
_i2c->write(address);
_i2c->endTransmission();

Wire.requestFrom(_i2caddr, (uint8_t)2);
data = Wire.read();
_i2c->requestFrom(_i2caddr, (uint8_t)2);
data = _i2c->read();
data <<= 8;
data |= Wire.read();
data |= _i2c->read();

return data;
}

// write 1 byte
void Adafruit_VL6180X::write8(uint16_t address, uint8_t data)
{
Wire.beginTransmission(_i2caddr);
Wire.write(address>>8);
Wire.write(address);
Wire.write(data);
Wire.endTransmission();
_i2c->beginTransmission(_i2caddr);
_i2c->write(address>>8);
_i2c->write(address);
_i2c->write(data);
_i2c->endTransmission();

#if defined(I2C_DEBUG)
Serial.print("\t$"); Serial.print(address, HEX); Serial.print(" = 0x"); Serial.println(data, HEX);
Expand All @@ -310,10 +310,10 @@ void Adafruit_VL6180X::write8(uint16_t address, uint8_t data)
// write 2 bytes
void Adafruit_VL6180X::write16(uint16_t address, uint16_t data)
{
Wire.beginTransmission(_i2caddr);
Wire.write(address>>8);
Wire.write(address);
Wire.write(data>>8);
Wire.write(data);
Wire.endTransmission();
_i2c->beginTransmission(_i2caddr);
_i2c->write(address>>8);
_i2c->write(address);
_i2c->write(data>>8);
_i2c->write(data);
_i2c->endTransmission();
}
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit_VL6180X
version=1.0.5
version=1.0.6
author=Adafruit
maintainer=adafruit <[email protected]>
sentence=Sensor driver for VL6180X Time of Flight sensor
Expand Down

0 comments on commit 10af0a9

Please sign in to comment.