7c18ad3c53
removed Critical and Noncritical exceptions
2019-06-25 10:50:52 +02:00
3db09bc0cd
Merge branch 'developer' into gui
2019-06-25 09:08:29 +02:00
Erik Frojdh
e80ce1b4c4
added -h --help option to display help
2019-06-21 17:27:47 +02:00
4b69c01357
ctb server: sync clk get added
2019-06-19 16:55:24 +02:00
Erik Fröjdh
6c33f7de7b
adding list command ( #34 )
2019-06-19 09:26:11 +02:00
Erik Frojdh
71f26b2831
removed mystring typedef
2019-06-18 17:41:26 +02:00
Erik Frojdh
17b08b6e53
removed MySocketTCP and old ServerInterface
2019-06-18 15:54:22 +02:00
b6bba0b7bc
Merge branch 'developer' into gui
2019-06-17 17:41:17 +02:00
Erik Fröjdh
c1435ea94f
Renamed receiver commands to rx_ ( #32 )
...
* renamed receiver commands to rx_
* WIP
* more commands
* check
* overwrite
* foverwrite
2019-06-13 15:29:05 +02:00
3c1df02414
merge resolved
2019-06-11 15:56:13 +02:00
Erik Frojdh
1fed3553b9
cleaning up tcp
2019-06-07 16:13:34 +02:00
ca5a0b4cc8
WIP Settings
2019-06-07 10:58:47 +02:00
Erik Frojdh
170aca0e1f
zmqip now uint
2019-06-06 18:17:04 +02:00
Erik Frojdh
c86a1e7d48
WIP
2019-06-06 17:00:05 +02:00
Erik Frojdh
3cfeb74529
minor
2019-06-06 10:36:40 +02:00
Erik Frojdh
5944957977
cleaning up socket
2019-06-06 10:34:57 +02:00
e4546c6121
WIP
2019-06-05 17:54:56 +02:00
Erik Frojdh
03f8b389ad
WIP
2019-06-05 17:30:21 +02:00
Erik Frojdh
3d6404952a
fix sending
2019-06-05 15:51:21 +02:00
Erik Frojdh
b5e4d7d8fb
fixed reading and double print in client
2019-06-05 15:40:28 +02:00
Erik Fröjdh
1db7521cfa
exceptions TCP ( #31 )
...
* WIP
* first test
* format
* test frames
* also 0:
* WIP
* WIP
* first test
* format
* test frames
* also 0:
* test and less local
* pass ret by value
* level
* WIP
* WIP
* cleaning up interface
* removed ref
* another
* updated api version
* cleanup
* cleanup
* WIP
* fixes
* fixed tests
2019-06-05 15:25:18 +02:00
862dc824ba
WIP
2019-06-05 11:27:19 +02:00
a6144f658e
ctb client and server bug fix: dac didnt compute indices correctly and set dac was not printing in server
2019-06-04 18:11:31 +02:00
3aea917175
updated binaries for the extsig api change
2019-06-04 12:18:06 +02:00
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
17f745b45d
ctb server: simulator effects, increased fpga reset time from 1 to 2 seconds
2019-06-03 17:22:59 +02:00
Dhanya Thattil
29141ac1a6
set starting frame number of next acquisition for both jungfrau and e… ( #27 )
...
* set starting frame number of next acquisition for both jungfrau and eiger. firmware has not implemented a get, so workaround. tests included. frame number 0 not allowed due to Eiger. Eiger max frame is 48 bit, while jungfrau is 64 bit
* made argument of setstartingframenumber const
2019-06-03 11:07:53 +02:00
Dhanya Thattil
894cc1c9e0
Simulator ( #28 )
...
* WIP
* wip
* wip
* removed loop
* sending 1 frame
* send multiple frames
* c11 for server
* WIP
* WIP
* Add CMake for the simulators. Requires some refactoring to make slsDetectorServer a proper library.
* Working cmake for jungfrau
* Working cmake for eiger
* WIP
* WIP
* Add preliminary working eiger simulator and breaks the jungfrau simulator
* virtual servers connected
* changes to make it work for rhel7 and install binaries in bin
* removed some unnecessary prints
* removed binaries and virtual makefiles
2019-06-03 10:16:54 +02:00
Erik Fröjdh
788ad8d3b6
Command proxy ( #25 )
...
* added cmd proxy
* minor
* minor
* WIP
* clean up
* added comment
2019-05-28 18:01:26 +02:00
Erik Frojdh
aa2bcfa308
fixed setup udp
2019-05-28 17:07:34 +02:00
Erik Frojdh
7a9dbd8b76
WIP
2019-05-28 15:43:20 +02:00
8c112efdb3
jungfrau bug fix: setting clkdivider also set adcphase: break inswitch
2019-05-28 14:14:08 +02:00
Erik Frojdh
8f4009bfb6
WIP
2019-05-28 13:27:43 +02:00
938e1e87ff
bugfix: vref adc voltage
2019-05-28 12:31:19 +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
659e204b35
solved conflicts
2019-05-27 15:05:40 +02:00
2c2fb7358c
jungfrau board 2 adc defines, full speed limitation for old boards
2019-05-27 15:04:13 +02:00
Dhanya Thattil
54a396065d
ctb versioning bug fix
2019-05-27 14:08:41 +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
3e5d34647e
updated test for argument parser
2019-05-17 10:00:49 +02:00
Erik Frojdh
591ff53b84
fixed MacAddr 0 output
2019-05-17 09:08:13 +02:00
Erik Frojdh
fff79fbbb6
const char* for command
2019-05-16 16:58:03 +02:00
Erik Frojdh
a11fc31c49
merge
2019-05-16 15:18:14 +02:00
Erik Frojdh
415567006f
non used header
2019-05-16 15:16:11 +02:00
1943e77b24
server interface: ip made to use inet_ntop, mac address and ip to string made common
2019-05-16 15:12:42 +02:00
Erik Frojdh
e6ad80e187
removed cout
2019-05-16 15:10:24 +02:00
Erik Frojdh
615d1b1f33
refactor
2019-05-16 14:27:16 +02:00
9315768159
client bug fix: smaller ips convert to hex
2019-05-16 14:07:58 +02:00
