Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
DSL4Agilent
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
InputOutput
lib
DSL4Agilent
Commits
55506c9e
Commit
55506c9e
authored
Jun 18, 2018
by
Xavier ELATTAOUI
Browse files
Options
Downloads
Patches
Plain Diff
VC12 compilation fixed
parent
916571ed
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
include/dsl/ni/NI5122.h
+1
-0
1 addition, 0 deletions
include/dsl/ni/NI5122.h
include/dsl/ni/NIDigitizer.h
+1
-1
1 addition, 1 deletion
include/dsl/ni/NIDigitizer.h
pom_NI.xml
+69
-0
69 additions, 0 deletions
pom_NI.xml
src/ni/NIDigitizer.cpp
+11
-7
11 additions, 7 deletions
src/ni/NIDigitizer.cpp
with
82 additions
and
8 deletions
include/dsl/ni/NI5122.h
+
1
−
0
View file @
55506c9e
...
...
@@ -21,6 +21,7 @@
#include
<yat/threading/Mutex.h>
#include
<dsl/DSLConfig.h>
#include
<dsl/ni/NIDigitizer.h>
#include
<dsl/DAQException.h>
namespace
dsl
{
...
...
This diff is collapsed.
Click to expand it.
include/dsl/ni/NIDigitizer.h
+
1
−
1
View file @
55506c9e
...
...
@@ -65,7 +65,7 @@ public:
/**
* Returns acquired data.
*/
virtual
dsl
::
AIScaledData
*
get_data
(
size_t
num_wfms
,
unsigned
long
timeout_ms
)
virtual
dsl
::
AIScaledData
*
get_data
(
unsigned
long
timeout_ms
)
throw
(
DAQException
);
/**
...
...
This diff is collapsed.
Click to expand it.
pom_NI.xml
0 → 100644
+
69
−
0
View file @
55506c9e
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<artifactId>
super-pom-C-CPP
</artifactId>
<groupId>
fr.soleil
</groupId>
<version>
RELEASE
</version>
</parent>
<groupId>
fr.soleil.lib
</groupId>
<artifactId>
DSL4NI-${aol}-${library}-${mode}
</artifactId>
<version>
2.0.4-SNAPSHOT
</version>
<packaging>
nar
</packaging>
<name>
DSL4NI
</name>
<description>
National Instruments/Digitizers Support Library
</description>
<developers>
<developer>
<id>
leclercq
</id>
<name>
Nicolas Leclercq
</name>
<email>
nicolas.leclercq@synchrotron-soleil.fr
</email>
<url>
${scm.connection.svn.tango-ds}/DeviceClasses/InputOutput/lib/DigitizerSupportLib/trunk/
</url>
<organization>
Synchrotron Soleil
</organization>
<organizationUrl>
http://www.synchrotron-soleil.fr
</organizationUrl>
<roles>
<role>
developer
</role>
</roles>
<timezone>
1
</timezone>
</developer>
</developers>
<scm>
<connection>
${scm.connection.svn.tango-ds}/DeviceClasses/InputOutput/lib/DigitizerSupportLib/trunk
</connection>
<developerConnection>
${scm.connection.svn.tango-ds}/DeviceClasses/InputOutput/lib/DigitizerSupportLib/trunk
</developerConnection>
<url>
${scm.connection.svn.tango-ds}/DeviceClasses/InputOutput/lib/DigitizerSupportLib/trunk
</url>
</scm>
<build>
<plugins>
<plugin>
<groupId>
org.freehep
</groupId>
<artifactId>
freehep-nar-plugin
</artifactId>
<configuration>
<os>
Windows
</os>
<cpp>
<sourceDirectory>
src
</sourceDirectory>
<includePaths>
<includePath>
include
</includePath>
</includePaths>
<defines>
<define>
_NI_SUPPORT_
</define>
</defines>
</cpp>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>
fr.soleil.lib
</groupId>
<artifactId>
YAT-${aol}-${library}-${mode}
</artifactId>
</dependency>
<dependency>
<groupId>
fr.soleil.lib
</groupId>
<artifactId>
YAT4Tango-${aol}-${library}-${mode}
</artifactId>
</dependency>
<dependency>
<groupId>
com.nationalinstrument.lib
</groupId>
<artifactId>
VXIPNP-${aol}-${library}-${mode}
</artifactId>
<version>
1.0.0
</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/ni/NIDigitizer.cpp
+
11
−
7
View file @
55506c9e
...
...
@@ -680,7 +680,7 @@ dsl::AIScaledData * NIDigitizer::get_data (unsigned long timeout_ms)
// ============================================================================
// NIDigitizer::get_waveforms
// ============================================================================
dsl
::
Waveforms
*
NIDigitizer
::
get_waveforms
(
unsigned
long
timeout_ms
)
dsl
::
Waveforms
*
NIDigitizer
::
get_waveforms
(
size_t
dummy_num_wfms
,
unsigned
long
timeout_ms
)
throw
(
DAQException
)
{
//- std::cout << "NIDigitizer::get_waveforms <-" << std::endl;
...
...
@@ -710,13 +710,17 @@ dsl::Waveforms * NIDigitizer::get_waveforms (unsigned long timeout_ms)
dsl
::
AIScaledData
*
wfm_ord
=
0
;
dsl
::
AIScaledData
*
wfm_abs
=
0
;
unsigned
long
wfm_len
=
wfms_data
->
depth
()
/
(
unsigned
long
)
num_wfms
;
// In legacy version the calculation was
// unsigned long wfm_len = wfms_data->depth() / (unsigned long)num_wfms;
// but was no more compatible
unsigned
long
wfm_len
=
wfms_data
->
length
()
/
(
unsigned
long
)
num_wfms
;
if
(
num_wfms
>
1
)
{
for
(
ViInt32
i
=
0
;
i
<
num_wfms
;
i
++
)
{
DSL_NEW
(
wfm_ord
,
dsl
::
AIScaledData
(
wfm_len
));
wfm_ord
=
DSL_NEW
(
dsl
::
AIScaledData
(
wfm_len
));
if
(
wfm_ord
==
0
)
{
delete
wfms_data
;
...
...
@@ -739,7 +743,7 @@ dsl::Waveforms * NIDigitizer::get_waveforms (unsigned long timeout_ms)
"NIDigitizer::get_waveforms"
);
}
DSL_NEW
(
wfm_abs
,
dsl
::
AIScaledData
(
wfm_len
));
wfm_abs
=
DSL_NEW
(
dsl
::
AIScaledData
(
wfm_len
));
if
(
wfm_abs
==
0
)
{
delete
wfm
;
...
...
@@ -781,7 +785,7 @@ dsl::Waveforms * NIDigitizer::get_waveforms (unsigned long timeout_ms)
"NIDigitizer::get_waveforms"
);
}
DSL_NEW
(
wfm_abs
,
dsl
::
AIScaledData
(
wfm_len
));
wfm_abs
=
DSL_NEW
(
dsl
::
AIScaledData
(
wfm_len
));
if
(
wfm_abs
==
0
)
{
delete
wfm
;
...
...
@@ -854,7 +858,7 @@ dsl::AIScaledData * NIDigitizer::get_data_i (unsigned long timeout_ms)
//- signal processing enabled (FFT)
if
(
this
->
ai_config_
.
fft_mode
()
==
dsl
::
fft_none
)
{
DSL_NEW
(
d
,
dsl
::
AIScaledData
(
this
->
daq_buffer_depth_
));
d
=
DSL_NEW
(
dsl
::
AIScaledData
(
this
->
daq_buffer_depth_
));
if
(
d
==
0
)
{
throw
DAQException
(
"out of memory"
,
...
...
@@ -932,7 +936,7 @@ dsl::AIScaledData * NIDigitizer::get_data_i (unsigned long timeout_ms)
//- store actual buffer depth locally
this
->
daq_buffer_depth_
=
static_cast
<
unsigned
long
>
(
actual_measurement_wfm_size
*
num_wfms
);
//- allocate buffer
DSL_NEW
(
d
,
dsl
::
AIScaledData
(
this
->
daq_buffer_depth_
));
d
=
DSL_NEW
(
dsl
::
AIScaledData
(
this
->
daq_buffer_depth_
));
if
(
d
==
0
)
{
throw
DAQException
(
"out of memory"
,
...
...
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