Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
Lima-camera-eiger
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
3
Issues
3
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LimaGroup
Lima-camera-eiger
Commits
ccd08576
Commit
ccd08576
authored
Dec 06, 2019
by
bliss administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed virtual signature in HwSavingCtrlObj
parent
835d18e7
Pipeline
#18181
failed with stages
in 1 minute
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
include/EigerSavingCtrlObj.h
include/EigerSavingCtrlObj.h
+3
-3
src/EigerSavingCtrlObj.cpp
src/EigerSavingCtrlObj.cpp
+3
-3
No files found.
include/EigerSavingCtrlObj.h
View file @
ccd08576
...
...
@@ -51,9 +51,9 @@ namespace lima
class
_EndDownloadCallback
;
friend
class
_EndDownloadCallback
;
virtual
void
_prepare
(
)
;
virtual
void
_start
(
)
;
virtual
void
_setActive
(
bool
)
;
virtual
void
_prepare
(
int
=
0
)
override
;
virtual
void
_start
(
int
=
0
)
override
;
virtual
void
_setActive
(
bool
,
int
=
0
)
override
;
Camera
&
m_cam
;
int
m_serie_id
;
...
...
src/EigerSavingCtrlObj.cpp
View file @
ccd08576
...
...
@@ -182,7 +182,7 @@ void SavingCtrlObj::stop()
m_poll_master_file
=
false
;
}
void
SavingCtrlObj
::
_setActive
(
bool
active
)
void
SavingCtrlObj
::
_setActive
(
bool
active
,
int
)
{
DEB_MEMBER_FUNCT
();
...
...
@@ -194,7 +194,7 @@ void SavingCtrlObj::_setActive(bool active)
active_req
->
wait
();
}
void
SavingCtrlObj
::
_prepare
()
void
SavingCtrlObj
::
_prepare
(
int
)
{
DEB_MEMBER_FUNCT
();
...
...
@@ -215,7 +215,7 @@ void SavingCtrlObj::_prepare()
m_poll_master_file
=
true
;
}
void
SavingCtrlObj
::
_start
()
void
SavingCtrlObj
::
_start
(
int
)
{
DEB_MEMBER_FUNCT
();
DEB_PARAM
()
<<
DEB_VAR1
(
m_active
);
...
...
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