|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f0450fbf5e
|
included DAQ reg editing in configuremac function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@299 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-10-18 09:07:55 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e0ad54dd46
|
updated getting detector mac address for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@262 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-19 13:58:03 +00:00 |
|
|
|
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 |
|
|
|
658589d15e
|
getmodulenumber gives back fff instead of screwing up reading random stuff
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@257 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-09-18 14:59:35 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f686a575b6
|
gotthard dacs only save 10 bits but firmware is more than 14-16 bits..so changed setdacreg to save only msb and accordingly ignore a difference of 3 while setting. Problem not detected earlier, communicationfuncs.c.Solution: commented out a part from receiveModule
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@215 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-08 16:18:46 +00:00 |
|
|
|
5aebcd4888
|
Changed everywhere from float to double, even mythenDetectorServer and the standalone files
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@206 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-08-02 12:58:08 +00:00 |
|
|
|
c04ed80b83
|
changed setDynamicRange to work if not set, set initial settings for num of frames, triggers,period,exptime etc to be 1
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@203 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-07-13 11:21:51 +00:00 |
|
|
|
4a9dfa12b2
|
the final working gotthard:with no errors in state
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@173 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-16 14:28:18 +00:00 |
|
|
|
d8e03f80e4
|
added reset for control reg and changed teh read and write register functions in server_funcs.c
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@168 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-04-03 09:35:23 +00:00 |
|
|
|
410725784c
|
got rid of many warnings and load darkimage and reset/read counter works now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@158 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-23 11:13:42 +00:00 |
|
|
|
145e38eac1
|
commenting out small printf changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@153 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-19 14:35:21 +00:00 |
|
|
|
bb12fe77d3
|
edited the updatedetector function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@148 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 15:22:43 +00:00 |
|
|
|
794ab4fdfc
|
updated the master, settiming, setextsig, setfpgasignal, synchronization functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@145 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-16 12:55:01 +00:00 |
|
|
|
c2846e72e7
|
changed fifo_data address, made fifo related stuff volatile, changed makefile to incorporate compiling image and program simultaneously
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@138 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-03-15 08:26:10 +00:00 |
|
|
|
bd54f179ed
|
status register updates
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@129 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-21 15:58:58 +00:00 |
|
|
|
7ed37b2e3f
|
moving digital test bit in configuremac function to the digital test function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@125 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 13:46:41 +00:00 |
|
|
|
44eea027f3
|
fixed dark/gain image correction
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@122 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-20 10:00:59 +00:00 |
|
|
|
a7e9cc1091
|
added the dark and gain image funcitions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@120 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-17 10:26:04 +00:00 |
|
|
|
ee2652f864
|
read_frame works and moved get temp to the getadc function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@116 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-16 14:16:38 +00:00 |
|
|
|
2e15e9c2db
|
works but usleep required
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@115 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-14 10:39:37 +00:00 |
|
|
|
ba833233b9
|
changed the register addresses
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@114 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-02-03 15:44:57 +00:00 |
|
|
|
266d13759c
|
a few changes for the fifo_read and the bus_r16
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@113 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-30 07:45:05 +00:00 |
|
|
|
af2c6b9bb2
|
named enums in mcb_funcs.h
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@112 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-23 15:33:19 +00:00 |
|
|
|
094a87ec7b
|
changes for testram which didnt work anyway
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@111 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-23 15:05:08 +00:00 |
|
|
|
41fea1fbcf
|
fixed testfpga, fixed pattern reg etc
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@110 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-19 11:05:37 +00:00 |
|
|
|
b7bb5a961b
|
fixed fpgaversion etc register problems
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@109 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-18 18:00:37 +00:00 |
|
|
|
918bcd3836
|
settings fixed
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@107 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-17 10:47:21 +00:00 |
|
|
|
3265f8b483
|
added the read write reg for debugging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@105 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 17:00:06 +00:00 |
|
|
|
429bedecca
|
included the ival for digital_test_bit and set adc_write_reg to all FFFFFFFF by default in DAQ reg initialization
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@103 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 13:40:58 +00:00 |
|
|
|
bbedcbc329
|
included serverMAC function for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@102 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 12:13:07 +00:00 |
|
|
|
8424decb72
|
complete before adding adcwritereg function from client
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@101 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 11:47:36 +00:00 |
|
