--- examples/gmsk_radio.grc.orig +++ examples/gmsk_radio.grc @@ -1,23 +1,23 @@ - - + + Fri Sep 12 22:58:12 2014 options - id - gmsk_radio + author + - _enabled - True + window_size + 1480, 1424 - title - GMSK Modem + category + gr-mac - author + comment @@ -25,65 +25,73 @@ - window_size - 1480, 1424 + _enabled + True - generate_options - hb + _coordinate + (10, 10) - category - gr-mac + _rotation + 0 - run_options - prompt + generate_options + hb - run - True + hier_block_src_path + .: + + + id + gmsk_radio max_nouts 0 - realtime_scheduling + qt_qss_theme - alias + realtime_scheduling - _coordinate - (10, 10) + run_command + {python} -u {filename} - _rotation - 0 + run_options + prompt - - - variable - id - samp_rate + run + True - _enabled - True + thread_safe_setters + - value - rate + title + GMSK Modem + + + variable - alias + comment + _enabled + True + + _coordinate (120, 123) @@ -91,632 +99,685 @@ _rotation 0 - - - parameter id - rate - - - _enabled - True - - - label - Sample rate + samp_rate value - 1e6 + rate + + + parameter - type - eng_float + alias + - short_id - r + comment + - alias - + _enabled + True _coordinate - (8, 123) + (8, 387) _rotation 0 - - - parameter id - samps_per_sym - - - _enabled - True + access_code_threshold label - Samples/symbol + Access code threshold - value - 4 + short_id + type intx - short_id - + value + 0 + + + parameter alias + comment + + + + _enabled + True + + _coordinate - (8, 251) + (168, 251) _rotation 0 - - - parameter id ampl - _enabled - True - - label TX BB amp - value - 0.7 + short_id + type eng_float - short_id - + value + 0.7 + + + blocks_multiply_const_vxx alias - _coordinate - (168, 251) + comment + - _rotation - 0 + const + ampl - - - parameter - id - access_code_threshold + affinity + _enabled True - label - Access code threshold + _coordinate + (592, 635) - value + _rotation 0 - type - intx + id + blocks_multiply_const_vxx_0 - short_id - + type + complex - alias - + maxoutbuf + 0 - _coordinate - (8, 387) + minoutbuf + 0 - _rotation - 0 + vlen + 1 - note + blocks_pdu_to_tagged_stream - id - note_0 + alias + - _enabled - True + comment + - note - Tradeoff between detecting possibly slightly corrupted header and still decoding packet vs. starting decode and have state machine decoding while another packet starts later (and it is missed) + affinity + - alias - + _enabled + True _coordinate - (184, 435) + (944, 491) _rotation 0 - - - pad_sink id - pad_sink_0_0 - - - _enabled - True - - - label - msg_out + blocks_pdu_to_tagged_stream_0 type - message + byte - vlen - 1 + tag + length - num_streams - 1 + maxoutbuf + 0 - optional - False + minoutbuf + 0 + + + digital_gmsk_demod - _coordinate - (1272, 235) + alias + - _rotation - 0 + comment + - - - mac_packet_to_pdu - id - mac_packet_to_pdu_0 + affinity + _enabled True - dewhiten - True + freq_error + 0.0 - output_invalid - False - + _coordinate + (632, 195) + - alias - + _rotation + 0 - affinity - + gain_mu + 0.175 - minoutbuf - 0 + id + digital_gmsk_demod_0 + + + log + False maxoutbuf 0 - _coordinate - (1088, 227) + minoutbuf + 0 - _rotation - 0 + mu + 0.5 - - - mac_packet_deframer - id - mac_packet_deframer_0 + omega_relative_limit + 0.005 - _enabled - True + samples_per_symbol + samps_per_sym - access_code - + verbose + True + + + digital_gmsk_mod - threshold - access_code_threshold + bt + 0.35 alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (888, 227) + (1184, 483) _rotation 0 - - - blocks_pdu_to_tagged_stream id - blocks_pdu_to_tagged_stream_0 + digital_gmsk_mod_0 - _enabled - True + log + False - type - byte + maxoutbuf + 0 - tag - length + minoutbuf + 0 + samples_per_symbol + samps_per_sym + + + verbose + False + + + + mac_burst_tagger + alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (944, 491) + (768, 611) _rotation 0 - - - digital_gmsk_mod id - digital_gmsk_mod_0 + mac_burst_tagger_0 - _enabled - True + maxoutbuf + 0 - samples_per_symbol - samps_per_sym + minoutbuf + 0 - bt - 0.35 + mult + samps_per_sym*8 - verbose - False + pad_front + 32*0+ 0 - log - False + pad_rear + 16*0 + 16 + + + tag_name + 'length' + + + + mac_packet_deframer + + access_code + alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (1184, 483) + (888, 227) _rotation 0 - - - blocks_multiply_const_vxx id - blocks_multiply_const_vxx_0 + mac_packet_deframer_0 - _enabled - True + maxoutbuf + 0 - type - complex + minoutbuf + 0 - const - ampl + threshold + access_code_threshold + + + mac_packet_framer - vlen - 1 + access_code + alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (592, 635) + (680, 451) _rotation 0 - - - pad_sink id - pad_sink_0 + mac_packet_framer_0 - _enabled + maxoutbuf + 0 + + + minoutbuf + 0 + + + postamble + ''.join(['\x00']*(16/8/samps_per_sym)*0) + + + preamble + ''.join(['\x55']*((256*1)/8/samps_per_sym)) + + + rotate_whitener_offset + False + + + whiten True - label - out + whitener_offset + 0 + + + mac_packet_to_pdu - type - complex + alias + - vlen - 1 + comment + - num_streams - 1 + affinity + - optional - False + dewhiten + True + + + _enabled + True _coordinate - (968, 635) + (1088, 227) _rotation 0 + + id + mac_packet_to_pdu_0 + + + maxoutbuf + 0 + + + minoutbuf + 0 + + + output_invalid + False + - digital_gmsk_demod + note - id - digital_gmsk_demod_0 + alias + + + + comment + _enabled True - samples_per_symbol - samps_per_sym + _coordinate + (184, 435) - gain_mu - 0.175 + _rotation + 0 - mu - 0.5 + id + note_0 - omega_relative_limit - 0.005 + note + Tradeoff between detecting possibly slightly corrupted header and still decoding packet vs. starting decode and have state machine decoding while another packet starts later (and it is missed) + + + pad_sink - freq_error - 0.0 + comment + - verbose + _enabled True - log - False + _coordinate + (968, 635) - alias - + _rotation + 0 - affinity - + id + pad_sink_0 - minoutbuf - 0 + type + complex - maxoutbuf - 0 + label + out - _coordinate - (632, 195) + num_streams + 1 - _rotation - 0 + optional + False + + + vlen + 1 - mac_packet_framer + pad_sink - id - mac_packet_framer_0 + comment + _enabled True - access_code - + _coordinate + (1272, 235) - whitener_offset + _rotation 0 - whiten - True + id + pad_sink_0_0 - rotate_whitener_offset - False + type + message - preamble - ''.join(['\x55']*((256*1)/8/samps_per_sym)) + label + msg_out - postamble - ''.join(['\x00']*(16/8/samps_per_sym)*0) + num_streams + 1 - alias - + optional + False - affinity - + vlen + 1 + + + pad_source - minoutbuf - 0 + comment + - maxoutbuf - 0 + _enabled + True _coordinate - (680, 451) + (456, 235) _rotation 0 - - - pad_source id pad_source_0 - _enabled - True - - label bb_in + num_streams + 1 + + + optional + False + + type complex @@ -724,38 +785,42 @@ vlen 1 + + + pad_source - num_streams - 1 + comment + - optional - False + _enabled + True _coordinate - (456, 235) + (504, 491) _rotation 0 - - - pad_source id pad_source_1 - _enabled - True - - label msg_in + num_streams + 1 + + + optional + False + + type message @@ -763,99 +828,106 @@ vlen 1 + + + parameter - num_streams - 1 + alias + - optional - False + comment + + + + _enabled + True _coordinate - (504, 491) + (8, 123) _rotation 0 - - - mac_burst_tagger id - mac_burst_tagger_0 - - - _enabled - True + rate - tag_name - 'length' + label + Sample rate - mult - samps_per_sym*8 + short_id + r - pad_front - 32*0+ 0 + type + eng_float - pad_rear - 16*0 + 16 + value + 1e6 + + + parameter alias - affinity + comment - minoutbuf - 0 - - - maxoutbuf - 0 + _enabled + True _coordinate - (768, 611) + (8, 251) _rotation 0 + + id + samps_per_sym + + + label + Samples/symbol + + + short_id + + + + type + intx + + + value + 4 + - blocks_pdu_to_tagged_stream_0 - digital_gmsk_mod_0 + blocks_multiply_const_vxx_0 + mac_burst_tagger_0 0 0 - mac_packet_framer_0 - blocks_pdu_to_tagged_stream_0 - out - pdus - - - mac_packet_to_pdu_0 - pad_sink_0_0 - pdu + blocks_pdu_to_tagged_stream_0 + digital_gmsk_mod_0 + 0 0 - mac_packet_deframer_0 - mac_packet_to_pdu_0 - msg - msg - - digital_gmsk_demod_0 mac_packet_deframer_0 0 @@ -868,18 +940,30 @@ 0 - blocks_multiply_const_vxx_0 - mac_burst_tagger_0 - 0 - 0 - - mac_burst_tagger_0 pad_sink_0 0 0 + mac_packet_deframer_0 + mac_packet_to_pdu_0 + msg + msg + + + mac_packet_framer_0 + blocks_pdu_to_tagged_stream_0 + out + pdus + + + mac_packet_to_pdu_0 + pad_sink_0_0 + pdu + in + + pad_source_0 digital_gmsk_demod_0 0 @@ -888,7 +972,7 @@ pad_source_1 mac_packet_framer_0 - 0 + out in --- examples/ofdm_radio.grc.orig +++ examples/ofdm_radio.grc @@ -1,23 +1,23 @@ - - + + Fri Sep 12 16:57:41 2014 options - id - ofdm_radio + author + - _enabled - True + window_size + 1280, 1024 - title - OFDM Modem + category + gr-mac - author + comment @@ -25,257 +25,243 @@ - window_size - 1280, 1024 + _enabled + True - generate_options - hb + _coordinate + (10, 10) - category - gr-mac + _rotation + 0 - run_options - prompt + generate_options + hb - run - True + hier_block_src_path + .: + + + id + ofdm_radio max_nouts 0 - realtime_scheduling + qt_qss_theme - alias + realtime_scheduling - _coordinate - (10, 10) + run_command + {python} -u {filename} - _rotation - 0 + run_options + prompt - - - variable - id - samp_rate + run + True - _enabled - True + thread_safe_setters + - value - rate + title + OFDM Modem + + + variable - alias + comment + _enabled + True + + _coordinate - (123, 98) + (844, 456) _rotation 0 - - - variable id backoff_db - _enabled - True - - value -15.0 + + + variable - alias + comment + _enabled + True + + _coordinate - (844, 456) + (123, 98) _rotation 0 - - - parameter id - rate + samp_rate - _enabled - True + value + rate + + + blocks_multiply_const_vxx - label - Sample rate + alias + - value - 1e6 + comment + - type - eng_float + const + 10.0**(1.0*backoff_db/10.0) - short_id - r + affinity + - alias - + _enabled + True _coordinate - (10, 98) + (810, 414) _rotation 0 - - - blocks_tagged_stream_to_pdu id - blocks_tagged_stream_to_pdu_0 + blocks_multiply_const_vxx_0 - _enabled - True + type + complex - type - byte + maxoutbuf + 0 - tag - length + minoutbuf + 0 + vlen + 1 + + + + blocks_pdu_to_tagged_stream + alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (826, 44) + (457, 237) _rotation 0 - - - pad_sink id - pad_sink_3 - - - _enabled - True - - - label - msg_out + blocks_pdu_to_tagged_stream_0 type - message - - - vlen - 1 - - - num_streams - 1 + byte - optional - True + tag + length - _coordinate - (1074, 44) + maxoutbuf + 0 - _rotation + minoutbuf 0 - note + blocks_tagged_stream_to_pdu - id - note_0 + alias + - _enabled - True + comment + - note - Front: 128 is too short, Tail: 8 is adequate + affinity + - alias - + _enabled + True _coordinate - (1080, 172) + (826, 44) _rotation 0 - - - blocks_pdu_to_tagged_stream id - blocks_pdu_to_tagged_stream_0 - - - _enabled - True + blocks_tagged_stream_to_pdu_0 type @@ -286,267 +272,335 @@ length + maxoutbuf + 0 + + + minoutbuf + 0 + + + + digital_ofdm_rx + alias + comment + + + affinity - minoutbuf - 0 + cp_len + 16 - maxoutbuf - 0 + _enabled + True + + + fft_len + 64 _coordinate - (457, 237) + (560, 9) _rotation 0 - - - pad_source + + header_mod + "BPSK" + id - pad_source_0 + digital_ofdm_rx_1 - _enabled - True + log + False - label - msg_in + maxoutbuf + 0 - type - message + minoutbuf + 0 - vlen - 1 + occupied_carriers + () - num_streams - 1 + packet_len_key + "length" - optional - True + payload_mod + "BPSK" - _coordinate - (274, 244) + pilot_carriers + () - _rotation - 0 + pilot_symbols + () + + + scramble_bits + False + + + sync_word1 + () + + + sync_word2 + () - foo_burst_tagger + digital_ofdm_tx - id - foo_burst_tagger_0 + alias + - _enabled - False + comment + - alias + affinity + cp_len + 16 + + + _enabled + True + + + fft_len + 64 + + _coordinate - (936, 237) + (696, 202) _rotation 0 - tag_name - pmt.intern("length") + header_mod + "BPSK" - mult - 1 + id + digital_ofdm_tx_0 - affinity - + packet_len_key + length - minoutbuf - 0 + log + False maxoutbuf 0 - - - foo_packet_pad - id - foo_packet_pad_0 + minoutbuf + 0 - _enabled - False + occupied_carriers + () - alias - + payload_mod + "BPSK" - _coordinate - (1141, 216) + pilot_carriers + () - _rotation - 0 + pilot_symbols + () - debug - False + rolloff + 0 + 4 - delay + scramble_bits False - delay_sec - 0.001 + sync_word1 + () - pad_front - 16*4 * 4 + sync_word2 + () + + + foo_burst_tagger - pad_tail - 16 + alias + + + + comment + affinity - minoutbuf + _enabled + False + + + _coordinate + (936, 237) + + + _rotation 0 + id + foo_burst_tagger_0 + + maxoutbuf 0 - - - digital_ofdm_tx - id - digital_ofdm_tx_0 + minoutbuf + 0 - _enabled - True + mult + 1 - fft_len - 64 + tag_name + pmt.intern("length") + + + foo_packet_pad - cp_len - 16 + alias + - packet_len_key - length + comment + - occupied_carriers - () + affinity + - pilot_carriers - () + debug + False - pilot_symbols - () + delay_sec + 0.001 - sync_word1 - () + delay + False - sync_word2 - () + _enabled + False - header_mod - "BPSK" + _coordinate + (1141, 216) - payload_mod - "BPSK" + _rotation + 0 - rolloff - 0 + 4 + id + foo_packet_pad_0 - scramble_bits - False + maxoutbuf + 0 - log - False + minoutbuf + 0 + + + pad_front + 16*4 * 4 + pad_tail + 16 + + + + mac_burst_tagger + alias - affinity + comment - minoutbuf - 0 + affinity + - maxoutbuf - 0 + _enabled + True _coordinate - (696, 202) + (588, 393) _rotation 0 - - - mac_burst_tagger id mac_burst_tagger_0 - _enabled - True + maxoutbuf + 0 - tag_name - 'length' + minoutbuf + 0 mult @@ -561,51 +615,70 @@ 16 - alias - + tag_name + 'length' + + + note - affinity + alias - minoutbuf - 0 + comment + - maxoutbuf - 0 + _enabled + True _coordinate - (588, 393) + (1080, 172) _rotation 0 + + id + note_0 + + + note + Front: 128 is too short, Tail: 8 is adequate + - pad_source + pad_sink - id - pad_source_1 + comment + _enabled True - label - in + _coordinate + (1008, 427) + + + _rotation + 0 + + + id + pad_sink_0 type complex - vlen - 1 + label + out num_streams @@ -616,186 +689,191 @@ False - _coordinate - (408, 67) - - - _rotation - 0 + vlen + 1 - digital_ofdm_rx + pad_sink - id - digital_ofdm_rx_1 + comment + _enabled True - fft_len - 64 + _coordinate + (1074, 44) - cp_len - 16 + _rotation + 0 - packet_len_key - "length" + id + pad_sink_3 - occupied_carriers - () + type + message - pilot_carriers - () + label + msg_out - pilot_symbols - () + num_streams + 1 - sync_word1 - () + optional + True - sync_word2 - () + vlen + 1 + + + pad_source - header_mod - "BPSK" + comment + - payload_mod - "BPSK" + _enabled + True - scramble_bits - False + _coordinate + (274, 244) - log - False + _rotation + 0 - alias - + id + pad_source_0 - affinity - + label + msg_in - minoutbuf - 0 + num_streams + 1 - maxoutbuf - 0 + optional + True - _coordinate - (560, 9) + type + message - _rotation - 0 + vlen + 1 - blocks_multiply_const_vxx + pad_source - id - blocks_multiply_const_vxx_0 + comment + _enabled True - type - complex - - - const - 10.0**(1.0*backoff_db/10.0) + _coordinate + (408, 67) - vlen - 1 + _rotation + 0 - alias - + id + pad_source_1 - affinity - + label + in - minoutbuf - 0 + num_streams + 1 - maxoutbuf - 0 + optional + False - _coordinate - (810, 414) + type + complex - _rotation - 0 + vlen + 1 - pad_sink + parameter - id - pad_sink_0 + alias + + + + comment + _enabled True - label - out + _coordinate + (10, 98) - type - complex + _rotation + 0 - vlen - 1 + id + rate - num_streams - 1 + label + Sample rate - optional - False + short_id + r - _coordinate - (1008, 427) + type + eng_float - _rotation - 0 + value + 1e6 - digital_ofdm_rx_1 - blocks_tagged_stream_to_pdu_0 + blocks_multiply_const_vxx_0 + pad_sink_0 + 0 + 0 + + + blocks_pdu_to_tagged_stream_0 + digital_ofdm_tx_0 0 0 @@ -803,23 +881,23 @@ blocks_tagged_stream_to_pdu_0 pad_sink_3 pdus - 0 + in - blocks_pdu_to_tagged_stream_0 - digital_ofdm_tx_0 + digital_ofdm_rx_1 + blocks_tagged_stream_to_pdu_0 0 0 - pad_source_0 - blocks_pdu_to_tagged_stream_0 + digital_ofdm_tx_0 + foo_burst_tagger_0 0 - pdus + 0 digital_ofdm_tx_0 - foo_burst_tagger_0 + mac_burst_tagger_0 0 0 @@ -836,26 +914,20 @@ 0 - digital_ofdm_tx_0 - mac_burst_tagger_0 - 0 - 0 - - mac_burst_tagger_0 blocks_multiply_const_vxx_0 0 0 - pad_source_1 - digital_ofdm_rx_1 - 0 - 0 + pad_source_0 + blocks_pdu_to_tagged_stream_0 + out + pdus - blocks_multiply_const_vxx_0 - pad_sink_0 + pad_source_1 + digital_ofdm_rx_1 0 0