Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-12 01:24:04 +00:00
Code Issues Releases Activity

[TSL2591] Check sensor before reading + speedup

Browse Source 
The old implementation did perform 3 readings, which depending on the set integration time could take a while.
But since all output values should be based on the same reading anyway, it is simply wrong to perform separate readings.

Also added a call to `begin()` of the library to make sure the gain and timing are correctly set.
This could cause incorrect readings if the sensor somehow got reset.

Fixes: #3347
This commit is contained in:
TD-er
2020-10-28 15:58:04 +01:00
parent 286009d942
commit cfe7d2f2cf
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_P074_TSL2591.ino
+21 -6
View File
@@ -197,15 +197,30 @@ boolean Plugin_074(byte function, struct EventStruct *event, String& string) {
static_cast<P074_data_struct *>(getPluginTaskData(event->TaskIndex));
if (nullptr != P074_data) {
// Fix to re-set the gain/timing before every read.
// See https://github.com/letscontrolit/ESPEasy/issues/3347
if (!P074_data->tsl.begin()) {
break;
}
// Simple data read example. Just read the infrared, fullspecrtrum diode
// or 'visible' (difference between the two) channels.
// This can take 100-600 milliseconds! Uncomment whichever of the
// following you want to read
float lux, full, visible, ir;
visible = P074_data->tsl.getLuminosity(TSL2591_VISIBLE);
ir = P074_data->tsl.getLuminosity(TSL2591_INFRARED);
full = P074_data->tsl.getLuminosity(TSL2591_FULLSPECTRUM);
lux = P074_data->tsl.calculateLuxf(full, ir); // get LUX
{
uint32_t fullLuminosity = P074_data->tsl.getFullLuminosity();
// TSL2591_FULLSPECTRUM: Reads two byte value from channel 0 (visible + infrared)
full = (fullLuminosity & 0xFFFF);
// TSL2591_INFRARED: Reads two byte value from channel 1 (infrared)
ir = (fullLuminosity >> 16);
// TSL2591_VISIBLE: Reads all and subtracts out just the visible!
visible = ( (fullLuminosity & 0xFFFF) - (fullLuminosity >> 16));
lux = P074_data->tsl.calculateLuxf(full, ir); // get LUX
}
UserVar[event->BaseVarIndex + 0] = lux;
UserVar[event->BaseVarIndex + 1] = full;