Commit Graph

461 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
35de710225 included network tab in gui, correctedmulti to be able to clear sls detectors error mask,included coud not set up network parameter error
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@454 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-07 17:34:09 +00:00
9fe499e20c made ports reusable and added cannot connect to these ports in error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@453 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 17:36:03 +00:00
1d03be832f added error mask properly inherited by base; mask exist only for cannot connect to detector, receiver and could not configure mac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@452 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-06 15:22:45 +00:00
7a55ed9a74 frame index now is set via the multi and sls and sent to receiver when frames/cycles is set, resetframescaught doesnt decide if frames needed, possible problem in acquire scans,gets #frames/cycles from detector,but needed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@451 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-05 11:23:46 +00:00
ed4aaa83ce changed getframeindex and getacquisitionindex to return proper values without checking framescaught
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@450 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 16:04:19 +00:00
c420906b0c uncommented the part about eth in slsreceiver
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@449 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 12:50:53 +00:00
aff0123672 a rough draft of send and rx via fifo with gerds bit file and software
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@448 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 12:45:50 +00:00
247e84ba7b Modifications for circular FIFO and memory leak corrected done during beamtime - to be tested
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@447 951219d9-93cf-4727-9268-0efd64621fa3
2013-02-04 10:13:48 +00:00
09d9e2fd03 forgot to check in error_defs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@446 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-31 12:40:28 +00:00
341e026f4e shortframes work with gui enabled
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@445 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-31 11:13:21 +00:00
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
7d96d8b3af tried fifo change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@443 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-30 14:33:39 +00:00
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
1ee23e21d5 basic tcp communication with writing /reading to fpga PLB_LL_FIFO_REG_CTRL works
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@441 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-29 16:34:02 +00:00
11924d1a51 forgot to add some files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@440 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:10:46 +00:00
a9d0a3faa4 forgot to add some files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@439 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:10:22 +00:00
39368180cb forgot to add some files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@438 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:09:51 +00:00
2b31e23f75 forgot to add some server files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@437 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:08:22 +00:00
55bfeb6044 added eiger server to svn
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@436 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 18:05:55 +00:00
1847eaf1d7 modified the server so that it has a firmware class as well to read/write fpga
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@435 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-28 08:02:37 +00:00
a4206208c9 implemented a trial error class
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@434 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-22 11:16:37 +00:00
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
47a9d34991 corected the rx_udpport change segmentation fault
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@432 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-17 10:53:39 +00:00
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
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
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
a2ae2eea95 changed receiver config to be rx_tcpport and not dataport, also -f
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@428 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-15 18:05:56 +00:00
f6a3254c2f got rid of local host because pcname works on its own
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@427 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-15 10:26:37 +00:00
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
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
9cfdbdac67 included sls defs first
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@424 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:59:09 +00:00
9f1825b193 uncommented ifdef verbose
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@423 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 09:52:35 +00:00
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
da2fd8369d not much change
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@421 951219d9-93cf-4727-9268-0efd64621fa3
2013-01-11 07:55:02 +00:00
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
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
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
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
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
5b4a90db29 checked in receiver svn info
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@415 951219d9-93cf-4727-9268-0efd64621fa3
2012-12-18 15:02:09 +00:00
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
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
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