start in OFF state

handle status string add current ripple, siwtch current ripple on/off

src/SimulatedE2PS.cpp

@@ -65,9 +65,11 @@
 //================================================================
 //  Attributes managed are:
 //================================================================
-//  current     |  Tango::DevDouble	Scalar
-//  voltage     |  Tango::DevDouble	Scalar
-//  currentSet  |  Tango::DevDouble	Scalar
+//  current        |  Tango::DevDouble	Scalar
+//  voltage        |  Tango::DevDouble	Scalar
+//  currentSet     |  Tango::DevDouble	Scalar
+//  CurrentRipple  |  Tango::DevDouble	Scalar
+//  AddRipple      |  Tango::DevBoolean	Scalar
 //================================================================
 
 namespace SimulatedE2PS_ns
@@ -80,8 +82,8 @@ namespace SimulatedE2PS_ns
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::SimulatedE2PS()
- * Description:  Constructors for a Tango device
+ *	Method     : SimulatedE2PS::SimulatedE2PS()
+ *	Description: Constructors for a Tango device
  *                implementing the classSimulatedE2PS
  */
 //--------------------------------------------------------
@@ -122,8 +124,8 @@ SimulatedE2PS::~SimulatedE2PS()
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::delete_device()
- * Description:  will be called at device destruction or at init command
+ *	Method     : SimulatedE2PS::delete_device()
+ *	Description: will be called at device destruction or at init command
  */
 //--------------------------------------------------------
 void SimulatedE2PS::delete_device()
@@ -138,8 +140,8 @@ void SimulatedE2PS::delete_device()
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::init_device()
- * Description:  will be called at device initialization.
+ *	Method     : SimulatedE2PS::init_device()
+ *	Description: will be called at device initialization.
  */
 //--------------------------------------------------------
 void SimulatedE2PS::init_device()
@@ -162,6 +164,8 @@ void SimulatedE2PS::init_device()
 	_current= 0.0;
 	_current_read= 0.0;
 	_voltage= 0.1;
+	_current_ripple = currentRipple;
+	_add_ripple = false;
 	_ohm = 0.2; // load resistance in ohm
 	_busy = false;
 	thread_running=false;
@@ -180,8 +184,8 @@ void SimulatedE2PS::init_device()
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::get_device_property()
- * Description:  Read database to initialize property data members.
+ *	Method     : SimulatedE2PS::get_device_property()
+ *	Description: Read database to initialize property data members.
  */
 //--------------------------------------------------------
 void SimulatedE2PS::get_device_property()
@@ -232,8 +236,8 @@ void SimulatedE2PS::get_device_property()
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::always_executed_hook()
- * Description:  method always executed before any command is executed
+ *	Method     : SimulatedE2PS::always_executed_hook()
+ *	Description: method always executed before any command is executed
  */
 //--------------------------------------------------------
 void SimulatedE2PS::always_executed_hook()
@@ -248,8 +252,8 @@ void SimulatedE2PS::always_executed_hook()
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::read_attr_hardware()
- * Description:  Hardware acquisition for attributes
+ *	Method     : SimulatedE2PS::read_attr_hardware()
+ *	Description: Hardware acquisition for attributes
  */
 //--------------------------------------------------------
 void SimulatedE2PS::read_attr_hardware(TANGO_UNUSED(std::vector<long> &attr_list))
