Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions examples/ReadSensors/ReadSensors.ino
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void loop() {
float temperature = ENV.readTemperature();
float humidity = ENV.readHumidity();
float pressure = ENV.readPressure();
float lux = ENV.readLux();
float illuminance = ENV.readIlluminance();
float uva = ENV.readUVA();
float uvb = ENV.readUVB();
float uvIndex = ENV.readUVIndex();
Expand All @@ -46,8 +46,9 @@ void loop() {
Serial.print(pressure);
Serial.println(" kPa");

Serial.print("Lux . = ");
Serial.println(lux);
Serial.print("Illuminance = ");
Serial.print(illuminance);
Serial.println(" lx");

Serial.print("UVA = ");
Serial.println(uva);
Expand Down
2 changes: 1 addition & 1 deletion keywords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ end KEYWORD2
readTemperature KEYWORD2
readHumidity KEYWORD2
readPressure KEYWORD2
readLux KEYWORD2
readIlluminance KEYWORD2
readUVA KEYWORD2
readUVB KEYWORD2
readUVIndex KEYWORD2
Expand Down
2 changes: 1 addition & 1 deletion src/MKRENV.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ float ENVClass::readPressure()
(i2cRead(LPS22HB_ADDRESS, LPS22HB_PRESS_OUT_H_REG) << 16)) / 40960.0;
}

float ENVClass::readLux()
float ENVClass::readIlluminance()
{
// read analog value and convert to mV
float mV = (analogRead(_lightSensorPin) * 3300.0) / 1023.0;
Expand Down
5 changes: 4 additions & 1 deletion src/MKRENV.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ class ENVClass {
float readTemperature();
float readHumidity();
float readPressure();
float readLux();
float readIlluminance();
float readUVA();
float readUVB();
float readUVIndex();

// deprecated, use readIlluminance() instead
float readLux() { return readIlluminance(); }

private:
int i2cRead(uint8_t address, uint8_t reg);
int i2cRead16(uint8_t address, uint8_t reg) {
Expand Down