l_maliakal_d
|
1882454cf3
|
udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-13 15:34:53 +00:00 |
|
l_maliakal_d
|
d205e79106
|
implemented SCHED_RR scheduling with priority in receiver-only if super user
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@490 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-08 15:27:25 +00:00 |
|
l_maliakal_d
|
c65026792c
|
made sure read frame from receiver doesnt send a null for current filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@487 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-07 17:02:53 +00:00 |
|
l_maliakal_d
|
bb5ae3d2ab
|
guiDataReady introduced so that both tcp and writing thread handshakes properly with their own variables
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@486 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-07 16:49:47 +00:00 |
|
l_maliakal_d
|
91e5e35c73
|
got rid of short file name
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@485 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-07 10:45:33 +00:00 |
|
l_maliakal_d
|
96d9e5d078
|
some revision variable problem resolved in slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@484 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-06 15:26:29 +00:00 |
|
bergamaschi
|
217f63b701
|
Small change in the receiver concerning the data to the GUI
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@483 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-06 10:00:40 +00:00 |
|
l_maliakal_d
|
bf429705bf
|
svn rev changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@482 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-06 09:18:16 +00:00 |
|
bergamaschi
|
16c9561fcd
|
Receiver changed passing only data array to fifos - fixed adata size given by bufferSize
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@481 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-05 16:02:10 +00:00 |
|
bergamaschi
|
b44cc16cff
|
Added startAcquisition, acquisitionFinished and rawDataReady callbacks to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@480 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-05 15:34:19 +00:00 |
|
l_maliakal_d
|
6aa90bba79
|
added default gui server port number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@479 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-01 13:14:47 +00:00 |
|
maliakal_d
|
e3d68d05c6
|
added latest changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@478 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-01 10:36:20 +00:00 |
|
l_maliakal_d
|
9d8b621adf
|
got rid of eth taking weird values error and also checks for fifo empty before you stop writing data
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@477 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-27 10:13:22 +00:00 |
|
maliakal_d
|
bb07b6db7d
|
UHRIX Callback function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@476 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 16:31:55 +00:00 |
|
maliakal_d
|
3c26cac591
|
UHRIX Callback added to receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@475 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 16:25:37 +00:00 |
|
l_maliakal_d
|
1ef4ace390
|
updated bug-crashing when file write disabled and included file pointer in call back function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@474 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 16:08:03 +00:00 |
|
l_maliakal_d
|
28d2d64f51
|
defined a default and register call back function to write receiver data
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@473 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 10:19:05 +00:00 |
|
l_maliakal_d
|
0e9b32fb33
|
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@472 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 08:35:12 +00:00 |
|
l_maliakal_d
|
3075b8ae11
|
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 08:34:41 +00:00 |
|
l_maliakal_d
|
aae7c68f65
|
concatenated filenames for the gui when using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@469 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-22 11:26:43 +00:00 |
|
l_maliakal_d
|
7a55ed9a74
|
frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-05 11:23:46 +00:00 |
|
l_maliakal_d
|
ed4aaa83ce
|
changed getframeindex and getacquisitionindex to return proper values without checking framescaught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@450 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-04 16:04:19 +00:00 |
|
l_maliakal_d
|
c420906b0c
|
uncommented the part about eth in slsreceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@449 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-04 12:50:53 +00:00 |
|
bergamaschi
|
247e84ba7b
|
Modifications for circular FIFO and memory leak corrected done during beamtime - to be tested
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@447 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-04 10:13:48 +00:00 |
|
l_maliakal_d
|
341e026f4e
|
shortframes work with gui enabled
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@445 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-31 11:13:21 +00:00 |
|
l_maliakal_d
|
22bd638f64
|
the gotthard receiver works for short frames, gui commented out for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-30 16:41:36 +00:00 |
|
l_maliakal_d
|
a4206208c9
|
implemented a trial error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@434 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-22 11:16:37 +00:00 |
|
l_maliakal_d
|
2c38aedcf8
|
with all the svn revisions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@431 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-16 13:59:30 +00:00 |
|
l_maliakal_d
|
a2ae2eea95
|
changed receiver config to be rx_tcpport and not dataport, also -f
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@428 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-15 18:05:56 +00:00 |
|
l_maliakal_d
|
5d88f249a4
|
localhost works as a receiver now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@426 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-14 16:40:10 +00:00 |
|
l_maliakal_d
|
9cfdbdac67
|
included sls defs first
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@424 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-11 09:59:09 +00:00 |
|
l_maliakal_d
|
16f74ebdf2
|
receiver +4 and +10 to get only data out of the whole data with frame index etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@418 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-08 14:04:50 +00:00 |
|
l_maliakal_d
|
6f793abca8
|
added receiver mac to be compatible with aldos receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-20 11:11:53 +00:00 |
|
l_maliakal_d
|
5b4a90db29
|
checked in receiver svn info
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@415 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-18 15:02:09 +00:00 |
|
l_maliakal_d
|
b62f3dc1dd
|
get version number for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@414 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-18 14:34:29 +00:00 |
|
l_maliakal_d
|
3d6530f043
|
deleted a few unnecessary c files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@409 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-17 14:12:26 +00:00 |
|
l_maliakal_d
|
9a909ecea7
|
no change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@388 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-17 08:22:20 +00:00 |
|
l_maliakal_d
|
97442cf91a
|
included enable write option in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@386 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-17 08:14:38 +00:00 |
|
l_maliakal_d
|
9c6886d030
|
included mismatched indices error shouldnt return fail, but client should try to read again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@375 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-13 08:33:22 +00:00 |
|
l_maliakal_d
|
f74ea5191d
|
included detector ip and detector mac defaults in client, which can be specified in config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@374 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-10 13:58:47 +00:00 |
|
l_maliakal_d
|
9341a2875a
|
now u can use receiver hostname instead of only ip, got rid of acqtest, separated udpip and port from setudpconnection
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@372 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-07 15:51:03 +00:00 |
|
l_maliakal_d
|
e4d477b53e
|
included settting up of udpport from client and getting receiver mac from receiver and also listening to only one ethernet interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@370 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-06 14:22:08 +00:00 |
|
l_maliakal_d
|
f20e40025b
|
got rid of fifo full message in receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@369 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-06 09:53:49 +00:00 |
|
l_maliakal_d
|
3b2a8ea13a
|
max frames per file, getting config filename
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@368 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-05 16:40:51 +00:00 |
|
l_maliakal_d
|
788bc9cfd7
|
made change to avoid compiltime errors with new gcc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@366 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-05 08:49:26 +00:00 |
|
l_maliakal_d
|
8df3541e47
|
some insignificant tuning in slsReceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@364 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-03 09:45:50 +00:00 |
|
l_maliakal_d
|
6b935f3bd2
|
included exitReceiver, using different threads to listen and write packets in receiver, edited circularfifo to use pointer references, and acquire returns frames caught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@362 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-30 09:28:52 +00:00 |
|
l_maliakal_d
|
d8af12456d
|
receiver does the flipping and processing before sending client the correct frame to display
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@361 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-26 15:33:53 +00:00 |
|
l_cartier
|
997ffec2ee
|
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@360 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-23 16:30:49 +00:00 |
|
l_maliakal_d
|
d0d7eac553
|
fixed gui expecting more databytes from receiver, cuz of probes changing databytes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@359 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-11-23 16:15:26 +00:00 |
|