|
|
0ef52138e1
|
merge conflict sorted, removing rest
|
2017-12-05 11:25:10 +01:00 |
|
|
|
65b4c69847
|
REST implementation removed from slsReceiver
|
2017-12-05 11:03:52 +01:00 |
|
|
|
6f3898441e
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:47 +01:00 |
|
|
|
70bf6eb4cb
|
restream stop from receiver
|
2017-11-30 18:39:08 +01:00 |
|
|
|
e54767b69d
|
conflict resolution with developer
|
2017-10-03 15:12:56 +02:00 |
|
|
|
0b82aabd2b
|
merge with 3.0.1 conflicts resolved
|
2017-10-03 14:52:53 +02:00 |
|
|
|
7cde5dbe38
|
changes upto the receiver, not incl gui
|
2017-10-03 10:44:08 +02:00 |
|
|
|
6a8aad4c2b
|
added silent mode in receiver during real time acquisition, doesnt print packet loss regularly or file name created each time
|
2017-09-27 10:11:31 +02:00 |
|
|
|
e8bb186ff8
|
removed setframeindexenable from being set by client, redundant. removed read_frame from list of functions, obsolete.
|
2017-09-22 12:25:08 +02:00 |
|
|
|
5ff574b33f
|
made default streamer to be the ip related to hostname, otherwise can be specified from the client, also made it compatible with chip test board detector now
|
2017-09-12 15:04:56 +02:00 |
|
|
|
77d688e508
|
changes done
|
2017-08-14 13:33:11 +02:00 |
|
|
|
ad3e3ce255
|
sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa
|
2017-08-10 17:25:28 +02:00 |
|
|
|
39560969f4
|
can set zmqport from receiver, ensured proper destructors, and ctrl c should kill it
|
2017-07-13 12:17:49 +02:00 |
|
|
|
a11313fe96
|
removed copies
|
2017-03-24 15:15:30 +01:00 |
|
|
|
86490226ed
|
removing the return value usage in start acquisition callback, callbacks will be called if registered, and we will write files if file write enabled
|
2017-03-24 13:41:56 +01:00 |
|
|
|
bb52676f50
|
merged from 2.3 without udpstandard
|
2017-03-24 10:34:31 +01:00 |
|
|
|
404be013a2
|
changes to new callback arguments without filepointer
|
2017-03-23 14:08:43 +01:00 |
|
|
|
b9eb3d5a52
|
somewere stuck with virtual template overloading
|
2017-03-23 11:56:17 +01:00 |
|
|
|
9f68fc6f3b
|
fixed call backs with new standard header
|
2017-03-15 15:00:25 +01:00 |
|
|
|
53be854efd
|
including subframe number
|
2017-03-13 11:33:06 +01:00 |
|
|
|
300b014f73
|
somewhere
|
2017-03-10 10:51:28 +01:00 |
|
|
|
936dfea8a7
|
works so far, no gui yet
|
2017-02-22 12:01:00 +01:00 |
|
|
|
9e21583331
|
virtual, master all works, still to do rewriting file in an acquisition
|
2017-02-21 15:13:59 +01:00 |
|
|
|
d95aaa2089
|
somewhere in between.. next step include generalData pointer in listerner and dataprocessor calss in constructor and a setter
|
2017-01-31 08:42:16 +01:00 |
|
|
|
01d54a7a4c
|
Complete rewrite of receiver, with new changes
|
2017-01-27 15:40:36 +01:00 |
|
|
|
d847a289a4
|
changed progress prints, file naming etc
|
2016-12-21 10:53:56 +01:00 |
|
|
|
d3200dc76f
|
moving towards c++ api
|
2016-12-12 14:24:24 +01:00 |
|
|
|
28b0897dd7
|
fixed bug of crash when changing dr sometimes, latestdata was incorrectly inititalized
|
2016-12-02 08:55:07 +01:00 |
|
|
|
09645cbba8
|
bottom is defined as flippeddatax in config file, not anymore as argument for receiver
|
2016-11-30 10:36:46 +01:00 |
|
|
|
e6c7dfc440
|
adding exptime to receiver for file header
|
2016-11-14 11:57:34 +01:00 |
|
|
|
acb900961a
|
fixed time interval in receiveR
|
2016-11-10 14:37:26 +01:00 |
|
|
|
266506e67f
|
merged with zmqdata
|
2016-10-20 08:54:29 +02:00 |
|
|
|
489b623afd
|
trying to get in changes for activate in receiver
|
2016-10-05 08:24:35 +02:00 |
|
|
|
2a4bd8022e
|
works for deactivated server and receiver
|
2016-10-04 07:36:00 +02:00 |
|
|
|
9c8f663b8e
|
done
|
2016-09-16 12:49:39 +02:00 |
|
|
|
a3369a7d21
|
separated
|
2016-08-31 17:23:44 +02:00 |
|
|
|
be2bc15ab5
|
not done
|
2016-08-30 16:10:46 +02:00 |
|
|
|
f17a2ba2b8
|
in between
|
2016-08-24 11:54:15 +02:00 |
|
|
|
0a2a88e23f
|
in between
|
2016-08-17 09:33:59 +02:00 |
|
|
|
18eb1274c5
|
fixed fifodepth to return defualt size, also moved destroying and creating threads to fifostructure, had forgotten to override setnumberofframes calling fifostructure which is important for gotthard
|
2015-12-15 11:04:49 +01:00 |
|
|
|
777f04331d
|
implemented fifo depth configurable from client
|
2015-11-17 10:31:09 +01:00 |
|
|
|
58bfa296be
|
done
|
2015-10-28 17:40:55 +01:00 |
|
|
|
5ac37c2154
|
some more
|
2015-10-13 15:22:30 +02:00 |
|
|
|
e915245c10
|
additional change
|
2015-10-08 17:09:43 +02:00 |
|
|
|
a3e88f96d6
|
some more changes
|
2015-10-08 12:19:07 +02:00 |
|
|
|
c392348def
|
big change half done
|
2015-09-30 11:40:39 +02:00 |
|
|
|
7c0430572b
|
included subframe into receiver and sends to gui
|
2015-09-22 16:21:41 +02:00 |
|
|
|
fe76ce9650
|
seems to run fine, only 16gb checked for fimware v 10 and software version v1.10.2
|
2015-09-15 15:31:29 +02:00 |
|
|
|
572b6fe29f
|
f
|
2015-09-10 14:05:10 +02:00 |
|
|
|
74366b3cfe
|
halfway into new server
|
2015-09-03 12:00:37 +02:00 |
|