@@ -263,8 +267,8 @@ void SimulatedE2PS::read_attr_hardware(TANGO_UNUSED(std::vector<long> &attr_list
 }
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::write_attr_hardware()
- * Description:  Hardware writing for attributes
+ *	Method     : SimulatedE2PS::write_attr_hardware()
+ *	Description: Hardware writing for attributes
  */
 //--------------------------------------------------------
 void SimulatedE2PS::write_attr_hardware(TANGO_UNUSED(std::vector<long> &attr_list))
@@ -280,7 +284,7 @@ void SimulatedE2PS::write_attr_hardware(TANGO_UNUSED(std::vector<long> &attr_lis
 //--------------------------------------------------------
 /**
  *	Read attribute current related method
- * Description:  The powersupply current setting in amps
+ *	Description: The powersupply current setting in amps
  *
  *	Data type:	Tango::DevDouble
  *	Attr type:	Scalar
@@ -292,13 +296,18 @@ void SimulatedE2PS::read_current(Tango::Attribute &attr)
 	/*----- PROTECTED REGION ID(SimulatedE2PS::read_current) ENABLED START -----*/
 	/* clang-format on */
 	//	Set the attribute value
-	double delta=drand48()-0.5;
+
+	double delta;
+	if (_add_ripple)
+		delta = drand48()-0.5; // use anothe random distribution?
+	else
+		delta = 0.0;
 
 	if(get_state() == Tango::OFF){
-		_current_read =  delta * currentRipple;
+		_current_read = 0.0; //delta * _current_ripple;
 	}
 	else{
-		_current_read = _current +( delta * currentRipple );
+		_current_read = _current +( delta * _current_ripple );
 	}
 	attr.set_value(&_current_read);
 	/* clang-format off */
@@ -307,7 +316,7 @@ void SimulatedE2PS::read_current(Tango::Attribute &attr)
 //--------------------------------------------------------
 /**
  *	Write attribute current related method
- * Description:  The powersupply current setting in amps
+ *	Description: The powersupply current setting in amps
  *
  *	Data type:	Tango::DevDouble
  *	Attr type:	Scalar
@@ -329,7 +338,7 @@ void SimulatedE2PS::write_current(Tango::WAttribute &attr)
 //--------------------------------------------------------
 /**
  *	Read attribute voltage related method
- * Description:  The powersupply voltage in volts.
+ *	Description: The powersupply voltage in volts.
  *
  *	Data type:	Tango::DevDouble
  *	Attr type:	Scalar
@@ -348,7 +357,7 @@ void SimulatedE2PS::read_voltage(Tango::Attribute &attr)
 //--------------------------------------------------------
 /**
  *	Read attribute currentSet related method
- * Description:  The current set value as stored in the powersupply.
+ *	Description: The current set value as stored in the powersupply.
  *
  *	Data type:	Tango::DevDouble
  *	Attr type:	Scalar
@@ -364,11 +373,95 @@ void SimulatedE2PS::read_currentSet(Tango::Attribute &attr)
 	/* clang-format off */
 	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::read_currentSet
 }
+//--------------------------------------------------------
+/**
+ *	Read attribute CurrentRipple related method
+ *	Description: Amplitude of current ripple (noise) added to output.
+ *               Initial value from property CurrentRipple
+ *
+ *	Data type:	Tango::DevDouble
+ *	Attr type:	Scalar
+ */
+//--------------------------------------------------------
+void SimulatedE2PS::read_CurrentRipple(Tango::Attribute &attr)
+{
+	DEBUG_STREAM << "SimulatedE2PS::read_CurrentRipple(Tango::Attribute &attr) entering... " << std::endl;
+	/*----- PROTECTED REGION ID(SimulatedE2PS::read_CurrentRipple) ENABLED START -----*/
+	/* clang-format on */
+	//	Set the attribute value
+	attr.set_value(&_current_ripple);
+	/* clang-format off */
+	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::read_CurrentRipple
+}
+//--------------------------------------------------------
+/**
+ *	Write attribute CurrentRipple related method
+ *	Description: Amplitude of current ripple (noise) added to output.
+ *               Initial value from property CurrentRipple
+ *
+ *	Data type:	Tango::DevDouble
+ *	Attr type:	Scalar
+ */
+//--------------------------------------------------------
+void SimulatedE2PS::write_CurrentRipple(Tango::WAttribute &attr)
+{
+	DEBUG_STREAM << "SimulatedE2PS::write_CurrentRipple(Tango::WAttribute &attr) entering... " << std::endl;
+	//	Retrieve write value
+	Tango::DevDouble	w_val;
+	attr.get_write_value(w_val);
+	/*----- PROTECTED REGION ID(SimulatedE2PS::write_CurrentRipple) ENABLED START -----*/
+	/* clang-format on */
+	//	Add your own code
+	_current_ripple = w_val;
+	/* clang-format off */
+	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::write_CurrentRipple
+}
+//--------------------------------------------------------
+/**
+ *	Read attribute AddRipple related method
+ *	Description: Switch on/off current ripple. If False the power supply is ideal :no noise.
+ *
+ *	Data type:	Tango::DevBoolean
+ *	Attr type:	Scalar
+ */
+//--------------------------------------------------------
+void SimulatedE2PS::read_AddRipple(Tango::Attribute &attr)
+{
+	DEBUG_STREAM << "SimulatedE2PS::read_AddRipple(Tango::Attribute &attr) entering... " << std::endl;
+	/*----- PROTECTED REGION ID(SimulatedE2PS::read_AddRipple) ENABLED START -----*/
+	/* clang-format on */
+	//	Set the attribute value
+	attr.set_value(&_add_ripple);
+	/* clang-format off */
+	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::read_AddRipple
+}
+//--------------------------------------------------------
+/**
+ *	Write attribute AddRipple related method
+ *	Description: Switch on/off current ripple. If False the power supply is ideal :no noise.
+ *
+ *	Data type:	Tango::DevBoolean
+ *	Attr type:	Scalar
+ */
+//--------------------------------------------------------
+void SimulatedE2PS::write_AddRipple(Tango::WAttribute &attr)
+{
+	DEBUG_STREAM << "SimulatedE2PS::write_AddRipple(Tango::WAttribute &attr) entering... " << std::endl;
+	//	Retrieve write value
+	Tango::DevBoolean	w_val;
+	attr.get_write_value(w_val);
+	/*----- PROTECTED REGION ID(SimulatedE2PS::write_AddRipple) ENABLED START -----*/
+	/* clang-format on */
+	//	Add your own code
+	_add_ripple = w_val;
+	/* clang-format off */
+	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::write_AddRipple
+}
 
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::add_dynamic_attributes()
- * Description:  Create the dynamic attributes if any
+ *	Method     : SimulatedE2PS::add_dynamic_attributes()
+ *	Description: Create the dynamic attributes if any
  *                for specified device.
  */
 //--------------------------------------------------------
@@ -384,7 +477,7 @@ void SimulatedE2PS::add_dynamic_attributes()
 //--------------------------------------------------------
 /**
  *	Command On related method
- * Description:  Switch powersupply ON.
+ *	Description: Switch powersupply ON.
  *
  */
 //--------------------------------------------------------
@@ -405,7 +498,7 @@ void SimulatedE2PS::on()
 //--------------------------------------------------------
 /**
  *	Command Off related method
- * Description:  Switch power supply OFF.
+ *	Description: Switch power supply OFF.
  *
  */
 //--------------------------------------------------------
@@ -432,7 +525,7 @@ void SimulatedE2PS::off()
 //--------------------------------------------------------
 /**
  *	Command Reset related method
- * Description:  Reset the powersupply to a well known state.
+ *	Description: Reset the powersupply to a well known state.
  *
  */
 //--------------------------------------------------------
@@ -473,7 +566,7 @@ void SimulatedE2PS::start_cycling()
 //--------------------------------------------------------
 /**
  *	Command Abort related method
- * Description:  stop ramp or cycling
+ *	Description: stop ramp or cycling
  *
  */
 //--------------------------------------------------------
@@ -491,7 +584,7 @@ void SimulatedE2PS::abort()
 //--------------------------------------------------------
 /**
  *	Command Fault related method
- * Description:  Force a simulated faulty condtion
+ *	Description: Force a simulated faulty condtion
  *
  */
 //--------------------------------------------------------
@@ -517,8 +610,8 @@ void SimulatedE2PS::fault()
 }
 //--------------------------------------------------------
 /**
- *	Method      : SimulatedE2PS::add_dynamic_commands()
- * Description:  Create the dynamic commands if any
+ *	Method     : SimulatedE2PS::add_dynamic_commands()
+ *	Description: Create the dynamic commands if any
  *                for specified device.
  */
 //--------------------------------------------------------