From 4f4418c6f289c049f5ae7426a226fca9051c17c0 Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Fri, 6 Dec 2013 18:21:57 +0100 Subject: [PATCH] use delay instead of zero padding --- examples/ofdm_transceiver.grc | 330 +++++++++++----------- examples/ofdm_tx.grc | 504 +++++++++++++++++----------------- 2 files changed, 425 insertions(+), 409 deletions(-) diff --git a/examples/ofdm_transceiver.grc b/examples/ofdm_transceiver.grc index c4a0ebc..bee6a69 100644 --- a/examples/ofdm_transceiver.grc +++ b/examples/ofdm_transceiver.grc @@ -1,65 +1,6 @@ - Thu Dec 5 14:40:29 2013 - - options - - id - ofdm_transceiver - - - _enabled - True - - - title - - - - author - - - - description - - - - window_size - 1280, 1024 - - - generate_options - wx_gui - - - category - Custom - - - run_options - prompt - - - run - True - - - max_nouts - 0 - - - realtime_scheduling - 1 - - - _coordinate - (12, 33) - - - _rotation - 0 - - + Fri Dec 6 17:59:08 2013 variable_chooser @@ -638,6 +579,139 @@ 0 + + ofdm_phy_hier + + id + ofdm_phy_hier_1 + + + _enabled + True + + + encoding + encoding + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (324, 355) + + + _rotation + 180 + + + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_0 + + + _enabled + True + + + type + complex + + + const + mult + + + vlen + 1 + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (104, 385) + + + _rotation + 180 + + + + variable_slider + + id + mult + + + _enabled + True + + + label + + + + value + 0.38 + + + min + 0 + + + max + 1 + + + num_steps + 100 + + + style + wx.SL_HORIZONTAL + + + converver + float_converter + + + grid_pos + + + + notebook + + + + _coordinate + (1140, 247) + + + _rotation + 0 + + uhd_usrp_sink @@ -670,7 +744,7 @@ sync - + pc_clock clock_rate @@ -1302,7 +1376,7 @@ _coordinate - (261, 479) + (256, 487) _rotation @@ -1341,7 +1415,7 @@ sync - + pc_clock clock_rate @@ -1988,41 +2062,6 @@ 0 - - ofdm_phy_hier - - id - ofdm_phy_hier_1 - - - _enabled - True - - - encoding - encoding - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (324, 355) - - - _rotation - 180 - - foo_packet_pad @@ -2037,9 +2076,17 @@ debug False + + delay + True + + + delay_sec + 0.001 + pad_front - 10000 + 0 pad_tail @@ -2067,97 +2114,58 @@ - blocks_multiply_const_vxx + options id - blocks_multiply_const_vxx_0 + ofdm_transceiver _enabled True - type - complex - - - const - mult - - - vlen - 1 - - - affinity + title - minoutbuf - 0 + author + - maxoutbuf - 0 + description + - _coordinate - (104, 385) + window_size + 1280, 1024 - _rotation - 180 - - - - variable_slider - - id - mult + generate_options + wx_gui - _enabled + category + Custom + + + run_options + prompt + + + run True - label - - - - value - 0.38 - - - min + max_nouts 0 - max - 1 - - - num_steps - 100 - - - style - wx.SL_HORIZONTAL - - - converver - float_converter - - - grid_pos - - - - notebook + realtime_scheduling _coordinate - (1140, 247) + (12, 33) _rotation diff --git a/examples/ofdm_tx.grc b/examples/ofdm_tx.grc index 1ad38f0..38251d4 100644 --- a/examples/ofdm_tx.grc +++ b/examples/ofdm_tx.grc @@ -1,6 +1,6 @@ - Thu Dec 5 14:11:27 2013 + Fri Dec 6 18:16:38 2013 options @@ -49,7 +49,7 @@ realtime_scheduling - 1 + _coordinate @@ -60,108 +60,6 @@ 0 - - variable_chooser - - id - freq - - - _enabled - True - - - label - Channel - - - value - 5.89e9 - - - choices - [2412000000.0, 2417000000.0, 2422000000.0, 2427000000.0, 2432000000.0, 2437000000.0, 2442000000.0, 2447000000.0, 2452000000.0, 2457000000.0, 2462000000.0, 2467000000.0, 2472000000.0, 2484000000.0, 5170000000.0, 5180000000.0, 5190000000.0, 5200000000.0, 5210000000.0, 5220000000.0, 5230000000.0, 5240000000.0, 5260000000.0, 5280000000.0, 5300000000.0, 5320000000.0, 5500000000.0, 5520000000.0, 5540000000.0, 5560000000.0, 5580000000.0, 5600000000.0, 5620000000.0, 5640000000.0, 5660000000.0, 5680000000.0, 5700000000.0, 5745000000.0, 5765000000.0, 5785000000.0, 5805000000.0, 5825000000.0, 5860000000.0, 5870000000.0, 5880000000.0, 5890000000.0, 5900000000.0, 5910000000.0, 5920000000.0] - - - labels - [' 1 | 2412.0 | 11g', ' 2 | 2417.0 | 11g', ' 3 | 2422.0 | 11g', ' 4 | 2427.0 | 11g', ' 5 | 2432.0 | 11g', ' 6 | 2437.0 | 11g', ' 7 | 2442.0 | 11g', ' 8 | 2447.0 | 11g', ' 9 | 2452.0 | 11g', ' 10 | 2457.0 | 11g', ' 11 | 2462.0 | 11g', ' 12 | 2467.0 | 11g', ' 13 | 2472.0 | 11g', ' 14 | 2484.0 | 11g', ' 34 | 5170.0 | 11a', ' 36 | 5180.0 | 11a', ' 38 | 5190.0 | 11a', ' 40 | 5200.0 | 11a', ' 42 | 5210.0 | 11a', ' 44 | 5220.0 | 11a', ' 46 | 5230.0 | 11a', ' 48 | 5240.0 | 11a', ' 52 | 5260.0 | 11a', ' 56 | 5280.0 | 11a', ' 58 | 5300.0 | 11a', ' 60 | 5320.0 | 11a', '100 | 5500.0 | 11a', '104 | 5520.0 | 11a', '108 | 5540.0 | 11a', '112 | 5560.0 | 11a', '116 | 5580.0 | 11a', '120 | 5600.0 | 11a', '124 | 5620.0 | 11a', '128 | 5640.0 | 11a', '132 | 5660.0 | 11a', '136 | 5680.0 | 11a', '140 | 5700.0 | 11a', '149 | 5745.0 | 11a', '153 | 5765.0 | 11a', '157 | 5785.0 | 11a', '161 | 5805.0 | 11a', '165 | 5825.0 | 11a', '172 | 5860.0 | 11p', '174 | 5870.0 | 11p', '176 | 5880.0 | 11p', '178 | 5890.0 | 11p', '180 | 5900.0 | 11p', '182 | 5910.0 | 11p', '184 | 5920.0 | 11p'] - - - type - drop_down - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (419, 11) - - - _rotation - 0 - - - - variable_chooser - - id - samp_rate - - - _enabled - True - - - label - Sample Rate - - - value - 10e6 - - - choices - [10e6, 20e6] - - - labels - ["10 Mhz", "20 Mhz"] - - - type - radio_buttons - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (629, 14) - - - _rotation - 0 - - variable_slider @@ -240,100 +138,6 @@ 0 - - variable_chooser - - id - encoding - - - _enabled - True - - - label - Encoding - - - value - 0 - - - choices - [0,1,2,3,4,5,6,7] - - - labels - ["BPSK 1/2", "BPSK 3/4", "QPSK 1/2", "QPSK 3/4", "16QAM 1/2", "16QAM 3/4", "64QAM 2/3", "64QAM 3/4"] - - - type - radio_buttons - - - style - wx.RA_HORIZONTAL - - - grid_pos - - - - notebook - - - - _coordinate - (780, 17) - - - _rotation - 0 - - - - foo_packet_pad - - id - foo_packet_pad_0 - - - _enabled - True - - - debug - False - - - pad_front - 500000 - - - pad_tail - 500000 - - - affinity - - - - minoutbuf - 0 - - - maxoutbuf - 0 - - - _coordinate - (72, 428) - - - _rotation - 0 - - blocks_null_source @@ -479,6 +283,64 @@ 0 + + blocks_ctrlport_monitor + + id + blocks_ctrlport_monitor_0 + + + _enabled + False + + + en + True + + + _coordinate + (980, 366) + + + _rotation + 0 + + + + ofdm_phy_hier + + id + ofdm_phy_hier_0 + + + _enabled + True + + + encoding + encoding + + + affinity + + + + minoutbuf + 0 + + + maxoutbuf + 0 + + + _coordinate + (449, 300) + + + _rotation + 180 + + ieee802_11_ofdm_mac @@ -511,22 +373,128 @@ - blocks_message_strobe + variable_chooser id - blocks_message_strobe_0 + encoding _enabled True - msg - pmt.intern("Hello World") + label + Encoding - period - 100 + value + 0 + + + choices + [0,1,2,3,4,5,6,7] + + + labels + ["BPSK 1/2", "BPSK 3/4", "QPSK 1/2", "QPSK 3/4", "16QAM 1/2", "16QAM 3/4", "64QAM 2/3", "64QAM 3/4"] + + + type + radio_buttons + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (780, 17) + + + _rotation + 0 + + + + variable_chooser + + id + samp_rate + + + _enabled + True + + + label + Sample Rate + + + value + 20e6 + + + choices + [10e6, 20e6] + + + labels + ["10 Mhz", "20 Mhz"] + + + type + radio_buttons + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (629, 14) + + + _rotation + 0 + + + + blocks_multiply_const_vxx + + id + blocks_multiply_const_vxx_1 + + + _enabled + True + + + type + complex + + + const + mult + + + vlen + 1 affinity @@ -542,34 +510,11 @@ _coordinate - (181, 179) + (162, 330) _rotation - 0 - - - - blocks_ctrlport_monitor - - id - blocks_ctrlport_monitor_0 - - - _enabled - False - - - en - True - - - _coordinate - (980, 366) - - - _rotation - 0 + 180 @@ -604,7 +549,7 @@ sync - + pc_clock clock_rate @@ -1244,26 +1189,22 @@ - blocks_multiply_const_vxx + blocks_message_strobe id - blocks_multiply_const_vxx_1 + blocks_message_strobe_0 _enabled True - type - complex + msg + pmt.intern("Hello World") - const - mult - - - vlen - 1 + period + 100 affinity @@ -1279,26 +1220,42 @@ _coordinate - (162, 330) + (113, 179) _rotation - 180 + 0 - ofdm_phy_hier + foo_packet_pad id - ofdm_phy_hier_0 + foo_packet_pad_0 _enabled True - encoding - encoding + debug + False + + + delay + True + + + delay_sec + 0.001 + + + pad_front + 0 + + + pad_tail + 0 affinity @@ -1314,11 +1271,62 @@ _coordinate - (449, 300) + (93, 420) _rotation - 180 + 0 + + + + variable_chooser + + id + freq + + + _enabled + True + + + label + Channel + + + value + 5.22e9 + + + choices + [2412000000.0, 2417000000.0, 2422000000.0, 2427000000.0, 2432000000.0, 2437000000.0, 2442000000.0, 2447000000.0, 2452000000.0, 2457000000.0, 2462000000.0, 2467000000.0, 2472000000.0, 2484000000.0, 5170000000.0, 5180000000.0, 5190000000.0, 5200000000.0, 5210000000.0, 5220000000.0, 5230000000.0, 5240000000.0, 5260000000.0, 5280000000.0, 5300000000.0, 5320000000.0, 5500000000.0, 5520000000.0, 5540000000.0, 5560000000.0, 5580000000.0, 5600000000.0, 5620000000.0, 5640000000.0, 5660000000.0, 5680000000.0, 5700000000.0, 5745000000.0, 5765000000.0, 5785000000.0, 5805000000.0, 5825000000.0, 5860000000.0, 5870000000.0, 5880000000.0, 5890000000.0, 5900000000.0, 5910000000.0, 5920000000.0] + + + labels + [' 1 | 2412.0 | 11g', ' 2 | 2417.0 | 11g', ' 3 | 2422.0 | 11g', ' 4 | 2427.0 | 11g', ' 5 | 2432.0 | 11g', ' 6 | 2437.0 | 11g', ' 7 | 2442.0 | 11g', ' 8 | 2447.0 | 11g', ' 9 | 2452.0 | 11g', ' 10 | 2457.0 | 11g', ' 11 | 2462.0 | 11g', ' 12 | 2467.0 | 11g', ' 13 | 2472.0 | 11g', ' 14 | 2484.0 | 11g', ' 34 | 5170.0 | 11a', ' 36 | 5180.0 | 11a', ' 38 | 5190.0 | 11a', ' 40 | 5200.0 | 11a', ' 42 | 5210.0 | 11a', ' 44 | 5220.0 | 11a', ' 46 | 5230.0 | 11a', ' 48 | 5240.0 | 11a', ' 52 | 5260.0 | 11a', ' 56 | 5280.0 | 11a', ' 58 | 5300.0 | 11a', ' 60 | 5320.0 | 11a', '100 | 5500.0 | 11a', '104 | 5520.0 | 11a', '108 | 5540.0 | 11a', '112 | 5560.0 | 11a', '116 | 5580.0 | 11a', '120 | 5600.0 | 11a', '124 | 5620.0 | 11a', '128 | 5640.0 | 11a', '132 | 5660.0 | 11a', '136 | 5680.0 | 11a', '140 | 5700.0 | 11a', '149 | 5745.0 | 11a', '153 | 5765.0 | 11a', '157 | 5785.0 | 11a', '161 | 5805.0 | 11a', '165 | 5825.0 | 11a', '172 | 5860.0 | 11p', '174 | 5870.0 | 11p', '176 | 5880.0 | 11p', '178 | 5890.0 | 11p', '180 | 5900.0 | 11p', '182 | 5910.0 | 11p', '184 | 5920.0 | 11p'] + + + type + drop_down + + + style + wx.RA_HORIZONTAL + + + grid_pos + + + + notebook + + + + _coordinate + (419, 11) + + + _rotation + 0