1773 Commits

Author	SHA1	Message	Date
Dhanya Thattil	897cbac27d	merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file	2018-02-07 11:02:36 +01:00
Dhanya Thattil	ecf1e9fac1	bugfix: returning pointer to local variable, char* to string in function definition	2018-02-07 10:14:52 +01:00
Dhanya Thattil	618f6291cf	server binaries for all, jungfgrauserver with adcphase returning something, serverclient interface fixed for others not using tempcontrol, detectornumber not used for settings file for non eiger/mythen, server dates removing rev number	2018-02-07 09:23:52 +01:00
Dhanya Thattil	3da6a6df65	merge conflict removed, jungfrau server and eiger server re compiled	2018-02-05 12:33:05 +01:00
Dhanya Thattil	e6bd874a88	modified jungfrau server and client to make auto_comp_disable a not yet implemented feature as it requires a firmware upgrade	2018-02-05 11:50:22 +01:00
Dhanya Thattil	5d04067973	added auto comp disable feature	2018-02-02 18:01:01 +01:00
Dhanya Thattil	c520f10409	jungfrau server binaries	2018-02-02 15:19:10 +01:00
Dhanya Thattil	1872deb1dd	fix for temperature workaround for fpga	2018-02-02 15:17:40 +01:00
Dhanya Thattil	e6f475d7c4	jungfrau server changes in temperature control for fpga bug: default temp threshold and temp event cleared at start and power reg only reads enable and not status	2018-02-02 12:37:52 +01:00
Dhanya Maliakal	08fda2b662	in between in terms of mythen3 server, done with setdac and set power	2018-02-01 17:48:43 +01:00
Andrä Marie	b11b2dcfa9	in between stage	2018-01-31 11:45:34 +01:00
Andrä Marie	3782a56ef2	second My3 commit	2018-01-30 11:02:08 +01:00
Andrä Marie	3aeb3f58d1	first mythen3Server commit	2018-01-22 14:01:46 +01:00
Andrä Marie	92b4b3324e	first mythen3 server commit	2018-01-18 09:25:06 +01:00
Dhanya Maliakal	061abf7be0	jungfrau server: changes to ensure no update of detector during this, included power chip to read the status bit and give error if temp event is up	2018-01-11 16:52:08 +01:00
Dhanya Maliakal	2d6e4c95a2	temp_threshold, temp_control, temp_event done	2018-01-11 15:37:24 +01:00
Dhanya Maliakal	a87687199f	jungfrau server: minor typo in previous ocmmit	2018-01-11 11:36:40 +01:00
Dhanya Maliakal	d879379aa4	jungfrau server: incorporated transmission delay	2018-01-11 11:33:26 +01:00
Dhanya Maliakal	8fc3d97e78	jungfrau server: changed delay to trigger delay to have better trigger being caught	2018-01-11 09:26:50 +01:00
Dhanya Maliakal	beabd03be2	jungfrau server: (also previous commit) date changed to have only 6 nibbles in format yymmdd	2018-01-11 09:24:49 +01:00
Dhanya Maliakal	348a426242	updating to have developer's debug mode, resetfpga, programfpga and added api versioning, changed software date to only have date	2018-01-11 09:14:45 +01:00
Dhanya Maliakal	68d6c514a9	jungfrau server has same resetfpga, programfpga and debug mode as developer branch, eiger server has effects from debug flag, but not compiled	2018-01-10 15:49:40 +01:00
Dhanya Maliakal	59c0861131	Merge branch '3.0.1' into developer	2017-12-19 17:51:31 +01:00
Dhanya Maliakal	6690335971	gotthard server bug fix, temp read	2017-12-19 17:50:20 +01:00
Dhanya Maliakal	bc8c706150	updated gotthard server binaries (3.0.0.6 was already used in 3.0.1)	2017-12-19 17:44:32 +01:00
Dhanya Maliakal	e39bee0113	gotthard server bug fix, temp fail	2017-12-19 17:33:27 +01:00
Dhanya Maliakal	a4dc00b252	gotthard server binary update	2017-12-19 17:08:28 +01:00
Dhanya Maliakal	6438238b55	gotthard server bug fix, read temp	2017-12-19 17:06:45 +01:00
Anna Bergamaschi	31589ce352	added and fixed gotthard 25um file and zmq photon finder	2017-12-19 13:40:05 +01:00
Dhanya Maliakal	d2319459df	Merge branch '3.0.1' into developer	2017-12-11 18:03:01 +01:00
helfenstein_p	03de29de90	refine threadpool mutex, remove unlock before destroying, unlocking twice is undefined behaviour	2017-12-11 18:02:33 +01:00
Dhanya Maliakal	d6bdbf8524	Merge branch '3.0.1' into developer	2017-12-11 13:51:20 +01:00
Dhanya Maliakal	bb3e5351b4	solving warnings from latest linux	2017-12-11 13:51:11 +01:00
Dhanya Maliakal	1e849097ea	merge conflict fixed in filename bug	2017-12-08 12:09:10 +01:00
Dhanya Maliakal	e19d564364	bug fix no reciever could not set file name for mythen for eg., also bug fix that did not allow _s, _S, _p, _d as suffix to file name	2017-12-08 12:06:10 +01:00
Dhanya Maliakal	7577d03e75	Merge branch '3.0.1' into developer	2017-12-08 11:50:15 +01:00
Dhanya Maliakal	8c123982d2	get detector and receiver status only when necessary for stopacquisition	2017-12-08 11:50:10 +01:00
Dhanya Maliakal	6e876d79ee	conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop	2017-12-08 11:45:29 +01:00
Dhanya Maliakal	40a7b3983a	put some locking in stop acquisition and startandreadallnowait (bugs threadpool with more evernts than normal due to main and processing thread with no locks for detector releated stuff, zmqthreadpool not required, r_restreamstop moved to status stop when idle	2017-12-08 11:40:07 +01:00
Dhanya Maliakal	4718378d0a	corrected bug fix in r_restreamstop	2017-12-06 19:21:28 +01:00
Dhanya Maliakal	24c305ec59	solved conflicts from merge of version being used to binary	2017-12-06 19:07:06 +01:00
Dhanya Maliakal	bf9905ad2a	possible to use binary --version or -v to get the branch and versionid	2017-12-06 19:05:35 +01:00
Dhanya Maliakal	c4a242e10a	changed all variables from svn to git, included --version for receiver binary	2017-12-06 10:29:57 +01:00
Dhanya Maliakal	2f3dc8d109	Merge branch '3.0.1' into developer	2017-12-06 08:44:21 +01:00
Dhanya Maliakal	7436d6c8d3	updaterev	2017-12-06 08:44:07 +01:00
Dhanya Maliakal	98e09b29d5	merge conflict solved -1 in adc in gui	2017-12-05 15:39:02 +01:00
Dhanya Maliakal	7aaf95a565	-1 in getadc fixed in gui as well	2017-12-05 15:37:34 +01:00
Dhanya Maliakal	a51f4f1252	Merge branch '3.0.1' into developer	2017-12-05 14:49:32 +01:00
Dhanya Maliakal	7b1f935da2	allowing to read adcs/temp during acquire	2017-12-05 14:49:20 +01:00
Dhanya Maliakal	2d14da545d	Merge branch '3.0.1' into developer	2017-12-05 13:47:09 +01:00