Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-apps-camogm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-apps-camogm
Commits
cce3b1de
Commit
cce3b1de
authored
7 years ago
by
Mikhail Karpenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't trigger overrun alert after restarts from GUI
parent
5759f046
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
camogm.c
src/camogm.c
+7
-0
camogm.h
src/camogm.h
+1
-0
No files found.
src/camogm.c
View file @
cce3b1de
...
@@ -332,6 +332,12 @@ int camogm_start(camogm_state *state)
...
@@ -332,6 +332,12 @@ int camogm_start(camogm_state *state)
D1
(
fprintf
(
debug_file
,
"Starting recording
\n
"
));
D1
(
fprintf
(
debug_file
,
"Starting recording
\n
"
));
double
dtime_stamp
;
double
dtime_stamp
;
state
->
frameno
=
0
;
state
->
frameno
=
0
;
// do not trigger overrun alert on successfull (from GUI) restarts
// if (state->prog_state != STATE_RESTARTING)
// for (int p = 0; p < SENSOR_PORTS; p++)
// state->buf_overruns[p] = -1;
state
->
timescale
=
state
->
set_timescale
;
// current timescale, default 1
state
->
timescale
=
state
->
set_timescale
;
// current timescale, default 1
// debug
// debug
int
*
ifp
=
(
int
*
)
&
(
state
->
frame_params
[
port
]);
int
*
ifp
=
(
int
*
)
&
(
state
->
frame_params
[
port
]);
...
@@ -1606,6 +1612,7 @@ int listener_loop(camogm_state *state)
...
@@ -1606,6 +1612,7 @@ int listener_loop(camogm_state *state)
// restart the file
// restart the file
D3
(
fprintf
(
debug_file
,
"%s:line %d - sendImageFrame() returned -%d
\n
"
,
__FILE__
,
__LINE__
,
rslt
));
D3
(
fprintf
(
debug_file
,
"%s:line %d - sendImageFrame() returned -%d
\n
"
,
__FILE__
,
__LINE__
,
rslt
));
camogm_stop
(
state
);
camogm_stop
(
state
);
state
->
prog_state
=
STATE_RESTARTING
;
camogm_start
(
state
);
camogm_start
(
state
);
break
;
break
;
case
CAMOGM_FRAME_FILE_ERR
:
// error with file I/O
case
CAMOGM_FRAME_FILE_ERR
:
// error with file I/O
...
...
This diff is collapsed.
Click to expand it.
src/camogm.h
View file @
cce3b1de
...
@@ -77,6 +77,7 @@ enum state_flags {
...
@@ -77,6 +77,7 @@ enum state_flags {
STATE_STARTING
,
STATE_STARTING
,
STATE_RUNNING
,
STATE_RUNNING
,
STATE_READING
,
STATE_READING
,
STATE_RESTARTING
,
STATE_CANCEL
STATE_CANCEL
};
};
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
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