167 Commits

Author SHA1 Message Date
l_maliakal_d
6778060b56 changed dynamic range of gotthard, moved get temp to getadc function, added 3 debugging functions just for now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@117 951219d9-93cf-4727-9268-0efd64621fa3
2012-02-16 14:23:05 +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
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
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
302a70d59b Using myMod-reg for settings for the gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@108 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-17 10:48:01 +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
3e8f916561 implemented the read write reg for debugging
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@106 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 17:00:26 +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
89c00ffda3 added adc_write to simply write to registers and read back, instead of making more functions
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@104 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 13:53:48 +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
e8e1157c1a included serverMAC function for gotthard
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@100 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 11:43:03 +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
6abd580f95 commented out stuff to make sure they are not included
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@98 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:45:43 +00:00
l_maliakal_d
fa369ca22f commented out everything to do with out detectors including multislsdetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@97 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:45:08 +00:00
l_maliakal_d
19f7712e65 changes which commented out virtual for child functions and some other changes for configuremac and setclientip and setclientmac
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@96 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:44:04 +00:00
l_maliakal_d
c50716f623 reverted the change: no struct for tse_conf etc in here anymore
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@95 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:39:56 +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
9f7fe775e8 works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@93 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:38:29 +00:00
l_maliakal_d
6b6fe986d4 works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@92 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:38:20 +00:00
l_maliakal_d
af1dab372e works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@91 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:38:16 +00:00
l_maliakal_d
913d1c5310 works with gigabit
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@90 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-13 09:33:37 +00:00
l_maliakal_d
88d7f7ffd2 added the enet conf structs
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@89 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-12 08:20:29 +00:00
l_maliakal_d
80bbea0b6f done update
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@88 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 17:53:32 +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
20bc38fe1a reverting to before configuremac command for error-free
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@86 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:38:29 +00:00
l_maliakal_d
784c423b55 changed the Makefile to what it was before
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@85 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:36:06 +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
bergamaschi
9a93a5f019 all detectors merged into slsDetector
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@83 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 14:14:52 +00:00
l_maliakal_d
ef65cc8b54 added the setclientmac function
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@82 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 13:41:53 +00:00
l_maliakal_d
1a85d9f691 changed the setClientIP function and included 2 header files for IP validation
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@81 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 09:31:52 +00:00
l_maliakal_d
0fd14ad113 a few more changes for phaseshiftonce
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@80 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-10 09:29:50 +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
efb30128fd changed RET to RETVAL for setDetectorType function to compile
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@78 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:34:08 +00:00
l_maliakal_d
c7d0330f55 got rid of some parameters in read-write of config file
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@77 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:13:16 +00:00
l_maliakal_d
77d21d16f9 added the set & get functions for clientIP and clientMAC
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@76 951219d9-93cf-4727-9268-0efd64621fa3
2012-01-06 10:11:56 +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
bergamaschi
c9a314d829 forces update
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@74 951219d9-93cf-4727-9268-0efd64621fa3
2011-12-09 15:48:26 +00:00
l_maliakal_d
a77a6bac21 gotthard: everything done except gigabyte and adcwrite upto now
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@73 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-29 09:19:35 +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
05705a907a gotthard settings name change again
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@71 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:18:44 +00:00
l_maliakal_d
5c4dfacadb changed name of settings
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@70 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:07:01 +00:00
l_maliakal_d
5eab29ed13 settings:upto a highgain
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@69 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:05:53 +00:00
l_maliakal_d
0044bdf0fd gotthard: moving confgain to configuration part
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@68 951219d9-93cf-4727-9268-0efd64621fa3
2011-11-28 15:02:39 +00:00