Skip to content
Snippets Groups Projects
Commit 07d2b94a authored by Arafat Nourredine's avatar Arafat Nourredine
Browse files

- Allow Stop command when state is OFF

parent c61b9c93
No related branches found
No related tags found
No related merge requests found
......@@ -152,7 +152,7 @@ Each increment is equal to StepSize.<Br>&nbsp
<Li><Strong>Argout:<Br>DEV_VOID</Strong>
: <Br>&nbsp
<Li><Strong>Command allowed for: </Strong><Ul>
<Li>Tango::STANDBY<Li>Tango::MOVING<Li>Tango::ALARM</Ul>
<Li>Tango::STANDBY<Li>Tango::MOVING<Li>Tango::ALARM<Li>Tango::OFF</Ul>
<Br>&nbsp
</ul><Br>
<Br>
......@@ -166,7 +166,7 @@ Each increment is equal to StepSize.<Br>&nbsp
<Li><Strong>Argout:<Br>DEV_VOID</Strong>
: <Br>&nbsp
<Li><Strong>Command allowed for: </Strong><Ul>
<Li>Tango::STANDBY<Li>Tango::MOVING<Li>Tango::ALARM<Li>Tango::OFF<Li>Tango::INIT</Ul>
<Li>Tango::STANDBY<Li>Tango::MOVING<Li>Tango::ALARM<Li>Tango::OFF</Ul>
<Br>&nbsp
</ul><Br>
<Br>
......@@ -180,7 +180,7 @@ Each increment is equal to StepSize.<Br>&nbsp
<Li><Strong>Argout:<Br>DEV_VOID</Strong>
: <Br>&nbsp
<Li><Strong>Command allowed for: </Strong><Ul>
<Li>Tango::STANDBY<Li>Tango::MOVING<Li>Tango::ALARM</Ul>
<Li>Tango::STANDBY<Li>Tango::MOVING<Li>Tango::ALARM<Li>Tango::OFF</Ul>
<Br>&nbsp
</ul><Br>
<Br>
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/ClassFactory.cpp,v 1.7 2009-05-29 08:47:16 anoureddine Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/ClassFactory.cpp,v 1.8 2009-05-29 08:49:03 anoureddine Exp $";
//+=============================================================================
//
// file : ClassFactory.cpp
......@@ -12,9 +12,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/Si
//
// $Author: anoureddine $
//
// $Revision: 1.7 $
// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
// Revision 1.7 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.6 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/SimulatedMotor.cpp,v 1.7 2009-05-29 08:47:16 anoureddine Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/SimulatedMotor.cpp,v 1.8 2009-05-29 08:49:03 anoureddine Exp $";
//+=============================================================================
//
// file : SimulatedMotor.cpp
......@@ -13,9 +13,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/Si
//
// $Author: anoureddine $
//
// $Revision: 1.7 $
// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
// Revision 1.7 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.6 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......@@ -949,4 +953,5 @@ void SimulatedMotor::motor_off()
} // namespace
......@@ -8,9 +8,13 @@
//
// $Author: anoureddine $
//
// $Revision: 1.7 $
// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
// Revision 1.7 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.6 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......@@ -64,7 +68,7 @@
/**
* @author $Author: anoureddine $
* @version $Revision: 1.7 $
* @version $Revision: 1.8 $
*/
// Add your own constants definitions here.
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/SimulatedMotorClass.cpp,v 1.7 2009-05-29 08:47:16 anoureddine Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/SimulatedMotorClass.cpp,v 1.8 2009-05-29 08:49:03 anoureddine Exp $";
static const char *TagName = "$Name: not supported by cvs2svn $";
......@@ -22,9 +22,13 @@ static const char *RCSfile = "$RCSfile: SimulatedMotorClass.cpp,v $";
//
// $Author: anoureddine $
//
// $Revision: 1.7 $
// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
// Revision 1.7 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.6 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......
......@@ -12,9 +12,13 @@
//
// $Author: anoureddine $
//
// $Revision: 1.7 $
// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
// Revision 1.7 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.6 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/SimulatedMotorStateMachine.cpp,v 1.7 2009-05-29 08:47:16 anoureddine Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/SimulatedMotorStateMachine.cpp,v 1.8 2009-05-29 08:49:03 anoureddine Exp $";
//+=============================================================================
//
// file : SimulatedMotorStateMachine.cpp
......@@ -10,9 +10,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/Si
//
// $Author: anoureddine $
//
// $Revision: 1.7 $
// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
// Revision 1.7 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.6 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......@@ -251,7 +255,6 @@ bool SimulatedMotor::is_Backward_allowed(const CORBA::Any &any)
bool SimulatedMotor::is_Stop_allowed(const CORBA::Any &any)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::OFF ||
get_state() == Tango::INIT)
{
// End of Generated Code
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/main.cpp,v 1.6 2009-05-29 08:47:16 anoureddine Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/SimulatedDevice/SimulatedMotor/src/main.cpp,v 1.7 2009-05-29 08:49:03 anoureddine Exp $";
//+=============================================================================
//
// file : main.cpp
......@@ -12,9 +12,13 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Motion/Axis/Si
//
// $Author: anoureddine $
//
// $Revision: 1.6 $ $
// $Revision: 1.7 $ $
//
// $Log: not supported by cvs2svn $
// Revision 1.6 2009/05/29 08:47:16 anoureddine
// - Rename commands On()|Of as MotorON|MotorOFF
// - Chaneg State Machine to allow executing of MotorON|MotorOFF & reading attributes when state is OFF
//
// Revision 1.5 2009/04/13 17:36:45 anoureddine
// - Enhance precision of speed using a high resolution timer in winmm.lib under windows. (~1ms accurate)
// - Correction a bug when using attribute accurate. (same required position value gives us 2 differents real values) !!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment