DiffractionExperiment: slsDetectorPackage use string for server version
This commit is contained in:
@@ -205,10 +205,10 @@ int64_t DetectorWrapper::GetFirmwareVersion() {
|
||||
}
|
||||
}
|
||||
|
||||
int64_t DetectorWrapper::GetDetectorServerVersion() {
|
||||
std::string DetectorWrapper::GetDetectorServerVersion() {
|
||||
try {
|
||||
auto result = det.getDetectorServerVersion();
|
||||
return result.squash(0x0);
|
||||
return result.squash("");
|
||||
} catch (std::exception &e) {
|
||||
throw JFJochException(JFJochExceptionCategory::Detector, e.what());
|
||||
}
|
||||
|
||||
@@ -24,7 +24,7 @@ public:
|
||||
void Trigger();
|
||||
void Deactivate();
|
||||
int64_t GetFirmwareVersion();
|
||||
int64_t GetDetectorServerVersion();
|
||||
std::string GetDetectorServerVersion();
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -312,7 +312,7 @@ message DetectorOutput {
|
||||
message DetectorStatus {
|
||||
State state = 1;
|
||||
int64 fw_version = 2;
|
||||
int64 server_version = 3;
|
||||
string server_version = 3;
|
||||
}
|
||||
|
||||
message FPGAStatus {
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user