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

untangled moench from jungfrau, quite a few changes

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-10-27 07:26:47 +02:00
parent 7eda5f9de5
commit 3c646c3545
16 changed files with 3222 additions and 5319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
slsDetectorSoftware/jungfrauDetectorServer/firmware_funcs.h
View File

@@ -29,7 +29,6 @@ u_int32_t bus_w(u_int32_t offset, u_int32_t data);
u_int32_t bus_r(u_int32_t offset);
int setPhaseShiftOnce();
int phaseStep(int st);
int adcPhase(int st);
int getPhase();
int cleanFifo();
@@ -37,8 +36,8 @@ int setDAQRegister();
u_int32_t putout(char *s, int modnum);
u_int32_t readin(int modnum);
u_int32_t setClockDivider(int d, int ic);
u_int32_t getClockDivider(int ic);
u_int32_t setClockDivider(int d);
u_int32_t getClockDivider();
void resetPLL();
u_int32_t setPllReconfigReg(u_int32_t reg, u_int32_t val, int trig);
@@ -68,7 +67,6 @@ int setTiming(int t);
int setConfigurationRegister(int d);
int setToT(int d);
int setContinousReadOut(int d);
int startReceiver(int d);
int setDACRegister(int idac, int val, int imod);
int getDacRegister(int dacnum);
@@ -142,9 +140,7 @@ u_int32_t fifoReadStatus();
u_int32_t fifo_full(void);
u_int16_t* fifo_read_event(int ns);
u_int16_t* fifo_read_frame();
void waitForAcquisitionEnd();
u_int32_t* decode_data(int* datain);
//u_int32_t move_data(u_int64_t* datain, u_int64_t* dataout);
int setDynamicRange(int dr);