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

Niosmarie (#63)

Browse Source 
* HV for Mythen3 server

* HV for mythen3 server

* corrected upstreams

* missing endif
This commit is contained in:
Marie Andrä
2019-09-03 09:36:02 +02:00
committed by Dhanya Thattil
parent 40b62ef5a4
commit 4b987abf41
10 changed files with 98 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,11 +5,10 @@
/**
* Set Defines
* @param dofst digital output offset
* @param softMaxV maximum software limit (permissible for this detector)
* @param hardMaxV maximum hardware limit
* @param driverfname driver file name
*/
void DAC6571_SetDefines(int softMaxV, int hardMaxV, char* driverfname);
void DAC6571_SetDefines(int hardMaxV, char* driverfname);
/**
* Set value

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

@ -226,9 +226,9 @@ void powerOff();
int getADC(enum ADCINDEX ind);
#endif
#endif
#if !defined(MYTHEN3D)
int setHighVoltage(int val);
#endif
// parameters - timing, extsig
@ -245,12 +245,12 @@ int getExtSignal();
#ifdef GOTTHARDD
void calcChecksum(mac_conf* mac, int sourceip, int destip);
#elif JUNGFRAUD
void setNumberofUDPInterfaces(int val);
int getNumberofUDPInterfaces();
void selectPrimaryInterface(int val);
int getPrimaryInterface();
void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip, uint64_t destmac, uint32_t destport, uint64_t sourcemac, uint32_t sourceip, uint32_t sourceport);
void calcChecksum(udp_header* udp);
void setNumberofUDPInterfaces(int val);
int getNumberofUDPInterfaces();
void selectPrimaryInterface(int val);
int getPrimaryInterface();
void setupHeader(int iRxEntry, enum interfaceType type, uint32_t destip, uint64_t destmac, uint32_t destport, uint64_t sourcemac, uint32_t sourceip, uint32_t sourceport);
void calcChecksum(udp_header* udp);
#endif
#if defined(CHIPTESTBOARDD) || defined(MOENCHD)
long int calcChecksum(int sourceip, int destip);