6709 Commits

Author SHA1 Message Date
Erik Frojdh
91ad7b0594 removed broken symlink 2020-10-26 15:15:56 +01:00
e3ffc9a57b updating jungfrau examples 2020-10-23 15:38:42 +02:00
b9234ee7f2 update doc 2020-10-23 15:34:20 +02:00
Dhanya Thattil
559b02e167
Merge pull request #208 from slsdetectorgroup/m3trimbits
M3trimbits
2020-10-22 13:18:42 +02:00
a5d70c1214 print missing packets in signed 2020-10-20 15:47:09 +02:00
cefddff848 scan trimbits_scan changed to trimbits 2020-10-20 12:31:08 +02:00
Dhanya Thattil
0460d7e531
Merge pull request #207 from slsdetectorgroup/m3counter
M3counter
2020-10-20 12:06:51 +02:00
b31f8a5ca6 binary in 2020-10-20 12:05:18 +02:00
f4a2702996 m3: exptime and gatedelay values set from reg variables but not converted to time first 2020-10-20 12:03:46 +02:00
476afed516 updated docs on programfpga troubleshooting 2020-10-20 09:49:01 +02:00
Dhanya Thattil
3d414e6438
Merge pull request #204 from slsdetectorgroup/programfpga
Programfpga
2020-10-16 16:14:21 +02:00
Gemma Tinti
df376c47d4 fix a typo and makefile 2020-10-16 15:09:56 +02:00
a86d70235c binaries in 2020-10-16 15:03:56 +02:00
5cd89487b6 blackfin fpga programming: if client socket killed or failure while writing to flash, only file pointer closed but fpga not asked to pick up from flash and client exception thrown. If all good and picking up from flash takes more than 10s, it will also throw exception in client. Client exception will prevent a reboot and hence allowing user to try to flash again. 2020-10-16 15:02:45 +02:00
Dhanya Thattil
acf29b6db8
Merge pull request #203 from slsdetectorgroup/m3trigger
M3trigger
2020-10-15 09:29:58 +02:00
fddc93ba8d binaries in 2020-10-15 09:28:41 +02:00
ae960fcb57 WIP 2020-10-15 09:28:17 +02:00
9f2bc85a18 m3: trigger enable moved to config reg, always enabling trigger flow for all timing modes for m3 2020-10-15 09:27:06 +02:00
Gemma Tinti
3021594e20 updating the slsImageReconstruction Makefile part 2020.10.12.dev0 2020-10-12 17:33:17 +02:00
9e8208dc0a update docs 2020-10-12 11:33:14 +02:00
Dhanya Thattil
21ad6b3a8a
Merge pull request #201 from slsdetectorgroup/m3exptime
M3exptime
2020-10-09 17:59:47 +02:00
12abf3e58b binary in 2020-10-09 17:56:36 +02:00
6ddde13b87 m3: exptime and gate delay registers 1 2 3 are updated only if counters enabled, when counters enabled, the registers are updated back 2020-10-09 17:54:35 +02:00
Dhanya Thattil
e4226d34dc
Merge pull request #200 from slsdetectorgroup/m3clk
M3clk
2020-10-09 17:09:05 +02:00
c1c885edd2 merge conflict resolved 2020-10-09 17:07:01 +02:00
a310ab9bfa updated all servers 2020-10-09 16:59:46 +02:00
904d10eb43 wip 2020-10-09 16:54:46 +02:00
e364fbcf32 m3: changed run clk div to 10, change run clkdiv to 40 while trimming, set default pipeline adif reg 2020-10-09 16:52:24 +02:00
95f816ad64 binaries in 2020-10-09 15:06:14 +02:00
2bd796cfff back to developer 2020-10-09 15:04:52 +02:00
794e579e12 update tag version in client version 5.0.0.rc2 5.0.0-rc2 2020-10-09 15:03:00 +02:00
bc6626aa7b docs 2020-10-09 08:55:03 +02:00
6fb2479178 updated docs 2020-10-09 08:52:19 +02:00
6053f2adff update docs 2020-10-08 16:04:58 +02:00
e0e2c2efba updated binaries 2020-10-08 15:55:24 +02:00
6d5f2e66ae updated client APIs 2020-10-08 15:46:26 +02:00
33d85dbfc0 all servers compiled 2020-10-08 15:45:29 +02:00
a838830090 ran tests and fixed 2020-10-08 15:44:15 +02:00
b9a459faa1 Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer 2020-10-08 14:47:21 +02:00
Gemma Tinti
d4806eb48b Eiger manual with 5.x updates 2020-10-08 14:42:02 +02:00
7f189629fb commands, set multi level but get module level enabled 2020-10-08 14:31:18 +02:00
Dhanya Thattil
bee6bcc7a3
Merge pull request #199 from slsdetectorgroup/zmqhwm
Zmqhwm
2020-10-08 13:42:36 +02:00
2f2399d550 minor 2020-10-08 13:29:46 +02:00
6c1035aa99 zmq hwm are specified to 2 for gui and restreaming of receiver if all zmq not closed at end of acquiistion 2020-10-08 13:01:01 +02:00
c9bba6fbdc Merge branch 'developer' into zmqhwm 2020-10-07 18:02:53 +02:00
Dhanya Thattil
6d929ce96f
Merge pull request #196 from slsdetectorgroup/semfail
Semfail
2020-10-07 18:00:24 +02:00
a36ce8cb1c binaries in 2020-10-07 17:05:38 +02:00
38cc365c01 setting shared mutex attribute for non blackfins 2020-10-07 17:01:16 +02:00
688fe4e3f7 fix zmqport and rx_zmqport, must restart zmq streaming 2020-10-07 14:17:34 +02:00
5c0dff29ed binaries in 2020-10-07 12:27:35 +02:00