Commit Graph
7977 Commits
Author SHA1 Message Date
Dhanya Maliakal ff2c42e921 Merge branch '2.3' into developer 2017-03-23 15:38:48 +01:00
Dhanya Maliakal 44be9829d4 removed anna from support as she prefered it 2017-03-23 15:38:24 +01:00
Dhanya Maliakal e450f5ec6a updaterev 2017-03-23 15:17:34 +01:00
Dhanya Maliakal 70a7217353 changed the header size to a better number 2017-03-23 15:17:21 +01:00
Dhanya Maliakal 7dfb1b7192 added a release text 2017-03-23 15:17:03 +01:00
Dhanya Maliakal da8d535dae updaterev 2017-03-23 14:09:01 +01:00
Dhanya Maliakal 404be013a2 changes to new callback arguments without filepointer 2017-03-23 14:08:43 +01:00
Dhanya Maliakal 6d4c0d0d46 modified users for new callback argument without filepointer 2017-03-23 14:07:56 +01:00
Dhanya Maliakal 54371bc6be updaterev 2017-03-23 13:48:18 +01:00
Dhanya Maliakal 5c230e2ac5 updaterev 2017-03-23 13:48:12 +01:00
Dhanya Maliakal 0814f6369d udpaterev 2017-03-23 13:46:16 +01:00
Dhanya Maliakal 9e658e7947 udpaterev 2017-03-23 13:46:02 +01:00
Dhanya Maliakal bf57be309f updated server 2017-03-23 13:44:44 +01:00
Dhanya Maliakal 6f34dddb5a changed the file header size t0 1kb and changed its description in the header 2017-03-23 13:41:37 +01:00
Dhanya Maliakal c47f2f3449 solved the gui 4 bit bug where no data was displayed: due to byterperchannel being int and a 0 2017-03-23 13:31:22 +01:00
Dhanya Maliakal 5dcacaae2a frame and packet counters for the delay was buggy, not looking at lsb and msb, fixed 2017-03-23 12:38:19 +01:00
Dhanya Maliakal b9eb3d5a52 somewere stuck with virtual template overloading 2017-03-23 11:56:17 +01:00
Dhanya Maliakal 78078f4ef3 esrf suggestion for volatile in multithread threadpool 2017-03-23 11:55:56 +01:00
Gemma Tinti ea66f2d12f manual 2017-03-20 14:51:18 +01:00
Gemma Tinti de16c2a7f1 manual 2017-03-20 12:42:28 +01:00
Dhanya Maliakal aae4e3f993 removed unnessary printout 2017-03-20 11:22:35 +01:00
Dhanya Maliakal 911ff49238 changes for merges from 2.3 incl standard packet header 2017-03-20 11:22:07 +01:00
Dhanya Maliakal 6731c39ce2 Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detectors_package into developer 2017-03-20 10:48:54 +01:00
Dhanya Maliakal 81eade8ede Merge branch '2.3' into developer 2017-03-20 10:48:38 +01:00
Dhanya Maliakal 78958c7699 updaterev 2017-03-20 09:30:15 +01:00
Dhanya Maliakal 575c9617c7 fixed gui for new header 2017-03-20 09:28:15 +01:00
Dhanya Maliakal 1ab80b0517 updaterev 2017-03-20 09:28:02 +01:00
Dhanya Maliakal 4b388f56b2 fixed gui for new header 2017-03-20 09:27:38 +01:00
Dhanya Maliakal fb91ba25f3 uncomment gui. insignificant 2017-03-20 09:26:13 +01:00
Gemma Tinti 4d5506a0a8 manual 2017-03-15 15:52:19 +01:00
Dhanya Maliakal 1413244617 update rev 2017-03-15 15:02:28 +01:00
Dhanya Maliakal dc77b07c92 update rev 2017-03-15 15:02:22 +01:00
Dhanya Maliakal 9f68fc6f3b fixed call backs with new standard header 2017-03-15 15:00:25 +01:00
Dhanya Maliakal 47a769e677 modified users receiver to have all objects defined in one 2017-03-15 15:00:01 +01:00
Dhanya Maliakal ecaa8e45a4 some changes to the command help 2017-03-15 14:52:19 +01:00
Dhanya Maliakal 36e92c194d changes for callback to work 2017-03-14 08:23:47 +01:00
Dhanya Maliakal 4a8f2b5a69 Merge branch '2.3-rc' of git.psi.ch:sls_detectors_software/sls_detectors_package into 2.3-rc 2017-03-14 08:22:29 +01:00
Dhanya Maliakal 22e0332833 changes to callback 2017-03-14 08:21:27 +01:00
Dhanya Maliakal 53be854efd including subframe number 2017-03-13 11:33:06 +01:00
Dhanya Maliakal 0a1aaec708 resolved the recovering from receiver start error , but still does not acknowledge error in gui 2017-03-10 13:24:00 +01:00
Dhanya Maliakal cad8ffc0c6 resolved the recovering from receiver start error , but still does not acknowledge error in gui 2017-03-10 13:07:33 +01:00
Dhanya Maliakal 8ebbfbb84b incl. prev commit: Included file overwrite, format and changed the functonality of filewrite enable and file path 2017-03-10 12:21:19 +01:00
Dhanya Maliakal 2ef44ec70b somewhere 2017-03-10 10:51:47 +01:00
Dhanya Maliakal 978b54dff9 somewhere 2017-03-10 10:51:37 +01:00
Dhanya Maliakal 300b014f73 somewhere 2017-03-10 10:51:28 +01:00
Dhanya Maliakal 1e94ec0c6a fixed short gotthard 2017-03-09 13:28:03 +01:00
Dhanya Maliakal 86018684c9 made it work for gotthard 2017-03-09 11:40:48 +01:00
Dhanya Maliakal 300bf85dae uncommented extra comments 2017-03-09 11:40:26 +01:00
Gemma Tinti 1cbbf9409f manual 2017-03-09 09:23:57 +01:00
Gemma Tinti 0ff79b7d5a manual 2017-03-09 09:21:50 +01:00