[Commit-gnuradio] r4418 - in gnuradio/branches/developers/trondeau/digital-wip2: gnuradio-core/src/python/gnuradio/blksimpl gnuradio-core/src/python/gnuradio/blksimpl2 gnuradio-examples/python/hier/digital

[trondeau]

Author: trondeau
Date: 2007-02-07 12:14:36 -0700 (Wed, 07 Feb 2007)
New Revision: 4418

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
   
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-examples/python/hier/digital/receive_path.py
Log:
very minor formatting changes to prepare for merge

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
      2007-02-07 19:14:30 UTC (rev 4417)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py
      2007-02-07 19:14:36 UTC (rev 4418)
@@ -234,7 +234,8 @@
         # Automatic gain control
         scale = (1.0/16384.0)
         self.pre_scaler = gr.multiply_const_cc(scale)   # scale the signal 
from full-range to +-1
-        self.agc = gr.agc2_cc(2e-1, 1e-3, 1, 1, 100)
+        #self.agc = gr.agc_cc(1e-2, 1, 1, 100)
+        self.agc = gr.agc2_cc(1e-1, 1e-2, 1, 1, 100)
         #self.agc = gr.feedforward_agc_cc(16, 1.0)
 
         # RRC data filter

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
     2007-02-07 19:14:30 UTC (rev 4417)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
     2007-02-07 19:14:36 UTC (rev 4418)
@@ -271,12 +271,12 @@
         fmin = -0.05
         fmax = 0.05
 
-        self.receier=gr.mpsk_receiver_cc(arity, 0,
-                                         self._costas_alpha, self._costas_beta,
-                                         fmin, fmax,
-                                         self._mm_mu, self._mm_gain_mu,
-                                         self._mm_omega, self._mm_gain_omega,
-                                         self._mm_omega_relative_limit)
+        self.receiver=gr.mpsk_receiver_cc(arity, 0,
+                                          self._costas_alpha, 
self._costas_beta,
+                                          fmin, fmax,
+                                          self._mm_mu, self._mm_gain_mu,
+                                          self._mm_omega, self._mm_gain_omega,
+                                          self._mm_omega_relative_limit)
         
         #self.diffdec = gr.diff_decoder_bb(arity)
 
@@ -299,7 +299,7 @@
         self.define_component("pre_scaler", self.pre_scaler)
         self.define_component("agc", self.agc)
         self.define_component("rrc_filter", self.rrc_filter)
-        self.define_component("receier", self.receier)
+        self.define_component("receiver", self.receiver)
         self.define_component("slicer", self.slicer)
         #self.define_component("diffdec", self.diffdec)
         self.define_component("symbol_mapper", self.symbol_mapper)
@@ -309,8 +309,8 @@
         self.connect("self", 0, "pre_scaler", 0)
         self.connect("pre_scaler", 0, "agc", 0)
         self.connect("agc", 0, "rrc_filter", 0)
-        self.connect("rrc_filter", 0, "receier", 0)
-        self.connect("receier", 0, "slicer", 0)
+        self.connect("rrc_filter", 0, "receiver", 0)
+        self.connect("receiver", 0, "slicer", 0)
         #self.connect("slicer", 0, "diffdec", 0)
         #self.connect("diffdec", 0, "symbol_mapper", 0)
         self.connect("slicer", 0, "symbol_mapper", 0)
