develop -> main

src/SingleShotAO.cpp

@@ -326,7 +326,6 @@ void SingleShotAO::init_device()
 		DEBUG_STREAM << "Failed to get frequency value. Maybe there is no value yet." << std::endl;
 	}
 	
-
 	// initialize the AO manager
 	//--------------------------------------------
 	try
@@ -348,6 +347,10 @@ void SingleShotAO::init_device()
 		return;
 	}
 
+
+	// Create dynamic attributes
+	//--------------------------------------------
+
   	// create dynamic attribute manager
 	try
 	{
@@ -495,8 +498,7 @@ void SingleShotAO::init_device()
 			double l_val = yat4tango::PropertyHelper::get_memorized_attribute<double>(this, name);
 			m_manager->set_speed(l_cpt, l_val);
 	  	}
-		catch (...)
-		{
+			catch (...) {
 			// nothing to do
 		}
 
@@ -903,16 +905,17 @@ void SingleShotAO::write_speed(yat4tango::DynamicAttributeWriteCallbackData & cb
 		ERROR_STREAM << df<< endl;
 		RETHROW_DEVFAILED(df,
 			"DRIVER_FAILURE",
-			"could not write initial [caught Tango::DevFailed]",
-			"SingleShotAO::write_initial");
+			"could not write speed [caught Tango::DevFailed]",
+			"SingleShotAO::write_speed");
 	}
 	catch(...)
 	{
-		ERROR_STREAM << "SingleShotAO::write_initial::unknown exception caught"<<std::endl;
+		ERROR_STREAM << "SingleShotAO::write_speed::unknown exception caught" << std::endl;
 		THROW_DEVFAILED("DRIVER_FAILURE",
-			"could not write initial [unknown error]",
-			"SingleShotAO::write_initial");
+			"could not write speed [unknown error]",
+			"SingleShotAO::write_speed");
 	}
+
 	yat4tango::PropertyHelper::set_memorized_attribute(this, l_attr_name, l_val);
 }
 
@@ -975,6 +978,7 @@ void SingleShotAO::write_initial(yat4tango::DynamicAttributeWriteCallbackData &
 			"could not write initial [unknown error]",
 			"SingleShotAO::write_initial");
 	}
+
 	yat4tango::PropertyHelper::set_memorized_attribute(this, l_attr_name, l_val);
 }
 
@@ -986,14 +990,12 @@ void SingleShotAO::write_initial(yat4tango::DynamicAttributeWriteCallbackData &
  *	description:	method to execute "Abort"
  *	Aborts ramps in progress.
  *
- *
  */
 //+------------------------------------------------------------------
 void SingleShotAO::abort()
 {
 	DEBUG_STREAM << "SingleShotAO::abort(): entering... !" << endl;
 
-	//	Add your own code to control device here
 	CHECK_MANAGER();
 	try
 	{
@@ -1014,7 +1016,6 @@ void SingleShotAO::abort()
 			"could not abort [unknown error]",
 			"SingleShotAO::abort");
 	}
-
 }
 
 }	//	namespace