[Commit-gnuradio] r3579 - gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl

[trondeau]

Author: trondeau
Date: 2006-09-18 22:02:57 -0600 (Mon, 18 Sep 2006)
New Revision: 3579

Modified:
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
   
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
Log:
work in progress: transmitters behaving better

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
        2006-09-19 03:03:30 UTC (rev 3578)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/bpsk.py
        2006-09-19 04:02:57 UTC (rev 3579)
@@ -112,7 +112,7 @@
         self._fg.connect(self.chunks2symbols,
                          gr.file_sink(gr.sizeof_gr_complex, 
"chunks2symbols.dat"))
         self._fg.connect(self.rrc_filter,
-                         gr.file_sink(gr.sizeof_gr_complex, "rrc.dat"))
+                         gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
 
     def extract_kwargs_from_options(options):
         """
@@ -250,8 +250,10 @@
                          gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
         self._fg.connect(self.costas_loop,
                          gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat"))
+        self._fg.connect((self.costas_loop,1),
+                         gr.file_sink(gr.sizeof_gr_complex, 
"costas_error.dat"))
         self._fg.connect(self.rrc_filter,
-                         gr.file_sink(gr.sizeof_gr_complex, "rrc.dat"))
+                         gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
         self._fg.connect(self.clock_recovery,
                          gr.file_sink(gr.sizeof_gr_complex, 
"clock_recovery.dat"))
         self._fg.connect(self.slicer,

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
       2006-09-19 03:03:30 UTC (rev 3578)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py
       2006-09-19 04:02:57 UTC (rev 3579)
@@ -278,8 +278,10 @@
                         gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
         self._fg.connect(self.costas_loop,
                         gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat"))
+        self._fg.connect((self.costas_loop,1),
+                        gr.file_sink(gr.sizeof_gr_complex, "costas_error.dat"))
         self._fg.connect(self.rrc_filter,
-                        gr.file_sink(gr.sizeof_gr_complex, "rrc.dat"))
+                        gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
         self._fg.connect(self.clock_recovery,
                         gr.file_sink(gr.sizeof_gr_complex, 
"clock_recovery.dat"))
         self._fg.connect(self.diffdec,
@@ -290,8 +292,6 @@
                         gr.file_sink(gr.sizeof_char, "gray_decoder.dat"))
         self._fg.connect(self.unpack,
                         gr.file_sink(gr.sizeof_char, "unpack.dat"))
-        self._fg.connect((self.costas_loop,1),
-                        gr.file_sink(gr.sizeof_gr_complex, "costas.dat"))
         
     def add_options(parser):
         """

Modified: 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
       2006-09-19 03:03:30 UTC (rev 3578)
+++ 
gnuradio/branches/developers/trondeau/digital-wip/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py
       2006-09-19 04:02:57 UTC (rev 3579)
@@ -82,17 +82,19 @@
             
         self.diffenc = gr.diff_encoder_bb(arity)
 
-        self.chunks2symbols = gr.chunks_to_symbols_bc(psk.constellation[arity])
+        rot = .707 + .707j
+        rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
+        self.chunks2symbols = gr.chunks_to_symbols_bc(rotated_const)
 
         # pulse shaping filter
        self.rrc_taps = gr.firdes.root_raised_cosine(
-           1.0,                # gain  (samples_per_symbol since we're 
interpolating by samples_per_symbol)
-            samples_per_symbol, # sampling rate
-            1.0,               # symbol rate
-            excess_bw,          # excess bandwidth (roll-off factor)
+           self._samples_per_symbol, # gain  (sps since we're interpolating by 
sps)
+            self._samples_per_symbol, # sampling rate
+            1.0,                     # symbol rate
+            self._excess_bw,          # excess bandwidth (roll-off factor)
             ntaps)
 
-       self.rrc_filter = gr.interp_fir_filter_ccf(1, self.rrc_taps)
+       self.rrc_filter = gr.interp_fir_filter_ccf(self._samples_per_symbol, 
self.rrc_taps)
 
         if verbose:
             self._print_verbage()
@@ -229,8 +231,7 @@
                                                     self._omega_relative_limit)
 
         # find closest constellation point
-        #rot = .707 + .707j
-        rot = 1
+        rot = .707 + .707j
         rotated_const = map(lambda pt: pt * rot, psk.constellation[arity])
         print "rotated_const = %s" % rotated_const
 
@@ -273,8 +274,10 @@
                          gr.file_sink(gr.sizeof_gr_complex, "agc.dat"))
         self._fg.connect(self.costas_loop,
                          gr.file_sink(gr.sizeof_gr_complex, "costas_loop.dat"))
+        self._fg.connect((self.costas_loop,1),
+                         gr.file_sink(gr.sizeof_gr_complex, 
"costas_error.dat"))
         self._fg.connect(self.rrc_filter,
-                         gr.file_sink(gr.sizeof_gr_complex, "rrc.dat"))
+                         gr.file_sink(gr.sizeof_gr_complex, "rrc_filter.dat"))
         self._fg.connect(self.clock_recovery,
                          gr.file_sink(gr.sizeof_gr_complex, 
"clock_recovery.dat"))
         self._fg.connect(self.diffdec,
@@ -285,10 +288,7 @@
                          gr.file_sink(gr.sizeof_char, "gray_decoder.dat"))
         self._fg.connect(self.unpack,
                          gr.file_sink(gr.sizeof_char, "unpack.dat"))
-        self._fg.connect((self.costas_loop,1),
-                         gr.file_sink(gr.sizeof_gr_complex, "costas.dat"))
 
-
     def add_options(parser):
         """
         Adds modulation-specific options to the standard parser