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

nios temp (#557)

Browse Source 
* fixed temp read nios

* divide for eiger and dont print
This commit is contained in:
Dhanya Thattil
2022-10-18 15:47:23 +02:00
committed by GitHub
parent 4a7cd051c1
commit 46bb9bc2d7
22 changed files with 171 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorServers/slsDetectorServer/include/common.h
View File

@ -68,3 +68,5 @@ int createEmptyFile(char *mess, char *fname, char *errorPrefix);
int deleteFile(char *mess, char *fname, char *errorPrefix);
int deleteOldServers(char *mess, char *newServerPath, char *errorPrefix);
int readADCFromFile(char *fname, int *value);

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

@ -378,7 +378,9 @@ void setPower(enum DACINDEX ind, int val);
void powerOff();
#endif
#if !defined(MOENCHD) && !defined(MYTHEN3D) && !defined(GOTTHARD2D)
#if defined(MYTHEN3D) || defined(GOTTHARD2D)
int getADC(enum ADCINDEX ind, int *value);
#elif !defined(MOENCHD)
int getADC(enum ADCINDEX ind);
#endif