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

setting next frame number also for udp 1g itnerface

Browse Source
This commit is contained in:
maliakal_d 2022-01-28 11:44:12 +01:00
parent 7b37489cdc
commit 8995d3db8d
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorServers/ctbDetectorServer/slsDetectorFunctionList.c
View File

@ -903,6 +903,10 @@ int setNextFrameNumber(uint64_t value) {
("Setting next frame number: %llu\n", (long long unsigned int)value)); ("Setting next frame number: %llu\n", (long long unsigned int)value));
setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG, setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG,
NEXT_FRAME_NUMB_LOCAL_MSB_REG); NEXT_FRAME_NUMB_LOCAL_MSB_REG);
#ifndef VIRTUAL
// for 1g udp interface
setUDPFrameNumber(value);
#endif
return OK; return OK;
} }

4
slsDetectorServers/moenchDetectorServer/slsDetectorFunctionList.c
View File

@ -805,6 +805,10 @@ int setNextFrameNumber(uint64_t value) {
("Setting next frame number: %llu\n", (long long unsigned int)value)); ("Setting next frame number: %llu\n", (long long unsigned int)value));
setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG, setU64BitReg(value, NEXT_FRAME_NUMB_LOCAL_LSB_REG,
NEXT_FRAME_NUMB_LOCAL_MSB_REG); NEXT_FRAME_NUMB_LOCAL_MSB_REG);
#ifndef VIRTUAL
// for 1g udp interface
setUDPFrameNumber(value);
#endif
return OK; return OK;
} }

16
slsDetectorServers/slsDetectorServer/include/UDPPacketHeaderGenerator.h
View File

@ -4,25 +4,11 @@
#include <inttypes.h> #include <inttypes.h>
/**
* Get current udp packet number
*/
uint32_t getUDPPacketNumber(); uint32_t getUDPPacketNumber();
/**
* Get current udp frame number
*/
uint64_t getUDPFrameNumber(); uint64_t getUDPFrameNumber();
void setUDPFrameNumber(uint64_t fnum);
/** /**
* Called for each UDP packet header creation
* @param buffer pointer to header
* @param id module id * @param id module id
*/ */
void createUDPPacketHeader(char *buffer, uint16_t id); void createUDPPacketHeader(char *buffer, uint16_t id);
/**
* fill up the udp packet with data till its full
* @param buffer pointer to memory
*/
int fillUDPPacket(char *buffer); int fillUDPPacket(char *buffer);

4
slsDetectorServers/slsDetectorServer/src/UDPPacketHeaderGenerator.c
View File

@ -32,6 +32,10 @@ uint64_t udpFrameNumber = 0;
uint32_t getUDPPacketNumber() { return udpPacketNumber; } uint32_t getUDPPacketNumber() { return udpPacketNumber; }
uint64_t getUDPFrameNumber() { return udpFrameNumber; } uint64_t getUDPFrameNumber() { return udpFrameNumber; }
void setUDPFrameNumber(uint64_t fnum) {
LOG(logINFO, ("Setting next frame number also for 1g to %lld\n", fnum));
udpFrameNumber = fnum;
}
void createUDPPacketHeader(char *buffer, uint16_t id) { void createUDPPacketHeader(char *buffer, uint16_t id) {
memset(buffer, 0, sizeof(sls_detector_header)); memset(buffer, 0, sizeof(sls_detector_header));