Skip to content
GitLab
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-pilatus
Commits
20923c69
Commit
20923c69
authored
Mar 26, 2018
by
Jose Tiago Macara Coutinho
Committed by
Operator for ID31
Mar 26, 2018
Browse files
resetHighVoltage sleep time ignores decimal fields; default is 1 second
parent
01831b5e
Changes
3
Hide whitespace changes
Inline
Side-by-side
include/PilatusCamera.h
View file @
20923c69
...
...
@@ -135,7 +135,7 @@ public:
void
setRoi
(
const
std
::
string
&
);
bool
hasHighVoltageReset
();
void
resetHighVoltage
(
double
sleeptime
=
-
1.
);
void
resetHighVoltage
(
unsigned
int
sleeptime
=
1
);
private:
static
const
double
TIME_OUT
=
10.
;
enum
HIGH_VOLTAGE
{
NOT_INITIALIZED
,
...
...
sip/PilatusCamera.sip
View file @
20923c69
...
...
@@ -104,6 +104,6 @@ namespace Pilatus
void setRoi(const std::string&);
bool hasHighVoltageReset();
void resetHighVoltage(
double
sleeptime =
-1.
);
void resetHighVoltage(
unsigned int
sleeptime =
1
);
};
};
src/PilatusCamera.cpp
View file @
20923c69
...
...
@@ -1220,7 +1220,7 @@ bool Camera::hasHighVoltageReset()
return
false
;
}
void
Camera
::
resetHighVoltage
(
double
sleep_time
)
void
Camera
::
resetHighVoltage
(
unsigned
int
sleep_time
)
{
DEB_MEMBER_FUNCT
();
AutoMutex
lock
(
m_cond
.
mutex
());
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment