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

connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger

Browse Source
This commit is contained in:
maliakal_d
2021-06-09 17:40:05 +02:00
parent 4de8234478
commit bdc3a5f3d9
7 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/eigerDetectorServer/slsDetectorFunctionList.c
View File

@@ -46,7 +46,6 @@ int on_dst = 0;
int dst_requested[32] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
enum masterFlags masterMode = IS_SLAVE;
int top = 0;
int master = 0;
int normal = 0;
@@ -1413,6 +1412,8 @@ int setHighVoltage(int val) {
/* parameters - timing, extsig */
int isMaster() { return master; }
void setTiming(enum timingMode arg) {
int ret = 0;
switch (arg) {

2
slsDetectorServers/gotthardDetectorServer/slsDetectorFunctionList.c
View File

@@ -1201,6 +1201,8 @@ int setHighVoltage(int val) {
/* parameters - timing, extsig */
int isMaster() { return (masterflags == IS_MASTER ? 1 : 0); }
void setTiming(enum timingMode arg) {
u_int32_t addr = EXT_SIGNAL_REG;
switch (arg) {

3
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@@ -1393,12 +1393,13 @@ int setHighVoltage(int val) {
return highvoltage;
}
/* parameters - timing */
int isMaster() {
return !((bus_r(SYSTEM_STATUS_REG) & SYSTEM_STATUS_SLV_BRD_DTCT_MSK) >>
SYSTEM_STATUS_SLV_BRD_DTCT_OFST);
}
/* parameters - timing */
void setTiming(enum timingMode arg) {
if (!isMaster() && arg == AUTO_TIMING)

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

@@ -350,6 +350,9 @@ int getADC(enum ADCINDEX ind);
int setHighVoltage(int val);
// parameters - timing, extsig
#if defined(MYTHEN3D) || defined(EIGERD) || defined(GOTTHARDD)
int isMaster();
#endif
#ifdef GOTTHARD2D
void updatingRegisters();
#endif
@@ -357,7 +360,6 @@ void setTiming(enum timingMode arg);
enum timingMode getTiming();
#ifdef MYTHEN3D
void setInitialExtSignals();
int isMaster();
int setGainCaps(int caps);
int getGainCaps();
int setChipStatusRegister(int csr);

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

@@ -8381,7 +8381,7 @@ int get_master(int file_des) {
LOG(logDEBUG1, ("Getting master\n"));
#ifndef MYTHEN3D
#if !defined(MYTHEN3D) && !defined(EIGERD) && !defined(GOTTHARDD)
functionNotImplemented();
#else
retval = isMaster();