67 Commits

Author SHA1 Message Date
e757e25fa1
merge fix #721 PR (sync 7.0.2.rc) to developer (#739)
* merge fix from #721 PR (sync) 7.0.2.rc -> developer
* row and column for jungfrau mixed up

* multi module jungfrau sync must do slaves first then master for start acquisition and send software trigger, and master first and then slaves for stopacquisition

* non blocking to slaves first and only then blocking/nonblocking to the master for sending software trigger(jungfrau multi mod sync)

* fixed get/set timing jungfrau when sync enabled, getsync during blocking acquire (for trigger or stop) will get stuck as it should ask the stop server

* switching between 1 and 2 interfaces did not set gui/client zmq port properly. Resulted in dummy streaming forever. fixed

* formatting, refactoring: const & for positions, multi mod M3 stop first master first

* adding missing cstdint for gcc 13

* Refactoring handle sync out, handling synchronization also for softwaretrigger for m3, for start/sync/stop for g2/g1

---------

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>

* fixed row and col for moench 2 interfaces

* fix moench getTiming and also allow moench to handle sync

---------

Co-authored-by: Erik Frojdh <erik.frojdh@gmail.com>
2023-05-08 15:58:19 +02:00
dc5db905d4 merge from 7.0.0 2023-02-24 10:39:51 +01:00
d84e9652d3 updated versions for the servers 2023-02-22 11:36:47 +01:00
Dhanya Thattil
adcde9fd49
user friendly message added from ' dangerous to continue' to 'check firmware' (#665) 2023-02-20 16:35:33 +01:00
Dhanya Thattil
b200a2efc1
Fix jf softwre trigger and tests with real jungfrau detector (#673)
* jungfrau: software triggers do not work, fixed

* eiger test: get highvoltage must be read twice to get the real voltage
2023-02-20 15:22:46 +01:00
Dhanya Thattil
55bf73f3b7
unicast udp_srcmac (#642)
* udp_srcmac can only be a unicast address (LSB of first octet must be 0)

* renamed binaries
2023-02-03 10:56:19 +01:00
Dhanya Thattil
3a3628c475
m3 firmware version change (#637)
* m3 firmware version change

* changed binary name to rc3
2023-01-27 10:54:45 +01:00
Dhanya Thattil
713639d001
Fix gotthard delay (#606)
* fix for set delay for gotthard1 (verification adds master delay even if its not master)

* binaries in

* binaries name
2023-01-17 09:16:43 +01:00
Dhanya Thattil
22b3229d94
m3: updated serializing loop in trimming (#613) 2023-01-16 13:43:28 +01:00
0f6f20a720 merge from 7.0.0.rc1 2022-12-13 10:03:57 +01:00
ae6c7f5841 updated server binary shortcuts 2022-12-08 09:27:44 +01:00
5dcc2ab35c fixed server names versioing 2021-11-25 13:01:23 +01:00
bcf0922b8d changed server names 2021-11-24 11:40:20 +01:00
95897085ec missed serverBin 2021-10-27 11:02:28 +02:00
e53a71f88f updated to developer versioning 2021-10-27 11:00:01 +02:00
9f27478f95 serverBin binaries updated 2021-10-21 16:18:36 +02:00
29fbef7ced binaries in 2021-10-18 16:10:01 +02:00
12945916b7 updated binary for current source comments 2021-10-18 15:25:55 +02:00
34bc596ea6 fixed eiger tengiga hotfix 2021-10-13 13:04:34 +02:00
0fd263aef1 updated server bin folder 2021-10-08 18:25:46 +02:00
e382df21b9 updated binaries, links in serverBin and deleted v5.0.0 binaries 2020-11-27 14:26:15 +01:00
cbf61ed05e binaries in serverbin 2020-11-17 18:43:45 +01:00
a310ab9bfa updated all servers 2020-10-09 16:59:46 +02:00
e0e2c2efba updated binaries 2020-10-08 15:55:24 +02:00
5df25a9eb7 updated new binaries 2020-09-30 12:39:44 +02:00
1c76f76a72 removed old server binaries 2020-09-30 12:36:18 +02:00
89a06f099c merging refactor (replacing) 2019-04-12 10:53:09 +02:00
907d1655d1 merge from 4.0.1 2019-02-11 14:04:09 +01:00
bf0e0ac601 updated binaries in serverbin 2019-02-07 17:06:07 +01:00
5e71aeb85f binaries modified 2018-12-04 13:39:27 +01:00
def79807f6 merge conflict resolved from 4.0.0 2018-09-28 16:28:21 +02:00
f9b95b63eb gotthard server: made gotthard server readout only via udp, readframe just waits for acquisition to be done, does not allocate ram, receiver: removed positions hardcoded in 1d, should be 2d for all 2018-09-27 18:20:03 +02:00
5a139d70b5 gotthard and jungfrau server binary updated for API 2018-09-25 14:08:34 +02:00
961489edb1 bugfix gotthard server and client to set roi and disable it, problem still exists with frame numbering between roi modes but can only be fixed in firmware 2018-09-18 18:02:01 +02:00
ed0b22b500 updated binaries 2018-08-24 13:18:51 +02:00
0781344117 updating binaries 2018-08-22 19:00:21 +02:00
a36b715eab resolved conflicts from merging 3.1.1 in here 2018-03-21 09:03:31 +01:00
17c20748bc updated links in serverbin 2018-03-21 08:28:49 +01:00
688dd15fe9 Jungfrau bug fix: cannot give same adcphase value to pll, updated recommended default of adcphase for half speed and quarter speed, updated client manuals for both adcphase and clkdivider 2018-03-20 12:12:38 +01:00
b58c3e8951 solving merging conflicts from 3.1.0 to developer 2018-03-14 15:45:35 +01:00
72970c9669 updated binaries, updated manuals, updated git versioning 2018-03-12 14:21:02 +01:00
ec5e779225 added binary 2018-03-08 15:19:11 +01:00
28101bed22 updated binaries 2018-02-27 14:37:46 +01:00
Dhanya Maliakal
dcf4d98a75 show warnings, update binaries conflict from merge 2017-11-17 11:33:52 +01:00
Dhanya Maliakal
bf89dd44f3 updated binaries 2017-11-16 12:34:12 +01:00
Dhanya Maliakal
875ca44c0b updated server hotfix binary 2017-11-16 12:30:41 +01:00
Dhanya Maliakal
bee751cebb updated binaries 2017-11-15 09:31:49 +01:00
Dhanya Maliakal
90fb8258ca updated binaries 2017-11-14 17:52:51 +01:00
Dhanya Maliakal
e33ba2cd76 merge from 3.0.1 compiling with rpath and updating detector binaries 2017-11-13 12:32:08 +01:00
Dhanya Maliakal
e12229633c update binaries 2017-10-27 16:18:21 +02:00