Skip to content

Changed magic number to SCL define #4

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

Open
bneumann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Changed magic number to SCL define #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bc2258
Changed magic number to SCL define
bneumann Dec 2, 2017
2509df2
Added resolution setter, fixed writing to user register
bneumann Dec 2, 2017
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
13 changes: 12 additions & 1 deletion SHT2x.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ uint8_t SHT2xClass::readUserRegister()
void SHT2xClass::writeUserRegister(uint8_t userRegister)
{
Wire.beginTransmission(SHT2xADDR);
Wire.write(USER_REG_W);
Wire.write(userRegister);
Wire.endTransmission();
}
Expand All @@ -75,7 +76,7 @@ uint16_t SHT2xClass::readMeasurement(SHT2xMeasureType type)

//wait for measurement to complete.
timeout= millis()+300;
while (!digitalRead(18)) {
while (!digitalRead(PIN_WIRE_SCL)) {
if (millis()>timeout) {
return 0;
}
Expand Down Expand Up @@ -114,5 +115,15 @@ void SHT2xClass::setHeater(uint8_t on)
} else {
userRegister=(userRegister&~SHT2x_HEATER_MASK) | SHT2x_HEATER_OFF;
}
writeUserRegister(userRegister);
}

void SHT2xClass::setResolution(SHT2xResolution resolution)
{
uint8_t userRegister;
userRegister=readUserRegister();
userRegister=(userRegister&~SHT2x_RES_MASK) | resolution;
writeUserRegister(userRegister);
}

SHT2xClass SHT2x;
1 change: 1 addition & 0 deletions SHT2x.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ class SHT2xClass {
public:
void softReset();
void setHeater(uint8_t on);
void setResolution(SHT2xResolution resolution);
float readRH();
float readT();

Expand Down