From b0503d5fa325ba3462bad7916eca9a9cb00d6b6a Mon Sep 17 00:00:00 2001 From: Bastian Bloessl Date: Thu, 10 Oct 2013 11:05:14 +0200 Subject: [PATCH] grc block bindings --- grc/CMakeLists.txt | 12 +----- grc/ieee802_11_ether_encap.xml | 18 ++++++++- grc/ieee802_11_moving_average_xx.xml | 43 +++++++++++++++++++++ grc/ieee802_11_ofdm_decode_mac.xml | 18 ++++++++- grc/ieee802_11_ofdm_decode_signal.xml | 18 ++++++++- grc/ieee802_11_ofdm_freq_est.xml | 54 +++++++++++++++++++++++++++ grc/ieee802_11_ofdm_mac.xml | 33 ++++++++++++++++ grc/ieee802_11_ofdm_mapper.xml | 48 ++++++++++++++++++++++++ grc/ieee802_11_ofdm_parse_mac.xml | 22 ++++++++--- grc/ieee802_11_ofdm_pilot.xml | 40 ++++++++++++++++++++ grc/ieee802_11_ofdm_preamble.xml | 38 +++++++++++++++++++ grc/ieee802_11_ofdm_sync_long.xml | 26 ++++++++----- grc/ieee802_11_ofdm_sync_short.xml | 18 ++++++++- grc/ieee802_11_wave_llc.xml | 19 ++++++++++ grc/ieee802_11_wave_short_message.xml | 28 ++++++++++++++ 15 files changed, 406 insertions(+), 29 deletions(-) create mode 100644 grc/ieee802_11_moving_average_xx.xml create mode 100644 grc/ieee802_11_ofdm_freq_est.xml create mode 100644 grc/ieee802_11_ofdm_mac.xml create mode 100644 grc/ieee802_11_ofdm_mapper.xml create mode 100644 grc/ieee802_11_ofdm_pilot.xml create mode 100644 grc/ieee802_11_ofdm_preamble.xml create mode 100644 grc/ieee802_11_wave_llc.xml create mode 100644 grc/ieee802_11_wave_short_message.xml diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index 5d916ca..7e4c03f 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -1,11 +1,3 @@ +file(GLOB xml_files "*.xml") -install(FILES - ieee802_11_ether_encap.xml - ieee802_11_ofdm_decode_mac.xml - ieee802_11_ofdm_decode_signal.xml - ieee802_11_ofdm_equalize_symbols.xml - ieee802_11_ofdm_parse_mac.xml - ieee802_11_ofdm_sync_long.xml - ieee802_11_ofdm_sync_short.xml - DESTINATION share/gnuradio/grc/blocks -) +install(FILES ${xml_files} DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/ieee802_11_ether_encap.xml b/grc/ieee802_11_ether_encap.xml index 34219c7..0a5a87c 100644 --- a/grc/ieee802_11_ether_encap.xml +++ b/grc/ieee802_11_ether_encap.xml @@ -24,13 +24,27 @@ - in + from tap message + 1 + + + + from wifi + message + 1 - out + to tap message + 1 + + + + to wifi + message + 1 diff --git a/grc/ieee802_11_moving_average_xx.xml b/grc/ieee802_11_moving_average_xx.xml new file mode 100644 index 0000000..53d31b3 --- /dev/null +++ b/grc/ieee802_11_moving_average_xx.xml @@ -0,0 +1,43 @@ + + + Moving Average + ieee802_11_moving_average_xx + IEEE802.11 + import ieee802_11 + ieee802_11.moving_average_$(type.fcn)($length) + set_length($length) + + Type + type + enum + + + + + + Length + length + 48 + int + + + + in + $type + + + + out + $type + + diff --git a/grc/ieee802_11_ofdm_decode_mac.xml b/grc/ieee802_11_ofdm_decode_mac.xml index 263da48..9458be5 100644 --- a/grc/ieee802_11_ofdm_decode_mac.xml +++ b/grc/ieee802_11_ofdm_decode_mac.xml @@ -5,7 +5,23 @@ ieee802_11_ofdm_decode_mac IEEE802.11 import ieee802_11 - ieee802_11.ofdm_decode_mac($debug) + ieee802_11.ofdm_decode_mac($log, $debug) + + + Log + log + False + bool + + + + Debug diff --git a/grc/ieee802_11_ofdm_decode_signal.xml b/grc/ieee802_11_ofdm_decode_signal.xml index 1fe8df6..cc6de50 100644 --- a/grc/ieee802_11_ofdm_decode_signal.xml +++ b/grc/ieee802_11_ofdm_decode_signal.xml @@ -5,7 +5,23 @@ ieee802_11_ofdm_decode_signal IEEE802.11 import ieee802_11 - ieee802_11.ofdm_decode_signal($debug) + ieee802_11.ofdm_decode_signal($log, $debug) + + + Log + log + False + bool + + + + Debug diff --git a/grc/ieee802_11_ofdm_freq_est.xml b/grc/ieee802_11_ofdm_freq_est.xml new file mode 100644 index 0000000..3c202b1 --- /dev/null +++ b/grc/ieee802_11_ofdm_freq_est.xml @@ -0,0 +1,54 @@ + + + + OFDM Freq Est + ieee802_11_ofdm_freq_est + IEEE802.11 + import ieee802_11 + ieee802_11.ofdm_freq_est($log, $debug) + + + Log + log + False + bool + + + + + + + Debug + debug + False + bool + + + + + + + in + complex + 1 + + + + out + complex + 1 + + + diff --git a/grc/ieee802_11_ofdm_mac.xml b/grc/ieee802_11_ofdm_mac.xml new file mode 100644 index 0000000..69eab8c --- /dev/null +++ b/grc/ieee802_11_ofdm_mac.xml @@ -0,0 +1,33 @@ + + + + OFDM MAC + ieee802_11_ofdm_mac + IEEE802.11 + import ieee802_11 + ieee802_11.ofdm_mac() + + + app in + message + 1 + + + + phy in + message + 1 + + + + app out + message + 1 + + + + phy out + message + 1 + + diff --git a/grc/ieee802_11_ofdm_mapper.xml b/grc/ieee802_11_ofdm_mapper.xml new file mode 100644 index 0000000..aaaf570 --- /dev/null +++ b/grc/ieee802_11_ofdm_mapper.xml @@ -0,0 +1,48 @@ + + + + OFDM Mapper + ieee802_11_ofdm_mapper + IEEE802.11 + import ieee802_11 + ieee802_11.ofdm_mapper($encoding, $debug) + set_encoding($encoding) + + + Encoding + encoding + 0 + int + + + + Debug + debug + False + bool + + + + + + $encoding in range(8) + + + in + message + + + + out + complex + 48 + 1 + + + diff --git a/grc/ieee802_11_ofdm_parse_mac.xml b/grc/ieee802_11_ofdm_parse_mac.xml index a67d8f3..cb6d9c9 100644 --- a/grc/ieee802_11_ofdm_parse_mac.xml +++ b/grc/ieee802_11_ofdm_parse_mac.xml @@ -5,7 +5,23 @@ ieee802_11_ofdm_parse_mac IEEE802.11 import ieee802_11 - ieee802_11.ofdm_parse_mac($debug) + ieee802_11.ofdm_parse_mac($log, $debug) + + + Log + log + False + bool + + + + Debug @@ -28,9 +44,5 @@ message - - out - message - diff --git a/grc/ieee802_11_ofdm_pilot.xml b/grc/ieee802_11_ofdm_pilot.xml new file mode 100644 index 0000000..a87c250 --- /dev/null +++ b/grc/ieee802_11_ofdm_pilot.xml @@ -0,0 +1,40 @@ + + + + OFDM Pilot + ieee802_11_ofdm_pilot + IEEE802.11 + import ieee802_11 + ieee802_11.ofdm_pilot($debug) + + + Debug + debug + False + bool + + + + + + + in + complex + 48 + 1 + + + + out + complex + 64 + 1 + + + diff --git a/grc/ieee802_11_ofdm_preamble.xml b/grc/ieee802_11_ofdm_preamble.xml new file mode 100644 index 0000000..6d7fecb --- /dev/null +++ b/grc/ieee802_11_ofdm_preamble.xml @@ -0,0 +1,38 @@ + + + + OFDM Preamble + ieee802_11_ofdm_preamble + IEEE802.11 + import ieee802_11 + ieee802_11.ofdm_preamble($debug) + + + Debug + debug + False + bool + + + + + + + in + complex + 1 + + + + out + complex + 1 + + + diff --git a/grc/ieee802_11_ofdm_sync_long.xml b/grc/ieee802_11_ofdm_sync_long.xml index 93f7f9a..e41c790 100644 --- a/grc/ieee802_11_ofdm_sync_long.xml +++ b/grc/ieee802_11_ofdm_sync_long.xml @@ -5,7 +5,23 @@ ieee802_11_ofdm_sync_long IEEE802.11 import ieee802_11 - ieee802_11.ofdm_sync_long($sync_length, $freq_est, $debug) + ieee802_11.ofdm_sync_long($sync_length, $log, $debug) + + + Log + log + False + bool + + + + Debug @@ -30,14 +46,6 @@ int - - Freq Est Samples - freq_est - 100 - int - - - $freq_est > 0 $sync_length > 0 diff --git a/grc/ieee802_11_ofdm_sync_short.xml b/grc/ieee802_11_ofdm_sync_short.xml index 4c5eaac..5ee8da9 100644 --- a/grc/ieee802_11_ofdm_sync_short.xml +++ b/grc/ieee802_11_ofdm_sync_short.xml @@ -5,7 +5,23 @@ ieee802_11_ofdm_sync_short IEEE802.11 import ieee802_11 - ieee802_11.ofdm_sync_short($threshold, $max_samples, $min_plateau, $debug) + ieee802_11.ofdm_sync_short($threshold, $max_samples, $min_plateau, $log, $debug) + + + Log + log + False + bool + + + + Debug diff --git a/grc/ieee802_11_wave_llc.xml b/grc/ieee802_11_wave_llc.xml new file mode 100644 index 0000000..660a1a0 --- /dev/null +++ b/grc/ieee802_11_wave_llc.xml @@ -0,0 +1,19 @@ + + + + WAVE LLC + ieee802_11_wave_llc + IEEE802.11 + import ieee802_11 + ieee802_11.wave_llc() + + + in + message + + + + out + message + + diff --git a/grc/ieee802_11_wave_short_message.xml b/grc/ieee802_11_wave_short_message.xml new file mode 100644 index 0000000..a0d5618 --- /dev/null +++ b/grc/ieee802_11_wave_short_message.xml @@ -0,0 +1,28 @@ + + + + WAVE Short Message + ieee802_11_wave_short_message + IEEE802.11 + import ieee802_11 + ieee802_11.wave_short_message($version) + + set_version($version) + + + Version + version + 0 + int + + + + in + message + + + + out + message + +