detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-23 15:00:02 +02:00
Code Issues Actions Packages Releases Activity

adcreg command line print

Browse Source
This commit is contained in:
maliakal_d 2018-11-12 15:14:37 +01:00
parent e3a0c1373c
commit c19c787904
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/eigerDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/eigerDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: d1c8d0b01c4c306ab8148fd5c39d09aeeac77a17
Revision: 12
Repsitory UUID: e3a0c1373c5dbfd800bb8d20cbca2989222c95ad
Revision: 15
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4164
Last Changed Date: 2018-11-02 15:52:57.000000002 +0100 ./Makefile
Last Changed Rev: 4172
Last Changed Date: 2018-11-08 17:37:28.000000002 +0100 ./xfs_types.h

6
slsDetectorServers/eigerDetectorServer/gitInfoEiger.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "d1c8d0b01c4c306ab8148fd5c39d09aeeac77a17"
#define GITREPUUID "e3a0c1373c5dbfd800bb8d20cbca2989222c95ad"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4164
#define GITDATE 0x20181102
#define GITREV 0x4172
#define GITDATE 0x20181108
#define GITBRANCH "refactor"

3
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -3788,7 +3788,8 @@ string slsDetectorCommand::cmdRegister(int narg, char *args[], int action, int d
;
else
return string("Could not scan value (hexadecimal fomat) ")+string(args[2]);
sprintf(answer,"0x%x",myDet->writeAdcRegister(addr,val, detPos));
sprintf(answer,"%s", (myDet->writeAdcRegister(addr,val, detPos) == OK)
? "successful" : "failed");
} else {
if (sscanf(args[2],"%d",&n))