detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-07-11 00:12:43 +02:00
Code Issues Actions Packages Releases Activity
7,977 Commits 46 Branches 103 Tags
aab54181663dfc40e70dbef2cc541a67f0cf974b
Commit Graph
7977 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
maliakal_d 01dfc08bbe qip 2021-06-23 08:42:56 +02:00
maliakal_d 04645dfae2 wip 2021-06-23 08:34:15 +02:00
maliakal_d 755738a42e wip 2021-06-22 20:50:50 +02:00
maliakal_d 1ab3bb8496 bianries in 2021-06-21 16:35:31 +02:00
maliakal_d 137b0cc288 merge from developer 2021-06-21 16:34:42 +02:00
maliakal_d e4bf8a5d97 binaries in 2021-06-21 16:33:28 +02:00
maliakal_d 5ca4c7f943 merged from developer 2021-06-21 16:32:36 +02:00
Dhanya ThattilandGitHub 1a88cbd266 Merge pull request #254 from slsdetectorgroup/patternrefactor 
RefactorPatternRedundancy
 2021-06-21 16:29:25 +02:00
maliakal_d d0faf64014 binaries in 2021-06-21 16:21:51 +02:00
maliakal_d 6ca67632c0 wip 2021-06-21 16:21:12 +02:00
maliakal_d fc6a0d4a26 Wip 2021-06-21 14:08:08 +02:00
maliakal_d 9c19fc3272 wip 2021-06-21 13:39:20 +02:00
maliakal_d 789d0df81c wip 2021-06-21 12:31:35 +02:00
maliakal_d bb91375533 wip 2021-06-21 09:37:31 +02:00
maliakal_d 665a3be6d8 wip 2021-06-18 19:38:47 +02:00
maliakal_d a8c0049f88 wip 2021-06-18 14:22:01 +02:00
maliakal_d fd2cc856b8 wip 2021-06-18 12:25:14 +02:00
maliakal_d 2ae2f84441 wip 2021-06-17 17:39:49 +02:00
maliakal_d 028edd0d08 wip 2021-06-17 07:13:27 +02:00
maliakal_d e110bfd5a7 usleep between sending frames and stop acquisition assures complete frames, require firmware update to remove usleep 2021-06-16 11:11:04 +02:00
maliakal_d ceeb4400a0 removing send complete frames fromstop acquisition 2021-06-16 10:25:49 +02:00
maliakal_d 47d6ed053c removed slave master difference in stop acquiistion 2021-06-15 16:58:32 +02:00
maliakal_d 74ca9d6fcc binaries in 2021-06-15 16:57:23 +02:00
maliakal_d 370fe4628a wip 2021-06-15 16:56:16 +02:00
maliakal_d 74903314ce wip 2021-06-15 16:31:29 +02:00
maliakal_d 4ea53cd3bd Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-15 16:27:19 +02:00
maliakal_d 994f0a71a6 wip 2021-06-15 16:27:09 +02:00
maliakal_d 19b16bc6e8 binaries in 2021-06-15 15:01:07 +02:00
maliakal_d b740cb7312 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-15 15:00:25 +02:00
maliakal_d bfdd62253a binaries in 2021-06-15 15:00:15 +02:00
maliakal_d 22bcac4c0b gotthard stop server should also know if there is a master for ismaster() to work 2021-06-15 14:59:50 +02:00
maliakal_d 1ae8ceb73c binaries in 2021-06-15 13:01:41 +02:00
maliakal_d b11f6c56e7 getmaster through stop server, allowing stopacq to first go to slave for eiger, eiger stop to first check reg value to send complete frames before calling stop 2021-06-15 12:59:54 +02:00
maliakal_d 709293be68 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-15 12:46:09 +02:00
maliakal_d f111ac733b without getmaster, getmaster needs to go to stop server 2021-06-15 12:45:58 +02:00
maliakal_d d0b2c13fa3 binaries in 2021-06-15 11:50:21 +02:00
maliakal_d 130613f730 fix for stopacq 2021-06-15 11:48:38 +02:00
maliakal_d a9f892483d wip 2021-06-11 17:29:01 +02:00
maliakal_d 26acde979f refactor on the gui from review missed out in pr 2021-06-11 11:54:22 +02:00
Dhanya ThattilandGitHub 621bb6cbfd Merge pull request #252 from slsdetectorgroup/guicounters 
added counters for m3 gui
 2021-06-11 09:24:58 +02:00
maliakal_d b4d2f2ee1c wip 2021-06-10 18:27:42 +02:00
maliakal_d f01e5fd5ec moved counters in gui from data output tab to settings tab 2021-06-10 18:07:52 +02:00
maliakal_d 1bcf10a211 minor 2021-06-10 15:43:17 +02:00
maliakal_d b9aa7bcc8e added counters for m3 gui 2021-06-10 15:41:49 +02:00
maliakal_d d0d9ffb3b6 binaries in 2021-06-10 12:11:45 +02:00
maliakal_d 2b8e4c8981 Merge branch 'stopacq' of github.com:slsdetectorgroup/slsDetectorPackage into stopacq 2021-06-10 12:10:28 +02:00
maliakal_d 0b2a4a879e removed masterflags enum, especially in gotthard server 2021-06-10 12:10:17 +02:00
maliakal_d 6fa9d7f367 binaries in 2021-06-09 17:41:54 +02:00
maliakal_d bdc3a5f3d9 connect ismaster for eiger and gotthard1 and using ismaster to stop master last for eiger 2021-06-09 17:40:05 +02:00
maliakal_d 4de8234478 eiger stop sends last frame, software or firmwarebug 2021-06-09 15:04:48 +02:00