Commit Graph

3349 Commits

Author SHA1 Message Date
Erik Frojdh afd2cd1923 fimnc 2018-01-29 16:40:37 +01:00
Erik Frojdh 2963d5c401 detector defs 2018-01-29 16:38:26 +01:00
Erik Frojdh 2f59d58a50 receiver funcs 2018-01-29 16:33:35 +01:00
Erik Frojdh ca059db4e9 path 2018-01-29 16:30:44 +01:00
Erik Frojdh 43a1d73522 ansi.h 2018-01-29 16:28:31 +01:00
Erik Frojdh 87d539a040 header 2018-01-29 16:18:12 +01:00
Erik Frojdh 3edac42ed3 remove png 2018-01-25 15:16:56 +01:00
Erik Frojdh 17d26869b5 specific libpng version 2018-01-25 14:32:04 +01:00
Erik Frojdh 933d34590b find png 2018-01-25 13:47:19 +01:00
Erik Frojdh eb57e3a1d3 gui install 2018-01-24 10:17:24 +01:00
Erik Frojdh 2cc5557ec8 o 2018-01-24 10:05:45 +01:00
Erik Frojdh 7f80b77060 t 2018-01-24 09:22:55 +01:00
Erik Frojdh ab4f364267 target zmq 2018-01-24 09:20:27 +01:00
Erik Frojdh 3a18a0a6cf o 2018-01-23 17:49:40 +01:00
Erik Frojdh fd03cf5b0f and more targets 2018-01-23 17:46:35 +01:00
Erik Frojdh b3d6bc1800 targets 2018-01-23 17:37:54 +01:00
Erik Frojdh 0242db7e7a target for install 2018-01-23 17:16:26 +01:00
Gemma Tinti 41240ac135 eiger manual 2018-01-19 16:05:15 +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
Dhanya Maliakal 0649626842 made the color fix for black/white backgrounds 2017-12-14 14:29:07 +01:00
Dhanya Maliakal e7f7e0f280 Merge remote branch 'slsDetectorCalibration/3.0.1' into 3.0.1 2017-12-12 11:14:30 +01:00
Dhanya Maliakal 735b8ea206 Merge remote branch 'slsDetectorCalibration/3.0' into 3.0 2017-12-12 11:14:24 +01:00
Dhanya Maliakal 8da5b8318f removed a few stuff from gitignore 2017-12-12 09:05:39 +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 bb3e5351b4 solving warnings from latest linux 2017-12-11 13:51:11 +01:00
Dhanya Maliakal d6a4f83a99 ignore misleading indentation 2017-12-11 11:13:25 +01:00
Dhanya Maliakal 29d66e455d possible to make only certain components of system 2017-12-11 10:51:19 +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 8c123982d2 get detector and receiver status only when necessary for stopacquisition 2017-12-08 11:50:10 +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 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 7436d6c8d3 updaterev 2017-12-06 08:44:07 +01:00
Dhanya Maliakal b498043ea6 remember old read freq if not 0 in gui 2017-12-05 16:04:10 +01:00
Dhanya Maliakal 7aaf95a565 -1 in getadc fixed in gui as well 2017-12-05 15:37:34 +01:00
Dhanya Maliakal 7b1f935da2 allowing to read adcs/temp during acquire 2017-12-05 14:49:20 +01:00
Dhanya Maliakal ce1ec97571 some indentation in writing config file 2017-12-05 13:47:01 +01:00
Dhanya Maliakal d00c837977 updated write config and write parameters list 2017-12-05 13:41:16 +01:00
Dhanya Maliakal 536203b6dc one repo so need for gitall.sh 2017-12-05 11:16:22 +01:00
Dhanya Maliakal 65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +01:00
Dhanya Maliakal 61791c078c Merge remote branch 'slsDetectorGui/3.0.1' into 3.0.1 2017-12-04 16:48:17 +01:00
Dhanya Maliakal 36802cdb14 Merge remote branch 'slsReceiverSoftware/3.0.1' into 3.0.1 2017-12-04 16:48:17 +01:00
Dhanya Maliakal e26cf3b673 Merge remote branch 'slsDetectorSoftware/3.0.1' into 3.0.1 2017-12-04 16:48:15 +01:00
Dhanya Maliakal aab62fccc1 Merge remote branch 'slsDetectorGui/3.0' into 3.0 2017-12-04 16:48:09 +01:00
Dhanya Maliakal 73ce4abd58 Merge remote branch 'slsReceiverSoftware/3.0' into 3.0 2017-12-04 16:48:08 +01:00
Dhanya Maliakal c12b137b79 Merge remote branch 'slsDetectorSoftware/3.0' into 3.0 2017-12-04 16:48:07 +01:00