detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-12 21:07:13 +02:00
Code Issues Actions Packages Releases Activity

mythen3 gui

Browse Source
This commit is contained in:
maliakal_d
2019-11-18 17:57:19 +01:00
parent c4e7086d99
commit dfc886a65b
14 changed files with 95 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/mythen3DetectorServer/bin/mythen3DetectorServer_developer
View File

Binary file not shown.

11
slsDetectorServers/mythen3DetectorServer/slsDetectorFunctionList.c
View File

@ -375,6 +375,7 @@ void setupDetector() {
setExpTime(DEFAULT_EXPTIME);
setPeriod(DEFAULT_PERIOD);
setDelayAfterTrigger(DEFAULT_DELAY_AFTER_TRIGGER);
setTiming(DEFAULT_TIMING_MODE);
}
int setDefaultDacs() {
@ -644,6 +645,16 @@ int setHighVoltage(int val){
}
/* parameters - timing */
void setTiming( enum timingMode arg){
// to be implemented
}
enum timingMode getTiming() {
return AUTO_TIMING;
}
int configureMAC() {
uint32_t srcip = udpDetails.srcip;

3
slsDetectorServers/mythen3DetectorServer/slsDetectorServer_defs.h
View File

@ -7,7 +7,7 @@
#define CTRL_SRVR_INIT_TIME_US (300 * 1000)
/* Hardware Definitions */
#define NCHAN (128)
#define NCHAN (128 * 3)
#define NCHIP (10)
#define NDAC (16)
#define HV_SOFT_MAX_VOLTAGE (200)
@ -24,6 +24,7 @@
#define DEFAULT_PERIOD (2*1000*1000) //ns
#define DEFAULT_DELAY_AFTER_TRIGGER (0)
#define DEFAULT_HIGH_VOLTAGE (0)
#define DEFAULT_TIMING_MODE (AUTO_TIMING)
#define DEFAULT_READOUT_C0 (125000000) // rdo_clk, 125 MHz
#define DEFAULT_READOUT_C1 (250000000) // rdo_x2_clk, 250 MHz
#define DEFAULT_SYSTEM_C0 (250000000) // run_clk, 250 MHz

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

@ -286,7 +286,7 @@ int setHighVoltage(int val);
// parameters - timing, extsig
#if !defined(MYTHEN3D) && !defined(GOTTHARD2D)
#if !defined(GOTTHARD2D)
void setTiming( enum timingMode arg);
enum timingMode getTiming();
#endif

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

@ -677,7 +677,7 @@ int set_timing_mode(int file_des) {
return printSocketReadError();
FILE_LOG(logDEBUG1, ("Setting external communication mode to %d\n", arg));
#if defined(MYTHEN3D) || defined(GOTTHARD2D)
#ifdef GOTTHARD2D
functionNotImplemented();
#else