Commit e4e92a37 authored by Pavel Vainerman's avatar Pavel Vainerman

fixed bug in getRawValue

parent 64cb3c12
...@@ -954,7 +954,18 @@ CORBA::Long IOController::getRawValue(const IOController_i::SensorInfo& si) ...@@ -954,7 +954,18 @@ CORBA::Long IOController::getRawValue(const IOController_i::SensorInfo& si)
// ??? raw ??? // ??? raw ???
IOController_i::CalibrateInfo& ci(it->second.ci); IOController_i::CalibrateInfo& ci(it->second.ci);
if( ci.maxCal!=0 && ci.maxCal!=ci.minCal )
{
if( it->second.type == UniversalIO::AnalogInput )
return UniSetTypes::lcalibrate(it->second.value,ci.minRaw,ci.maxRaw,ci.minCal,ci.maxCal,true); return UniSetTypes::lcalibrate(it->second.value,ci.minRaw,ci.maxRaw,ci.minCal,ci.maxCal,true);
// калибруем в обратную сторону (на выход)
if( it->second.type == UniversalIO::AnalogOutput )
return UniSetTypes::lcalibrate(it->second.value,ci.minCal,ci.maxCal,ci.minRaw,ci.maxRaw,true);
}
return it->second.value;
} }
// -------------------------------------------------------------------------------------------------------------- // --------------------------------------------------------------------------------------------------------------
void IOController::calibrate(const IOController_i::SensorInfo& si, void IOController::calibrate(const IOController_i::SensorInfo& si,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment