usb2 @ 028744bf

-Subproject commit bbf88d71ce04b87c7a3a2aa98996f91a5079bb47
+Subproject commit 028744bfd6ceac8690b236df49dfd11b7175c00b

src/E621.cpp

@@ -59,7 +59,6 @@
 //================================================================
 //  State         |  Inherited (no method)
 //  Status        |  Inherited (no method)
-//  Reset         |  reset
 //================================================================
 
 //================================================================
@@ -554,27 +553,6 @@ void E621::add_dynamic_attributes()
 	/*----- PROTECTED REGION END -----*/	//	E621::add_dynamic_attributes
 }
 
-//--------------------------------------------------------
-/**
- *	Command Reset related method
- *
- *
- */
-//--------------------------------------------------------
-void E621::reset()
-{
-	DEBUG_STREAM << "E621::Reset()  - " << device_name << std::endl;
-	/*----- PROTECTED REGION ID(E621::reset) ENABLED START -----*/
-	/* clang-format on */
-
-	//	Add your own code
-	check_init();
-// TODO Test
-	_command("RST\n");
-
-	/* clang-format off */
-	/*----- PROTECTED REGION END -----*/	//	E621::reset
-}
 //--------------------------------------------------------
 /**
  *	Method     : E621::add_dynamic_commands()

src/E621.h

@@ -218,13 +218,6 @@ public:
 
 //	Command related methods
 public:
-	/**
-	 *	Command Reset related method
-	 *
-	 *
-	 */
-	virtual void reset();
-	virtual bool is_Reset_allowed(const CORBA::Any &any);
 
 
 	//--------------------------------------------------------

src/E621.xmi

@@ -28,16 +28,6 @@
       </argout>
       <status abstract="true" inherited="true" concrete="true"/>
     </commands>
-    <commands name="Reset" description="" execMethod="reset" displayLevel="OPERATOR" polledPeriod="0" isDynamic="false">
-      <argin description="">
-        <type xsi:type="pogoDsl:VoidType"/>
-      </argin>
-      <argout description="">
-        <type xsi:type="pogoDsl:VoidType"/>
-      </argout>
-      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
-      <excludedStates>UNKNOWN</excludedStates>
-    </commands>
     <attributes name="Firmware" attType="Scalar" rwType="READ" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
       <dataType xsi:type="pogoDsl:StringType"/>
       <changeEvent fire="false" libCheckCriteria="false"/>
@@ -81,9 +71,6 @@
     <states name="ON" description="">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>
-    <states name="FAULT" description="">
-      <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
-    </states>
     <states name="UNKNOWN" description="">
       <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
     </states>

src/E621Class.cpp

@@ -156,24 +156,6 @@ E621Class *E621Class::instance()
 //===================================================================
 //	Command execution method calls
 //===================================================================
-//--------------------------------------------------------
-/**
- * method : 		ResetClass::execute()
- * description : 	method to trigger the execution of the command.
- *
- * @param	device	The device on which the command must be executed
- * @param	in_any	The command input data
- *
- *	returns The command output data (packed in the Any object)
- */
-//--------------------------------------------------------
-CORBA::Any *ResetClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))
-{
-	TANGO_LOG_INFO << "ResetClass::execute(): arrived" << std::endl;
-	((static_cast<E621 *>(device))->reset());
-	return new CORBA::Any();
-}
-
 
 //===================================================================
 //	Properties management
@@ -468,15 +450,6 @@ void E621Class::command_factory()
 
 
 
-	//	Command Reset
-	ResetClass	*pResetCmd =
-		new ResetClass("Reset",
-			Tango::DEV_VOID, Tango::DEV_VOID,
-			"",
-			"",
-			Tango::OPERATOR);
-	command_list.push_back(pResetCmd);
-
 	/*----- PROTECTED REGION ID(E621Class::command_factory_after) ENABLED START -----*/
 	
 	//	Add your own code

src/E621Class.h

@@ -121,33 +121,6 @@ public:
 };
 
 
-//=========================================
-//	Define classes for commands
-//=========================================
-//	Command Reset class definition
-class ResetClass : public Tango::Command
-{
-public:
-	ResetClass(const char   *cmd_name,
-	               Tango::CmdArgType in,
-				   Tango::CmdArgType out,
-				   const char        *in_desc,
-				   const char        *out_desc,
-				   Tango::DispLevel  level)
-	:Command(cmd_name,in,out,in_desc,out_desc, level)	{}
-
-	ResetClass(const char   *cmd_name,
-	               Tango::CmdArgType in,
-				   Tango::CmdArgType out)
-	:Command(cmd_name,in,out)	{}
-	~ResetClass() {}
-
-	virtual CORBA::Any *execute (Tango::DeviceImpl *dev, const CORBA::Any &any);
-	virtual bool is_allowed (Tango::DeviceImpl *dev, const CORBA::Any &any)
-	{return (static_cast<E621 *>(dev))->is_Reset_allowed(any);}
-};
-
-
 /**
  *	The E621Class singleton definition
  */

src/E621StateMachine.cpp

@@ -188,26 +188,6 @@ bool E621::is_Position_allowed(TANGO_UNUSED(Tango::AttReqType type))
 //		Commands Allowed Methods
 //=================================================
 
-//--------------------------------------------------------
-/**
- *	Method     : E621::is_Reset_allowed()
- *	Description: Execution allowed for Reset attribute
- */
-//--------------------------------------------------------
-bool E621::is_Reset_allowed(TANGO_UNUSED(const CORBA::Any &any))
-{
-	//	Compare device state with not allowed states.
-	if (get_state()==Tango::UNKNOWN)
-	{
-	/*----- PROTECTED REGION ID(E621::ResetStateAllowed) ENABLED START -----*/
-	/* clang-format on */
-	/* clang-format off */
-	/*----- PROTECTED REGION END -----*/	//	E621::ResetStateAllowed
-		return false;
-	}
-	return true;
-}
-
 
 /*----- PROTECTED REGION ID(E621::E621StateAllowed.AdditionalMethods) ENABLED START -----*/