detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 16:45:55 +01:00
Code Issues Actions Packages Releases Activity

get version number for receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@414 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-12-18 14:34:29 +00:00
parent 1d9ae4e316
commit b62f3dc1dd
10 changed files with 104 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@@ -1563,9 +1563,10 @@ slsDetectorDefs::externalCommunicationMode slsDetector::setExternalCommunication
MODULE_FIRMWARE_VERSION,
DETECTOR_SERIAL_NUMBER,
DETECTOR_FIRMWARE_VERSION,
DETECTOR_SOFTWARE_VERSION
DETECTOR_SOFTWARE_VERSION,
THIS_SOFTWARE_VERSION,
RECEIVER_VERSION
}{};
*/
@@ -1590,6 +1591,12 @@ int64_t slsDetector::getId( idMode mode, int imod){
ret=OK;
retval=SVNREVLIB;
retval=(retval<<32) | SVNDATELIB;
} else if (mode==RECEIVER_VERSION) {
if (setReceiverOnline(ONLINE_FLAG)==ONLINE_FLAG) {
ret=thisReceiver->getInt(fnum,retval);
if(ret==FORCE_UPDATE)
ret=updateReceiver();
}
} else {
if (thisDetector->onlineFlag==ONLINE_FLAG) {
if (controlSocket) {

6
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@@ -416,7 +416,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
i++;
descrToFuncMap[i].m_pFuncName="detectorsvnversion"; //
descrToFuncMap[i].m_pFuncName="receiverversion"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdSN;
i++;
@@ -2749,8 +2749,8 @@ string slsDetectorCommand::cmdSN(int narg, char *args[], int action) {
return string(answer);
}
if (cmd=="detectorsvnversion") {
sprintf(answer,"%llx",myDet->getId(DETECTOR_FIRMWARE_SVN_VERSION));
if (cmd=="receiverversion") {
sprintf(answer,"%llx",myDet->getId(RECEIVER_VERSION));
return string(answer);
}
return string("unknown id mode ")+cmd;

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x411
//#define SVNREV 0x413
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTHLIB "bergamaschi"
#define SVNREVLIB 0x411
#define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x413
#define SVNDATELIB 0x20121217
//