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

added receiver mac to be compatible with aldos receiver

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3
This commit is contained in:
l_maliakal_d
2012-12-20 11:11:53 +00:00
parent 83342b6d5b
commit 6f793abca8
9 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/commonFiles/sls_detector_defs.h
View File

@ -185,7 +185,8 @@ enum networkParameter {
DETECTOR_IP, /**< detector IP */ DETECTOR_IP, /**< detector IP */
RECEIVER_HOSTNAME, /**< receiver IP/hostname */ RECEIVER_HOSTNAME, /**< receiver IP/hostname */
RECEIVER_UDP_IP, /**< receiever UDP IP */ RECEIVER_UDP_IP, /**< receiever UDP IP */
RECEIVER_UDP_PORT /**< receiever UDP Port */ RECEIVER_UDP_PORT, /**< receiever UDP Port */
RECEIVER_UDP_MAC /**< receiever UDP MAC */
}; };
/** /**

6
slsDetectorSoftware/gotthardDetectorServer/svnInfoGotthard.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/gotthardDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x413 //#define SVNREV 0x416
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x413 #define SVNREV 0x416
#define SVNDATE 0x20121217 #define SVNDATE 0x20121218
// //

12
slsDetectorSoftware/mythenDetectorServer/svnInfoMythen.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define MYTHENSVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/mythenDetectorServer"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define MYTHENSVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x412 //#define SVNREV 0x414
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define MYTHENSVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define MYTHENSVNREV 0x412 #define SVNREV 0x414
#define MYTHENSVNDATE 0x20121217 #define SVNDATE 0x20121218
// //

10
slsDetectorSoftware/mythenDetectorServer/svnInfoMythenTmp.h
View File

@ -1,11 +1,11 @@
//#define SVNPATH "" //#define SVNPATH ""
#define MYTHENSVNURL "" #define SVNURL ""
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define MYTHENSVNREPUUID "" #define SVNREPUUID ""
//#define SVNREV "" //#define SVNREV ""
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define MYTHENSVNAUTH "" #define SVNAUTH ""
#define MYTHENSVNREV "" #define SVNREV ""
#define MYTHENSVNDATE "" #define SVNDATE ""
// //

20
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -4461,6 +4461,8 @@ char* slsDetector::setNetworkParameter(networkParameter index, string value) {
return setReceiver(value); return setReceiver(value);
case RECEIVER_UDP_IP: case RECEIVER_UDP_IP:
return setReceiverUDPIP(value); return setReceiverUDPIP(value);
case RECEIVER_UDP_MAC:
return setReceiverUDPMAC(value);
case RECEIVER_UDP_PORT: case RECEIVER_UDP_PORT:
sscanf(value.c_str(),"%d",&i); sscanf(value.c_str(),"%d",&i);
sprintf(answer,"%d",setReceiverUDPPort(i)); sprintf(answer,"%d",setReceiverUDPPort(i));
@ -4488,6 +4490,9 @@ char* slsDetector::getNetworkParameter(networkParameter index) {
case RECEIVER_UDP_IP: case RECEIVER_UDP_IP:
return getReceiverUDPIP(); return getReceiverUDPIP();
break; break;
case RECEIVER_UDP_MAC:
return getReceiverUDPMAC();
break;
case RECEIVER_UDP_PORT: case RECEIVER_UDP_PORT:
return getReceiverUDPPort(); return getReceiverUDPPort();
break; break;
@ -4571,6 +4576,21 @@ char* slsDetector::setReceiverUDPIP(string udpip){
char* slsDetector::setReceiverUDPMAC(string udpmac){
if(udpmac.length()==17){
if((udpmac[2]==':')&&(udpmac[5]==':')&&(udpmac[8]==':')&&
(udpmac[11]==':')&&(udpmac[14]==':'))
strcpy(thisDetector->receiverUDPMAC,udpmac.c_str());
else
return("receiver udp mac address should be in xx:xx:xx:xx:xx:xx format");
}
else
return("receiver udp mac address should be in xx:xx:xx:xx:xx:xx format");
return thisDetector->receiverUDPMAC;
}
int slsDetector::setReceiverUDPPort(int udpport){ int slsDetector::setReceiverUDPPort(int udpport){
thisDetector->receiverUDPPort = udpport; thisDetector->receiverUDPPort = udpport;

4
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1633,6 +1633,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
char* getReceiver() {return thisDetector->receiver_hostname;}; char* getReceiver() {return thisDetector->receiver_hostname;};
/** returns the receiver UDP IP address \sa sharedSlsDetector */ /** returns the receiver UDP IP address \sa sharedSlsDetector */
char* getReceiverUDPIP() {return thisDetector->receiverUDPIP;}; char* getReceiverUDPIP() {return thisDetector->receiverUDPIP;};
/** returns the receiver UDP MAC address \sa sharedSlsDetector */
char* getReceiverUDPMAC() {return thisDetector->receiverUDPMAC;};
/** returns the receiver UDP IP address \sa sharedSlsDetector */ /** returns the receiver UDP IP address \sa sharedSlsDetector */
char* getReceiverUDPPort() {char *c= new char[MAX_STR_LENGTH];sprintf(c,"%d",thisDetector->receiverUDPPort); return c;}; char* getReceiverUDPPort() {char *c= new char[MAX_STR_LENGTH];sprintf(c,"%d",thisDetector->receiverUDPPort); return c;};
@ -1644,6 +1646,8 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
char* setReceiver(string receiver); char* setReceiver(string receiver);
/** validates the format of receiver udp ip and sets it \sa sharedSlsDetector */ /** validates the format of receiver udp ip and sets it \sa sharedSlsDetector */
char* setReceiverUDPIP(string udpip); char* setReceiverUDPIP(string udpip);
/** validates the format of receiver udp mac and sets it \sa sharedSlsDetector */
char* setReceiverUDPMAC(string udpmac);
/** sets the receiver udp port \sa sharedSlsDetector */ /** sets the receiver udp port \sa sharedSlsDetector */
int setReceiverUDPPort(int udpport); int setReceiverUDPPort(int udpport);

