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

gotthard server: minor fixes

Browse Source
This commit is contained in:
maliakal_d
2018-12-04 14:12:11 +01:00
parent 98b5e893b1
commit 4e65a1d964
6 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorServers/gotthardDetectorServer/gitInfo.txt
View File

@ -1,9 +1,9 @@
Path: slsDetectorPackage/slsDetectorServers/gotthardDetectorServer
URL: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repository Root: origin git@github.com:slsdetectorgroup/slsDetectorPackage.git
Repsitory UUID: 89fa30ee4b815dd208c5e2ca0c401707eacbcef7
Revision: 7
Repsitory UUID: 98b5e893b180217e8ddddb95275b84d3b28a0832
Revision: 10
Branch: refactor
Last Changed Author: Dhanya_Thattil
Last Changed Rev: 4170
Last Changed Date: 2018-11-09 11:03:24.000000002 +0100 ./RegisterDefs.h
Last Changed Rev: 4175
Last Changed Date: 2018-12-04 13:39:41.000000002 +0100 ./.target-makefrag

6
slsDetectorServers/gotthardDetectorServer/gitInfoGotthard.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "89fa30ee4b815dd208c5e2ca0c401707eacbcef7"
#define GITREPUUID "98b5e893b180217e8ddddb95275b84d3b28a0832"
#define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4170
#define GITDATE 0x20181109
#define GITREV 0x4175
#define GITDATE 0x20181204
#define GITBRANCH "refactor"

5
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@ -1213,11 +1213,6 @@ void setDAC(enum DACINDEX ind, int val, int mV, int retval[]) {
DAC_CNTRL_CLK_MSK, DAQ_CNTRL_DGTL_MSK, DAQ_CNTRL_DGTL_OFST);
dacValues[ind] = val;
/* if (ind == VREF_COMP) { // FIXME:??
bus_w (VREF_COMP_MOD_REG, (bus_r(VREF_COMP_MOD_REG) &~ (VREF_COMP_MOD_MSK)) // reset
| ((val << VREF_COMP_MOD_OFST) & VREF_COMP_MOD_MSK)); // or it with value
}*/
#endif
}