jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-24 19:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in triggered measurements

Browse Source
This commit is contained in:
Michael Bisbjerg 2024-05-17 15:03:56 +02:00
parent dcb5049f97
commit 075c164407
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usermods/INA226_v2/usermod_ina226.h
View File

@ -52,7 +52,7 @@ INA226_CONV_TIME getConversionTimeEnum(uint16_t &timeUs)
{ {
for (const auto &setting : _inaSettingsLookup) for (const auto &setting : _inaSettingsLookup)
{ {
// If a user supplies 9000 us, we serve up the highest possible value // If a user supplies 9000 μs, we serve up the highest possible value
if (timeUs >= setting.convTimeUs) if (timeUs >= setting.convTimeUs)
{ {
timeUs = setting.convTimeUs; timeUs = setting.convTimeUs;
@ -70,7 +70,7 @@ private:
static const char _name[]; static const char _name[];
unsigned long _lastLoopCheck = 0; unsigned long _lastLoopCheck = 0;
unsigned long _lastCheckTime = 0; unsigned long _lastTriggerTime = 0;
bool _settingEnabled : 1; // Enable the usermod bool _settingEnabled : 1; // Enable the usermod
bool _mqttPublish : 1; // Publish MQTT values bool _mqttPublish : 1; // Publish MQTT values
@ -178,9 +178,9 @@ private:
if (_measurementTriggered) if (_measurementTriggered)
{ {
// Test if we have a measurement every 400ms // Test if we have a measurement every 400ms
if (currentTime - _lastCheckTime >= 400) if (currentTime - _lastTriggerTime >= 400)
{ {
_lastCheckTime = currentTime; _lastTriggerTime = currentTime;
if (_ina226->isBusy()) if (_ina226->isBusy())
return; return;
@ -192,10 +192,11 @@ private:
{ {
if (currentTime - _lastLoopCheck >= _checkInterval) if (currentTime - _lastLoopCheck >= _checkInterval)
{ {
_ina226->startSingleMeasurement(); // Start a measurement and use isBusy() later to determine when it is done
_ina226->startSingleMeasurementNoWait();
_lastLoopCheck = currentTime; _lastLoopCheck = currentTime;
_lastTriggerTime = currentTime;
_measurementTriggered = true; _measurementTriggered = true;
_lastCheckTime = currentTime;
} }
} }
} }
@ -385,7 +386,7 @@ public:
temp = user.createNestedArray(F("INA226 conversion time")); temp = user.createNestedArray(F("INA226 conversion time"));
temp.add(_settingInaConversionTimeUs << 2); temp.add(_settingInaConversionTimeUs << 2);
temp.add(F("us")); temp.add(F("μs"));
// INA226 uses (2 * conversion time * samples) time to take a reading. // INA226 uses (2 * conversion time * samples) time to take a reading.
temp = user.createNestedArray(F("INA226 expected sample time")); temp = user.createNestedArray(F("INA226 expected sample time"));