Skip to content
Snippets Groups Projects
Commit df128def authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

minor change

parent de161609
Branches
Tags
No related merge requests found
......@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>MCCE2Electrometers-${aol}-${mode}</artifactId>
<version>2.2.7-SNAPSHOT</version>
<version>2.2.7</version>
<packaging>nar</packaging>
<name>MCCE2Electrometers</name>
<!-- use for the name of executable -->
......
......@@ -2596,7 +2596,6 @@ void MCCE2Electrometers::set_polarity(Tango::DevString argin)
}
}
//+------------------------------------------------------------------
/**
* method: MCCE2Electrometers::get_electrometer_type_str
......@@ -2630,17 +2629,24 @@ Tango::DevString MCCE2Electrometers::get_electrometer_type_str(Tango::DevUShort
);
}
if ( *attr_electrometerChannel_read == ELETRO_CHANNEL_ONE )
if ( argin == ELETRO_CHANNEL_ONE )
{
argout = new char[this->_electroCH1StrType.size()+1];
::strncpy(argout, _electroCH1StrType.c_str(), _electroCH1StrType.size());
}
if ( *attr_electrometerChannel_read == ELETRO_CHANNEL_TWO )
else if ( argin == ELETRO_CHANNEL_TWO )
{
argout = new char[this->_electroCH2StrType.size()+1];
::strncpy(argout, _electroCH2StrType.c_str(), _electroCH2StrType.size());
}
else
{
Tango::Except::throw_exception(
"INVALID_PARAMETER",
"Channel number must be 1 or 2.",
"MCCE2Electrometers::get_electrometer_type_str()"
);
}
return argout;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment