diff options
author | Roman Khassraf <roman@khassraf.at> | 2015-08-04 11:16:04 +0200 |
---|---|---|
committer | Roman Khassraf <roman@khassraf.at> | 2015-08-04 11:16:04 +0200 |
commit | 8e3b0eca898706383bf7dfbbef8f37dfea5d10be (patch) | |
tree | b84596808cd643053a01af3361839b89c3006b23 | |
parent | dbc3a50c313906cba0c2536b934f6a563adabe67 (diff) |
Implemented burst framenumber filter. Issue #100
-rw-r--r-- | grc/flow_control/CMakeLists.txt | 3 | ||||
-rw-r--r-- | grc/flow_control/gsm_burst_fnr_filter.xml | 42 | ||||
-rw-r--r-- | grc/gsm_block_tree.xml | 1 | ||||
-rw-r--r-- | include/grgsm/flow_control/CMakeLists.txt | 3 | ||||
-rw-r--r-- | include/grgsm/flow_control/burst_fnr_filter.h | 64 | ||||
-rw-r--r-- | lib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib/flow_control/burst_fnr_filter_impl.cc | 79 | ||||
-rw-r--r-- | lib/flow_control/burst_fnr_filter_impl.h | 46 | ||||
-rw-r--r-- | python/CMakeLists.txt | 1 | ||||
-rwxr-xr-x | python/qa_burst_fnr_filter.py | 168 | ||||
-rw-r--r-- | swig/grgsm_swig.i | 3 |
11 files changed, 409 insertions, 2 deletions
diff --git a/grc/flow_control/CMakeLists.txt b/grc/flow_control/CMakeLists.txt index c11943f..37fa830 100644 --- a/grc/flow_control/CMakeLists.txt +++ b/grc/flow_control/CMakeLists.txt @@ -18,5 +18,6 @@ # Boston, MA 02110-1301, USA. install(FILES - gsm_burst_timeslot_splitter.xml DESTINATION share/gnuradio/grc/blocks + gsm_burst_timeslot_splitter.xml + gsm_burst_fnr_filter.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/flow_control/gsm_burst_fnr_filter.xml b/grc/flow_control/gsm_burst_fnr_filter.xml new file mode 100644 index 0000000..d09b6e6 --- /dev/null +++ b/grc/flow_control/gsm_burst_fnr_filter.xml @@ -0,0 +1,42 @@ +<?xml version="1.0"?> +<block> + <name>Burst framenumber filter</name> + <key>gsm_burst_fnr_filter</key> + <import>import grgsm</import> + <make>grgsm.burst_fnr_filter($mode, $fnr)</make> + + <param> + <name>Mode</name> + <key>mode</key> + <type>enum</type> + <option> + <name>Less or equal</name> + <key>grgsm.FILTER_LESS_OR_EQUAL</key> + </option> + <option> + <name>Greater or equal</name> + <key>grgsm.FILTER_GREATER_OR_EQUAL</key> + </option> + </param> + <param> + <name>Framenumber</name> + <key>fnr</key> + <value>1500123</value> + <type>int</type> + </param> + + <sink> + <name>in</name> + <type>message</type> + </sink> + + <source> + <name>out</name> + <type>message</type> + <optional>1</optional> + </source> + + <doc> +Burst framenumber filter forwards only blocks with a framenumber satisfying the configured mode, i.e. if mode is "Less or equal", then only bursts with a smaller or equal framenumber are forwarded. + </doc> +</block> diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml index 1679ad1..2c48aff 100644 --- a/grc/gsm_block_tree.xml +++ b/grc/gsm_block_tree.xml @@ -40,6 +40,7 @@ <cat> <name>Flow control</name> <block>gsm_burst_timeslot_splitter</block> + <block>gsm_burst_fnr_filter</block> </cat> <cat> <name>Utilities</name> diff --git a/include/grgsm/flow_control/CMakeLists.txt b/include/grgsm/flow_control/CMakeLists.txt index e701592..1063aae 100644 --- a/include/grgsm/flow_control/CMakeLists.txt +++ b/include/grgsm/flow_control/CMakeLists.txt @@ -21,5 +21,6 @@ # Install public header files ######################################################################## install(FILES - burst_timeslot_splitter.h DESTINATION include/grgsm/flow_control + burst_timeslot_splitter.h + burst_fnr_filter.h DESTINATION include/grgsm/flow_control ) diff --git a/include/grgsm/flow_control/burst_fnr_filter.h b/include/grgsm/flow_control/burst_fnr_filter.h new file mode 100644 index 0000000..9451d58 --- /dev/null +++ b/include/grgsm/flow_control/burst_fnr_filter.h @@ -0,0 +1,64 @@ +/* -*- c++ -*- */ +/* + * @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + + +#ifndef INCLUDED_GSM_BURST_FNR_FILTER_H +#define INCLUDED_GSM_BURST_FNR_FILTER_H + +#include <grgsm/api.h> +#include <gnuradio/block.h> + +namespace gr { + namespace gsm { + + enum filter_mode + { + FILTER_LESS_OR_EQUAL, + FILTER_GREATER_OR_EQUAL + }; + + /*! + * \brief <+description of block+> + * \ingroup gsm + * + */ + class GSM_API burst_fnr_filter : virtual public gr::block + { + public: + typedef boost::shared_ptr<burst_fnr_filter> sptr; + + /*! + * \brief Return a shared_ptr to a new instance of gsm::burst_fnr_filter. + * + * To avoid accidental use of raw pointers, gsm::burst_fnr_filter's + * constructor is in a private implementation + * class. gsm::burst_fnr_filter::make is the public interface for + * creating new instances. + */ + static sptr make(filter_mode mode, unsigned int fnr); + + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_BURST_FNR_FILTER_H */ diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 4a61f0b..83948b7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -47,6 +47,7 @@ list(APPEND grgsm_sources decoding/GSM503Tables.cpp decoding/ViterbiR204.cpp flow_control/burst_timeslot_splitter_impl.cc + flow_control/burst_fnr_filter_impl.cc misc_utils/controlled_rotator_cc_impl.cc misc_utils/controlled_const_source_f_impl.cc misc_utils/message_printer_impl.cc diff --git a/lib/flow_control/burst_fnr_filter_impl.cc b/lib/flow_control/burst_fnr_filter_impl.cc new file mode 100644 index 0000000..1aa6f5b --- /dev/null +++ b/lib/flow_control/burst_fnr_filter_impl.cc @@ -0,0 +1,79 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <gnuradio/io_signature.h> +#include "burst_fnr_filter_impl.h" +#include <stdio.h> +#include <grgsm/endian.h> +#include <grgsm/gsmtap.h> + + +namespace gr { + namespace gsm { + + burst_fnr_filter::sptr + burst_fnr_filter::make(filter_mode mode, unsigned int fnr) + { + return gnuradio::get_initial_sptr + (new burst_fnr_filter_impl(mode, fnr)); + } + + /* + * The private constructor + */ + burst_fnr_filter_impl::burst_fnr_filter_impl(filter_mode mode, unsigned int fnr) + : gr::block("burst_fnr_filter", + gr::io_signature::make(0, 0, 0), + gr::io_signature::make(0, 0, 0)), + d_mode(mode), + d_framenr(fnr) + { + message_port_register_in(pmt::mp("in")); + message_port_register_out(pmt::mp("out")); + + set_msg_handler(pmt::mp("in"), boost::bind(&burst_fnr_filter_impl::process_burst, this, _1)); + } + + /* + * Our virtual destructor. + */ + burst_fnr_filter_impl::~burst_fnr_filter_impl() {} + + void burst_fnr_filter_impl::process_burst(pmt::pmt_t msg) + { + pmt::pmt_t header_plus_burst = pmt::cdr(msg); + gsmtap_hdr * header = (gsmtap_hdr *)pmt::blob_data(header_plus_burst); + + unsigned int frame_nr = be32toh(header->frame_number); + + if ((d_mode == FILTER_LESS_OR_EQUAL && frame_nr <= d_framenr) + || d_mode == FILTER_GREATER_OR_EQUAL && frame_nr >= d_framenr) + { + message_port_pub(pmt::mp("out"), msg); + } + } + } /* namespace gsm */ +} /* namespace gr */ diff --git a/lib/flow_control/burst_fnr_filter_impl.h b/lib/flow_control/burst_fnr_filter_impl.h new file mode 100644 index 0000000..5d9850d --- /dev/null +++ b/lib/flow_control/burst_fnr_filter_impl.h @@ -0,0 +1,46 @@ +/* -*- c++ -*- */ +/* @file + * @author Roman Khassraf <rkhassraf@gmail.com> + * @section LICENSE + * + * Gr-gsm is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * Gr-gsm is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with gr-gsm; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + * + */ + +#ifndef INCLUDED_GSM_BURST_FNR_FILTER_IMPL_H +#define INCLUDED_GSM_BURST_FNR_FILTER_IMPL_H + +#include <grgsm/flow_control/burst_fnr_filter.h> + +namespace gr { + namespace gsm { + + class burst_fnr_filter_impl : public burst_fnr_filter + { + private: + unsigned int d_framenr; + filter_mode d_mode; + public: + burst_fnr_filter_impl(filter_mode mode, unsigned int fnr); + ~burst_fnr_filter_impl(); + void process_burst(pmt::pmt_t msg); + }; + + } // namespace gsm +} // namespace gr + +#endif /* INCLUDED_GSM_BURST_FNR_FILTER_IMPL_H */ + diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index f84c458..0bd5042 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -48,3 +48,4 @@ set(GR_TEST_TARGET_DEPS gr-gsm) set(GR_TEST_PYTHON_DIRS ${CMAKE_BINARY_DIR}/swig) GR_ADD_TEST(qa_decryption ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_decryption.py) GR_ADD_TEST(qa_burst_timeslot_splitter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_timeslot_splitter.py) +GR_ADD_TEST(qa_burst_fnr_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_burst_fnr_filter.py) diff --git a/python/qa_burst_fnr_filter.py b/python/qa_burst_fnr_filter.py new file mode 100755 index 0000000..a1d3d11 --- /dev/null +++ b/python/qa_burst_fnr_filter.py @@ -0,0 +1,168 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +# @file +# @author Roman Khassraf <rkhassraf@gmail.com> +# @section LICENSE +# +# Gr-gsm is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# Gr-gsm is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with gr-gsm; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# +# + +from gnuradio import gr, gr_unittest, blocks +import grgsm +import pmt + +class qa_burst_fnr_filter (gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test_001_less_or_equal (self): + """ + filter mode less_or_equal, limiting frame number 1500123 + 25 random framenumbers, timeslots and bursts as input + """ + framenumbers_input = [1259192, 1076346, 1076242, 235879, 1259218, 2194302, 2714322, 1588, 1259244, 1563637, 1435624, 1928543, 503726, 1571144, 2658397, 1807445, 869789, 624070, 2005511, 1306953, 2284894, 1600339, 551375, 1259270, 1500123] + timeslots_input = [6, 3, 4, 3, 5, 3, 2, 7, 1, 6, 0, 7, 2, 3, 2, 0, 7, 1, 0, 6, 0, 6, 5, 7, 0] + bursts_input = [ + "0001100001000111100111101111100101000100101011000010011110011101001111101100010100111111100000110100011111101011101100100111110011000100010001010000", + "0001000101000000001001111110000110010110110111110111101000001101001111101100010100111111001110001001110101110001010001000111011010010001011011000000", + "0001001101101101000111001000101011001101001110110001001100111101001111101100010100111111111001001010011010011111010010010101011001001011011100110000", + "0000010010100000001001101010100001011100010001101100111111101101001111101100010100111111101101001110100010101110010110101111100010010000110010110000", + "0000010101010110010011110101010101101100000000001000100100101010000111011101001000011101011101110000101011001111000100001000000000001110010001111000", + "0001000000000010111010100000010101000010001010111010000000011010000111011101001000011101000000100010111110101000000001000000000010111010100000000000", + "0001010101111111111010000001010101011111111111101000000001001010000111011101001000011101010111111111111010101000000001010101011011101010000001000000", + "0000000000111110101010100001000000100010101110101010000101001010000111011101001000011101001010001111101010001000010000000000101110101010100000010000", + "0000010000000010000001001000011001010010000011000101000000001010000111011101001000011101010100100000000001001000001000000100100011000101001000111000", + "0001010100110111100000110111100110010100011100011000110110001010000111011101001000011101011111111001111001101010010100000000011111001101000111110000", + "0001100110000001011110001000001100101001010100111111000100111010000111011101001000011101000011010010001010111101000100110011111010100010010101000000", + "0000010101100101010110000011010000000000000010111001110110101010000111011101001000011101000001000100100001111001100011000101010001110001010100111000", + "0001000100000011001010111001111100011010000000000000001001001010000111011101001000011101010110000101111010011001110110001001011010101000011110110000", + "0001100001000111111111100001011000000011010110111010110000111010000111011101001000011101100010111100100101110001101000110100110000001010101110011000", + "0000000100111011000000000010100100001100101010000000010010101010000111011101001000011101000110110001110110000100110100110110011001100100000101100000", + "0000100101111010011110111010100111010100011011011101100111001010000111011101001000011101010000111010000110100000001000010011101011001001110100011000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000110101000011011010110000110011010000000001001010110010001010000111011101001000011101010000011000111001101110000000110010100001101110101000100000", + "0000001000010001011111111111101010100000010101011101101010101010000111011101001000011101100010010101010101011110101010101000010001011101111010101000", + "0000101110101111011001011001000011110010100010011100110010001010000111011101001000011101100000001110000100010100110111001001100010101101100010101000", + "0001100010000001000111011100101101101010100001111101001000101010000111011101001000011101111010000011010110010111011111010010001000001101100011111000", + "0001011101101101011100001111001100010001000011011001101110011010000111011101001000011101010010111011100111000001011100100001111010100101111000100000", + "0000001000100011000000000000110100000000010000001010100100001010000111011101001000011101000010010000000000001001000001011000000001010000000100010000", + "0000100000110001000000000100000110001011100001001000000000001010000111011101001000011101001010010001010000000111010000000011000001000000000101010000", + "0000100000110001000000000101000100001010100001001000000000001010000111011101001000011101001010010001101011001011101111101000010001000000000101010000" + ] + + bursts_expected = [ + "0001100001000111100111101111100101000100101011000010011110011101001111101100010100111111100000110100011111101011101100100111110011000100010001010000", + "0001000101000000001001111110000110010110110111110111101000001101001111101100010100111111001110001001110101110001010001000111011010010001011011000000", + "0001001101101101000111001000101011001101001110110001001100111101001111101100010100111111111001001010011010011111010010010101011001001011011100110000", + "0000010010100000001001101010100001011100010001101100111111101101001111101100010100111111101101001110100010101110010110101111100010010000110010110000", + "0000010101010110010011110101010101101100000000001000100100101010000111011101001000011101011101110000101011001111000100001000000000001110010001111000", + "0000000000111110101010100001000000100010101110101010000101001010000111011101001000011101001010001111101010001000010000000000101110101010100000010000", + "0000010000000010000001001000011001010010000011000101000000001010000111011101001000011101010100100000000001001000001000000100100011000101001000111000", + "0001100110000001011110001000001100101001010100111111000100111010000111011101001000011101000011010010001010111101000100110011111010100010010101000000", + "0001000100000011001010111001111100011010000000000000001001001010000111011101001000011101010110000101111010011001110110001001011010101000011110110000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000110101000011011010110000110011010000000001001010110010001010000111011101001000011101010000011000111001101110000000110010100001101110101000100000", + "0000101110101111011001011001000011110010100010011100110010001010000111011101001000011101100000001110000100010100110111001001100010101101100010101000", + "0000001000100011000000000000110100000000010000001010100100001010000111011101001000011101000010010000000000001001000001011000000001010000000100010000", + "0000100000110001000000000100000110001011100001001000000000001010000111011101001000011101001010010001010000000111010000000011000001000000000101010000", + "0000100000110001000000000101000100001010100001001000000000001010000111011101001000011101001010010001101011001011101111101000010001000000000101010000" + ] + + fnr_filter = grgsm.burst_fnr_filter(grgsm.FILTER_LESS_OR_EQUAL, 1500123) + + src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input) + sink = grgsm.burst_sink_qa() + + self.tb.msg_connect(src, "out", fnr_filter, "in") + self.tb.msg_connect(fnr_filter, "out", sink, "in") + + self.tb.run () + + bursts_result = list(sink.get_burst_data()) + + self.assertEqual(bursts_expected, bursts_result) + + + def test_002_greater_or_equal (self): + """ + filter mode greater_or_equal, limiting frame number 1500123 + 25 random framenumbers, timeslots and bursts as input + """ + framenumbers_input = [1259192, 1076346, 1076242, 235879, 1259218, 2194302, 2714322, 1588, 1259244, 1563637, 1435624, 1928543, 503726, 1571144, 2658397, 1807445, 869789, 624070, 2005511, 1306953, 2284894, 1600339, 551375, 1259270, 1500123] + timeslots_input = [6, 3, 4, 3, 5, 3, 2, 7, 1, 6, 0, 7, 2, 3, 2, 0, 7, 1, 0, 6, 0, 6, 5, 7, 0] + bursts_input = [ + "0001100001000111100111101111100101000100101011000010011110011101001111101100010100111111100000110100011111101011101100100111110011000100010001010000", + "0001000101000000001001111110000110010110110111110111101000001101001111101100010100111111001110001001110101110001010001000111011010010001011011000000", + "0001001101101101000111001000101011001101001110110001001100111101001111101100010100111111111001001010011010011111010010010101011001001011011100110000", + "0000010010100000001001101010100001011100010001101100111111101101001111101100010100111111101101001110100010101110010110101111100010010000110010110000", + "0000010101010110010011110101010101101100000000001000100100101010000111011101001000011101011101110000101011001111000100001000000000001110010001111000", + "0001000000000010111010100000010101000010001010111010000000011010000111011101001000011101000000100010111110101000000001000000000010111010100000000000", + "0001010101111111111010000001010101011111111111101000000001001010000111011101001000011101010111111111111010101000000001010101011011101010000001000000", + "0000000000111110101010100001000000100010101110101010000101001010000111011101001000011101001010001111101010001000010000000000101110101010100000010000", + "0000010000000010000001001000011001010010000011000101000000001010000111011101001000011101010100100000000001001000001000000100100011000101001000111000", + "0001010100110111100000110111100110010100011100011000110110001010000111011101001000011101011111111001111001101010010100000000011111001101000111110000", + "0001100110000001011110001000001100101001010100111111000100111010000111011101001000011101000011010010001010111101000100110011111010100010010101000000", + "0000010101100101010110000011010000000000000010111001110110101010000111011101001000011101000001000100100001111001100011000101010001110001010100111000", + "0001000100000011001010111001111100011010000000000000001001001010000111011101001000011101010110000101111010011001110110001001011010101000011110110000", + "0001100001000111111111100001011000000011010110111010110000111010000111011101001000011101100010111100100101110001101000110100110000001010101110011000", + "0000000100111011000000000010100100001100101010000000010010101010000111011101001000011101000110110001110110000100110100110110011001100100000101100000", + "0000100101111010011110111010100111010100011011011101100111001010000111011101001000011101010000111010000110100000001000010011101011001001110100011000", + "0001111101101110110000010100100111000001001000100000001111100011100010111000101110001010111010010100011001100111001111010011111000100101111101010000", + "0000110101000011011010110000110011010000000001001010110010001010000111011101001000011101010000011000111001101110000000110010100001101110101000100000", + "0000001000010001011111111111101010100000010101011101101010101010000111011101001000011101100010010101010101011110101010101000010001011101111010101000", + "0000101110101111011001011001000011110010100010011100110010001010000111011101001000011101100000001110000100010100110111001001100010101101100010101000", + "0001100010000001000111011100101101101010100001111101001000101010000111011101001000011101111010000011010110010111011111010010001000001101100011111000", + "0001011101101101011100001111001100010001000011011001101110011010000111011101001000011101010010111011100111000001011100100001111010100101111000100000", + "0000001000100011000000000000110100000000010000001010100100001010000111011101001000011101000010010000000000001001000001011000000001010000000100010000", + "0000100000110001000000000100000110001011100001001000000000001010000111011101001000011101001010010001010000000111010000000011000001000000000101010000", + "0000100000110001000000000101000100001010100001001000000000001010000111011101001000011101001010010001101011001011101111101000010001000000000101010000" + ] + + bursts_expected = [ + "0001000000000010111010100000010101000010001010111010000000011010000111011101001000011101000000100010111110101000000001000000000010111010100000000000", + "0001010101111111111010000001010101011111111111101000000001001010000111011101001000011101010111111111111010101000000001010101011011101010000001000000", + "0001010100110111100000110111100110010100011100011000110110001010000111011101001000011101011111111001111001101010010100000000011111001101000111110000", + "0000010101100101010110000011010000000000000010111001110110101010000111011101001000011101000001000100100001111001100011000101010001110001010100111000", + "0001100001000111111111100001011000000011010110111010110000111010000111011101001000011101100010111100100101110001101000110100110000001010101110011000", + "0000000100111011000000000010100100001100101010000000010010101010000111011101001000011101000110110001110110000100110100110110011001100100000101100000", + "0000100101111010011110111010100111010100011011011101100111001010000111011101001000011101010000111010000110100000001000010011101011001001110100011000", + "0000001000010001011111111111101010100000010101011101101010101010000111011101001000011101100010010101010101011110101010101000010001011101111010101000", + "0001100010000001000111011100101101101010100001111101001000101010000111011101001000011101111010000011010110010111011111010010001000001101100011111000", + "0001011101101101011100001111001100010001000011011001101110011010000111011101001000011101010010111011100111000001011100100001111010100101111000100000", + "0000100000110001000000000101000100001010100001001000000000001010000111011101001000011101001010010001101011001011101111101000010001000000000101010000" + ] + + fnr_filter = grgsm.burst_fnr_filter(grgsm.FILTER_GREATER_OR_EQUAL, 1500123) + + src = grgsm.burst_source_qa(framenumbers_input, timeslots_input, bursts_input) + sink = grgsm.burst_sink_qa() + + self.tb.msg_connect(src, "out", fnr_filter, "in") + self.tb.msg_connect(fnr_filter, "out", sink, "in") + + self.tb.run () + + bursts_result = list(sink.get_burst_data()) + + self.assertEqual(bursts_expected, bursts_result) + +if __name__ == '__main__': + gr_unittest.run(qa_burst_fnr_filter, "qa_burst_fnr_filter.xml") diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i index 600281a..eacabb6 100644 --- a/swig/grgsm_swig.i +++ b/swig/grgsm_swig.i @@ -17,6 +17,7 @@ #include "grgsm/demapping/universal_ctrl_chans_demapper.h" #include "grgsm/demapping/tch_f_chans_demapper.h" #include "grgsm/flow_control/burst_timeslot_splitter.h" +#include "grgsm/flow_control/burst_fnr_filter.h" #include "grgsm/misc_utils/bursts_printer.h" #include "grgsm/misc_utils/controlled_const_source_f.h" #include "grgsm/misc_utils/controlled_rotator_cc.h" @@ -52,6 +53,8 @@ GR_SWIG_BLOCK_MAGIC2(gsm, tch_f_chans_demapper); %include "grgsm/flow_control/burst_timeslot_splitter.h" GR_SWIG_BLOCK_MAGIC2(gsm, burst_timeslot_splitter); +%include "grgsm/flow_control/burst_fnr_filter.h" +GR_SWIG_BLOCK_MAGIC2(gsm, burst_fnr_filter); %include "grgsm/misc_utils/bursts_printer.h" GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer); |