e22d03a744
WIP
2019-07-02 09:13:47 +02:00
a373609b08
WIP
2019-06-28 18:16:32 +02:00
bd3e439d87
Merge branch 'developer' into gui
2019-06-25 10:51:17 +02:00
136e00d15e
Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer
2019-06-25 10:51:00 +02:00
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
33f5253831
QIP
2019-06-21 18:19:39 +02:00
Erik Frojdh
c466623e86
fix
2019-06-21 17:38:49 +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
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
ca9fca88c4
Merge branch 'developer' into gui
2019-06-13 09:37:54 +02:00
359970dfc2
bug fix from 4.0.2: powerchip multi should have delays, burst trigger added to users
2019-06-13 09:37:44 +02:00
3c1df02414
merge resolved
2019-06-11 15:56:13 +02:00
1bab010d0b
WIP
2019-06-11 10:15:40 +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
bb760f3210
WIP datatoutput
2019-06-06 15:04:05 +02:00
Erik Frojdh
6c64bdb04a
fixing tests for gcc 4.8
2019-06-05 17:40:48 +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
ff3e5001e6
Merge branch 'developer' into gui
2019-06-04 18:12:41 +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
ffbc0a0fc3
Merge branch 'developer' into gui
2019-06-04 12:18:20 +02:00
b74ce95b24
removed colon in commands. affects dac, adc and extsig
2019-06-04 12:10:26 +02:00
70ea143dcb
Merge branch 'developer' into gui
2019-06-03 18:16:56 +02:00
7a9745e2da
fixed typo in command, bsamples to dsamples
2019-06-03 18:14:23 +02:00
e7c164fb24
Merge branch 'developer' into gui
2019-06-03 11:13:03 +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
073d06f143
removed unnecessary print that might have been used for debugging
2019-06-03 08:59:54 +02:00
Erik Fröjdh
4b1a9bea32
Integration tests for the command line ( #26 )
...
* WIP
* first test
* format
* test frames
* also 0:
2019-05-31 14:40:45 +02:00
Erik Frojdh
d935e78763
clang-format
2019-05-28 18:15:43 +02:00
Erik Frojdh
0f869e1215
fixed acquire not working
2019-05-28 18:15:15 +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
85d4dfc7c8
Merge branch 'socket' into developer
2019-05-28 17:11:29 +02:00
a008c2b2c8
added ctbGui
2019-05-28 17:15:59 +02:00
f7aedf7711
client bug fix: typo in command line, get returned rx_udpip instead of rx_udpip2, same with mac
2019-05-28 16:56:15 +02:00
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
