l_maliakal_d
|
922bc929c8
|
fixed connect receiver problem from previous version
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@495 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-15 11:02:57 +00:00 |
|
l_maliakal_d
|
1882454cf3
|
udpip and hostname order for write config,receiver returns quicker when no data or mismatched indices
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@491 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-13 15:34:53 +00:00 |
|
l_maliakal_d
|
96d9e5d078
|
some revision variable problem resolved in slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@484 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-06 15:26:29 +00:00 |
|
l_maliakal_d
|
bf429705bf
|
svn rev changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@482 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-03-06 09:18:16 +00:00 |
|
l_maliakal_d
|
1ef4ace390
|
updated bug-crashing when file write disabled and included file pointer in call back function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@474 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 16:08:03 +00:00 |
|
l_maliakal_d
|
0e9b32fb33
|
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@472 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 08:35:12 +00:00 |
|
l_maliakal_d
|
3075b8ae11
|
made advanced tab detector dependent. each set mac adress etc is done via slsdetector and not multi
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@471 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-26 08:34:41 +00:00 |
|
l_maliakal_d
|
aae7c68f65
|
concatenated filenames for the gui when using receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@469 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-22 11:26:43 +00:00 |
|
l_maliakal_d
|
b98545814f
|
included setroi for multidet
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@468 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-21 16:09:57 +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_cartier
|
6adeca51ed
|
gotthardServer: added pedestal substraction function (not yet working properly).
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@462 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-15 17:13:26 +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
|
11eea73138
|
just fixed the links in gotthard server
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@458 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-11 13:46:16 +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
|
2c9f05e8fd
|
added a virtual make file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@455 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-02-11 09:57:43 +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
|
2c38aedcf8
|
with all the svn revisions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@431 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-16 13:59:30 +00:00 |
|
l_maliakal_d
|
4fca3d302a
|
cleaned up a bit of gotthard detector server side
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@430 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-16 10:39:38 +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
|
5d88f249a4
|
localhost works as a receiver now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@426 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-14 16:40:10 +00:00 |
|
l_maliakal_d
|
4cc8566311
|
included a current frame index whch is different than file frame index for gotthard, even when readout through blackfin, for mythen both will alwys be incrememnted by one; gotthard server all of them should be consistent for 32 bit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@425 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-11 17:20:57 +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
|
af2d3d87b3
|
not really a change in the server, but this seems to have worked for cpu transfer after changing vhdl code
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@420 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-10 15:54:45 +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
|
16f74ebdf2
|
receiver +4 and +10 to get only data out of the whole data with frame index etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@418 951219d9-93cf-4727-9268-0efd64621fa3
|
2013-01-08 14:04:50 +00:00 |
|
l_maliakal_d
|
6f793abca8
|
added receiver mac to be compatible with aldos receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@417 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-20 11:11: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
|
b62f3dc1dd
|
get version number for receiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@414 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-18 14:34:29 +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
|
8cad188c59
|
got rid of svnInfo class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@412 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-17 16:43:46 +00:00 |
|
bergamaschi
|
5f74a469eb
|
svn version from svn works for text client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@411 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-17 15:47:36 +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
|
452812aaf8
|
changed cleanfifo and setdaq
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@367 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-12-05 16:39:35 +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
|
2338de4054
|
added receiver in here
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@328 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-30 10:06:58 +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
|
db249237c9
|
fixed error with cleaning fifo
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@316 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-26 10:21:09 +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
|
964ff9006f
|
using daq register function in configuremac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@308 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 12:08:20 +00:00 |
|