96ec3b2123
merge conflict resolved
2020-04-29 14:17:07 +02:00
b7805ae0d4
gotthard2, moench: remove leading spaces in config file on board detector server
2020-04-29 14:09:35 +02:00
1f6b0b5887
gotthard2: new default clk dividers
2020-04-29 12:51:05 +02:00
b1cdc79bd4
Merge branch 'developer' into static
2020-04-28 18:31:11 +02:00
f626db454e
updated gotthard2, mythen3 binaries
2020-04-28 17:07:18 +02:00
86b39853a3
gotthard2, mythen3: making them clkdivider dependant and not clkfrequency, binaries not loaded yet
2020-04-28 17:04:57 +02:00
e3044689dd
WIP
2020-04-28 14:26:59 +02:00
Erik Frojdh
337e56d9bf
cleaned up LTO detection
2020-04-23 08:23:36 +02:00
Erik Frojdh
eb257154c6
added triggers
2020-04-22 09:15:31 +02:00
Erik Fröjdh
c1ae67ac46
Small refactor on ThreadObject and listener ( #93 )
...
* removed pointer, slight cleaning of loop
* removed semaphore, use getters
* removed redundant log msg
* removed comment
* added const
* removed comment
* changed header
2020-04-21 09:45:29 +02:00
Erik Frojdh
68f76e5356
more like UdpRxSocket
2020-04-20 17:24:53 +02:00
Erik Frojdh
8afa11ed33
removed pointer to server socket
2020-04-20 17:20:33 +02:00
Erik Frojdh
bc389f4825
moved data members to top
2020-04-20 14:51:48 +02:00
Erik Frojdh
095ced153c
removed need for pointer
2020-04-20 14:31:10 +02:00
Erik Frojdh
a1a5a20845
from thread sanitizer
2020-04-17 09:35:38 +02:00
Erik Frojdh
c725a05ef8
fix RH7
2020-04-16 15:51:28 +02:00
Erik Frojdh
815b6a37aa
moved flag to base class
2020-04-16 13:22:51 +02:00
Erik Frojdh
655a410d43
cleaned up UdpRxSocket
2020-04-16 09:45:44 +02:00
Erik Frojdh
97ba81d923
fixed test
2020-04-14 16:58:37 +02:00
3d00eed0f0
Change SetTrimbits() and SaveAllTrimbits() to rely on top/bottom signal instead of TopAddressIsValid() for further cleanup.
2020-04-14 16:13:26 +02:00
Dhanya Thattil
a7f5300455
Merge pull request #92 from slsdetectorgroup/setrxhostname
...
Setrxhostname
2020-04-09 11:52:46 +02:00
2f33a1a479
updated binaries
2020-04-09 09:35:46 +02:00
39fa5e0185
client recieve rx parameters as a struct
2020-04-09 09:34:20 +02:00
ba4985ed4d
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2020-04-09 09:32:09 +02:00
f811c065d1
corrected a delete [] in multiThreadedAnalogDetector
2020-04-09 09:31:43 +02:00
3a1d87728c
updated client api
2020-04-09 08:38:37 +02:00
0652ff6b5a
updated binaries
2020-04-09 08:37:27 +02:00
373e177274
WIP
2020-04-09 08:35:30 +02:00
6dd6685e7d
minor
2020-04-09 08:24:16 +02:00
38c31fdada
WIP
2020-04-08 20:27:10 +02:00
b3fe0e79bc
WIP
2020-04-08 16:43:28 +02:00
215e4a56fd
Merge branch 'developer' into setrxhostname
2020-04-08 12:00:21 +02:00
71a68c2022
eiger transmitting fix in 10g mode (stop servers informed about 10g mode)
2020-04-08 11:58:59 +02:00
55f8497eac
WIP
2020-04-08 11:05:06 +02:00
738f341265
eiger server compiled from previous commit
2020-04-08 08:41:39 +02:00
c4ae876ca7
Add Eiger server Init() modification also to initStopServer()
2020-04-07 17:45:53 +02:00
07cd71f0c7
removed update shared memory from detector, check if eiger firmware >=26: have same top and bottom addresses
2020-04-07 17:19:47 +02:00
9f3ad4e2f4
merge from 4.2.0
2020-04-07 15:14:27 +02:00
Dhanya Thattil
ab9fed45fb
Merge pull request #91 from slsdetectorgroup/testing
...
Testing
2020-04-07 12:15:37 +02:00
a86ae0cb47
WIP
2020-04-07 12:14:22 +02:00
bdf0f9e2b9
fixed start stop tests
2020-04-07 10:39:50 +02:00
fad10273ed
fix for server crashing when sending udp packets if no udp server present to listen to it (receiver): cannot use connect and write
2020-04-07 09:57:22 +02:00
83283b672a
WIP
2020-04-06 19:38:35 +02:00
456b96446f
WIP
2020-04-06 17:59:06 +02:00
80e55cd4da
WIP
2020-04-06 17:28:05 +02:00
47b0e46f15
Merge branch 'developer' into testing
2020-04-06 10:55:41 +02:00
Dhanya Thattil
fdb6e3f3d4
Removeshm ( #90 )
...
* eiger: moved rate correction outside, fixed threshold energy bug in client (binaries not updated yet)
* removed dr and deadtiem from shm
* help for rx_status and status to point them to rx_Start, rx_stop, start and stop
* moved progress to receiver
* removed currentsettings from eiger shm
* updated server binaries, and client api
* moench and ctb virtual servers compile fix
* gui: moved acquire to a concurrent qt thread so it doesnt block updateplot
2020-04-06 10:44:44 +02:00
eeed102bf3
somewhere between fork and pipes, crashes at sendingudppacket at print
2020-04-03 20:18:16 +02:00
7c7f7e8c70
testing WIP
2020-04-03 16:20:05 +02:00
262b4b0b16
more tests
2020-03-31 18:19:32 +02:00
