[Commit-gnuradio] r3580 - in gnuradio/branches/developers/jcorgan/pager: config ezdop/src/firmware gnuradio-core/src/lib/io gnuradio-examples/python/channel-coding/fsm_files gr-pager/src gr-radio-astronomy/src/python gr-wxgui/src/python

[jcorgan]

Author: jcorgan
Date: 2006-09-18 22:46:55 -0600 (Mon, 18 Sep 2006)
New Revision: 3580

Modified:
   gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4
   gnuradio/branches/developers/jcorgan/pager/ezdop/src/firmware/dopctrl.c
   
gnuradio/branches/developers/jcorgan/pager/gnuradio-core/src/lib/io/gr_oscope_guts.cc
   
gnuradio/branches/developers/jcorgan/pager/gnuradio-examples/python/channel-coding/fsm_files/
   gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_message.h
   
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/local_calibrator.py
   
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_psr_receiver.py
   
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_ra_receiver.py
   gnuradio/branches/developers/jcorgan/pager/gr-wxgui/src/python/scopesink.py
Log:
Merged r3546:3579 of trunk into wip directory.

Modified: gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4   
2006-09-19 04:02:57 UTC (rev 3579)
+++ gnuradio/branches/developers/jcorgan/pager/config/grc_gr_pager.m4   
2006-09-19 04:46:55 UTC (rev 3580)
@@ -14,8 +14,8 @@
 dnl 
 dnl You should have received a copy of the GNU General Public License
 dnl along with GNU Radio; see the file COPYING.  If not, write to
-dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl Boston, MA 02111-1307, USA.
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_PAGER],[
     GRC_ENABLE([gr-pager])

Modified: 
gnuradio/branches/developers/jcorgan/pager/ezdop/src/firmware/dopctrl.c
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/ezdop/src/firmware/dopctrl.c     
2006-09-19 04:02:57 UTC (rev 3579)
+++ gnuradio/branches/developers/jcorgan/pager/ezdop/src/firmware/dopctrl.c     
2006-09-19 04:46:55 UTC (rev 3580)
@@ -33,7 +33,7 @@
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
-#include <avr/signal.h>
+#include <compat/deprecated.h> // for timer_enable_int
 #include "dopctrl.h"
 
 #define LED 0

Modified: 
gnuradio/branches/developers/jcorgan/pager/gnuradio-core/src/lib/io/gr_oscope_guts.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gnuradio-core/src/lib/io/gr_oscope_guts.cc
       2006-09-19 04:02:57 UTC (rev 3579)
+++ 
gnuradio/branches/developers/jcorgan/pager/gnuradio-core/src/lib/io/gr_oscope_guts.cc
       2006-09-19 04:46:55 UTC (rev 3580)
@@ -54,7 +54,7 @@
 gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, 
gr_msg_queue_sptr msgq)
   : d_nchannels (nchannels),
     d_msgq (msgq), 
-    d_trigger_mode (gr_TRIG_POS_SLOPE),
+    d_trigger_mode (gr_TRIG_AUTO),
     d_trigger_channel (0),
     d_sample_rate (sample_rate),
     d_update_rate (20),


Property changes on: 
gnuradio/branches/developers/jcorgan/pager/gnuradio-examples/python/channel-coding/fsm_files
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_message.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_message.h    
    2006-09-19 04:02:57 UTC (rev 3579)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-pager/src/pager_flex_message.h    
    2006-09-19 04:46:55 UTC (rev 3580)
@@ -27,7 +27,7 @@
 class pager_flex_message;
 typedef boost::shared_ptr<pager_flex_message> pager_flex_message_sptr;
 
-pager_flex_message_sptr pgr_make_flex_message();
+pager_flex_message_sptr pager_make_flex_message();
 
 /*!
  * \brief flex message description

Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/local_calibrator.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/local_calibrator.py
        2006-09-19 04:02:57 UTC (rev 3579)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/local_calibrator.py
        2006-09-19 04:46:55 UTC (rev 3580)
@@ -65,7 +65,7 @@
 
     rainbow_file = open (filenamestr+".tpdat","a")
   
-    r = (data / 4096.0)
+    r = (data / 409.6)
     flt = "%6.3f" % r
     #r = calib_default_total_power(data)
     inter = globals()["calib_decln"]

Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_psr_receiver.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_psr_receiver.py
       2006-09-19 04:02:57 UTC (rev 3579)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_psr_receiver.py
       2006-09-19 04:46:55 UTC (rev 3580)
@@ -16,8 +16,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 # 
 
 
@@ -219,7 +219,7 @@
         self.decim = int(decim)
 
         # So that we can view 4 pulses in the pulse viewer window
-        FOLD_MULT=4
+        FOLD_MULT=1
 
         # determine the daughterboard subdevice we're using
         self.subdev = usrp.selected_subdev(self.u, options.rx_subdev_spec)
@@ -235,7 +235,10 @@
         # Set baseband filter bandwidth if DBS_RX:
         #
         if self.cardtype == usrp_dbid.DBS_RX:
-            self.subdev.set_bw((self.u.adc_freq() / self.u.decim_rate())/2)
+            lbw = input_rate / 2
+            if lbw < 1.0e6:
+                lbw = 1.0e6
+            self.subdev.set_bw(lbw)
 
         #
         # We use this as a crude volume control for the audio output

Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_ra_receiver.py
        2006-09-19 04:02:57 UTC (rev 3579)
+++ 
gnuradio/branches/developers/jcorgan/pager/gr-radio-astronomy/src/python/usrp_ra_receiver.py
        2006-09-19 04:46:55 UTC (rev 3580)
@@ -16,8 +16,8 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
 # 
 
 from gnuradio import gr, gru
@@ -290,7 +290,10 @@
 
         # Set analog baseband filtering, if DBS_RX
         if self.cardtype == usrp_dbid.DBS_RX:
-            self.subdev.set_bw((self.u.adc_freq() / self.u.decim_rate())/2)
+            lbw = (self.u.adc_freq() / self.u.decim_rate()) / 2
+            if lbw < 1.0e6:
+                lbw = 1.0e6
+            self.subdev.set_bw(lbw)
 
         # Tell calibrator our declination as well
         calib_set_decln(self.decln)

Modified: 
gnuradio/branches/developers/jcorgan/pager/gr-wxgui/src/python/scopesink.py
===================================================================
--- gnuradio/branches/developers/jcorgan/pager/gr-wxgui/src/python/scopesink.py 
2006-09-19 04:02:57 UTC (rev 3579)
+++ gnuradio/branches/developers/jcorgan/pager/gr-wxgui/src/python/scopesink.py 
2006-09-19 04:46:55 UTC (rev 3580)
@@ -310,7 +310,7 @@
         ctrlbox.Add (self.trig_chan_choice, 0, wx.ALIGN_CENTER)
 
         self.trig_mode_choice = wx.Choice (self, 1005,
-                                           choices = ['Pos', 'Neg', 'Auto'])
+                                           choices = ['Auto', 'Pos', 'Neg'])
         self.trig_mode_choice.SetToolTipString ("Select trigger slope or Auto 
(untriggered roll)")
         wx.EVT_CHOICE (self, 1005, self.trig_mode_choice_event)
         ctrlbox.Add (self.trig_mode_choice, 0, wx.ALIGN_CENTER)