4982 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Frojdh	8f4009bfb6	WIP	2019-05-28 13:27:43 +02:00
Erik Frojdh	e64f57ecac	receiver	2019-05-28 13:12:43 +02:00
Dhanya Thattil	938e1e87ff	bugfix: vref adc voltage	2019-05-28 12:31:19 +02:00
Dhanya Thattil	82308daf7b	jungfrau server bug fix: vref adc voltage overwritten by default for ctb	2019-05-28 12:28:44 +02:00
Erik Frojdh	57170b1c80	pinned conda build	2019-05-28 12:12:05 +02:00
Erik Frojdh	6a81e779c1	replaced server with receiver bug	2019-05-28 11:35:41 +02:00
Dhanya Thattil	aa99309caf	Merge branch 'jungfrau2.0' into developer	2019-05-28 10:32:01 +02:00
Dhanya Thattil	a0f697ce71	jungfrau feature change: outer is default and connects to bottom, inner is secondary but connects to top	2019-05-28 10:31:36 +02:00
Erik Frojdh	14dd753397	updated build nr	2019-05-27 16:59:42 +02:00
Dhanya Thattil	7e43472b7b	minor help editing	2019-05-27 16:29:56 +02:00
Erik Frojdh	ac7c85029c	Merge branch 'developer' of github.com:slsdetectorgroup/slsDetectorPackage into developer	2019-05-27 16:22:04 +02:00
Erik Frojdh	639ea0eb56	Merge branch 'condabuild' into developer	2019-05-27 16:11:57 +02:00
Dhanya Thattil	659e204b35	solved conflicts	2019-05-27 15:05:40 +02:00
Dhanya Thattil	2c2fb7358c	jungfrau board 2 adc defines, full speed limitation for old boards	2019-05-27 15:04:13 +02:00
Erik Frojdh	d3646f0ac5	pinned conda-build version	2019-05-27 14:33:17 +02:00
Erik Frojdh	e4367c9ab1	checking for nullptr	2019-05-27 14:20:40 +02:00
Dhanya Thattil	54a396065d	ctb versioning bug fix	2019-05-27 14:08:41 +02:00
Dhanya Thattil	7fdab08256	ctb receiver fix: extract in 8 bit batches instead of 32 for less padding	2019-05-27 11:30:54 +02:00
Erik Frojdh	8ebc0f2644	uniqe ptr for receiver	2019-05-27 11:28:59 +02:00
Erik Frojdh	0972b803dd	Merge branch 'developer' into mysocket	2019-05-27 09:12:10 +02:00
Erik Frojdh	e2ef043e04	removed old configure file	2019-05-24 16:31:25 +02:00
Erik Frojdh	43dc9df6db	removed unused scripts	2019-05-24 10:25:34 +02:00
Dhanya Thattil	10f89599e0	bug fix: hdf5 printError still called once. replcaed with printErrorStack	2019-05-22 19:11:35 +02:00
Erik Frojdh	452fd1e457	new defaults for CMake	2019-05-22 09:45:08 +02:00
Dhanya Thattil	7b817fa194	Merge branch 'developer' into jungfrauv0.8	2019-05-17 19:21:01 +02:00
Dhanya Thattil	1a1c6b9b42	jungfrau server: feature finish: switching between 2 interfaces	2019-05-17 19:19:03 +02:00
Erik Frojdh	3e5d34647e	updated test for argument parser	2019-05-17 10:00:49 +02:00
Erik Frojdh	591ff53b84	fixed MacAddr 0 output	2019-05-17 09:08:13 +02:00
Erik Frojdh	fff79fbbb6	const char* for command	2019-05-16 16:58:03 +02:00
Erik Frojdh	a11fc31c49	merge	2019-05-16 15:18:14 +02:00
Erik Frojdh	415567006f	non used header	2019-05-16 15:16:11 +02:00
Dhanya Thattil	1943e77b24	server interface: ip made to use inet_ntop, mac address and ip to string made common	2019-05-16 15:12:42 +02:00
Erik Frojdh	e6ad80e187	removed cout	2019-05-16 15:10:24 +02:00
Erik Frojdh	c30c6bb883	fixed uninitialized pointer	2019-05-16 15:00:15 +02:00
Erik Frojdh	615d1b1f33	refactor	2019-05-16 14:27:16 +02:00
Dhanya Thattil	9315768159	client bug fix: smaller ips convert to hex	2019-05-16 14:07:58 +02:00
Erik Frojdh	1db1b0307c	init	2019-05-16 11:50:35 +02:00
Erik Frojdh	0d98bd0048	init	2019-05-16 11:43:12 +02:00
Erik Frojdh	54983c5fd0	removing constexpr	2019-05-16 11:36:25 +02:00
Erik Frojdh	9a8773d9a5	ip test	2019-05-16 11:25:18 +02:00
Erik Frojdh	c6651df1b2	remove mySock	2019-05-16 11:14:03 +02:00
Erik Frojdh	e252b8e0e9	receiver socket	2019-05-15 17:51:48 +02:00
Erik Frojdh	40c2d9f760	try for accept	2019-05-15 12:17:32 +02:00
Erik Fröjdh	f1a1391866	Factored out time conversion (#23) ... * time conversion * with comment * lround in slsDetectorCommand	2019-05-15 10:22:38 +02:00
Erik Frojdh	c632badb55	Merge branch 'developer' into mysocket	2019-05-15 10:10:13 +02:00
Erik Frojdh	8f8d565e4e	work	2019-05-15 10:09:54 +02:00
Erik Frojdh	f64facee0c	Merge branch 'developer' into mysocket	2019-05-15 10:02:43 +02:00
Erik Fröjdh	877bdb8979	Using FixedCapacityContainer for rxDbitList (#22) ... * fixed capacity container * changed shm date	2019-05-15 09:16:18 +02:00
Erik Frojdh	9d5848d0d6	inprogress	2019-05-15 09:12:14 +02:00
Erik Frojdh	bf0847e967	removed ClientInterface	2019-05-15 08:38:49 +02:00