@@ -353,8 +353,8 @@
                               gr.file_sink(gr.sizeof_gr_complex, "rx_agc.dat"))
         self.define_component("rrc_filter_dat",
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
-        self.define_component("receier_dat",
-                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_receier.dat"))
+        self.define_component("receiver_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_receiver.dat"))
         self.define_component("slicer_dat",
                               gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
 #        self.define_component("diffdec_dat",
@@ -367,7 +367,7 @@
         self.connect("pre_scaler", 0, "prescaler_dat", 0)
         self.connect("agc", 0, "agc_dat", 0)
         self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
-        self.connect("receier", 0, "receier_dat", 0)
+        self.connect("receiver", 0, "receiver_dat", 0)
         self.connect("slicer", 0, "slicer_dat", 0)
 #        self.connect("diffdec", 0, "diffdec_dat", 0)
         self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
     2007-02-07 19:14:30 UTC (rev 4417)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
     2007-02-07 19:14:36 UTC (rev 4418)
@@ -273,7 +273,8 @@
                                          self._mm_omega, self._mm_gain_omega,
                                          self._mm_omega_relative_limit)
         
-        self.diffdec = gr.diff_decoder_bb(arity)
+        # Perform Differential decoding on the constellation
+        self.diffdec = gr.diff_phasor_cc()
 
         # find closest constellation point
         rot = 1
@@ -295,8 +296,8 @@
         self.define_component("agc", self.agc)
         self.define_component("rrc_filter", self.rrc_filter)
         self.define_component("receiver", self.receiver)
+        self.define_component("diffdec", self.diffdec)
         self.define_component("slicer", self.slicer)
-        self.define_component("diffdec", self.diffdec)
         self.define_component("symbol_mapper", self.symbol_mapper)
         self.define_component("unpack", self.unpack)
 
@@ -305,9 +306,9 @@
         self.connect("pre_scaler", 0, "agc", 0)
         self.connect("agc", 0, "rrc_filter", 0)
         self.connect("rrc_filter", 0, "receiver", 0)
-        self.connect("receiver", 0, "slicer", 0)
-        self.connect("slicer", 0, "diffdec", 0)
-        self.connect("diffdec", 0, "symbol_mapper", 0)
+        self.connect("receiver", 0, "diffdec", 0)
+        self.connect("diffdec", 0, "slicer", 0)
+        self.connect("slicer", 0, "symbol_mapper", 0)
         self.connect("symbol_mapper", 0, "unpack", 0)
         self.connect("unpack", 0, "self", 0)
 
@@ -347,10 +348,10 @@
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_rrc_filter.dat"))
         self.define_component("receiver_dat",
                               gr.file_sink(gr.sizeof_gr_complex, 
"rx_receiver.dat"))
+        self.define_component("diffdec_dat",
+                              gr.file_sink(gr.sizeof_gr_complex, 
"rx_diffdec.dat"))
         self.define_component("slicer_dat",
                               gr.file_sink(gr.sizeof_char, "rx_slicer.dat"))
-        self.define_component("diffdec_dat",
-                              gr.file_sink(gr.sizeof_char, "rx_diffdec.dat"))
         self.define_component("symbol_mapper_dat",
                               gr.file_sink(gr.sizeof_char, 
"rx_symbol_mapper.dat"))
         self.define_component("unpack_dat",
@@ -360,8 +361,8 @@
         self.connect("agc", 0, "agc_dat", 0)
         self.connect("rrc_filter", 0, "rrc_filter_dat", 0)
         self.connect("receiver", 0, "receiver_dat", 0)
+        self.connect("diffdec", 0, "diffdec_dat", 0)
         self.connect("slicer", 0, "slicer_dat", 0)
-        self.connect("diffdec", 0, "diffdec_dat", 0)
         self.connect("symbol_mapper", 0, "symbol_mapper_dat", 0)
         self.connect("unpack", 0, "unpack_dat", 0)
 

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
       2007-02-07 19:14:30 UTC (rev 4417)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
       2007-02-07 19:14:36 UTC (rev 4418)
@@ -159,9 +159,7 @@
 
     def run(self):
         while self.keep_running:
-            print "hello? 1"
             msg = self.rcvd_pktq.delete_head()
-            print "hello? 2"
             ok, payload = packet_utils.unmake_packet(msg.to_string())
             if self.callback:
                 self.callback(ok, payload)

Modified: 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-examples/python/hier/digital/receive_path.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-examples/python/hier/digital/receive_path.py
    2007-02-07 19:14:30 UTC (rev 4417)
+++ 
gnuradio/branches/developers/trondeau/digital-wip2/gnuradio-examples/python/hier/digital/receive_path.py
    2007-02-07 19:14:36 UTC (rev 4418)
@@ -240,6 +240,7 @@
         """
         Prints information about the receive path
         """
+        print "\nReceive Path:"
         print "Using RX d'board %s"    % (self.subdev.side_and_name(),)
         print "Rx gain:         %g"    % (self.gain,)
         print "modulation:      %s"    % (self._demod_class.__name__)
@@ -247,7 +248,6 @@
         print "samples/symbol:  %3d"   % (self._samples_per_symbol)
         print "decim:           %3d"   % (self._decim)
         print "Rx Frequency:    %s"    % 
(eng_notation.num_to_str(self._rx_freq))
-        # print "Rx Frequency:    %f"    % (self._rx_freq)
 
 def add_freq_option(parser):
     """