Erik Frojdh
7a9dbd8b76
WIP
2019-05-28 15:43:20 +02:00
a0f697ce71
jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top
2019-05-28 10:31:36 +02:00
7e43472b7b
minor help editing
2019-05-27 16:29:56 +02:00
Erik Frojdh
0972b803dd
Merge branch 'developer' into mysocket
2019-05-27 09:12:10 +02:00
7b817fa194
Merge branch 'developer' into jungfrauv0.8
2019-05-17 19:21:01 +02:00
1a1c6b9b42
jungfrau server: feature finish: switching between 2 interfaces
2019-05-17 19:19:03 +02:00
Erik Frojdh
fff79fbbb6
const char* for command
2019-05-16 16:58:03 +02:00
Erik Frojdh
415567006f
non used header
2019-05-16 15:16:11 +02:00
Erik Frojdh
c6651df1b2
remove mySock
2019-05-16 11:14:03 +02:00
Erik Fröjdh
f1a1391866
Factored out time conversion ( #23 )
...
* time conversion
* with comment
* lround in slsDetectorCommand
2019-05-15 10:22:38 +02:00
Erik Fröjdh
877bdb8979
Using FixedCapacityContainer for rxDbitList ( #22 )
...
* fixed capacity container
* changed shm date
2019-05-15 09:16:18 +02:00
Erik Frojdh
bf0847e967
removed ClientInterface
2019-05-15 08:38:49 +02:00
97dd329a7b
client: zmqip bug fix (typo with strlen)
2019-05-14 18:57:39 +02:00
Erik Frojdh
24fc5de58d
clang-tidy header include order
2019-05-14 17:34:51 +02:00
Erik Frojdh
7314c52c63
removed unneccecary includes
2019-05-14 17:32:21 +02:00
Erik Frojdh
bc4d0452af
removed unused error_defs.h
2019-05-14 17:25:43 +02:00
Erik Frojdh
74d67261a9
no check for null when deleting
2019-05-14 17:09:24 +02:00
Erik Frojdh
1029ce9705
minor
2019-05-14 14:53:59 +02:00
c30485a65b
advanced down
2019-05-08 16:44:08 +02:00
Erik Fröjdh
2a1c89f712
Fixed container ( #19 )
...
* added FixedCapacityContainer
* added empty to FixedCapacityContainer
* removed commented out section
* added FixedCapacityContainer to public headers
2019-05-08 12:34:45 +02:00
df938c2535
review: removing size in sendtoDetector
2019-05-07 09:47:53 +02:00
932e377765
review fdback: using sendtoReceiver, not using size of for specifyng arguments to sendtodetector
2019-05-06 19:13:31 +02:00
20720bc073
Merge branch 'developer' into rxctb
2019-05-03 20:38:32 +02:00
e14519c236
slsReceiver: removed special receiver config, added rx_dbitlist, rx_dbitoffset to put bits together in file, connected adcinvert, extsamplingsrc and extsampling properly to the detector, added tests
2019-05-03 20:37:40 +02:00
Erik Frojdh
e2f08da3e6
Merge branch 'tidywarning' into developer
2019-05-03 16:14:07 +02:00
Erik Frojdh
181ac4f509
small renaming
2019-05-03 16:13:32 +02:00
Erik Fröjdh
1094d5d30c
Build doxygen documentation by cmake ( #17 )
...
* added cmake command to make doxygen docs
* added back doxyfile for users
2019-05-03 14:58:15 +02:00
Erik Frojdh
9231dff626
clang tidy implicit bool
2019-05-03 14:49:47 +02:00
Erik Frojdh
92b447c83a
minor fixes
2019-05-03 14:39:22 +02:00
Erik Frojdh
aaa7576f7d
clang-tidy
2019-05-03 14:15:13 +02:00
Erik Frojdh
4f13b29c7f
fixed copyserver bug
2019-05-02 18:18:49 +02:00
Erik Frojdh
a55ae38874
changed to matching names
2019-05-02 18:11:36 +02:00
2f3b0e0b06
ctb:separated analog and digital samples in server and send analog and digital data packed separately per frame to reciever
2019-04-30 18:55:32 +02:00
b0cffcd570
master file option, adcdisable changed to adcenable
2019-04-30 12:13:28 +02:00
668cff1c65
fix for corrupt merge
2019-04-29 11:30:19 +02:00
06d4c7ce37
client: finishing up of gotthard for roi and ctb and moench for setting adcenablemask
2019-04-29 09:10:17 +02:00
Erik Frojdh
c0f06fcfca
fix reset frames caught
2019-04-26 17:11:32 +02:00
Erik Frojdh
33efd42bdc
fix merge
2019-04-26 17:06:59 +02:00
af5eb9fc12
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-04-26 16:53:35 +02:00
61a939ef53
ctb: removed setroi, instead using adcenablemask
2019-04-26 16:53:23 +02:00
Erik Frojdh
a3342f86d8
names
2019-04-26 16:47:08 +02:00
Erik Frojdh
554f9dc2ee
minor
2019-04-26 16:28:21 +02:00
Erik Frojdh
c4aa5ef7bb
sendToDetectorStop
2019-04-26 15:15:56 +02:00
Erik Frojdh
d7eadd5782
sendToReceiver
2019-04-26 12:58:40 +02:00
Erik Frojdh
714e456d7d
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-04-25 17:56:32 +02:00
Erik Frojdh
b76d123df1
shorter functino
2019-04-25 17:56:20 +02:00
2eac75aa0b
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-04-25 17:39:56 +02:00
18558e1288
bug fix command line patnloops should print in decimal, receiver ctb: added p option to print data for debugging, fixed initializing of result in memory
2019-04-25 17:39:46 +02:00
Erik Frojdh
b853bd92c8
template for sending to detector
2019-04-25 17:01:04 +02:00
Erik Frojdh
4da85b15a0
cleaning
2019-04-25 13:55:45 +02:00
