diff --git a/examples/ReadSensors/ReadSensors.ino b/examples/ReadSensors/ReadSensors.ino index e273a28..e62e0d6 100644 --- a/examples/ReadSensors/ReadSensors.ino +++ b/examples/ReadSensors/ReadSensors.ino @@ -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(); @@ -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); diff --git a/keywords.txt b/keywords.txt index b43c348..d3d6543 100644 --- a/keywords.txt +++ b/keywords.txt @@ -18,7 +18,7 @@ end KEYWORD2 readTemperature KEYWORD2 readHumidity KEYWORD2 readPressure KEYWORD2 -readLux KEYWORD2 +readIlluminance KEYWORD2 readUVA KEYWORD2 readUVB KEYWORD2 readUVIndex KEYWORD2 diff --git a/src/MKRENV.cpp b/src/MKRENV.cpp index 08e9600..88006ec 100644 --- a/src/MKRENV.cpp +++ b/src/MKRENV.cpp @@ -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; diff --git a/src/MKRENV.h b/src/MKRENV.h index 40f95d3..d28eb63 100644 --- a/src/MKRENV.h +++ b/src/MKRENV.h @@ -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) {