Skip to content
Snippets Groups Projects
Commit 82057927 authored by Sebastien Leport's avatar Sebastien Leport
Browse files

- shiftVoltage changed by deltaVoltage attribute

- add OFF state
- RUNNING state priority has changed
parent 14f6207b
No related branches found
No related tags found
No related merge requests found
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/SY2527Channel/src/SY2527Channel.cpp,v 1.4 2007-09-06 09:13:44 sebleport Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/SY2527Channel/src/SY2527Channel.cpp,v 1.5 2007-09-06 09:21:12 sebleport Exp $";
//+=============================================================================
//
// file : SY2527Channel.cpp
......@@ -13,9 +13,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
//
// $Author: sebleport $
//
// $Revision: 1.4 $
// $Revision: 1.5 $
//
// $Log: not supported by cvs2svn $
// Revision 1.4 2007/09/06 09:13:44 sebleport
// - shiftVoltage changed by deltaVoltage attribute
// - add OFF state
// - RUNNING state priority has changed
//
// Revision 1.3 2007/09/05 14:02:15 sebleport
// filling array argin command corrected
//
......@@ -528,14 +533,20 @@ Tango::DevState SY2527Channel::dev_state()
}
catch(Tango::DevFailed &df)
{
ERROR_STREAM<<df<<endl;
if(SY2527_crate_proxy!=0)
{
delete SY2527_crate_proxy;
SY2527_crate_proxy = 0;
}
ERROR_STREAM<<df<<endl;
throw df;
s << "No Communication with SY2527Crate, try to init the SY2527Crate DS again"<<endl;
state_to_return = Tango::FAULT;
set_status(s.str().c_str());
return state_to_return;
}
status_byte = argout;
......@@ -602,11 +613,6 @@ Tango::DevState SY2527Channel::dev_state()
state_to_return = Tango::FAULT;
}
if(SY2527_crate_proxy==0)
{
s << "No Communication with SY2527Crate, try to init the SY2527Crate DS again"<<endl;
state_to_return = Tango::FAULT;
}
// NO corresponding state
if( status_byte & 0x40) // bit 6
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment