detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-15 22:31:32 +01:00
Code Issues Actions Packages Releases Activity

esrf bug, shut down socket, but being processed and object deleted, fixed

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-09 17:25:23 +02:00
parent 5a45f15c7f
commit 39847c5db6
5 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsReceiverSoftware/include/Listener.h
View File

@@ -278,5 +278,8 @@ class Listener : private virtual slsReceiverDefs, public ThreadObject {
/** if the standard header is implemented in firmware */
bool standardheader;
/** if the udp socket is connected */
bool udpSocketAlive;
};

4
slsReceiverSoftware/include/genericSocket.h
View File

@@ -637,10 +637,10 @@ enum communicationProtocol{
break;
//incomplete packets or header packets ignored and read buffer again
if(nsent != packet_size && nsent != header_packet_size)
bprintf(RED,"Incomplete Packet size %d\n",nsent);
bprintf(RED,"%d Incomplete Packet size %d\n", portno, nsent);
}
//nsent = 1040;
total_sent+=nsent;
if(nsent > 0)total_sent+=nsent;
}
break;
default:

8
slsReceiverSoftware/include/gitInfoReceiver.h
View File

@@ -1,11 +1,11 @@
//#define SVNPATH ""
#define SVNURL "git@git.psi.ch:sls_detectors_software/sls_receiver_software.git"
//#define SVNREPPATH ""
#define SVNREPUUID "1e33a1e0f7de91e255f4a1553445f80d184d84d2"
//#define SVNREV 0x625
#define SVNREPUUID "abdbd15341f292983b3943639c54404c700fbdb8"
//#define SVNREV 0x627
//#define SVNKIND ""
//#define SVNSCHED ""
#define SVNAUTH "Dhanya_Maliakal"
#define SVNREV 0x625
#define SVNDATE 0x20170808
#define SVNREV 0x627
#define SVNDATE 0x20170809
//