start in OFF state

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

src/SimulatedE2PS.cpp

@@ -151,7 +151,9 @@ void SimulatedE2PS::init_device()
 	/* clang-format off */
 	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::init_device_before
 
-	//	No device property to be read from database
+
+	//	Get the device properties from database
+	get_device_property();
 
 	/*----- PROTECTED REGION ID(SimulatedE2PS::init_device) ENABLED START -----*/
 	/* clang-format on */
@@ -175,6 +177,57 @@ void SimulatedE2PS::init_device()
 	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::init_device
 }
 
+//--------------------------------------------------------
+/**
+ *	Method      : SimulatedE2PS::get_device_property()
+ * Description:  Read database to initialize property data members.
+ */
+//--------------------------------------------------------
+void SimulatedE2PS::get_device_property()
+{
+	/*----- PROTECTED REGION ID(SimulatedE2PS::get_device_property_before) ENABLED START -----*/
+	/* clang-format on */
+	//	Initialize property data members
+	/* clang-format off */
+	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::get_device_property_before
+
+
+	//	Read device properties from database.
+	Tango::DbData	dev_prop;
+	dev_prop.push_back(Tango::DbDatum("CurrentRipple"));
+
+	//	is there at least one property to be read ?
+	if (dev_prop.size()>0)
+	{
+		//	Call database and extract values
+		if (Tango::Util::instance()->_UseDb==true)
+			get_db_device()->get_property(dev_prop);
+
+		//	get instance on SimulatedE2PSClass to get class property
+		Tango::DbDatum	def_prop, cl_prop;
+		SimulatedE2PSClass	*ds_class =
+			(static_cast<SimulatedE2PSClass *>(get_device_class()));
+		int	i = -1;
+
+		//	Try to initialize CurrentRipple from class property
+		cl_prop = ds_class->get_class_property(dev_prop[++i].name);
+		if (cl_prop.is_empty()==false)	cl_prop  >>  currentRipple;
+		else {
+			//	Try to initialize CurrentRipple from default device value
+			def_prop = ds_class->get_default_device_property(dev_prop[i].name);
+			if (def_prop.is_empty()==false)	def_prop  >>  currentRipple;
+		}
+		//	And try to extract CurrentRipple value from database
+		if (dev_prop[i].is_empty()==false)	dev_prop[i]  >>  currentRipple;
+
+	}
+
+	/*----- PROTECTED REGION ID(SimulatedE2PS::get_device_property_after) ENABLED START -----*/
+	/* clang-format on */
+	//	Check device property data members init
+	/* clang-format off */
+	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::get_device_property_after
+}
 
 //--------------------------------------------------------
 /**
@@ -238,14 +291,13 @@ void SimulatedE2PS::read_current(Tango::Attribute &attr)
 	/*----- PROTECTED REGION ID(SimulatedE2PS::read_current) ENABLED START -----*/
 	/* clang-format on */
 	//	Set the attribute value
-	double delta=rand_r(&rand_r_seed)/RAND_MAX;
+	double delta=drand48()-0.5;
+
 	if(get_state() == Tango::OFF){
-		delta +=0.5;
-		_current_read =  delta *0.0001;
+		_current_read =  delta * currentRipple;
 	}
 	else{
-		delta -=0.5;
-		_current_read = _current +( delta *0.0001 );
+		_current_read = _current +( delta * currentRipple );
 	}
 	attr.set_value(&_current_read);
 	/* clang-format off */
@@ -264,9 +316,8 @@ void SimulatedE2PS::write_current(Tango::WAttribute &attr)
 {
 	DEBUG_STREAM << "SimulatedE2PS::write_current(Tango::WAttribute &attr) entering... " << std::endl;
 	//	Retrieve write value
-	attr.get_write_value(_current_read);
-	attr.get_write_value(_current);
-	_voltage = _current * _ohm;
+	Tango::DevDouble	w_val;
+	attr.get_write_value(w_val);
 	/*----- PROTECTED REGION ID(SimulatedE2PS::write_current) ENABLED START -----*/
 	/* clang-format on */
 	//	Add your own code
@@ -342,6 +393,8 @@ void SimulatedE2PS::on()
 	/* clang-format on */
 
 	//	Add your own code
+	set_state(Tango::ON);
+	push_change_event("State");
 
 	/* clang-format off */
 	/*----- PROTECTED REGION END -----*/	//	SimulatedE2PS::on
@@ -358,7 +411,15 @@ void SimulatedE2PS::off()
 	DEBUG_STREAM << "SimulatedE2PS::Off()  - " << device_name << std::endl;
 	/*----- PROTECTED REGION ID(SimulatedE2PS::off) ENABLED START -----*/
 	/* clang-format on */
-
+	_current_read = 0.0;
+	_current = 0.0;
+	_voltage = 0.0;
+	attr_current->set_write_value(_current);
+	push_change_event("current",&_current_read);
+	push_change_event("currentSet",&_current);
+	set_state(Tango::OFF);
+	push_change_event("State");
+;
 	//	Add your own code
 
 	/* clang-format off */