2038 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dhanya Maliakal	82669103af	added rapidjson lib	2016-09-16 17:22:44 +02:00
Dhanya Maliakal	57e741c36c	included json example with dummy values	2016-09-16 17:19:55 +02:00
Dhanya Maliakal	f517eb7a41	included json example with dummy values	2016-09-16 17:19:37 +02:00
Dhanya Maliakal	e9a3310042	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_receiver_software into zmqdata	2016-09-16 15:41:20 +02:00
Dhanya Maliakal	c16f251442	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata	2016-09-16 15:41:05 +02:00
Dhanya Maliakal	9c8f663b8e	done	2016-09-16 12:49:39 +02:00
Dhanya Maliakal	1263e80d21	done	2016-09-16 12:49:27 +02:00
Dhanya Maliakal	58713a90aa	works, need to do json header and send dataready	2016-09-15 17:16:00 +02:00
Dhanya Maliakal	1da4b07e73	works, need to do json header and send dataready	2016-09-15 17:15:55 +02:00
Dhanya Maliakal	7d86e62045	almost	2016-09-15 12:16:08 +02:00
Dhanya Maliakal	a821442b1a	almosst	2016-09-15 12:16:01 +02:00
Dhanya Maliakal	0f9a841c4a	almost done	2016-09-15 10:17:16 +02:00
Gemma Tinti	7a55866966	manual	2016-09-14 17:41:07 +02:00
Dhanya Maliakal	a80da4f677	Merge branch 'developer' into cmake	2016-09-14 14:38:54 +02:00
wang_x1	721249231f	add missing preprocessor macro	2016-09-14 12:03:39 +02:00
wang_x1	c80b1c9a91	add missing preprossor macros	2016-09-14 11:58:39 +02:00
Dhanya Maliakal	33807b7fac	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into zmqdata	2016-09-14 10:43:33 +02:00
Dhanya Maliakal	557eccb74d	almost there	2016-09-14 10:42:51 +02:00
Dhanya Maliakal	3ed738b949	almost done	2016-09-09 17:52:07 +02:00
Dhanya Maliakal	652d29f2d9	almost done	2016-09-09 17:51:36 +02:00
Anna Bergamaschi	988426dc96	Added adc command for chiptestboard	2016-09-05 10:49:47 +02:00
Dhanya Maliakal	258e671420	Merge branch 'cmake' into zmqdata	2016-09-05 10:43:13 +02:00
Dhanya Maliakal	5f6b4c1b79	in between	2016-09-05 10:09:49 +02:00
wang_x1	1044fc68ab	Merge branch 'cmake' of git.psi.ch:sls_detectors_software/sls_detectors_package into cmake	2016-09-02 16:28:28 +02:00
wang_x1	36904db3ca	now GUI is compatible with qwt 6.1	2016-09-02 16:28:01 +02:00
Dhanya Maliakal	4a7d7ec9e1	Merge branch 'developer' into cmake	2016-09-02 16:00:04 +02:00
Dhanya Maliakal	4eceb3b5f7	kinda	2016-09-02 15:47:28 +02:00
Gemma Tinti	c940607088	Merge branch '2.1-rc' into developer	2016-09-01 18:12:59 +02:00
Gemma Tinti	d2240884b4	settings dir for eiger	2016-09-01 18:10:49 +02:00
Gemma Tinti	90d2e6b82a	eiger manual	2016-09-01 15:50:36 +02:00
wang_x1	61d347b45d	FindQwt returns qwt verison ... This can be used to check compatibility	2016-09-01 14:42:47 +02:00
Dhanya Maliakal	5b3ab9a2b4	soewhere	2016-09-01 13:34:02 +02:00
wang_x1	13aa0599af	add variable for GUI libraries	2016-09-01 12:05:59 +02:00
Dhanya Maliakal	eea2809136	in between	2016-09-01 11:22:28 +02:00
wang_x1	59d8584a9e	README for compilation	2016-09-01 11:16:17 +02:00
wang_x1	0807e130e4	optionally build calibrationWizards	2016-09-01 11:14:29 +02:00
wang_x1	1a0550301b	cmake config file from ROOT with compatibility fixes	2016-09-01 11:13:27 +02:00
wang_x1	6152ca66b4	add cmake configuration	2016-08-31 20:55:00 +02:00
wang_x1	f8b62bba64	add cmake configuration	2016-08-31 20:54:06 +02:00
wang_x1	316ed783a8	add cmake configuration	2016-08-31 20:49:58 +02:00
Dhanya Maliakal	a3369a7d21	separated	2016-08-31 17:23:44 +02:00
Dhanya Maliakal	fbf6e2bff1	not done	2016-08-31 10:23:58 +02:00
Dhanya Maliakal	6adc373e18	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2016-08-30 16:14:13 +02:00
Dhanya Maliakal	8eea853a9a	updaterev	2016-08-30 16:13:24 +02:00
Dhanya Maliakal	aad1885bf5	updaterev	2016-08-30 16:13:18 +02:00
Dhanya Maliakal	be2bc15ab5	not done	2016-08-30 16:10:46 +02:00
Anna Bergamaschi	13aa48e3ec	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2016-08-30 09:30:53 +02:00
Anna Bergamaschi	d5f80831dd	Changes to jctb server to correctly change the power supplies	2016-08-30 09:30:31 +02:00
Dhanya Maliakal	cf34103d1f	Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_software into developer	2016-08-24 16:47:14 +02:00
Dhanya Maliakal	079c7dc169	removed setup_beb.txt not required	2016-08-24 16:47:05 +02:00