detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-04 06:28:41 +01:00
Code Issues Actions Packages Releases Activity

sls_receiver_header* in callbacks (#425)

Browse Source 
* char* to sls_receiver_header* in receiver data call backs

* uint32_t to size_t in callbacks

* string to const std::string & for callbacks
This commit is contained in:
Dhanya Thattil
2022-04-07 10:19:47 +02:00
committed by GitHub
parent 95ed9551c0
commit 62418c1316
10 changed files with 114 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsReceiverSoftware/src/DataProcessor.cpp
View File

@@ -316,16 +316,17 @@ uint64_t DataProcessor::ProcessAnImage(char *buf) {
try {
// normal call back
if (rawDataReadyCallBack != nullptr) {
rawDataReadyCallBack((char *)rheader,
std::size_t dsize = *reinterpret_cast<uint32_t*>(buf);
rawDataReadyCallBack(rheader,
buf + FIFO_HEADER_NUMBYTES +
sizeof(sls_receiver_header),
(uint32_t)(*((uint32_t *)buf)), pRawDataReady);
dsize, pRawDataReady);
}
// call back with modified size
else if (rawDataModifyReadyCallBack != nullptr) {
auto revsize = (uint32_t)(*((uint32_t *)buf));
rawDataModifyReadyCallBack((char *)rheader,
std::size_t revsize = *reinterpret_cast<uint32_t*>(buf);
rawDataModifyReadyCallBack(rheader,
buf + FIFO_HEADER_NUMBYTES +
sizeof(sls_receiver_header),
revsize, pRawDataReady);
@@ -393,15 +394,14 @@ bool DataProcessor::CheckCount() {
return false;
}
void DataProcessor::registerCallBackRawDataReady(void (*func)(char *, char *,
uint32_t, void *),
void *arg) {
void DataProcessor::registerCallBackRawDataReady(
void (*func)(sls_receiver_header *, char *, size_t, void *), void *arg) {
rawDataReadyCallBack = func;
pRawDataReady = arg;
}
void DataProcessor::registerCallBackRawDataModifyReady(
void (*func)(char *, char *, uint32_t &, void *), void *arg) {
void (*func)(sls_receiver_header *, char *, size_t &, void *), void *arg) {
rawDataModifyReadyCallBack = func;
pRawDataReady = arg;
}