Erik Frojdh
|
4943983d10
|
det id const and ini shm in constructor
|
2019-03-15 10:15:42 +01:00 |
|
Erik Frojdh
|
bad44f5bf4
|
moving SharedMemory into namespace sls
|
2019-03-14 16:51:38 +01:00 |
|
|
|
cb687d805e
|
merge conflict
|
2019-03-14 12:41:37 +01:00 |
|
|
|
327d08a016
|
removing comments, added one check for nullptr, updated current threshold when getting module, removing unsued function from header file (writesettingsfile)
|
2019-03-14 12:40:01 +01:00 |
|
Erik Frojdh
|
c9422befff
|
fixed loading trimbits
|
2019-03-14 10:21:18 +01:00 |
|
Erik Frojdh
|
9a08c85b2a
|
changed the shared memory of slsDetector
|
2019-03-13 17:38:27 +01:00 |
|
Erik Frojdh
|
85134443de
|
initial
|
2019-03-13 16:29:29 +01:00 |
|
|
|
f8aa0e3d6d
|
removed minor commented lines
|
2019-03-13 15:19:32 +01:00 |
|
Erik Frojdh
|
7e793539ca
|
removed typedef for shared struct
|
2019-03-12 14:42:27 +01:00 |
|
Erik Frojdh
|
a01d68a61f
|
initial changes
|
2019-03-12 08:22:07 +01:00 |
|
|
|
ca817c6ae9
|
client: update roi on updatedetector, (ctb, moench)moved nchans and databyte calculated to updatenumberofchannels and called for any update in roi, readoutflag or #samples changed (get should not update). ctb,moench server: roi fixed, . gotthard server: bug fix waiting to finish, ad9252 spi call fix. receiver: updated for moench and 10g
|
2019-03-06 17:25:18 +01:00 |
|
|
|
08bd2378f4
|
slsReceiver bug fix affecting Jungfrau receivers as root (optlen size as int), but setting buffer size is uint32_t size. setting it to uint64_t
|
2019-03-04 09:41:20 +01:00 |
|
|
|
8c067437e6
|
ctb moench: added feature set pattern mask and set pattern bit mask, removed CTB prefix for all the patern functions
|
2019-03-01 12:28:11 +01:00 |
|
|
|
35b1ad39f7
|
ctb moench: feature to set digital io pin delay, changed print from unsuccessful to failed, maxpatternlength in server is inclusive
|
2019-03-01 10:45:01 +01:00 |
|
|
|
bb81613900
|
ctb, moench: implemented led enable feature
|
2019-03-01 09:00:04 +01:00 |
|
|
|
722883531d
|
reverted json_emin, emax, framemode and detectormode. All json parameters for moench will go through rx_jsonpara using strings
|
2019-02-14 17:43:28 +01:00 |
|
|
|
46aa7769cc
|
client: added command line and for APIfor framemode and detectormode. Refactorinng required in the future
|
2019-02-13 20:19:08 +01:00 |
|
|
|
f9be8b89ac
|
added functionality to set additional json header key value pairs for prototype ctb, server fixed for eiger compile from ctb integration
|
2019-02-13 09:37:31 +01:00 |
|
|
|
031a11c4f7
|
removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)
|
2019-02-12 11:09:19 +01:00 |
|
Erik Frojdh
|
f1d055138c
|
moved updateDetector/Receiver
|
2019-01-25 19:12:28 +01:00 |
|
Erik Frojdh
|
89ee1d5bcf
|
new socket for slsDetector
|
2019-01-25 16:44:29 +01:00 |
|
Erik Frojdh
|
a1c0d28ddb
|
changed constructor
|
2019-01-24 11:12:24 +01:00 |
|
Erik Frojdh
|
b200138730
|
data types and format
|
2019-01-21 14:43:24 +01:00 |
|
Erik Frojdh
|
a4fec1e750
|
format and no check before delete
|
2019-01-21 12:10:00 +01:00 |
|
Erik Frojdh
|
e1ec60c9c1
|
cleaning up tests for command line parser
|
2019-01-21 10:45:43 +01:00 |
|
Erik Frojdh
|
603b217b54
|
clang-tidy modernize
|
2019-01-18 15:15:39 +01:00 |
|
Erik Frojdh
|
10539f8533
|
new getDetectorType functions
|
2019-01-18 10:53:49 +01:00 |
|
|
|
a9fb476543
|
changing signature from std::string to const std::string& for client receiver ip functions
|
2019-01-15 13:14:43 +01:00 |
|
|
|
f2669adda7
|
Merge branch 'refactor' into networkParameterFix
|
2019-01-15 12:12:53 +01:00 |
|
|
|
c1c302f740
|
removing networkPArameter function complete
|
2019-01-14 20:42:15 +01:00 |
|
|
|
f0b29cfecc
|
signatures fixed for setnetworkparameter
|
2019-01-14 15:26:58 +01:00 |
|
Erik Frojdh
|
b7582e93d3
|
working on removing undefined beaviour in configureMAC
|
2019-01-11 16:56:31 +01:00 |
|
Erik Frojdh
|
5ea5e83236
|
removing local variable in slsDetector::setTCPSocket and adding some const string&
|
2019-01-11 14:38:56 +01:00 |
|
Erik Frojdh
|
b46fb5e9c4
|
deduce parallel call only on function signature and some const&
|
2019-01-11 12:33:11 +01:00 |
|
Erik Frojdh
|
15235ab4fc
|
default initializer for slsDetector
|
2019-01-10 16:02:29 +01:00 |
|
Erik Frojdh
|
0f50b9f161
|
clang-tidy nullptr
|
2019-01-10 15:28:43 +01:00 |
|
|
|
a99584a0da
|
removed ndac from sls_detector_module and from the servers (not used), fixed setting module by eiger bug in sending number of channels
|
2018-11-02 17:08:25 +01:00 |
|
|
|
aec8c031de
|
kept the same client interface:tb changed when fixing error codes/exceptions, modified multi print, fixed roi bug in indexing to sls
|
2018-10-31 14:30:30 +01:00 |
|
|
|
70a1b87603
|
merge conflict resolved
|
2018-10-30 14:31:20 +01:00 |
|
|
|
92fc837eb4
|
compiles, but doesnt run
|
2018-10-29 15:23:52 +01:00 |
|
|
|
33ac63d14a
|
still updating slsdetector.cpp
|
2018-10-26 17:40:18 +02:00 |
|
|
|
cf87b6ca83
|
still updating slsdetector.cpp
|
2018-10-25 16:24:05 +02:00 |
|
|
|
86fb843021
|
in the process of rewriting detector client interface
|
2018-10-18 10:58:48 +02:00 |
|
Erik Frojdh
|
0070a79838
|
removed command threaded
|
2018-10-17 17:35:55 +02:00 |
|
|
|
5a356534e6
|
refactor receiver client interface, moved defs into one sls_detector_defs.h
|
2018-10-11 12:25:18 +02:00 |
|
|
|
b981fe78ef
|
connected command to execute command in receiver pc
|
2018-10-10 12:23:55 +02:00 |
|
|
|
5e7e7d3c33
|
moved client interface to common folder as receiver wills tart using it as well
|
2018-10-10 12:00:47 +02:00 |
|
|
|
78bfc9d0a5
|
insignificant, renamed recieverInterface to have a capital letter in class name
|
2018-10-10 11:43:35 +02:00 |
|
|
|
7d5b24fe33
|
solved errors with client compile, rxr yet to do
|
2018-10-09 13:43:50 +02:00 |
|
|
|
1c78400369
|
client compiles, more changes required
|
2018-10-08 09:34:08 +02:00 |
|
