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
7ac92bc3
Commit
7ac92bc3
authored
Feb 6, 2020
by
Sonia Minolli
Browse files
Options
Downloads
Patches
Plain Diff
Increase tmo for task go()
parent
454f1b2c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ContinuousAI.cpp
+1
-1
1 addition, 1 deletion
src/ContinuousAI.cpp
src/acqiris/AcqirisDigitizer.cpp
+1
-2
1 addition, 2 deletions
src/acqiris/AcqirisDigitizer.cpp
with
2 additions
and
3 deletions
src/ContinuousAI.cpp
+
1
−
1
View file @
7ac92bc3
...
@@ -487,7 +487,7 @@ void ContinuousAI::init (unsigned short _type, unsigned short _id, bool _calibra
...
@@ -487,7 +487,7 @@ void ContinuousAI::init (unsigned short _type, unsigned short _id, bool _calibra
std
::
cout
<<
" soso -- start underlying task"
<<
std
::
endl
;
std
::
cout
<<
" soso -- start underlying task"
<<
std
::
endl
;
//- start the underlying yat::task
//- start the underlying yat::task
this
->
go
(
1000
);
this
->
go
(
1000
0
);
// tmo 10s to let hardware init end -- soso
try
try
{
{
...
...
This diff is collapsed.
Click to expand it.
src/acqiris/AcqirisDigitizer.cpp
+
1
−
2
View file @
7ac92bc3
...
@@ -105,7 +105,7 @@ AcqirisDigitizer::~AcqirisDigitizer ()
...
@@ -105,7 +105,7 @@ AcqirisDigitizer::~AcqirisDigitizer ()
// ============================================================================
// ============================================================================
int
AcqirisDigitizer
::
register_hardware
()
int
AcqirisDigitizer
::
register_hardware
()
{
{
std
::
cout
<<
"
soso --
AcqirisDigitizer::register_hardware () entering - calibration required? "
<<
is_calibration_at_init_
<<
std
::
endl
;
//-
std::cout << "AcqirisDigitizer::register_hardware () entering - calibration required? " << is_calibration_at_init_ << std::endl;
#if !defined(_SIMULATION_)
#if !defined(_SIMULATION_)
//- build resource name
//- build resource name
...
@@ -144,7 +144,6 @@ std::cout << "soso -- AcqirisDigitizer::register_hardware () entering - calibrat
...
@@ -144,7 +144,6 @@ std::cout << "soso -- AcqirisDigitizer::register_hardware () entering - calibrat
dsl
::
acqiris_error_text
(
this
->
hh_
,
err
),
dsl
::
acqiris_error_text
(
this
->
hh_
,
err
),
"AcqirisDigitizer::register_hardware"
);
"AcqirisDigitizer::register_hardware"
);
}
}
std
::
cout
<<
"soso AcqirisDigitizer::register_hardware() quiting <=="
<<
std
::
endl
;
#else // _SIMULATION_
#else // _SIMULATION_
return
0
;
return
0
;
...
...
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