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

merge

Browse Source
This commit is contained in:
maliakal_d
2019-11-06 16:46:00 +01:00
parent 18b8720c17 7de9401bc7
commit 73b5c3ac57
8 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h
View File

@ -424,6 +424,7 @@ uint64_t writePatternWord(int addr, uint64_t word);
int setPatternWaitAddress(int level, int addr);
uint64_t setPatternWaitTime(int level, uint64_t t);
void setPatternLoop(int level, int *startAddr, int *stopAddr, int *nLoop);
int powerChip (int on);
#elif GOTTHARD2D

2
slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c
View File

@ -3750,7 +3750,7 @@ int power_chip(int file_des) {
return printSocketReadError();
FILE_LOG(logDEBUG1, ("Powering chip to %d\n", arg));
#if (!defined(JUNGFRAUD)) && (!defined(MOENCHD))
#if (!defined(JUNGFRAUD)) && (!defined(MOENCHD)) && (!defined(MYTHEN3D))
functionNotImplemented();
#else
// set & get