Skip to content
Snippets Groups Projects
Commit 78073efa authored by Jean Coquet's avatar Jean Coquet
Browse files

correction affichage du status et afichage attribut temperature

release
parent 24b4deb9
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>Lakeshore_336-${aol}-${mode}</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
<packaging>nar</packaging>
<name>Lakeshore_336</name>
<developers>
......
......@@ -698,8 +698,11 @@ namespace HWProxy_ns
}
}
cmd = "HTRST?\n";
if (this->write_read (cmd, response))
{
std::stringstream s;
s << "HTRST? " << this->conf.loop_number << std::endl;
//- cmd = "HTRST? \n";
if (this->write_read (s.str (), response))
{
StringTokenizer tok(",", response);
if (tok.get_number_of_token () < 1)
......@@ -726,6 +729,7 @@ namespace HWProxy_ns
this->status_str = "HWProxy::read_lakeshore_state response error to cmd [" + cmd + "] response [" + response;
return false;
}
}
std::stringstream s;
s << "RDGST? " << this->input_number << std::endl;
......
......@@ -143,8 +143,8 @@ namespace HWProxy_ns
else
{
Tango::Except::throw_exception ("DATA_OUT_OF_RANGE",
" temperature index must be in [0...3]",
"HWProxy::get_temperature");
" temperature index must be in [1...4]",
"HWProxy::get_input");
}
};
......@@ -157,7 +157,7 @@ namespace HWProxy_ns
" temperature index must be in [0...3]",
"HWProxy::get_temperature");
}
return temperature_read [this->conf.loop_number -1];
return temperature_read [this->input_number - 1];
};
//- and get the setpoint
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment