90 Commits

Author SHA1 Message Date
Dhanya Maliakal
56aaaaf182 fixed rate correction to not include 16 bit dr 2016-08-08 15:52:09 +02:00
Dhanya Maliakal
a8fc34c92b included propix for client 2015-07-21 16:26:50 +02:00
Maliakal Dhanya
d8c7201749 module udpport2 2014-09-26 11:18:59 +02:00
Maliakal Dhanya
c5a4f357bf got rid of extra servers for eiger, converted to c and it works 2014-08-29 16:41:19 +02:00
Maliakal Dhanya
828a2dbd17 10Gbe, some functions in gotthard and eiger servers including mv in dacs, mv in dacs, changing settings file 2014-07-11 13:06:48 +02:00
Maliakal Dhanya
73ba765647 git version history 2014-06-03 13:55:41 +02:00
l_maliakal_d
97aa35a388 small error couts
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@653 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-15 12:34:25 +00:00
l_maliakal_d
58cf66cf10 clearer error printout for gotthard cant set probes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@650 951219d9-93cf-4727-9268-0efd64621fa3
2013-08-12 12:22:19 +00:00
l_maliakal_d
f0e30926fe fixed part of mythen module 6 problem: offsets should be updated after set nmod, still need to fix numchips in one direction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@542 951219d9-93cf-4727-9268-0efd64621fa3
2013-05-06 16:23:13 +00:00
l_maliakal_d
679a7dfd7e a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@529 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 12:07:10 +00:00
l_maliakal_d
fb47f3d4fc a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@528 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 09:10:46 +00:00
l_maliakal_d
671c30f30a a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@527 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 09:02:40 +00:00
l_maliakal_d
528b34d2b5 a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@526 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:59:28 +00:00
l_maliakal_d
a7bc91da1d a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@525 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:56:43 +00:00
l_maliakal_d
055c557931 a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@523 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:36:29 +00:00
l_maliakal_d
507debd7f4 a check in gotthard server to ensure that it is really gotthard and not moench module
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@522 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-26 08:29:43 +00:00
l_maliakal_d
61a1356bc3 moench server first draft
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@509 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:44:19 +00:00
l_maliakal_d
c5b3f10669 changed gotthard server type to be defined in makefile and not in mcb
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@508 951219d9-93cf-4727-9268-0efd64621fa3
2013-04-11 12:32:26 +00:00
l_maliakal_d
bc61fd4883 included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@463 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-21 15:53:07 +00:00
l_maliakal_d
51a008784b first time detector starts, chip of interest was not configured at all and this was never configured if via blackfin, fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@461 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-12 13:59:26 +00:00
l_maliakal_d
a48ae49ae4 took off start state machine for startAndReadAll by mistake
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@460 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 17:22:46 +00:00
l_maliakal_d
e324d5ec83 threshold for gottahrd shouldnt exist
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@459 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 13:54:14 +00:00
l_maliakal_d
2a1755df50 just fixed the links in gotthard server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@457 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 13:45:42 +00:00
l_maliakal_d
4a4efda69f added calibrate pedestal for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@456 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-11 10:45:41 +00:00
l_maliakal_d
22bd638f64 the gotthard receiver works for short frames, gui commented out for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@444 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 16:41:36 +00:00
l_maliakal_d
2176620ca4 server should be up to date
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@442 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 14:33:03 +00:00
l_maliakal_d
3be74327f3 fixed clean fifo roi_flag error(being set after cleanfifo called)
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@433 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 10:23:53 +00:00
l_maliakal_d
fc2e1cedee probes was screwing up gotthard data, changed in places to be only for data
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@429 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-16 10:16:44 +00:00
l_maliakal_d
42fe126f33 by default readout through blackfin upon server startup
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@422 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:17:41 +00:00
l_maliakal_d
1c275c28bd the functions setspeed, setflags and execute trimming should do nothing in the server and send back a fail to client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@419 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-09 10:12:53 +00:00
l_maliakal_d
83342b6d5b got rid of firmware svn version, combined with detector version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@416 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-18 15:04:19 +00:00
l_maliakal_d
1d9ae4e316 updated server firmware and software versions to reflect an svn date plus svn rev
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@413 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-17 17:01:03 +00:00
l_maliakal_d
f74ea5191d included detector ip and detector mac defaults in client, which can be specified in config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@374 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-10 13:58:47 +00:00
l_cartier
9d9d00cdc7 added adcprepare in server and updaed TOKEN_RESTART_DELAY and TOKEN_TIMING_REV
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@373 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-10 11:22:37 +00:00
l_maliakal_d
ac2c4211e2 included settting up of udpport from client and getting receiver mac from receiver and also listening to only one ethernet interface
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@371 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-06 14:27:52 +00:00
l_maliakal_d
f6ff1359aa implemented server to have a phase shift input
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@341 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-13 12:31:41 +00:00
l_maliakal_d
8f7872d056 gotthard receiver works so far without cpu file write and tcp generic socket lock
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@337 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-12 15:48:28 +00:00
l_maliakal_d
33fa69d546 configuremac doesnt return a retval, separated setdaqregister and clean fifo, included clean fifo before startstatemachine, set delay and gates to 0 at start of server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@335 951219d9-93cf-4727-9268-0efd64621fa3
2012-11-08 08:21:33 +00:00
l_maliakal_d
f37cd6640f acquire works with receiver now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@324 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-29 17:00:53 +00:00
l_maliakal_d
9b323c9e7e included registers.h in server_funcs.c
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@311 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 08:17:58 +00:00
bergamaschi
da5759bed6 changes of get detector status by Anna-with error message
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@310 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 08:12:42 +00:00
bergamaschi
e577cd369e changes of get detector status by Anna
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@309 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-24 08:09:21 +00:00
l_maliakal_d
524160422f using daq register function in configuremac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@300 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-18 09:27:35 +00:00
l_maliakal_d
6cf4fc5e43 editing configuremac to include adc number
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@298 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-16 15:31:46 +00:00
l_maliakal_d
733f5b1f3e made sure that server knows whether to stop sending to receiver even if receiver is down, made sure error in configuremac is shown when doing start receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@292 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-12 10:20:19 +00:00
l_maliakal_d
29a540818f configuremac after starting receiver, also telling the server to send packets to receiver or cpu with receiver start and receiver stop
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@290 951219d9-93cf-4727-9268-0efd64621fa3
2012-10-11 12:53:48 +00:00
l_maliakal_d
32621b1916 included command to get detector firmware svn version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@261 951219d9-93cf-4727-9268-0efd64621fa3
2012-09-19 12:09:00 +00:00
l_maliakal_d
cd7cfadac8 changes in gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@225 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-21 13:38:01 +00:00
l_maliakal_d
5407fdcf6e changed dacs and adcs values to be an int between sockets
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@222 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-15 17:07:55 +00:00
l_maliakal_d
73424d0376 somehow it works with the receive adc in receieveModule blocked. added DDACS_DOUBLE to makefile to make it work with client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@221 951219d9-93cf-4727-9268-0efd64621fa3
2012-08-15 15:33:04 +00:00