diff --git a/pom.xml b/pom.xml index 876d2fa15d685094514154127c2cea86247a8a54..717ddaf483669aa7fa3235947d49630e5506fc95 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>fr.soleil.device</groupId> <artifactId>AcquireWaveformLecroy-${aol}-${mode}</artifactId> - <version>1.1.19-SNAPSHOT</version> + <version>1.1.19</version> <packaging>nar</packaging> <name>AcquireWaveformLecroy</name> <description>AcquireWaveformLecroy device</description> diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp index cde8ccd6875ca4f5e801ff543dfaf084d9d6dda5..53552c53732fe550bcc65344b8bf88fc3ecd7724 100644 --- a/src/AcquireWaveformLecroy.cpp +++ b/src/AcquireWaveformLecroy.cpp @@ -104,7 +104,6 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio #include <yat/time/Timer.h> static const int MAX_RESPONSE_LENGTH = 150000; -static const int MAX_STRING_LENGTH = 256; namespace AcquireWaveformLecroy_ns { @@ -509,10 +508,10 @@ void AcquireWaveformLecroy::read_verticalScaledData(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_verticalScaledData(Tango::Attribute &attr) entering... "<< endl; yat::Timer t; - + // Add your own code here attr_verticalScaledData_read = waveform_ptr->get_vertical_scaled_waveform_data(); - + attr.set_value(attr_verticalScaledData_read, data_length); INFO_STREAM << "read_verticalScaledData : " << t.elapsed_msec() << " milliseconds.\n" << std::endl; } @@ -528,11 +527,11 @@ void AcquireWaveformLecroy::read_triggerTime(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_triggerTime(Tango::Attribute &attr) entering... "<< endl; yat::Timer t; - + // Add your own code here std::string response = waveform_ptr->get_trigger_time_value(); strcpy(*attr_triggerTime_read, response.c_str()); - + attr.set_value(attr_triggerTime_read); DEBUG_STREAM << "read_triggerTime : " << t.elapsed_msec() << " milliseconds.\n" << std::endl; } @@ -548,10 +547,10 @@ void AcquireWaveformLecroy::read_verticalOffset(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_verticalOffset(Tango::Attribute &attr) entering... "<< endl; yat::Timer t; - + //- Add your own code here *attr_verticalOffset_read = waveform_ptr->get_wavedesc_descriptor()->vertical_offset; - + attr.set_value(attr_verticalOffset_read); DEBUG_STREAM << "read_verticalOffset : " << t.elapsed_msec() << " milliseconds.\n" << std::endl; } @@ -567,10 +566,10 @@ void AcquireWaveformLecroy::read_verticalGain(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_verticalGain(Tango::Attribute &attr) entering... "<< endl; yat::Timer t; - + //- Add your own code here *attr_verticalGain_read = (double) (waveform_ptr->get_wavedesc_descriptor()->vertical_gain); - + attr.set_value(attr_verticalGain_read); DEBUG_STREAM << "read_verticalGain : " << t.elapsed_msec() << " milliseconds.\n" << std::endl; } @@ -586,7 +585,7 @@ void AcquireWaveformLecroy::read_horizontalOffset(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_horizontalOffset(Tango::Attribute &attr) entering... "<< endl; yat::Timer t; - + //- Add your own code here *attr_horizontalOffset_read = waveform_ptr->get_wavedesc_descriptor()->horizontal_offset; attr.set_value(attr_horizontalOffset_read); @@ -604,7 +603,7 @@ void AcquireWaveformLecroy::read_horizontalInterval(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_horizontalInterval(Tango::Attribute &attr) entering... "<< endl; yat::Timer t; - + //- Add your own code here *attr_horizontalInterval_read = (double) (waveform_ptr->get_wavedesc_descriptor()->horizontal_interval); attr.set_value(attr_horizontalInterval_read); @@ -689,7 +688,7 @@ yat::Timer t; void AcquireWaveformLecroy::read_rawWaveformData(Tango::Attribute &attr) { //- DEBUG_STREAM << "AcquireWaveformLecroy::read_rawWaveformData(Tango::Attribute &attr) entering... "<< endl; - //- Add your own code here + //- Add your own code here yat::Timer t; //- get waveform data attr_rawWaveformData_read = waveform_ptr->get_raw_waveform_data();