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

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d 2019-06-03 18:16:56 +02:00
commit 70ea143dcb
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
slsDetectorServers/ctbDetectorServer/bin/ctbDetectorServer_developer
View File

Binary file not shown.

12
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -1523,7 +1523,7 @@ int configureMAC(uint32_t destip, uint64_t destmac, uint64_t sourcemac, uint32_t
memset(cDestIp, 0, MAX_STR_LENGTH); memset(cDestIp, 0, MAX_STR_LENGTH);
sprintf(cDestIp, "%d.%d.%d.%d", (destip>>24)&0xff,(destip>>16)&0xff,(destip>>8)&0xff,(destip)&0xff); sprintf(cDestIp, "%d.%d.%d.%d", (destip>>24)&0xff,(destip>>16)&0xff,(destip>>8)&0xff,(destip)&0xff);
FILE_LOG(logINFO, ("1G UDP: Destination (IP: %s, port:%d)\n", cDestIp, udpport)); FILE_LOG(logINFO, ("1G UDP: Destination (IP: %s, port:%d)\n", cDestIp, udpport));
if (setUDPDestinationDetails(cDestIp, udpport) == FAIL) { if (setUDPDestinationDetails(0, cDestIp, udpport) == FAIL) {
FILE_LOG(logERROR, ("could not set udp 1G destination IP and port\n")); FILE_LOG(logERROR, ("could not set udp 1G destination IP and port\n"));
return FAIL; return FAIL;
} }
@ -2146,7 +2146,7 @@ int startStateMachine(){
// 1 giga udp // 1 giga udp
if (!enableTenGigabitEthernet(-1)) { if (!enableTenGigabitEthernet(-1)) {
// create udp socket // create udp socket
if(createUDPSocket() != OK) { if(createUDPSocket(0) != OK) {
return FAIL; return FAIL;
} }
// update header with modId, detType and version. Reset offset and fnum // update header with modId, detType and version. Reset offset and fnum
@ -2265,9 +2265,9 @@ void readandSendUDPFrames(int *ret, char *mess) {
FILE_LOG(logDEBUG1, ("Reading from 1G UDP\n")); FILE_LOG(logDEBUG1, ("Reading from 1G UDP\n"));
// validate udp socket // validate udp socket
if (getUdPSocketDescriptor() <= 0) { if (getUdPSocketDescriptor(0) <= 0) {
*ret = FAIL; *ret = FAIL;
sprintf(mess,"UDP Socket not created. sockfd:%d\n", getUdPSocketDescriptor()); sprintf(mess,"UDP Socket not created. sockfd:%d\n", getUdPSocketDescriptor(0));
FILE_LOG(logERROR, (mess)); FILE_LOG(logERROR, (mess));
return; return;
} }
@ -2276,14 +2276,14 @@ void readandSendUDPFrames(int *ret, char *mess) {
while(readFrameFromFifo() == OK) { while(readFrameFromFifo() == OK) {
int bytesToSend = 0, n = 0; int bytesToSend = 0, n = 0;
while((bytesToSend = fillUDPPacket(udpPacketData))) { while((bytesToSend = fillUDPPacket(udpPacketData))) {
n += sendUDPPacket(udpPacketData, bytesToSend); n += sendUDPPacket(0, udpPacketData, bytesToSend);
} }
if (n >= dataBytes) { if (n >= dataBytes) {
FILE_LOG(logINFO, (" Frame %lld sent (%d packets, %d databytes, n:%d bytes sent)\n", FILE_LOG(logINFO, (" Frame %lld sent (%d packets, %d databytes, n:%d bytes sent)\n",
udpFrameNumber, udpPacketNumber + 1, dataBytes, n)); udpFrameNumber, udpPacketNumber + 1, dataBytes, n));
} }
} }
closeUDPSocket(); closeUDPSocket(0);
} }

2
slsDetectorServers/ctbDetectorServer/slsDetectorServer_defs.h
View File

@ -6,7 +6,7 @@
#define MIN_REQRD_VRSN_T_RD_API 0x181130 #define MIN_REQRD_VRSN_T_RD_API 0x181130
#define REQRD_FRMWR_VRSN 0x190402 #define REQRD_FRMWR_VRSN 0x190402
#define CTRL_SRVR_INIT_TIME_US (1 * 1000 * 1000) #define CTRL_SRVR_INIT_TIME_US (2 * 1000 * 1000)
/* Struct Definitions */ /* Struct Definitions */
typedef struct ip_header_struct { typedef struct ip_header_struct {

6
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -632,9 +632,9 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
++i; ++i;
/*! \page timing /*! \page timing
- <b>bsamples [i]</b> sets/gets number of digital samples expected from the ctb. Used in CHIP TEST BOARD and MOENCH only. \c Returns \c (long long int) - <b>dsamples [i]</b> sets/gets number of digital samples expected from the ctb. Used in CHIP TEST BOARD and MOENCH only. \c Returns \c (long long int)
*/ */
descrToFuncMap[i].m_pFuncName = "bsamples"; descrToFuncMap[i].m_pFuncName = "dsamples";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimer; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimer;
++i; ++i;
@ -4468,7 +4468,7 @@ std::string slsDetectorCommand::cmdTimer(int narg, const char * const args[], in
index = ANALOG_SAMPLES; index = ANALOG_SAMPLES;
else if (cmd == "asamples") else if (cmd == "asamples")
index = ANALOG_SAMPLES; index = ANALOG_SAMPLES;
else if (cmd == "bsamples") else if (cmd == "dsamples")
index = DIGITAL_SAMPLES; index = DIGITAL_SAMPLES;
else if (cmd == "storagecells") else if (cmd == "storagecells")
index = STORAGE_CELL_NUMBER; index = STORAGE_CELL_NUMBER;

2
slsSupportLib/include/versionAPI.h
View File

@ -5,6 +5,6 @@
#define APILIB 0x190405 #define APILIB 0x190405
#define APIRECEIVER 0x190405 #define APIRECEIVER 0x190405
#define APIGUI 0x190405 #define APIGUI 0x190405
#define APICTB 0x190528
#define APIEIGER 0x190531 #define APIEIGER 0x190531
#define APIJUNGFRAU 0x190531 #define APIJUNGFRAU 0x190531
#define APICTB 0x190603