diff --git a/examples/wifi_loopback.grc b/examples/wifi_loopback.grc
index 5e60db3..a994e13 100644
--- a/examples/wifi_loopback.grc
+++ b/examples/wifi_loopback.grc
@@ -1,6 +1,6 @@
- Mon Jan 20 12:59:27 2014
+ Sat Feb 1 18:28:19 2014
options
@@ -134,61 +134,6 @@
0
-
- variable_slider
-
- id
- freq_offset
-
-
- _enabled
- True
-
-
- label
-
-
-
- value
- 500
-
-
- min
- -10000
-
-
- max
- 10000
-
-
- num_steps
- 1000
-
-
- style
- wx.SL_HORIZONTAL
-
-
- converver
- float_converter
-
-
- grid_pos
-
-
-
- notebook
-
-
-
- _coordinate
- (947, 7)
-
-
- _rotation
- 0
-
-
import
@@ -329,49 +274,6 @@
0
-
- blocks_multiply_xx
-
- id
- blocks_multiply_xx_0
-
-
- _enabled
- True
-
-
- type
- complex
-
-
- num_inputs
- 2
-
-
- vlen
- 1
-
-
- affinity
-
-
-
- minoutbuf
- 0
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (544, 440)
-
-
- _rotation
- 0
-
-
analog_sig_source_x
@@ -497,147 +399,6 @@
180
-
- foo_packet_pad
-
- id
- foo_packet_pad_0
-
-
- _enabled
- True
-
-
- debug
- False
-
-
- delay
- False
-
-
- delay_sec
- 0.001
-
-
- pad_front
- 60000
-
-
- pad_tail
- 20000
-
-
- affinity
-
-
-
- minoutbuf
- 0
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (308, 408)
-
-
- _rotation
- 0
-
-
-
- variable_slider
-
- id
- noise_power
-
-
- _enabled
- True
-
-
- label
-
-
-
- value
- 0.01
-
-
- min
- 0.01
-
-
- max
- 5
-
-
- num_steps
- 1000
-
-
- style
- wx.SL_HORIZONTAL
-
-
- converver
- float_converter
-
-
- grid_pos
-
-
-
- notebook
-
-
-
- _coordinate
- (814, 8)
-
-
- _rotation
- 0
-
-
-
- wifi_phy_hier
-
- id
- wifi_phy_hier_0
-
-
- _enabled
- True
-
-
- encoding
- encoding
-
-
- affinity
-
-
-
- minoutbuf
- 0
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (360, 262)
-
-
- _rotation
- 180
-
-
analog_noise_source_x
@@ -865,6 +626,245 @@
180
+
+ blocks_multiply_xx
+
+ id
+ blocks_multiply_xx_0
+
+
+ _enabled
+ True
+
+
+ type
+ complex
+
+
+ num_inputs
+ 2
+
+
+ vlen
+ 1
+
+
+ affinity
+
+
+
+ minoutbuf
+ 0
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (544, 440)
+
+
+ _rotation
+ 0
+
+
+
+ variable_slider
+
+ id
+ freq_offset
+
+
+ _enabled
+ True
+
+
+ label
+
+
+
+ value
+ 0
+
+
+ min
+ -10000
+
+
+ max
+ 10000
+
+
+ num_steps
+ 1000
+
+
+ style
+ wx.SL_HORIZONTAL
+
+
+ converver
+ float_converter
+
+
+ grid_pos
+
+
+
+ notebook
+
+
+
+ _coordinate
+ (947, 7)
+
+
+ _rotation
+ 0
+
+
+
+ variable_slider
+
+ id
+ noise_power
+
+
+ _enabled
+ True
+
+
+ label
+
+
+
+ value
+ 0.1
+
+
+ min
+ 0.01
+
+
+ max
+ 5
+
+
+ num_steps
+ 1000
+
+
+ style
+ wx.SL_HORIZONTAL
+
+
+ converver
+ float_converter
+
+
+ grid_pos
+
+
+
+ notebook
+
+
+
+ _coordinate
+ (814, 8)
+
+
+ _rotation
+ 0
+
+
+
+ wifi_phy_hier
+
+ id
+ wifi_phy_hier_0
+
+
+ _enabled
+ True
+
+
+ encoding
+ encoding
+
+
+ affinity
+
+
+
+ minoutbuf
+ 0
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (360, 262)
+
+
+ _rotation
+ 180
+
+
+
+ foo_packet_pad2
+
+ id
+ foo_packet_pad2_0
+
+
+ _enabled
+ True
+
+
+ debug
+ False
+
+
+ delay
+ False
+
+
+ delay_sec
+ 0.001
+
+
+ pad_front
+ 10000
+
+
+ pad_tail
+ 10000
+
+
+ affinity
+
+
+
+ minoutbuf
+ 48000
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (315, 404)
+
+
+ _rotation
+ 0
+
+
foo_wireshark_connector_0
blocks_file_sink_0
@@ -877,12 +877,6 @@
0
1
-
- foo_packet_pad_0
- blocks_multiply_xx_0
- 0
- 0
-
analog_noise_source_x_0
blocks_add_xx_0
@@ -919,12 +913,6 @@
0
0
-
- wifi_phy_hier_0
- foo_packet_pad_0
- 0
- 0
-
wifi_phy_hier_0
ieee802_11_ofdm_mac_0
@@ -943,4 +931,16 @@
strobe
app in
+
+ foo_packet_pad2_0
+ blocks_multiply_xx_0
+ 0
+ 0
+
+
+ wifi_phy_hier_0
+ foo_packet_pad2_0
+ 0
+ 0
+
diff --git a/examples/wifi_phy_hier.grc b/examples/wifi_phy_hier.grc
index e944652..75ce41d 100644
--- a/examples/wifi_phy_hier.grc
+++ b/examples/wifi_phy_hier.grc
@@ -1,6 +1,6 @@
- Mon Jan 20 14:02:22 2014
+ Sat Feb 1 18:33:23 2014
options
@@ -64,7 +64,7 @@
variable
id
- header_formatter
+ window_size
_enabled
@@ -72,11 +72,11 @@
value
- ieee802_11.wifi_signal_field()
+ 48
_coordinate
- (518, 18)
+ (323, 14)
_rotation
@@ -110,7 +110,7 @@
variable
id
- window_size
+ header_formatter
_enabled
@@ -118,11 +118,11 @@
value
- 48
+ ieee802_11.wifi_signal_field()
_coordinate
- (323, 14)
+ (518, 18)
_rotation
@@ -332,45 +332,6 @@
0
-
- pad_source
-
- id
- pad_source_0
-
-
- _enabled
- True
-
-
- label
- samp_in
-
-
- type
- complex
-
-
- vlen
- 1
-
-
- num_streams
- 1
-
-
- optional
- False
-
-
- _coordinate
- (57, 549)
-
-
- _rotation
- 0
-
-
fft_vxx
@@ -945,45 +906,6 @@
0
-
- pad_sink
-
- id
- pad_sink_0
-
-
- _enabled
- True
-
-
- label
- samp_out
-
-
- type
- complex
-
-
- vlen
- 1
-
-
- num_streams
- 1
-
-
- optional
- False
-
-
- _coordinate
- (305, 428)
-
-
- _rotation
- 180
-
-
ieee802_11_ofdm_mapper
@@ -1144,198 +1066,6 @@
0
-
- fft_vxx
-
- id
- fft_vxx_0
-
-
- _enabled
- True
-
-
- type
- complex
-
-
- fft_size
- 64
-
-
- forward
- False
-
-
- window
- tuple([1/52**.5] * 64)
-
-
- shift
- True
-
-
- nthreads
- 1
-
-
- affinity
-
-
-
- minoutbuf
- 0
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (973, 396)
-
-
- _rotation
- 180
-
-
-
- digital_ofdm_carrier_allocator_cvc
-
- id
- digital_ofdm_carrier_allocator_cvc_0_0
-
-
- _enabled
- True
-
-
- fft_len
- 64
-
-
- occupied_carriers
- (range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)
-
-
- pilot_carriers
- ((-21, -7, 7, 21), )
-
-
- pilot_symbols
- ((1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1))
-
-
- sync_words
- ()
-
-
- len_tag_key
- "packet_len"
-
-
- affinity
-
-
-
- minoutbuf
- 1000
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (1023, 242)
-
-
- _rotation
- 0
-
-
-
- ieee802_11_ofdm_preamble
-
- id
- ieee802_11_ofdm_preamble_0
-
-
- _enabled
- True
-
-
- debug
- False
-
-
- affinity
-
-
-
- minoutbuf
- 48000
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (510, 428)
-
-
- _rotation
- 180
-
-
-
- digital_ofdm_cyclic_prefixer
-
- id
- digital_ofdm_cyclic_prefixer_0
-
-
- _enabled
- True
-
-
- input_size
- 64
-
-
- cp_len
- 16
-
-
- rolloff
- 2
-
-
- tagname
- "packet_len"
-
-
- affinity
-
-
-
- minoutbuf
- 48000
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (731, 412)
-
-
- _rotation
- 180
-
-
blocks_tagged_stream_mux
@@ -1380,25 +1110,248 @@
_coordinate
- (743, 269)
+ (744, 269)
+
+
+ _rotation
+ 0
+
+
+
+ digital_ofdm_carrier_allocator_cvc
+
+ id
+ digital_ofdm_carrier_allocator_cvc_0_0_0
+
+
+ _enabled
+ True
+
+
+ fft_len
+ 64
+
+
+ occupied_carriers
+ (range(-26, -21) + range(-20, -7) + range(-6, 0) + range(1, 7) + range(8, 21) + range(22, 27),)
+
+
+ pilot_carriers
+ ((-21, -7, 7, 21), )
+
+
+ pilot_symbols
+ ((1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (1, 1, 1, -1), (1, 1, 1, -1), (1, 1, 1, -1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1), (-1, -1, -1, 1))
+
+
+ sync_words
+ ((0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (-1.4719601443879746-1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, (1.4719601443879746+1.4719601443879746j), 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0), (0, 0j, 0, 0j, 0, 0j, -1, 1j, -1, 1j, -1, 1j, -1, -1j, 1, 1j, 1, -1j, -1, 1j, 1, 1j, 1, 1j, 1, 1j, -1, (-0-1j), 1, -1j, -1, 1j, 0, -1j, 1, (-0-1j), 1, -1j, 1, 1j, -1, -1j, 1, (-0-1j), -1, 1j, 1, 1j, 1, 1j, 1, 1j, -1, -1j, 1, 1j, 1, -1j, -1, 0j, 0, 0j, 0, 0j), (0, 0, 0, 0, 0, 0, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1, -1, 1, 1, 1, 1, 0, 1, -1, -1, 1, 1, -1, 1, -1, 1, -1, -1, -1, -1, -1, 1, 1, -1, -1, 1, -1, 1, -1, 1, 1, 1, 1, 0, 0, 0, 0, 0))
+
+
+ len_tag_key
+ "packet_len"
+
+
+ affinity
+
+
+
+ minoutbuf
+ 1000
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (1005, 242)
+
+
+ _rotation
+ 0
+
+
+
+ fft_vxx
+
+ id
+ fft_vxx_0_0
+
+
+ _enabled
+ True
+
+
+ type
+ complex
+
+
+ fft_size
+ 64
+
+
+ forward
+ False
+
+
+ window
+ tuple([1/52**.5] * 64)
+
+
+ shift
+ True
+
+
+ nthreads
+ 1
+
+
+ affinity
+
+
+
+ minoutbuf
+ 0
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (1003, 395)
+
+
+ _rotation
+ 180
+
+
+
+ digital_ofdm_cyclic_prefixer
+
+ id
+ digital_ofdm_cyclic_prefixer_0_0
+
+
+ _enabled
+ True
+
+
+ input_size
+ 64
+
+
+ cp_len
+ 16
+
+
+ rolloff
+ 2
+
+
+ tagname
+ "packet_len"
+
+
+ affinity
+
+
+
+ minoutbuf
+ 48000
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (703, 411)
+
+
+ _rotation
+ 180
+
+
+
+ pad_sink
+
+ id
+ pad_sink_0
+
+
+ _enabled
+ True
+
+
+ label
+ samp_out
+
+
+ type
+ complex
+
+
+ vlen
+ 1
+
+
+ num_streams
+ 1
+
+
+ optional
+ False
+
+
+ _coordinate
+ (470, 427)
+
+
+ _rotation
+ 180
+
+
+
+ pad_source
+
+ id
+ pad_source_0
+
+
+ _enabled
+ True
+
+
+ label
+ samp_in
+
+
+ type
+ complex
+
+
+ vlen
+ 1
+
+
+ num_streams
+ 1
+
+
+ optional
+ True
+
+
+ _coordinate
+ (57, 549)
_rotation
0
-
- fft_vxx_0
- digital_ofdm_cyclic_prefixer_0
- 0
- 0
-
-
- ieee802_11_ofdm_preamble_0
- pad_sink_0
- 0
- 0
-
pad_source_1
ieee802_11_ofdm_mapper_0
@@ -1423,12 +1376,6 @@
0
1
-
- blocks_complex_to_mag_squared_0
- ieee802_11_moving_average_xx_0
- 0
- 0
-
ieee802_11_moving_average_xx_1
blocks_complex_to_mag_0
@@ -1537,12 +1484,6 @@
0
0
-
- digital_ofdm_cyclic_prefixer_0
- ieee802_11_ofdm_preamble_0
- 0
- 0
-
ieee802_11_chunks_to_symbols_xx_0
blocks_tagged_stream_mux_0
@@ -1555,18 +1496,6 @@
0
0
-
- blocks_tagged_stream_mux_0
- digital_ofdm_carrier_allocator_cvc_0_0
- 0
- 0
-
-
- digital_ofdm_carrier_allocator_cvc_0_0
- fft_vxx_0
- 0
- 0
-
ieee802_11_ofdm_mapper_0
digital_packet_headergenerator_bb_0
@@ -1579,4 +1508,34 @@
0
0
+
+ blocks_complex_to_mag_squared_0
+ ieee802_11_moving_average_xx_0
+ 0
+ 0
+
+
+ fft_vxx_0_0
+ digital_ofdm_cyclic_prefixer_0_0
+ 0
+ 0
+
+
+ blocks_tagged_stream_mux_0
+ digital_ofdm_carrier_allocator_cvc_0_0_0
+ 0
+ 0
+
+
+ digital_ofdm_carrier_allocator_cvc_0_0_0
+ fft_vxx_0_0
+ 0
+ 0
+
+
+ digital_ofdm_cyclic_prefixer_0_0
+ pad_sink_0
+ 0
+ 0
+
diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc
index dd13b60..8265b68 100644
--- a/examples/wifi_transceiver.grc
+++ b/examples/wifi_transceiver.grc
@@ -1,6 +1,6 @@
- Mon Jan 20 14:04:11 2014
+ Sat Feb 1 18:32:31 2014
options
@@ -1361,49 +1361,6 @@
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
- (108, 390)
-
-
- _rotation
- 180
-
-
uhd_usrp_sink
@@ -2076,34 +2033,26 @@
- foo_packet_pad
+ blocks_multiply_const_vxx
id
- foo_packet_pad_0
+ blocks_multiply_const_vxx_0
_enabled
True
- debug
- False
+ type
+ complex
- delay
- False
+ const
+ mult
- delay_sec
- 0.0005
-
-
- pad_front
- 10000
-
-
- pad_tail
- 10000
+ vlen
+ 1
affinity
@@ -2119,7 +2068,58 @@
_coordinate
- (73, 479)
+ (108, 389)
+
+
+ _rotation
+ 180
+
+
+
+ foo_packet_pad2
+
+ id
+ foo_packet_pad2_0
+
+
+ _enabled
+ True
+
+
+ debug
+ False
+
+
+ delay
+ False
+
+
+ delay_sec
+ 0.001
+
+
+ pad_front
+ 10000
+
+
+ pad_tail
+ 0
+
+
+ affinity
+
+
+
+ minoutbuf
+ 0
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (78, 479)
_rotation
@@ -2132,12 +2132,6 @@
0
0
-
- foo_packet_pad_0
- uhd_usrp_sink_0
- 0
- 0
-
ieee802_11_ether_encap_0
blocks_tuntap_pdu_0
@@ -2168,12 +2162,6 @@
phy out
in
-
- blocks_multiply_const_vxx_0
- foo_packet_pad_0
- 0
- 0
-
wifi_phy_hier_0
blocks_multiply_const_vxx_0
@@ -2210,4 +2198,16 @@
mac_out
in
+
+ foo_packet_pad2_0
+ uhd_usrp_sink_0
+ 0
+ 0
+
+
+ blocks_multiply_const_vxx_0
+ foo_packet_pad2_0
+ 0
+ 0
+
diff --git a/examples/wifi_tx.grc b/examples/wifi_tx.grc
index 43c828e..331f4c3 100644
--- a/examples/wifi_tx.grc
+++ b/examples/wifi_tx.grc
@@ -1,6 +1,6 @@
- Mon Jan 20 13:49:51 2014
+ Sat Feb 1 18:33:30 2014
options
@@ -320,23 +320,74 @@
- blocks_null_source
+ variable_slider
id
- blocks_null_source_0
+ mult
_enabled
True
- type
- complex
+ label
+
- vlen
+ value
1
+
+ min
+ 0
+
+
+ max
+ 2
+
+
+ num_steps
+ 100
+
+
+ style
+ wx.SL_HORIZONTAL
+
+
+ converver
+ float_converter
+
+
+ grid_pos
+
+
+
+ notebook
+
+
+
+ _coordinate
+ (979, 10)
+
+
+ _rotation
+ 0
+
+
+
+ wifi_phy_hier
+
+ id
+ wifi_phy_hier_0
+
+
+ _enabled
+ True
+
+
+ encoding
+ 0
+
affinity
@@ -351,7 +402,7 @@
_coordinate
- (692, 334)
+ (443, 300)
_rotation
@@ -389,6 +440,92 @@
0
+
+ blocks_socket_pdu
+
+ id
+ blocks_socket_pdu_0
+
+
+ _enabled
+ True
+
+
+ type
+ "UDP_SERVER"
+
+
+ host
+
+
+
+ port
+ 52001
+
+
+ mtu
+ 10000
+
+
+ affinity
+
+
+
+ minoutbuf
+ 0
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (200, 210)
+
+
+ _rotation
+ 0
+
+
+
+ blocks_message_strobe
+
+ id
+ blocks_message_strobe_0
+
+
+ _enabled
+ True
+
+
+ msg
+ pmt.intern(" Hello World")
+
+
+ period
+ 300
+
+
+ affinity
+
+
+
+ minoutbuf
+ 0
+
+
+ maxoutbuf
+ 0
+
+
+ _coordinate
+ (113, 154)
+
+
+ _rotation
+ 0
+
+
uhd_usrp_sink
@@ -1061,72 +1198,33 @@
- variable_slider
+ foo_packet_pad2
id
- mult
+ foo_packet_pad2_0
_enabled
True
- label
-
+ debug
+ False
- value
- 1
+ delay
+ False
- min
+ delay_sec
+ 0.001
+
+
+ pad_front
0
- max
- 2
-
-
- num_steps
- 100
-
-
- style
- wx.SL_HORIZONTAL
-
-
- converver
- float_converter
-
-
- grid_pos
-
-
-
- notebook
-
-
-
- _coordinate
- (979, 10)
-
-
- _rotation
- 0
-
-
-
- wifi_phy_hier
-
- id
- wifi_phy_hier_0
-
-
- _enabled
- True
-
-
- encoding
+ pad_tail
0
@@ -1143,11 +1241,11 @@
_coordinate
- (443, 300)
+ (86, 420)
_rotation
- 180
+ 0
@@ -1186,158 +1284,13 @@
_coordinate
- (172, 330)
+ (199, 330)
_rotation
180
-
- blocks_file_sink
-
- id
- blocks_file_sink_0
-
-
- _enabled
- False
-
-
- file
- /tmp/ofdm.bin
-
-
- type
- complex
-
-
- vlen
- 1
-
-
- unbuffered
- True
-
-
- append
- False
-
-
- affinity
-
-
-
- _coordinate
- (592, 430)
-
-
- _rotation
- 0
-
-
-
- blocks_message_strobe
-
- id
- blocks_message_strobe_0
-
-
- _enabled
- True
-
-
- msg
- pmt.intern("Hello World")
-
-
- period
- 300
-
-
- affinity
-
-
-
- minoutbuf
- 0
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (113, 179)
-
-
- _rotation
- 0
-
-
-
- foo_packet_pad
-
- id
- foo_packet_pad_0
-
-
- _enabled
- True
-
-
- debug
- False
-
-
- delay
- True
-
-
- delay_sec
- 0.001
-
-
- pad_front
- 100000
-
-
- pad_tail
- 100000
-
-
- affinity
-
-
-
- minoutbuf
- 0
-
-
- maxoutbuf
- 0
-
-
- _coordinate
- (93, 420)
-
-
- _rotation
- 0
-
-
-
- blocks_multiply_const_vxx_1
- foo_packet_pad_0
- 0
- 0
-
-
- foo_packet_pad_0
- uhd_usrp_sink_0
- 0
- 0
-
blocks_message_strobe_0
ieee802_11_ofdm_mac_0
@@ -1350,12 +1303,6 @@
0
0
-
- blocks_null_source_0
- wifi_phy_hier_0
- 0
- 0
-
ieee802_11_ofdm_mac_0
wifi_phy_hier_0
@@ -1363,9 +1310,21 @@
mac_in
- wifi_phy_hier_0
+ blocks_socket_pdu_0
ieee802_11_ofdm_mac_0
- mac_out
- phy in
+ pdus
+ app in
+
+
+ foo_packet_pad2_0
+ uhd_usrp_sink_0
+ 0
+ 0
+
+
+ blocks_multiply_const_vxx_1
+ foo_packet_pad2_0
+ 0
+ 0