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

updated minor 10g ctb

Browse Source
This commit is contained in:
maliakal_d 2019-08-16 15:35:23 +02:00
parent 3a698cc306
commit b59d69325e
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/ctbDetectorServer/Makefile
View File

@ -10,8 +10,8 @@ INSTMODE = 0777
SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c SRC_CLNT = communication_funcs.c slsDetectorServer.c slsDetectorServer_funcs.c slsDetectorFunctionList.c
OBJS = $(SRC_CLNT:.c=.o) OBJS = $(SRC_CLNT:.c=.o)
#all: clean versioning $(PROGS) all: clean versioning $(PROGS)
all: clean $(PROGS) #all: clean $(PROGS)
boot: $(OBJS) boot: $(OBJS)

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

8
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -2163,8 +2163,9 @@ int startStateMachine(){
FILE_LOG(logINFOGREEN, ("Virtual Acquisition started\n")); FILE_LOG(logINFOGREEN, ("Virtual Acquisition started\n"));
return OK; return OK;
#endif #endif
int send_to_10g = enableTenGigabitEthernet(-1);
// 1 giga udp // 1 giga udp
if (!enableTenGigabitEthernet(-1)) { if (send_to_10g == 0) {
// create udp socket // create udp socket
if(createUDPSocket(0) != OK) { if(createUDPSocket(0) != OK) {
return FAIL; return FAIL;
@ -2175,7 +2176,9 @@ int startStateMachine(){
FILE_LOG(logINFOBLUE, ("Starting State Machine\n")); FILE_LOG(logINFOBLUE, ("Starting State Machine\n"));
cleanFifos(); cleanFifos();
if (send_to_10g == 0) {
unsetFifoReadStrobes(); // FIXME: unnecessary to write bus_w(dumm, 0) as it is 0 in the beginnig and the strobes are always unset if set unsetFifoReadStrobes(); // FIXME: unnecessary to write bus_w(dumm, 0) as it is 0 in the beginnig and the strobes are always unset if set
}
//start state machine //start state machine
bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_STRT_ACQSTN_MSK | CONTROL_STRT_EXPSR_MSK); bus_w(CONTROL_REG, bus_r(CONTROL_REG) | CONTROL_STRT_ACQSTN_MSK | CONTROL_STRT_EXPSR_MSK);
@ -2332,14 +2335,13 @@ void readFrame(int *ret, char *mess) {
// frames left to give status // frames left to give status
int64_t retval = getTimeLeft(FRAME_NUMBER) + 2; int64_t retval = getTimeLeft(FRAME_NUMBER) + 2;
if ( retval > 1) { if ( retval > 1) {
*ret = (int)FAIL;
sprintf(mess,"No data and run stopped: %lld frames left\n",(long long int)retval); sprintf(mess,"No data and run stopped: %lld frames left\n",(long long int)retval);
FILE_LOG(logERROR, (mess)); FILE_LOG(logERROR, (mess));
} else { } else {
*ret = (int)OK;
FILE_LOG(logINFOGREEN, ("Acquisition successfully finished\n")); FILE_LOG(logINFOGREEN, ("Acquisition successfully finished\n"));
} }
} }
*ret = (int)OK;
} }
void unsetFifoReadStrobes() { void unsetFifoReadStrobes() {

2
slsSupportLib/include/versionAPI.h
View File

@ -1,10 +1,10 @@
/** API versions */ /** API versions */
#define GITBRANCH "developer" #define GITBRANCH "developer"
#define APIMOENCH 0x181108 #define APIMOENCH 0x181108
#define APICTB 0x190604
#define APIGOTTHARD 0x190715 #define APIGOTTHARD 0x190715
#define APILIB 0x190723 #define APILIB 0x190723
#define APIRECEIVER 0x190722 #define APIRECEIVER 0x190722
#define APIGUI 0x190723 #define APIGUI 0x190723
#define APIJUNGFRAU 0x190730 #define APIJUNGFRAU 0x190730
#define APIEIGER 0x190806 #define APIEIGER 0x190806
#define APICTB 0x190816