[Commit-gnuradio] r6112 - gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm

[trondeau]

Author: trondeau
Date: 2007-08-04 09:16:00 -0600 (Sat, 04 Aug 2007)
New Revision: 6112

Modified:
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm.py
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
   
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/transmit_path.py
Log:
Adjusting default options

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm.py
      2007-08-03 20:11:01 UTC (rev 6111)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm.py
      2007-08-04 15:16:00 UTC (rev 6112)
@@ -38,7 +38,7 @@
 
         if not options.channel_off:
             SNR = 10.0**(options.snr/10.0)
-            power_in_signal = 1.0
+            power_in_signal = abs(options.tx_amplitude)**2.0
             noise_power_in_channel = power_in_signal/SNR
             noise_voltage = math.sqrt(noise_power_in_channel/2.0)
             print "Noise voltage: ", noise_voltage
@@ -118,7 +118,7 @@
                 
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
-    parser.add_option("-s", "--size", type="eng_float", default=1450,
+    parser.add_option("-s", "--size", type="eng_float", default=400,
                       help="set packet size [default=%default]")
     parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
                       help="set megabytes to transmit [default=%default]")

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
   2007-08-03 20:11:01 UTC (rev 6111)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
   2007-08-04 15:16:00 UTC (rev 6112)
@@ -128,7 +128,7 @@
 
         expert.add_option("", "--rx-freq", type="eng_float", default=None,
                           help="set Rx frequency to FREQ [default=%default]", 
metavar="FREQ")
-        expert.add_option("-d", "--decim", type="intx", default=32,
+        expert.add_option("-d", "--decim", type="intx", default=128,
                           help="set fpga decimation rate to DECIM 
[default=%default]")
         expert.add_option("", "--snr", type="eng_float", default=30,
                           help="set the SNR of the channel in dB 
[default=%default]")

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
   2007-08-03 20:11:01 UTC (rev 6111)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
   2007-08-04 15:16:00 UTC (rev 6112)
@@ -131,7 +131,7 @@
 
         expert.add_option("", "--tx-freq", type="eng_float", default=None,
                           help="set transmit frequency to FREQ 
[default=%default]", metavar="FREQ")
-        expert.add_option("-i", "--interp", type="intx", default=64,
+        expert.add_option("-i", "--interp", type="intx", default=256,
                           help="set fpga interpolation rate to INTERP 
[default=%default]")
     # Make a static method to call before instantiation
     add_options = staticmethod(add_options)
@@ -171,7 +171,7 @@
 
     parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
     expert_grp = parser.add_option_group("Expert")
-    parser.add_option("-s", "--size", type="eng_float", default=1450,
+    parser.add_option("-s", "--size", type="eng_float", default=400,
                       help="set packet size [default=%default]")
     parser.add_option("-M", "--megabytes", type="eng_float", default=1.0,
                       help="set megabytes to transmit [default=%default]")

Modified: 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/transmit_path.py
===================================================================
--- 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/transmit_path.py
       2007-08-03 20:11:01 UTC (rev 6111)
+++ 
gnuradio/branches/developers/trondeau/ofdm_mod/gnuradio-examples/python/ofdm/transmit_path.py
       2007-08-04 15:16:00 UTC (rev 6112)
@@ -73,7 +73,7 @@
         """
         Adds transmitter-specific options to the Options Parser
         """
-        normal.add_option("", "--tx-amplitude", type="eng_float", default=1, 
metavar="AMPL",
+        normal.add_option("", "--tx-amplitude", type="eng_float", default=200, 
metavar="AMPL",
                           help="set transmitter digital amplitude: 0 <= AMPL < 
32768 [default=%default]")
         normal.add_option("-v", "--verbose", action="store_true", 
default=False)
         expert.add_option("", "--log", action="store_true", default=False,