Skip to content

Adapt to v2 hardware #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2021
Merged

Adapt to v2 hardware #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/MKRENV.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ int ENVClass::begin()
}

if (i2cReadWord(VEML6075_ADDRESS, VEML6075_ID_REG) != 0x0026) {
end();

return 0;
_isv2 = true;
}

readHTS221Calibration();
Expand Down Expand Up @@ -236,6 +234,9 @@ float ENVClass::readUVIndex()

int ENVClass::i2cRead(uint8_t address, uint8_t reg)
{
if (_isv2 && address == VEML6075_ADDRESS) {
return 0;
}
_wire->beginTransmission(address);
_wire->write(reg);
if (_wire->endTransmission(false) != 0) {
Expand All @@ -251,6 +252,9 @@ int ENVClass::i2cRead(uint8_t address, uint8_t reg)

int ENVClass::i2cWrite(uint8_t address, uint8_t reg, uint8_t val)
{
if (_isv2 && address == VEML6075_ADDRESS) {
return 0;
}
_wire->beginTransmission(address);
_wire->write(reg);
_wire->write(val);
Expand All @@ -263,6 +267,9 @@ int ENVClass::i2cWrite(uint8_t address, uint8_t reg, uint8_t val)

int ENVClass::i2cReadWord(uint8_t address, uint8_t reg)
{
if (_isv2 && address == VEML6075_ADDRESS) {
return 0;
}
_wire->beginTransmission(address);
_wire->write(reg);
if (_wire->endTransmission(false) != 0) {
Expand All @@ -278,6 +285,9 @@ int ENVClass::i2cReadWord(uint8_t address, uint8_t reg)

int ENVClass::i2cWriteWord(uint8_t address, uint8_t reg, uint16_t val)
{
if (_isv2 && address == VEML6075_ADDRESS) {
return 1;
}
_wire->beginTransmission(address);
_wire->write(reg);
_wire->write(val & 0xff);
Expand Down
1 change: 1 addition & 0 deletions src/MKRENV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class ENVClass {
private:
TwoWire* _wire;
int _lightSensorPin;
bool _isv2 = false;

float _hts221HumiditySlope;
float _hts221HumidityZero;
Expand Down