minor bug fixed.

src/RetrigAO.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/RetrigAO.cpp,v 1.1.1.1 2004-12-06 10:23:38 syldup Exp $";
+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 $";
 //+=============================================================================
 //
 // file :	  RetrigAO.cpp
@@ -11,9 +11,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
 //
 // project :	  TANGO Device Server
 //
-// $Author: syldup $
+// $Author: abeilleg $
 //
-// $Revision: 1.1.1.1 $
+// $Revision: 1.2 $
 //
 // $Log: not supported by cvs2svn $
 //
@@ -380,13 +380,13 @@ void RetrigAO::init_device()
     if(channel4Waveform.empty())
     {
       WARN_STREAM<<"No waveform is saved in database for channel 4, using a default one"<<endl;
-      config.set_channel_periodic_data(4, default_waveformA);
+      config.set_channel_periodic_data(4, default_waveformB);
     }
     else if(channel4Waveform.size() != bufferDepth)
     {
       WARN_STREAM<<"The waveform saved in database for channel 4 has a different size from property BufferDepth, "<<
         "using default waveform"<<endl;
-      config.set_channel_periodic_data(4, default_waveformA);
+      config.set_channel_periodic_data(4, default_waveformB);
     }
     else //put waveform of the Tango database in ch4
     {
@@ -411,13 +411,13 @@ void RetrigAO::init_device()
     if(channel5Waveform.empty())
     {
       WARN_STREAM<<"No waveform is saved in database for channel 5, using a default one"<<endl;
-      config.set_channel_periodic_data(5, default_waveformA);
+      config.set_channel_periodic_data(5, default_waveformB);
     }
     else if(channel5Waveform.size() != bufferDepth)
     {
       WARN_STREAM<<"The waveform saved in database for channel 5 has a different size from property BufferDepth, "<<
         "using default waveform"<<endl;
-      config.set_channel_periodic_data(5, default_waveformA);
+      config.set_channel_periodic_data(5, default_waveformB);
     }
     else //put waveform of the Tango database in ch5
     {
@@ -442,13 +442,13 @@ void RetrigAO::init_device()
     if(channel6Waveform.empty())
     {
       WARN_STREAM<<"No waveform is saved in database for channel 6, using a default one"<<endl;
-      config.set_channel_periodic_data(6, default_waveformA);
+      config.set_channel_periodic_data(6, default_waveformB);
     }
     else if(channel6Waveform.size() != bufferDepth)
     {
       WARN_STREAM<<"The waveform saved in database for channel 6 has a different size from property BufferDepth, "<<
         "using default waveform"<<endl;
-      config.set_channel_periodic_data(6, default_waveformA);
+      config.set_channel_periodic_data(6, default_waveformB);
     }
     else //put waveform of the Tango database in ch6
     {
@@ -473,13 +473,13 @@ void RetrigAO::init_device()
     if(channel7Waveform.empty())
     {
       WARN_STREAM<<"No waveform is saved in database for channel 7, using a default one"<<endl;
-      config.set_channel_periodic_data(7, default_waveformA);
+      config.set_channel_periodic_data(7, default_waveformB);
     }
     else if(channel7Waveform.size() != bufferDepth)
     {
       WARN_STREAM<<"The waveform saved in database for channel 7 has a different size from property BufferDepth, "<<
         "using default waveform"<<endl;
-      config.set_channel_periodic_data(7, default_waveformA);
+      config.set_channel_periodic_data(7, default_waveformB);
     }
     else //put waveform of the Tango database in ch7
     {
@@ -490,15 +490,15 @@ void RetrigAO::init_device()
       // put the waveform in the configuration
       config.set_channel_periodic_data(7, data);
       //cpy data in the attribute of the device
-      ::memcpy(ch7, data.base(), data.size());
     }
   }
-
   //--------------------------------trigger config---------------------------------
   config.enable_retrigger();
+
   config.set_trigger_source((adl::AIOTriggerSource)triggerSource);
   config.set_trigger_mode((adl::AOTriggerMode)triggerMode);
   config.set_nb_waveforms(1);
+
   if(triggerMode == adl::ao_delay)
   {
     //cout<<"delay: "<<delay<<endl;
@@ -1350,7 +1350,7 @@ 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::RESTARTING:
     case asl::ContinuousAO::ABORTING:
       this->set_state(Tango::RUNNING);
       this->set_status("The acquisition is running");