Skip to content
Snippets Groups Projects
Commit aa0c91e1 authored by Alain BUTEAU's avatar Alain BUTEAU
Browse files

Created tag release_1_0_17.

parent 9840dd87
Branches
No related merge requests found
......@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>MechanicalGenericBender-${aol}-${mode}</artifactId>
<version>1.0.17-SNAPSHOT</version>
<version>1.0.17</version>
<packaging>nar</packaging>
<name>MechanicalGenericBender</name>
<!-- use for the name of executable -->
......
......@@ -66,19 +66,10 @@ namespace MechanicalGenericBender_ns
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_bender_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -89,19 +80,10 @@ bool MechanicalGenericBender::is_bender_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_bender1_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -112,19 +94,10 @@ bool MechanicalGenericBender::is_bender1_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_bender2_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -135,19 +108,10 @@ bool MechanicalGenericBender::is_bender2_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_bender3_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -158,19 +122,10 @@ bool MechanicalGenericBender::is_bender3_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_bender4_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -181,15 +136,10 @@ bool MechanicalGenericBender::is_bender4_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_asymmetry_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -200,19 +150,10 @@ bool MechanicalGenericBender::is_asymmetry_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_curvature_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -223,19 +164,10 @@ bool MechanicalGenericBender::is_curvature_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_curvatureRadius_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
if ( get_state()==Tango::MOVING && type==Tango::WRITE_REQ )
{
return true;
}
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -246,15 +178,10 @@ bool MechanicalGenericBender::is_curvatureRadius_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_meanCurvature_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -265,15 +192,10 @@ bool MechanicalGenericBender::is_meanCurvature_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_meanCurvatureRadius_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -284,15 +206,10 @@ bool MechanicalGenericBender::is_meanCurvatureRadius_allowed(Tango::AttReqType t
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_numberOfMotors_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -303,15 +220,10 @@ bool MechanicalGenericBender::is_numberOfMotors_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_autoSendValues_allowed(Tango::AttReqType type)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
......@@ -327,15 +239,10 @@ bool MechanicalGenericBender::is_autoSendValues_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_Stop_allowed(const CORBA::Any &any)
{
if (get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -346,15 +253,10 @@ bool MechanicalGenericBender::is_Stop_allowed(const CORBA::Any &any)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_InitializeBender_allowed(const CORBA::Any &any)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
//+----------------------------------------------------------------------------
......@@ -365,16 +267,10 @@ bool MechanicalGenericBender::is_InitializeBender_allowed(const CORBA::Any &any)
//
//-----------------------------------------------------------------------------
bool MechanicalGenericBender::is_SendValues_allowed(const CORBA::Any &any)
{
if (get_state() == Tango::MOVING ||
get_state() == Tango::FAULT ||
get_state() == Tango::INIT)
{
// End of Generated Code
// Re-Start of Generated Code
return false;
}
return true;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment