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

eiger reading master slave top bottom configuration from firmware;not reading from file anymore, serial is hardcoded for each master: also bug changes in gui getting frame from receiver in postprocessing

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-02-23 15:13:14 +01:00
parent b2c7944014
commit d658799b20
16 changed files with 394 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/slsDetectorServer/slsDetectorFunctionList.h
View File

@ -19,8 +19,9 @@ Here are the definitions, but the actual implementation should be done for each
void getModuleConfiguration();
int initDetector();
int initDetectorStop();
int setNMod(int nm, enum dimension dim);
int getNModBoard(enum dimension arg);

2
slsDetectorSoftware/slsDetectorServer/slsDetectorServer.c
View File

@ -64,6 +64,8 @@ int main(int argc, char *argv[]){
#endif
printf("\nReady...\n\n");
/* waits for connection */
while(retval!=GOODBYE) {
#ifdef VERBOSE

13
slsDetectorSoftware/slsDetectorServer/slsDetectorServer_funcs.c
View File

@ -47,18 +47,11 @@ int init_detector(int b) {
#ifdef VIRTUAL
printf("This is a VIRTUAL detector\n");
#endif
//only for control server
if(b){
#ifdef SLS_DETECTOR_FUNCTION_LIST
initDetector();
if(b) initDetector();
else initDetectorStop();
#endif
}else{
Feb_Interface_FebInterface();
Feb_Control_Init();
// printf("FEb control constructor done\n");
/* Beb_Beb(-1);
printf("BEB constructor done\n");*/
}
strcpy(mess,"dummy message");
strcpy(lastClientIP,"none");
strcpy(thisClientIP,"none1");