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

code clean up

parent 7e2ae9f6
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,7 @@ from conan import ConanFile ...@@ -3,7 +3,7 @@ from conan import ConanFile
class Lakeshore_336Recipe(ConanFile): class Lakeshore_336Recipe(ConanFile):
name = "lakeshore_336" name = "lakeshore_336"
executable = "ds_Lakeshore_336" executable = "ds_Lakeshore_336"
version = "1.0.7" version = "1.0.8"
package_type = "application" package_type = "application"
user = "soleil" user = "soleil"
python_requires = "base/[>=1.0]@soleil/stable" python_requires = "base/[>=1.0]@soleil/stable"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>fr.soleil.device</groupId> <groupId>fr.soleil.device</groupId>
<artifactId>Lakeshore_336-${aol}-${mode}</artifactId> <artifactId>Lakeshore_336-${aol}-${mode}</artifactId>
<version>1.0.7</version> <version>1.0.8</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>Lakeshore_336</name> <name>Lakeshore_336</name>
<developers> <developers>
......
...@@ -387,43 +387,6 @@ void Lakeshore_336::get_device_property() ...@@ -387,43 +387,6 @@ void Lakeshore_336::get_device_property()
yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1000", "Period"); yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1000", "Period");
yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1", "LoopNumber"); yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1", "LoopNumber");
// Tango::DbData data_put;
// if (dev_prop[0].is_empty()==true || comDeviceProxy.find ("must be defined") != std::string::npos)
// {
// m_properties_missing = true;
// m_status_str = "Communication Device Proxy Property not defined [fix and restart device]";
// Tango::DbDatum property("ComDeviceProxy");
// property << comDeviceProxy;
// data_put.push_back(property);
// FATAL_STREAM << "Lakeshore_336::get_properties() missing property url -set here the IP Address" << endl;
// }
// if (dev_prop[1].is_empty() == true)
// {
// Tango::DbDatum property("TimeInDeadBand");
// property << timeInDeadBand;
// data_put.push_back(property);
// INFO_STREAM << "Lakeshore_336::get_properties() missing property TimeInDeadband -set to default " << timeInDeadBand << " sec " << endl;
// }
// if (dev_prop[2].is_empty() == true)
// {
// Tango::DbDatum property("Period");
// property << period;
// data_put.push_back(property);
// INFO_STREAM << "Lakeshore_336::get_properties() missing property Period -set to default 1000 msec value " << period << endl;
// }
// if (dev_prop[3].is_empty() == true)
// {
// Tango::DbDatum property("LoopNumber");
// property << loopNumber;
// data_put.push_back(property);
// INFO_STREAM << "Lakeshore_336::get_properties() missing property LoopNumber -set to default 1 value " << period << endl;
// }
// if(!data_put.empty())
// {
// get_db_device()->put_property(data_put);
// }
/*----- PROTECTED REGION END -----*/ // Lakeshore_336::get_device_property_after /*----- PROTECTED REGION END -----*/ // Lakeshore_336::get_device_property_after
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment