Commit Graph

2230 Commits

Author SHA1 Message Date
Erik Frojdh 6a0c108e96 added comments 2019-08-07 15:37:30 +02:00
Erik Frojdh 65ebd0baf0 WIP 2019-08-07 15:36:27 +02:00
Dhanya Thattil 4ceee97c03 Api (#48)
* WIP

* WIP

* WIP

* cleaned up multi

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* split up python module

* WIP

* WIP

* WIP

* WIP

* WIP

* ok

* fixed bugs from rebase

* WIP

* fixed broken test

* WIP

* fixed python

* WIP

* sphinx help

* including new commands

* docs

* WIP

* WIP

* more tests

* added missing public header

* WIP
2019-08-07 11:21:07 +02:00
Dhanya Thattil 98ddf154b2 Partialreadout (#47)
* eiger server, rxr: partial readout, also gui messages: up last command, down clear command

* added binaries and resolved conflict

* bugfix eiger server: interrupt subframe is bit 2 and not bit number 3

* brackets in defs
2019-08-07 09:08:58 +02:00
Erik Fröjdh e20b5e6952 added const overloads for sendToDetector and sendToReceiver (#46) 2019-08-06 16:58:22 +02:00
Dhanya Thattil d72b6c3659 eiger server: quad, interrupt subframe, reg left and right (#45)
* eiger server: quad, interrupt subframe, reg left and right

*  eiger server: beb can fail in setting up quad, quad and gap pixels
2019-08-06 10:12:34 +02:00
maliakal_d 63c2599328 insignificant print 2019-07-30 10:33:25 +02:00
maliakal_d facbc60907 jungfrau server: changes for old and new boards 2019-07-30 09:32:10 +02:00
Dhanya Thattil 64a8dd2def Stoppedflag (#44)
* removed stopped flag from multi and sls shm, since its removed from fixed pattern in sls, slsshmversion api also added to get hostname and type

* clang format
2019-07-29 11:35:21 +02:00
Dhanya Thattil b524e0c95f removed online flags, apiversion in shm, ret for ok and fail, bind socket help in exception message (#43)
* removed online flag, removed rxronline flag, added useReceier flag that is set only when rxr hostname is set, removed setonline, setreceiveronline flag, removed ret for ok or fail, using exceptions for this, changed cannot bind socket printout

* fixed python
2019-07-26 16:33:39 +02:00
Dhanya Thattil fb2c015c5c Setonline (#42)
* setonline and setreceiveronline removed from command line

* removed multi shm rxr online flag

* setonine and setreceiveronline not needed in gui
2019-07-24 16:25:02 +02:00
Erik Frojdh 35aff6bf76 format on multi 2019-07-24 09:36:42 +02:00
Erik Frojdh e3db7099f1 removed non const getFileIndex in multi 2019-07-24 09:07:26 +02:00
Erik Frojdh 9cc1ff43a9 removed non const getFileIndex 2019-07-24 09:05:04 +02:00
Erik Fröjdh 2c453fc1be Removed multiSlsDetector dependency from slsDetector (#41)
* WIP

* removed multiSlsDetector dependency from slsDetector

* removed comment

* review changes
2019-07-23 15:47:39 +02:00
Dhanya Thattil e7a76ccea1 Quad (#39)
* making quad work in developer branch

* binary added

* minor changes

* bug fix to set quad to 0 when more than 1 detector
2019-07-22 16:41:03 +02:00
maliakal_d 3ef8b392db rx_hostname command line bug: should not setreceiveronline if connecting to a new receiver without clearing shm 2019-07-17 17:02:40 +02:00
maliakal_d 0f2641f9fa WIP 2019-07-12 18:24:23 +02:00
maliakal_d 5e24591295 Merge branch 'developer' into gui 2019-07-12 10:36:54 +02:00
maliakal_d 40c3c78024 client bug fix: framesl, cyclesl printed in float, fixed 2019-07-10 11:18:24 +02:00
maliakal_d 8ac7d96ef3 WIP 2019-07-05 08:54:50 +02:00
maliakal_d c582ba15d5 WIP 2019-07-04 16:40:25 +02:00
maliakal_d 0954bdd2d3 Merge branch 'developer' into gui 2019-07-02 17:29:50 +02:00
maliakal_d f4fa19b559 bugfix rxr: checkonline prints error msg, call receiverversion instead 2019-07-02 17:29:38 +02:00
maliakal_d 975076043f WIP 2019-07-02 13:50:20 +02:00
maliakal_d e22d03a744 WIP 2019-07-02 09:13:47 +02:00
maliakal_d a373609b08 WIP 2019-06-28 18:16:32 +02:00
maliakal_d bd3e439d87 Merge branch 'developer' into gui 2019-06-25 10:51:17 +02:00
maliakal_d 136e00d15e Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2019-06-25 10:51:00 +02:00
maliakal_d 7c18ad3c53 removed Critical and Noncritical exceptions 2019-06-25 10:50:52 +02:00
maliakal_d 3db09bc0cd Merge branch 'developer' into gui 2019-06-25 09:08:29 +02:00
maliakal_d 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
maliakal_d 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
maliakal_d 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
maliakal_d ca9fca88c4 Merge branch 'developer' into gui 2019-06-13 09:37:54 +02:00
maliakal_d 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
maliakal_d 3c1df02414 merge resolved 2019-06-11 15:56:13 +02:00
maliakal_d 1bab010d0b WIP 2019-06-11 10:15:40 +02:00
Erik Frojdh 1fed3553b9 cleaning up tcp 2019-06-07 16:13:34 +02:00
maliakal_d 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
maliakal_d 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
maliakal_d 862dc824ba WIP 2019-06-05 11:27:19 +02:00