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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
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 |
|
l_maliakal_d
|
e5ab585ab0
|
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@99 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 11:41:59 +00:00 |
|
l_maliakal_d
|
f0ec4036be
|
works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@94 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-13 09:39:02 +00:00 |
|
l_maliakal_d
|
fceb4d63f8
|
before configuremac for errorfree
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@87 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 14:39:21 +00:00 |
|
l_maliakal_d
|
16bfd722b3
|
changed a few parameters & nvar for writeConfigurationFile function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@84 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-10 14:31:37 +00:00 |
|
l_maliakal_d
|
d5271ecb46
|
added the phase shift at power on part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@79 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 14:06:34 +00:00 |
|
l_maliakal_d
|
1770045bce
|
Modified upto DAQ reg
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@75 951219d9-93cf-4727-9268-0efd64621fa3
|
2012-01-06 10:02:55 +00:00 |
|
l_maliakal_d
|
15a649c767
|
gotthard: everything done upto the gigabyte part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@72 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 17:08:03 +00:00 |
|
l_maliakal_d
|
57b892267a
|
gotthard a few changes
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@65 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-28 12:52:47 +00:00 |
|
l_maliakal_d
|
f1654363e0
|
interchanged both the temp_adc and temp_fpga values, since they were reading alternate values
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@63 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-25 10:55:22 +00:00 |
|
l_maliakal_d
|
05aaefb8f0
|
temp, confgain and hv works well, temp is alternate though
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@61 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-24 15:54:26 +00:00 |
|
l_maliakal_d
|
7de31bbe93
|
highvoltage again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@59 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-22 17:19:58 +00:00 |
|
l_maliakal_d
|
39d9ae8b7b
|
gotthard:highvoltage done
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@57 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-22 15:08:48 +00:00 |
|
l_maliakal_d
|
40e945889c
|
gotthard:incorporated the temperature read
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@52 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-11-18 16:56:14 +00:00 |
|
l_maliakal_d
|
5ec765e41e
|
dhanya-got rid of temp, setgotthard, getgotthard functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@37 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-10-18 09:02:05 +00:00 |
|
bergamaschi
|
ab27ab1c5d
|
Gotthard class implemented
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@34 951219d9-93cf-4727-9268-0efd64621fa3
|
2011-10-13 11:26:28 +00:00 |
|