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

getdata from commandline was getting stuck:fixed,eiger server remembers frame and exptime period cuz getstatus doesn work for now, request images, added setting image number in eigerserver, packetsize fixed in eigerserver

Browse Source
This commit is contained in:
Maliakal Dhanya
2014-06-16 17:00:21 +02:00
parent 73ba765647
commit cf52d85f73
8 changed files with 67 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorSoftware/eigerDetectorServer/EigerBackEndFunctions.c
View File

@ -123,7 +123,13 @@ int EigerSetupTableEntryLeft(int ipad, long long int macad, long long int detect
(unsigned int)((macad>>8)&0xFF),
(unsigned int)((macad>>0)&0xFF));
/*
if(((detectormacadd>>40)&0xFF)<9)
sprintf(src_mac,"0%s",detectormacadd);
if(((macad>>40)&0xFF)<9)
sprintf(dst_mac,"0%s",macad);
*/
strcpy(src_mac,"00:aa:bb:cc:dd:ee");
printf("Seting up Table Entry Left:\n");
printf("src_port:%d\n",src_port);
printf("dst_port:%d\n",dst_port);
@ -132,8 +138,10 @@ int EigerSetupTableEntryLeft(int ipad, long long int macad, long long int detect
printf("src_mac:%s\n",src_mac);
printf("dst_mac:%s\n\n",dst_mac);
eiger_back_ret_val=0;
eiger_back_message_length = sprintf(eiger_back_message,"setuptableentry %d %d %d %s %s %d %s %s %d",1,0,0,src_mac,src_ip,src_port,dst_mac,dst_ip,dst_port);
eiger_back_message_length = sprintf(eiger_back_message,"setuptableentry %d %d %d %s %s %d %s %s %d",34,0,0,src_mac,src_ip,src_port,dst_mac,dst_ip,dst_port);
return EigerBackSendCMD();
}
@ -158,7 +166,7 @@ int EigerSetupTableEntryRight(int ipad, long long int macad, long long int detec
(unsigned int)((macad>>8)&0xFF),
(unsigned int)((macad>>0)&0xFF));
strcpy(src_mac,"00:aa:bb:cc:dd:ee");
printf("Seting up Table Entry Right:\n");
printf("src_port:%d\n",src_port);
printf("dst_port:%d\n",dst_port);
@ -168,7 +176,7 @@ int EigerSetupTableEntryRight(int ipad, long long int macad, long long int detec
printf("dst_mac:%s\n\n",dst_mac);
eiger_back_ret_val=0;
eiger_back_message_length = sprintf(eiger_back_message,"setuptableentry %d %d %d %s %s %d %s %s %d",1,0,32,src_mac,src_ip,src_port,dst_mac,dst_ip,dst_port);
eiger_back_message_length = sprintf(eiger_back_message,"setuptableentry %d %d %d %s %s %d %s %s %d",34,0,32,src_mac,src_ip,src_port,dst_mac,dst_ip,dst_port);
return EigerBackSendCMD();
}
@ -176,10 +184,25 @@ int EigerSetupTableEntryRight(int ipad, long long int macad, long long int detec
int RequestImages(){
printf("Going to request images\n");
eiger_back_ret_val=0;
eiger_back_message_length = sprintf(eiger_back_message,"requestimages %d",0);
return EigerBackSendCMD();
}
int SetDestinationParameters(int i){
SetLeftDestinationParameters(i);
return SetRightDestinationParameters(i);
}
int SetLeftDestinationParameters(int i){
eiger_back_ret_val=0;
eiger_back_message_length = sprintf(eiger_back_message,"setdstparameters %d %d %d",0,1,i);
return EigerBackSendCMD();
}
int SetRightDestinationParameters(int i){
eiger_back_ret_val=0;
eiger_back_message_length = sprintf(eiger_back_message,"setdstparameters %d %d %d",0,32,i);
return EigerBackSendCMD();
}