Commit 20923c69 authored by Jose Tiago Macara Coutinho's avatar Jose Tiago Macara Coutinho Committed by Operator for ID31
Browse files

resetHighVoltage sleep time ignores decimal fields; default is 1 second

parent 01831b5e
...@@ -135,7 +135,7 @@ public: ...@@ -135,7 +135,7 @@ public:
void setRoi(const std::string&); void setRoi(const std::string&);
bool hasHighVoltageReset(); bool hasHighVoltageReset();
void resetHighVoltage(double sleeptime = -1.); void resetHighVoltage(unsigned int sleeptime = 1);
private: private:
static const double TIME_OUT = 10.; static const double TIME_OUT = 10.;
enum HIGH_VOLTAGE { NOT_INITIALIZED, enum HIGH_VOLTAGE { NOT_INITIALIZED,
......
...@@ -104,6 +104,6 @@ namespace Pilatus ...@@ -104,6 +104,6 @@ namespace Pilatus
void setRoi(const std::string&); void setRoi(const std::string&);
bool hasHighVoltageReset(); bool hasHighVoltageReset();
void resetHighVoltage(double sleeptime = -1.); void resetHighVoltage(unsigned int sleeptime = 1);
}; };
}; };
...@@ -1220,7 +1220,7 @@ bool Camera::hasHighVoltageReset() ...@@ -1220,7 +1220,7 @@ bool Camera::hasHighVoltageReset()
return false; return false;
} }
void Camera::resetHighVoltage(double sleep_time) void Camera::resetHighVoltage(unsigned int sleep_time)
{ {
DEB_MEMBER_FUNCT(); DEB_MEMBER_FUNCT();
AutoMutex lock(m_cond.mutex()); AutoMutex lock(m_cond.mutex());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment