code clean up

conanfile.py

@@ -3,7 +3,7 @@ from conan import ConanFile
 class GpibPrologixRecipe(ConanFile):
     name = "gpibprologix"
     executable = "ds_GpibPrologix"
-    version = "1.4.0"
+    version = "1.4.1"
     package_type = "application"
     user = "soleil"
     python_requires = "base/[>=1.0]@soleil/stable"

pom.xml

@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.device</groupId>
    <artifactId>GpibPrologix-${aol}-${mode}</artifactId>
-   <version>1.4.0</version>
+   <version>1.4.1</version>
    <packaging>nar</packaging>
    <name>GpibPrologix</name>
    <description>GpibPrologix device</description>

src/GpibPrologix.cpp

@@ -482,69 +482,13 @@ void GpibPrologix::get_device_property()
 
 	/*----- PROTECTED REGION ID(GpibPrologix::get_device_property_after) ENABLED START -----*/
 	
-	//	Check device property data members init
-	Tango::DbData data_put;
-  if (dev_prop[0].is_empty()==true || url.find ("must be defined") != std::string::npos)
-  {
-    m_properties_missing = true;
-    m_status_str = "Property Url not defined [fix and restart device]";
-    Tango::DbDatum  prop ("Url");
-    prop  <<  url;
-    data_put.push_back(prop);
-    FATAL_STREAM << "GpibPrologix::get_properties() missing property Url [fix and restart device]" << endl;
-  }
-  if (dev_prop[1].is_empty() == true)
-  {
-    Tango::DbDatum  prop ("Port");
-    prop  <<  port;
-    data_put.push_back(prop);
-    INFO_STREAM << "GpibPrologix::get_properties() missing or not set property Port, set to default 1234 " << endl;
-  }
-  if (dev_prop[2].is_empty() == true)
-  {
-    Tango::DbDatum  prop ("ReadTimeout");
-    prop  <<  readTimeout;
-    data_put.push_back(prop);
-    INFO_STREAM << "GpibPrologix::get_properties() missing property ReadTimeout, set to default 100 (ms)" << endl;
-  }
-  if (dev_prop[3].is_empty()==true ||
-    (readTermination.find ("EOI") == std::string::npos &&
-    readTermination.find ("TIMEOUT") == std::string::npos &&
-    readTermination.find ("TERMINATOR") == std::string::npos))
-  {
-    Tango::DbDatum  prop ("ReadTermination");
-    prop  <<  readTermination;
-    data_put.push_back(prop);
-    INFO_STREAM << "GpibPrologix::get_properties() missing property ReadTermination, set to default <EOI>" << endl;
-  }
-  if (dev_prop[4].is_empty() == true || readTerminator < 0 || readTerminator > 255)
-  {
-    Tango::DbDatum  prop ("ReadTerminator");
-    prop  <<  readTerminator;
-    data_put.push_back(prop);
-    INFO_STREAM << "GpibPrologix::get_properties() missing property ReadTerminator created, set to default value 10 (LF)" << endl;
-  }
-  if (dev_prop[5].is_empty() == true || writeTerminator < 0 || writeTerminator > 3)
-  {
-    Tango::DbDatum  prop ("WriteTerminator");
-    prop  <<  writeTerminator;
-    data_put.push_back(prop);
-    INFO_STREAM << "GpibPrologix::get_properties() missing property WriteTerminator created, set to default value 0 (append <CR><LF> at the end of command)" << endl;
-  }
-  if (dev_prop[6].is_empty() == true)
-  {
-    Tango::DbDatum  prop ("GpibAddress");
-    m_properties_missing = true;
-    m_status_str += "\nProperty GpibAddress not defined [fix and restart device]";
-    prop  <<  gpibAddress;
-    data_put.push_back(prop);
-    ERROR_STREAM << "GpibPrologix::get_properties() missing property GpibAddress not defined [fix and restart device]" << endl;
-  }
-
-  if(!data_put.empty())
-  {
-    get_db_device()->put_property(data_put);
-  }
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "", "Url");
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "1234", "Port");
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "100", "ReadTimeout");
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "EOI", "ReadTermination");
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "10", "ReadTerminator");
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "0", "WriteTerminator");
+  yat4tango::PropertyHelper::create_property_if_empty(this, dev_prop, "-1", "GpibAddress");
   
 	/*----- PROTECTED REGION END -----*/	//	GpibPrologix::get_device_property_after
 }