Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
AcquireWaveformLecroy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
MeasureInstruments
Lecroy
AcquireWaveformLecroy
Commits
84cd71c1
Commit
84cd71c1
authored
7 years ago
by
ELATTAOUI
Browse files
Options
Downloads
Patches
Plain Diff
Release preparation : compile error fixed
parent
b030c880
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+1
-1
1 addition, 1 deletion
pom.xml
src/AcquireWaveformLecroy.cpp
+11
-12
11 additions, 12 deletions
src/AcquireWaveformLecroy.cpp
with
12 additions
and
13 deletions
pom.xml
+
1
−
1
View file @
84cd71c1
...
...
@@ -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>
...
...
This diff is collapsed.
Click to expand it.
src/AcquireWaveformLecroy.cpp
+
11
−
12
View file @
84cd71c1
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment