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

gotthard compiles

Browse Source
This commit is contained in:
maliakal_d
2018-11-08 18:09:11 +01:00
parent a37be4b2e3
commit 2e37eda9d9
10 changed files with 72 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorServers/slsDetectorServer/AD9257.h
View File

@ -1,6 +1,9 @@
#pragma once
#include "commonServerFunctions.h" // blackfin.h, ansi.h
#ifdef GOTTHARDD
#include <unistd.h>
#endif
/* AD9257 ADC DEFINES */
#define AD9257_ADC_NUMBITS (24)

6
slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -18,7 +18,7 @@ int isFirmwareCheckDone();
int getFirmwareCheckResult(char** mess);
#endif
void basictests();
#ifdef JUNGFRAUD
#if defined(GOTTHARDD) || defined(JUNGFRAUD)
int checkType();
u_int32_t testFpga(void);
int testBus(void);
@ -101,7 +101,7 @@ void setMasterSlaveConfiguration();
// parameters - dr, roi
int setDynamicRange(int dr);
#ifdef GOTTHARD
#ifdef GOTTHARDD
ROI* setROI(int n, ROI arg[], int *retvalsize, int *ret);
#endif
@ -187,7 +187,7 @@ int setDetectorPosition(int pos[]);
// gotthard specific - image, pedestal
#ifdef GOTTHARDD
void loadImage(enum imageType index, short int imageVals[]);
int readCounterBlock(int startACQ, char *counterVals);
int readCounterBlock(int startACQ, short int counterVals[]);
int resetCounterBlock(int startACQ);
// jungfrau specific - pll, flashing firmware

22
slsDetectorServers/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -389,15 +389,18 @@ int set_external_signal_flag(int file_des) {
#ifndef GOTTHARDD
functionNotImplemented();
#else
// set
if ((flag != GET_EXTERNAL_SIGNAL_FLAG) && (Server_VerifyLock() == OK)) {
setExtSignal(signalindex, flag);
if (signalindex > 0)
modeNotImplemented("Signal index", signalindex);
else {
// set
if ((flag != GET_EXTERNAL_SIGNAL_FLAG) && (Server_VerifyLock() == OK)) {
setExtSignal(flag);
}
// get
retval = getExtSignal();
validate((int)flag, (int)retval, "set external signal flag", DEC);
FILE_LOG(logDEBUG1, ("External Signal Flag: %d\n", retval));
}
// get
retval = getExtSignal(signalindex);
validate((int)flag, (int)retval, "set external signal flag", DEC);
FILE_LOG(logDEBUG1, ("External Signal Flag: %d\n", retval));
}
#endif
return Server_SendResult(file_des, INT32, UPDATE, &retval, sizeof(retval));
}
@ -2319,12 +2322,13 @@ int set_network_parameter(int file_des) {
return printSocketReadError();
enum networkParameter mode = args[0];
int value = args[1];
enum NETWORKINDEX serverIndex = 0;
FILE_LOG(logDEBUG1, ("Set network parameter index %d to %d\n", mode, value));
#ifdef GOTTHARDD
functionNotImplemented();
#else
enum NETWORKINDEX serverIndex = 0;
// set & get
if ((value == -1) || ((value != -1) && (Server_VerifyLock() == OK))) {
// check index