Skip to content
Snippets Groups Projects
Commit 08ec1b8b authored by Gwenaelle ABEILLE's avatar Gwenaelle ABEILLE
Browse files

following ASL modifications (states management).

parent 690da800
No related branches found
No related tags found
No related merge requests found
......@@ -28,7 +28,7 @@ Device States Description
</h1>
<Br>
<b>
Revision: - Author:
Revision: 1.1.1.1 - Author: syldup
</b>
</center>
......@@ -50,6 +50,9 @@ Revision: - Author:
<Tr><Td>RUNNING</Td>
<Td></Td></Tr>
<Tr><Td>FAULT</Td>
<Td></Td></Tr>
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.2 2004-12-21 13:09:03 abeilleg Exp $";
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.3 2005-01-24 15:42:23 abeilleg Exp $";
//+=============================================================================
//
// file : RetrigAO.cpp
......@@ -13,9 +13,12 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
//
// $Author: abeilleg $
//
// $Revision: 1.2 $
// $Revision: 1.3 $
//
// $Log: not supported by cvs2svn $
// Revision 1.2 2004/12/21 13:09:03 abeilleg
// minor bug fixed.
//
//
// copyleft : Synchrotron SOLEIL
// L'Orme des Merisiers
......@@ -1350,11 +1353,14 @@ void RetrigAO::set_internal_state(void)
this->set_status("The acquisition is stopped");
break;
case asl::ContinuousAO::RUNNING:
//case asl::ContinuousAO::RESTARTING:
case asl::ContinuousAO::ABORTING:
this->set_state(Tango::RUNNING);
this->set_status("The acquisition is running");
break;
case asl::ContinuousAO::FAULT:
this->set_state(Tango::FAULT);
this->set_status("An error has occured");
break;
case asl::ContinuousAO::UNKNOWN:
default:
this->set_state(Tango::UNKNOWN);
......
......@@ -6,11 +6,14 @@
//
// project : Retriggered Continuous Anolog Output
//
// $Author: syldup $
// $Author: abeilleg $
//
// $Revision: 1.1.1.1 $
// $Revision: 1.2 $
//
// $Log: not supported by cvs2svn $
// Revision 1.1.1.1 2004/12/06 10:23:38 syldup
// initial import
//
//
// copyleft : Synchrotron SOLEIL
// L'Orme des Merisiers
......@@ -34,8 +37,8 @@
//using namespace Tango;
/**
* @author $Author: syldup $
* @version $Revision: 1.1.1.1 $ $
* @author $Author: abeilleg $
* @version $Revision: 1.2 $ $
*/
// Add your own constants definitions here.
......@@ -55,6 +58,7 @@ namespace RetrigAO
* Tango::UNKNOWN :
* Tango::STANDBY :
* Tango::RUNNING :
* Tango::FAULT :
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment