Skip to content

Commit

Permalink
Merge branch 'iioadaptor-scale-override' into 'master'
Browse files Browse the repository at this point in the history
[iioadaptor] Allow overriding iioDevices' scaling factor

See merge request mer-core/sensorfw!39
  • Loading branch information
spiiroin committed Aug 14, 2019
2 parents 61a9d7e + 19aa31b commit 02098f0
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions adaptors/iioadaptor/iioadaptor.cpp
Expand Up @@ -145,6 +145,14 @@ void IioAdaptor::setup()
iioDevice.channels = scanElementsEnable(devNodeNumber,1);
scanElementsEnable(devNodeNumber,0);

/* Override the scaling factor if asked */
bool ok;
double scale_override = SensorFrameworkConfig::configuration()->value(iioDevice.name + "/scale").toDouble(&ok);
if (ok) {
sensordLogD() << "Overriding scale to" << scale_override;
iioDevice.scale = scale_override;
}

introduceAvailableDataRange(DataRange(0, 65535, 1));
introduceAvailableInterval(DataRange(0, 586, 0));
setDefaultInterval(10);
Expand Down

0 comments on commit 02098f0

Please sign in to comment.