Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
LimaGroup
Lima-camera-frelon
Commits
18d3e0b1
Commit
18d3e0b1
authored
Feb 25, 2014
by
Alejandro Homs Puron
Browse files
* Returning the expected DetIdle status when working in IntTrigMult
parent
e2873171
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/FrelonInterface.cpp
View file @
18d3e0b1
...
...
@@ -896,8 +896,8 @@ void Interface::startAcq()
TrigMode
trig_mode
;
m_cam
.
getTrigMode
(
trig_mode
);
bool
acq_start
=
(
trig_mode
!
=
IntTrigMult
)
||
!
m_cam
.
isRunning
();
if
(
acq_start
)
{
bool
was_running
=
(
trig_mode
=
=
IntTrigMult
)
&&
m_cam
.
isRunning
();
if
(
!
was_running
)
{
m_buffer_mgr
.
setStartTimestamp
(
Timestamp
::
now
());
m_acq
.
start
();
}
...
...
@@ -905,7 +905,7 @@ void Interface::startAcq()
try
{
m_cam
.
start
();
}
catch
(...)
{
if
(
acq_start
)
if
(
!
was_running
)
m_acq
.
stop
();
throw
;
}
...
...
@@ -945,6 +945,11 @@ void Interface::getStatus(StatusType& status)
if
(
cam
&
Frelon
::
Latency
)
status
.
det
|=
DetLatency
;
TrigMode
trig_mode
;
m_cam
.
getTrigMode
(
trig_mode
);
if
((
trig_mode
==
IntTrigMult
)
&&
(
status
.
det
==
DetWaitForTrigger
))
status
.
det
=
DetIdle
;
DEB_RETURN
()
<<
DEB_VAR1
(
status
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment