Commit Graph

6172 Commits

Author SHA1 Message Date
Erik Frojdh cf2e1c1dfc Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-07-24 07:57:20 +02:00
Erik Frojdh cb54bf6225 docs 2020-07-24 07:57:12 +02:00
maliakal_d 3b0f68c3c4 gotthard2: fix of ext burst mode global settings 2020-07-23 17:05:43 +02:00
Erik Frojdh 5faf3c7336 format 2020-07-23 14:01:59 +02:00
Erik Frojdh 3ddb264875 minor 2020-07-23 14:01:13 +02:00
Erik Frojdh 1fb19aeae2 constexpr 2020.07.23.dev0 2020-07-23 12:29:08 +02:00
Dhanya Thattil ad297e9c51 Readlink (#117)
* gotthard config file path using readlink

* gotthard2

* eiger

* eieger, mnythen3, moench

* binaries in

* moved readlink to a common function

* binaries in
2020-07-23 12:17:46 +02:00
Dhanya Thattil beb6afe101 Merge pull request #120 from slsdetectorgroup/usleep
Replaced usleep with std::this_thread::sleep_for
2020-07-23 11:44:30 +02:00
Erik Frojdh 78a6896ae9 replaced usleep with sleep_for 2020-07-23 11:07:42 +02:00
Erik Frojdh 9ea8882c05 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-07-23 10:57:47 +02:00
Erik Frojdh 4cf5e81971 removed usleep 2020-07-23 10:48:59 +02:00
Dhanya Thattil 2fa5e7d00c Merge pull request #118 from slsdetectorgroup/rxstartfix
Fixed rx_start
2020-07-23 10:28:38 +02:00
Erik Frojdh af17fb9f61 removed make_timedelta 2020-07-23 09:34:04 +02:00
Erik Frojdh 07869134d6 removed additional buggy signatures 2020-07-23 08:19:08 +02:00
Erik Frojdh 8b9a69e1f1 overload for rx void return type 2020-07-23 08:07:36 +02:00
maliakal_d 023924c4cc updatd gotthard2 module id for new hdi 2020-07-22 11:22:58 +02:00
Erik Frojdh 01d00164e5 added cast to silence warning in CTB server 2020-07-22 08:57:02 +02:00
Dhanya Thattil e6c8ba0e88 Merge pull request #116 from slsdetectorgroup/serverconfigs
Serverconfigs
2020-07-21 10:33:41 +02:00
maliakal_d 37fc69b297 modified permissions of config file 2020-07-20 18:01:13 +02:00
maliakal_d e1e265bd49 moench fix 2020-07-20 17:53:38 +02:00
maliakal_d b46809e1c0 binaries in 2020-07-20 17:36:55 +02:00
maliakal_d 396d82bd62 eiger 2020-07-20 17:33:19 +02:00
maliakal_d e7ff96fe8d gotthard2 2020-07-20 17:30:44 +02:00
maliakal_d 07a292af95 gotthard 2020-07-20 17:28:29 +02:00
maliakal_d e4433a99a5 moench 2020-07-20 17:24:55 +02:00
maliakal_d 28fb1023fa mythen3: rename default pattern txt and move to inst dir 2020-07-20 17:18:59 +02:00
Dhanya Thattil c4374e623e Merge pull request #115 from slsdetectorgroup/mythen3
Mythen3
2020-07-17 19:24:34 +02:00
maliakal_d da2f12072f virtual data mythen3 fix 2020-07-17 19:19:21 +02:00
maliakal_d 918da2402f binaries in 2020-07-17 19:06:30 +02:00
maliakal_d 94e9591974 gui: dr enabled for m3 2020-07-17 18:49:05 +02:00
maliakal_d a76ed6d8db tengiga enable 2020-07-17 18:34:23 +02:00
maliakal_d b7cb341ee3 dr 2020-07-17 17:33:43 +02:00
maliakal_d 546bef5e5a powerchip at server startup 2020-07-17 15:38:27 +02:00
Dhanya Thattil 97ddfed819 Merge pull request #114 from slsdetectorgroup/gotthard2
Gotthard2
2020-07-17 13:00:07 +02:00
maliakal_d 2d68b61f00 binaries recompiled 2020-07-17 12:59:37 +02:00
maliakal_d 3bdf02a23c rx_zmqstartfnum added to have an offset of streaming frame numbers 2020-07-17 11:11:19 +02:00
maliakal_d f70d28b175 Merge branch 'developer' into gotthard2 2020-07-17 10:34:46 +02:00
Dhanya Thattil d076fda59a Merge pull request #113 from slsdetectorgroup/shmissue
Shmissue
2020-07-17 07:19:46 +02:00
maliakal_d a3062a5e00 formatting 2020-07-17 07:19:19 +02:00
maliakal_d c6921bf954 virtual memory error verbosity 2020-07-16 17:19:05 +02:00
maliakal_d ae9499047b powerpc and nios binaries in 2020-07-16 16:36:49 +02:00
maliakal_d 8dd9bb6ea3 blackfin binaries 2020-07-16 16:21:00 +02:00
maliakal_d 9a284f75c3 pthread mutex works on blackfin 2020-07-16 16:18:40 +02:00
maliakal_d 3e87cfa5c1 WIP shm deletion working on blackfin 2020-07-16 16:01:30 +02:00
maliakal_d 6136eabee2 WIP shm deletion working on blackfin 2020-07-16 16:00:28 +02:00
maliakal_d 67bb0dff1a rx_zmqstartfnum, not tested 2020-07-16 12:18:18 +02:00
maliakal_d ca298580f3 badchannels done 2020-07-15 18:24:17 +02:00
maliakal_d d7f490701b confadc added to client, removed conf adc depending on burst mode 2020-07-15 13:30:30 +02:00
maliakal_d 7752b86d97 veto file in 2020-07-14 18:51:47 +02:00
maliakal_d 35dbc3813d filter and cds gain, burst and continuous value to asic changed, bug fix to scanning function addresses in server_funcs.c 2020-07-14 17:09:51 +02:00