9
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -329,6 +329,10 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
i++; i++;
descrToFuncMap[i].m_pFuncName="rx_udpmac"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
i++;
descrToFuncMap[i].m_pFuncName="rx_udpport"; // descrToFuncMap[i].m_pFuncName="rx_udpport"; //
descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdNetworkParameter;
i++; i++;
@ -2236,6 +2240,8 @@ string slsDetectorCommand::cmdNetworkParameter(int narg, char *args[], int actio
t=RECEIVER_HOSTNAME; t=RECEIVER_HOSTNAME;
} else if (cmd=="rx_udpip") { } else if (cmd=="rx_udpip") {
t=RECEIVER_UDP_IP; t=RECEIVER_UDP_IP;
} else if (cmd=="rx_udpmac") {
t=RECEIVER_UDP_MAC;
} else if (cmd=="rx_udpport") { } else if (cmd=="rx_udpport") {
t=RECEIVER_UDP_PORT; t=RECEIVER_UDP_PORT;
if (!(sscanf(args[1],"%d",&i))) if (!(sscanf(args[1],"%d",&i)))
@ -2259,13 +2265,14 @@ string slsDetectorCommand::helpNetworkParameter(int narg, char *args[], int acti
os << "detectorip ip \n sets detector ip to ip"<< std::endl; os << "detectorip ip \n sets detector ip to ip"<< std::endl;
os << "rx_hostname name \n sets receiver ip/hostname to name"<< std::endl; os << "rx_hostname name \n sets receiver ip/hostname to name"<< std::endl;
os << "rx_udpip ip \n sets receiver udp ip to ip"<< std::endl; os << "rx_udpip ip \n sets receiver udp ip to ip"<< std::endl;
os << "rx_udpmac mac \n sets receiver udp mac to mac"<< std::endl;
os << "rx_udpport port \n sets receiver udp port to port"<< std::endl; os << "rx_udpport port \n sets receiver udp port to port"<< std::endl;
} }
if (action==GET_ACTION || action==HELP_ACTION) { if (action==GET_ACTION || action==HELP_ACTION) {
os << "detectormac \n gets detector mac "<< std::endl; os << "detectormac \n gets detector mac "<< std::endl;
os << "detectorip \n gets detector ip "<< std::endl; os << "detectorip \n gets detector ip "<< std::endl;
os << "rx_hostname \n gets receiver ip "<< std::endl; os << "rx_hostname \n gets receiver ip "<< std::endl;
os << "rx_udpip \n gets receiver udp ip "<< std::endl; os << "rx_udpmac \n gets receiver udp mac "<< std::endl;
os << "rx_udpport \n gets receiver udp port "<< std::endl; os << "rx_udpport \n gets receiver udp port "<< std::endl;
} }
return os.str(); return os.str();

6
slsDetectorSoftware/slsDetector/svnInfoLib.h
View File

@ -2,10 +2,10 @@
#define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware" #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x413 //#define SVNREV 0x416
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTHLIB "l_maliakal_d" #define SVNAUTHLIB "l_maliakal_d"
#define SVNREVLIB 0x413 #define SVNREVLIB 0x416
#define SVNDATELIB 0x20121217 #define SVNDATELIB 0x20121218
// //

6
slsDetectorSoftware/slsReceiver/svnInfoReceiver.h
View File

@ -2,10 +2,10 @@
#define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver" #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware/slsReceiver"
//#define SVNREPPATH "" //#define SVNREPPATH ""
#define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3" #define SVNREPUUID "951219d9-93cf-4727-9268-0efd64621fa3"
//#define SVNREV 0x409 //#define SVNREV 0x415
//#define SVNKIND "" //#define SVNKIND ""
//#define SVNSCHED "" //#define SVNSCHED ""
#define SVNAUTH "l_maliakal_d" #define SVNAUTH "l_maliakal_d"
#define SVNREV 0x409 #define SVNREV 0x415
#define SVNDATE 0x20121217 #define SVNDATE 0x20121218
// //