[Commit-gnuradio] r6084 - gnuradio/trunk/gr-radio-astronomy/src/python

[mleech]

Author: mleech
Date: 2007-07-29 21:46:03 -0600 (Sun, 29 Jul 2007)
New Revision: 6084

Modified:
   gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
Log:
Extended the range of the offset controls so that it now covers -750 to +750
Added bounds-checking/setting for both --calib_coeff and --calib_offset



Modified: gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py    
2007-07-30 01:26:03 UTC (rev 6083)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/usrp_ra_receiver.py    
2007-07-30 03:46:03 UTC (rev 6084)
@@ -148,8 +148,16 @@
         # Calibration coefficient and offset
         self.calib_coeff = options.calib_coeff
         self.calib_offset = options.calib_offset
-        self.orig_calib_offset = options.calib_offset
+        if self.calib_offset < -750:
+            self.calib_offset = -750
+        if self.calib_offset > 750:
+            self.calib_offset = 750
 
+        if self.calib_coeff < 1:
+            self.calib_offset = 1
+        if self.calib_coeff > 100:
+            self.calib_offset = 100
+
         self.integ = options.integ
         self.avg_alpha = options.avg
         self.gain = options.gain
@@ -374,8 +382,8 @@
         self.integ = options.integ
         if self.setimode == False:
             self.myform['integration'].set_value(int(options.integ))
-            self.myform['offset'].set_value(options.calib_offset)
-            self.myform['dcgain'].set_value(options.calib_coeff)
+            self.myform['offset'].set_value(self.calib_offset)
+            self.myform['dcgain'].set_value(self.calib_coeff)
         self.myform['average'].set_value(int(options.avg))
 
 
@@ -521,7 +529,7 @@
 
         if self.setimode == False:
             myform['offset'] = form.slider_field(parent=self.panel, 
sizer=vbox3,
-                label="Post-Detector Offset", weight=1, min=-500, max=500, 
+                label="Post-Detector Offset", weight=1, min=-750, max=750, 
                 callback=self.set_pd_offset)
             vbox3.Add((2,0), 0, 0)
             myform['dcgain'] = form.slider_field(parent=self.panel, 
sizer=vbox3,