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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2021-06-08 12:29:33 +02:00
parent 74f5c52bc9 ac5dece221
commit 45992b28a5
65 changed files with 554 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/slsDetectorServer/include/loadPattern.h
View File

@@ -1,6 +1,7 @@
#ifndef LOADPATTERN_H
#define LOADPATTERN_H
#include "Pattern.h"
#include "clogger.h"
int loadPattern(patternParameters *pat);
int loadPattern(enum TLogLevel printLevel, patternParameters *pat);
#endif

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

@@ -25,7 +25,7 @@
#include "blackfin.h"
#endif
#if defined(MYTHEN3D)
#ifdef MYTHEN3D
#include "mythen3.h"
#endif
@@ -289,8 +289,6 @@ int64_t getMeasurementTime();
int setModule(sls_detector_module myMod, char *mess);
#endif
#ifdef MYTHEN3D
int setBit(int ibit, int patword);
int clearBit(int ibit, int patword);
int setTrimbits(int *trimbits);
int setAllTrimbits(int val);
int getAllTrimbits();
@@ -319,6 +317,9 @@ int setOnChipDAC(enum ONCHIP_DACINDEX ind, int chipIndex, int val);
int getOnChipDAC(enum ONCHIP_DACINDEX ind, int chipIndex);
#endif
void setDAC(enum DACINDEX ind, int val, int mV);
#ifdef MYTHEN3D
void setGeneralDAC(enum DACINDEX ind, int val, int mV);
#endif
int getDAC(enum DACINDEX ind, int mV);
int getMaxDacSteps();
#if defined(CHIPTESTBOARDD) || defined(MOENCHD)