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

moench server: list.h fixed

Browse Source
This commit is contained in:
maliakal_d 2019-01-15 17:16:00 +01:00
parent 8bc9fa54fc
commit dd5bd60429
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorServers/moenchDetectorServer/gitInfoMoench.h
View File

@ -1,6 +1,6 @@
#define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git" #define GITURL "git@github.com:slsdetectorgroup/slsDetectorPackage.git"
#define GITREPUUID "91dd176a0fb314f583ca6e29140053f1eb742896" #define GITREPUUID "8bc9fa54fc295aa2590f5aa53ffdd7bab4b6096d"
#define GITAUTH "Dhanya_Thattil" #define GITAUTH "Dhanya_Thattil"
#define GITREV 0x4166 #define GITREV 0x4248
#define GITDATE 0x20181108 #define GITDATE 0x20190114
#define GITBRANCH "refactor" #define GITBRANCH "refactor"

4
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -445,7 +445,7 @@ void initStopServer() {
/* set up detector */ /* set up detector */
void setupDetector() { void setupDetector() {
FILE_LOG(logINFO, ("This Server is for 1 Jungfrau module (500k)\n")); FILE_LOG(logINFO, ("This Server is for 1 moench board\n"));
// default variables // default variables
dataBytes = 0; dataBytes = 0;
@ -1247,7 +1247,7 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
/* jungfrau specific - pll, flashing fpga */ /* jungfrau specific - pll, flashing fpga */
// only for moench // only for moench
int powerChip(int on) { int powerChip(int on) { //FIXME only for moench? or only for ctb?
uint32_t addr = POWER_REG; uint32_t addr = POWER_REG;
if (on >= 0) { if (on >= 0) {
FILE_LOG(logINFO, ("Powering %s\n", (on > 0 ? "on" : "off"))); FILE_LOG(logINFO, ("Powering %s\n", (on > 0 ? "on" : "off")));

44
slsDetectorServers/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -18,7 +18,7 @@ Here are the definitions, but the actual implementation should be done for each
int isFirmwareCheckDone(); int isFirmwareCheckDone();
int getFirmwareCheckResult(char** mess); int getFirmwareCheckResult(char** mess);
void basictests(); void basictests();
#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) #if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
int checkType(); int checkType();
u_int32_t testFpga(void); u_int32_t testFpga(void);
int testBus(void); int testBus(void);
@ -26,14 +26,14 @@ int testBus(void);
#ifdef GOTTHARDD #ifdef GOTTHARDD
int detectorTest(enum digitalTestMode arg, int ival); int detectorTest(enum digitalTestMode arg, int ival);
#elif defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) #elif defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
int detectorTest(enum digitalTestMode arg); int detectorTest(enum digitalTestMode arg);
#endif #endif
// Ids // Ids
int64_t getDetectorId(enum idMode arg); int64_t getDetectorId(enum idMode arg);
u_int64_t getFirmwareVersion(); u_int64_t getFirmwareVersion();
#if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) #if defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
u_int64_t getFirmwareAPIVersion(); u_int64_t getFirmwareAPIVersion();
u_int16_t getHardwareVersionNumber(); u_int16_t getHardwareVersionNumber();
u_int16_t getHardwareSerialNumber(); u_int16_t getHardwareSerialNumber();
@ -76,7 +76,7 @@ extern u_int32_t readRegister(u_int32_t offset); // blackfin.h
uint32_t writeRegister(uint32_t offset, uint32_t data); uint32_t writeRegister(uint32_t offset, uint32_t data);
uint32_t readRegister(uint32_t offset); uint32_t readRegister(uint32_t offset);
#else #else
uint32_t writeRegister16And32(uint32_t offset, uint32_t data); uint32_t writeRegister16And32(uint32_t offset, uint32_t data); //FIXME its not there in ctb or moench?
uint32_t readRegister16And32(uint32_t offset); uint32_t readRegister16And32(uint32_t offset);
#endif #endif
@ -101,11 +101,15 @@ void setMasterSlaveConfiguration();
void cleanFifos(); void cleanFifos();
void resetCore(); void resetCore();
void resetPeripheral(); void resetPeripheral();
#elif MOENCHD
void cleanFifos();
void resetCore();
void resetPeripheral();
#endif #endif
// parameters - dr, roi // parameters - dr, roi
int setDynamicRange(int dr); int setDynamicRange(int dr);
#if defined(GOTTHARDD) || defined(CHIPTESTBOARDD) #if defined(GOTTHARDD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
ROI* setROI(int n, ROI arg[], int *retvalsize, int *ret); ROI* setROI(int n, ROI arg[], int *retvalsize, int *ret);
#endif #endif
@ -114,7 +118,7 @@ ROI* setROI(int n, ROI arg[], int *retvalsize, int *ret);
void setSpeed(enum speedVariable ind, int val); void setSpeed(enum speedVariable ind, int val);
int getSpeed(enum speedVariable ind); int getSpeed(enum speedVariable ind);
#endif #endif
#if defined(EIGERD) || defined(CHIPTESTBOARDD) #if defined(EIGERD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
enum readOutFlags setReadOutFlags(enum readOutFlags val); enum readOutFlags setReadOutFlags(enum readOutFlags val);
#endif #endif
@ -129,7 +133,7 @@ int validateTimer(enum timerIndex ind, int64_t val, int64_t retval);
#endif #endif
// parameters - module, settings // parameters - module, settings
#ifndef CHIPTESTBOARDD #if !defined(CHIPTESTBOARDD) && !defined(MOENCHD)
int setModule(sls_detector_module myMod, char* mess); int setModule(sls_detector_module myMod, char* mess);
int getModule(sls_detector_module *myMod); int getModule(sls_detector_module *myMod);
enum detectorSettings setSettings(enum detectorSettings sett); enum detectorSettings setSettings(enum detectorSettings sett);
@ -146,10 +150,10 @@ int setThresholdEnergy(int ev);
#ifdef GOTTHARDD #ifdef GOTTHARDD
extern void AD9252_Set(int addr, int val); // AD9252.h (old board) extern void AD9252_Set(int addr, int val); // AD9252.h (old board)
#endif #endif
#if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) #if defined(GOTTHARDD) || defined(JUNGFRAUD) || defined(CHIPTESTBOARDD) || defined(MOENCHD)
extern void AD9257_Set(int addr, int val); // AD9257.h extern void AD9257_Set(int addr, int val); // AD9257.h
#endif #endif
#ifdef CHIPTESTBOARDD #ifdef CHIPTESTBOARDD || defined(MOENCHD)
extern int AD9257_GetMaxValidVref(); // AD9257.h extern int AD9257_GetMaxValidVref(); // AD9257.h
extern void AD9257_SetVrefVoltage(int val) // AD9257.h extern void AD9257_SetVrefVoltage(int val) // AD9257.h
#endif #endif
@ -157,11 +161,12 @@ extern void AD9257_SetVrefVoltage(int val) // AD9257.h
void setDAC(enum DACINDEX ind, int val, int mV); void setDAC(enum DACINDEX ind, int val, int mV);
int getDAC(enum DACINDEX ind, int mV); int getDAC(enum DACINDEX ind, int mV);
int getMaxDacSteps(); int getMaxDacSteps();
#ifdef CHIPTESTBOARDD #if defined(CHIPTESTBOARDD) || defined(MOENCHD)
int checkVLimitCompliant(int mV); int checkVLimitCompliant(int mV);
int checkVLimitDacCompliant(int dac); int checkVLimitDacCompliant(int dac);
int getVLimit(); int getVLimit();
void setVLimit(int l); void setVLimit(int l);
#ifdef CHIPTESTBOARDD
int isVchipValid(int val); int isVchipValid(int val);
int getVchip(); int getVchip();
void setVchip(int val); void setVchip(int val);
@ -202,7 +207,8 @@ int getExtSignal();
// configure mac // configure mac
#ifdef GOTTHARDD #ifdef GOTTHARDD
void calcChecksum(mac_conf* mac, int sourceip, int destip); void calcChecksum(mac_conf* mac, int sourceip, int destip);
#elif JUNGFRAUD #endif
#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
long int calcChecksum(int sourceip, int destip); long int calcChecksum(int sourceip, int destip);
#endif #endif
#ifdef GOTTHARDD #ifdef GOTTHARDD
@ -216,14 +222,9 @@ int setDetectorPosition(int pos[]);
// very detector specific // very detector specific
// gotthard specific - image, pedestal
#ifdef GOTTHARDD
void loadImage(enum imageType index, short int imageVals[]);
int readCounterBlock(int startACQ, short int counterVals[]);
int resetCounterBlock(int startACQ);
// chip test board specific - powerchip, sendudp, pll, flashing firmware // chip test board specific - powerchip, sendudp, pll, flashing firmware
#elif CHIPTESTBOARDD #if defined(CHIPTESTBOARDD) || defined(MOENCHD)
int powerChip (int on); int powerChip (int on);
int sendUDP(int enable); int sendUDP(int enable);
void resetPLL(); void resetPLL();
@ -247,6 +248,13 @@ uint64_t writePatternWord(int addr, uint64_t word);
int setPatternWaitAddress(int level, int addr); int setPatternWaitAddress(int level, int addr);
uint64_t setPatternWaitTime(int level, uint64_t t); uint64_t setPatternWaitTime(int level, uint64_t t);
void setPatternLoop(int level, int *startAddr, int *stopAddr, int *nLoop); void setPatternLoop(int level, int *startAddr, int *stopAddr, int *nLoop);
#endif
// gotthard specific - image, pedestal
#ifdef GOTTHARDD
void loadImage(enum imageType index, short int imageVals[]);
int readCounterBlock(int startACQ, short int counterVals[]);
int resetCounterBlock(int startACQ);
// jungfrau specific - powerchip, autocompdisable, clockdiv, asictimer, clock, pll, flashing firmware // jungfrau specific - powerchip, autocompdisable, clockdiv, asictimer, clock, pll, flashing firmware
#elif JUNGFRAUD #elif JUNGFRAUD
@ -312,7 +320,7 @@ int startReadOut();
#endif #endif
enum runStatus getRunStatus(); enum runStatus getRunStatus();
void readFrame(int *ret, char *mess); void readFrame(int *ret, char *mess);
#ifdef CHIPTESTBOARDD #if defined(CHIPTESTBOARDD) || defined(MOENCHD)#ifdef CHIPTESTBOARDD
void unsetFifoReadStrobes(); void unsetFifoReadStrobes();
void readSample(); void readSample();
int checkDataPresent(); int checkDataPresent();