From 0aafe2856de2286e5b88e43f81785a1aa5284f3f Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 1 Dec 2017 19:24:14 +0700 Subject: Implement the 'burst_to_fn_time' block in C++ --- swig/grgsm_swig.i | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'swig') diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i index 005033f..17ed130 100644 --- a/swig/grgsm_swig.i +++ b/swig/grgsm_swig.i @@ -74,6 +74,7 @@ #include "grgsm/transmitter/preprocess_tx_burst.h" #include "grgsm/transmitter/gen_test_ab.h" #include "grgsm/misc_utils/trx_burst_if.h" +#include "grgsm/misc_utils/burst_to_fn_time.h" %} %include "constants.i" @@ -177,14 +178,14 @@ GR_SWIG_BLOCK_MAGIC2(gsm, message_sink); //}; %include "grgsm/misc_utils/fn_time.h" - %include "grgsm/transmitter/txtime_setter.h" GR_SWIG_BLOCK_MAGIC2(gsm, txtime_setter); %include "grgsm/transmitter/preprocess_tx_burst.h" GR_SWIG_BLOCK_MAGIC2(gsm, preprocess_tx_burst); - %include "grgsm/transmitter/gen_test_ab.h" GR_SWIG_BLOCK_MAGIC2(gsm, gen_test_ab); %include "grgsm/misc_utils/trx_burst_if.h" GR_SWIG_BLOCK_MAGIC2(gsm, trx_burst_if); +%include "grgsm/misc_utils/burst_to_fn_time.h" +GR_SWIG_BLOCK_MAGIC2(gsm, burst_to_fn_time); -- cgit v1.2.3 From 7f121d6470d04242bebe4ada80bf14bd1b8c00f7 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 4 Dec 2017 02:05:49 +0700 Subject: Clean up grgsm_swig.i --- swig/grgsm_swig.i | 45 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) (limited to 'swig') diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i index 17ed130..c600a72 100644 --- a/swig/grgsm_swig.i +++ b/swig/grgsm_swig.i @@ -60,21 +60,20 @@ #include "grgsm/misc_utils/burst_file_source.h" #include "grgsm/misc_utils/collect_system_info.h" #include "grgsm/misc_utils/extract_cmc.h" -#include "grgsm/qa_utils/burst_sink.h" -#include "grgsm/qa_utils/burst_source.h" -#include "grgsm/qa_utils/message_source.h" -#include "grgsm/qa_utils/message_sink.h" #include "grgsm/misc_utils/message_file_sink.h" #include "grgsm/misc_utils/message_file_source.h" #include "grgsm/misc_utils/msg_to_tag.h" #include "grgsm/misc_utils/controlled_fractional_resampler_cc.h" -//#include "grgsm/misc_utils/time_spec.h" +#include "grgsm/misc_utils/trx_burst_if.h" +#include "grgsm/misc_utils/burst_to_fn_time.h" #include "grgsm/misc_utils/fn_time.h" +#include "grgsm/qa_utils/burst_sink.h" +#include "grgsm/qa_utils/burst_source.h" +#include "grgsm/qa_utils/message_source.h" +#include "grgsm/qa_utils/message_sink.h" #include "grgsm/transmitter/txtime_setter.h" #include "grgsm/transmitter/preprocess_tx_burst.h" #include "grgsm/transmitter/gen_test_ab.h" -#include "grgsm/misc_utils/trx_burst_if.h" -#include "grgsm/misc_utils/burst_to_fn_time.h" %} %include "constants.i" @@ -146,6 +145,11 @@ GR_SWIG_BLOCK_MAGIC2(gsm, msg_to_tag); GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc); %include "grgsm/misc_utils/extract_cmc.h" GR_SWIG_BLOCK_MAGIC2(gsm, extract_cmc); +%include "grgsm/misc_utils/trx_burst_if.h" +GR_SWIG_BLOCK_MAGIC2(gsm, trx_burst_if); +%include "grgsm/misc_utils/burst_to_fn_time.h" +GR_SWIG_BLOCK_MAGIC2(gsm, burst_to_fn_time); + %include "grgsm/qa_utils/burst_sink.h" GR_SWIG_BLOCK_MAGIC2(gsm, burst_sink); %include "grgsm/qa_utils/burst_source.h" @@ -155,28 +159,6 @@ GR_SWIG_BLOCK_MAGIC2(gsm, message_source); %include "grgsm/qa_utils/message_sink.h" GR_SWIG_BLOCK_MAGIC2(gsm, message_sink); -//#pragma SWIG nowarn=319 -//%include "grgsm/misc_utils/time_spec.h" - -//%extend gr::gsm::time_spec_t{ -// gr::gsm::time_spec_t __add__(const gr::gsm::time_spec_t &what) -// { -// gr::gsm::time_spec_t temp = *self; -// temp += what; -// return temp; -// } -// gr::gsm::time_spec_t __sub__(const gr::gsm::time_spec_t &what) -// { -// gr::gsm::time_spec_t temp = *self; -// temp -= what; -// return temp; -// } -// bool __eq__(const gr::gsm::time_spec_t &what) -// { -// return (what == *self); -// } -//}; - %include "grgsm/misc_utils/fn_time.h" %include "grgsm/transmitter/txtime_setter.h" GR_SWIG_BLOCK_MAGIC2(gsm, txtime_setter); @@ -184,8 +166,3 @@ GR_SWIG_BLOCK_MAGIC2(gsm, txtime_setter); GR_SWIG_BLOCK_MAGIC2(gsm, preprocess_tx_burst); %include "grgsm/transmitter/gen_test_ab.h" GR_SWIG_BLOCK_MAGIC2(gsm, gen_test_ab); - -%include "grgsm/misc_utils/trx_burst_if.h" -GR_SWIG_BLOCK_MAGIC2(gsm, trx_burst_if); -%include "grgsm/misc_utils/burst_to_fn_time.h" -GR_SWIG_BLOCK_MAGIC2(gsm, burst_to_fn_time); -- cgit v1.2.3