diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2018-04-17 09:10:33 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2018-04-17 09:10:33 +0200 |
| commit | 2471052cfe724699c8bd2d4fec20d7f194cf6bb9 (patch) | |
| tree | 494bfac4ec79a65f87bf970ab766d52b50a05af3 /swig | |
| parent | 2ece45f5169a0aa2db90f3a9eae4a4892a9cde79 (diff) | |
| parent | 012323230549af786f04fd94fc85ab7fbfa7a53d (diff) | |
Merge branch 'fixeria/trx' of https://github.com/axilirator/gr-gsm into fixeria_trx
# Resolved conflicts:
# apps/grgsm_trx
# python/trx/radio_if.py
# swig/grgsm_swig.i
Diffstat (limited to 'swig')
| -rw-r--r-- | swig/grgsm_swig.i | 35 |
1 files changed, 6 insertions, 29 deletions
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i index 3665108..c66a2cc 100644 --- a/swig/grgsm_swig.i +++ b/swig/grgsm_swig.i @@ -1,7 +1,7 @@ /* -*- c++ -*- */ /* * @file - * @author (C) 2014 by Piotr Krysik <ptrkrysik@gmail.com> + * @author (C) 2014-2017 by Piotr Krysik <ptrkrysik@gmail.com> * @section LICENSE * * Gr-gsm is free software; you can redistribute it and/or modify @@ -69,7 +69,7 @@ #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/burst_to_fn_time.h" #include "grgsm/misc_utils/fn_time.h" #include "grgsm/transmitter/txtime_setter.h" #include "grgsm/transmitter/preprocess_tx_burst.h" @@ -148,6 +148,10 @@ GR_SWIG_BLOCK_MAGIC2(gsm, controlled_fractional_resampler_cc); GR_SWIG_BLOCK_MAGIC2(gsm, extract_cmc); %include "grgsm/misc_utils/extract_assignment_cmd.h" GR_SWIG_BLOCK_MAGIC2(gsm, extract_assignment_cmd); +%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); @@ -158,37 +162,10 @@ 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); %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); |