sdr
/
gr-gsm
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added txtime_setter block (a c++ version of txtime_bursts_tagger Python block)

This commit is contained in:
Piotr Krysik 2017-11-05 12:23:15 +01:00
parent d32ba5b471
commit 517464c0a9
12 changed files with 419 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
grc/gsm_block_tree.xml
View File

@ -24,6 +24,7 @@
<cat>
<name>Transmitter</name>
<block>gsm_txtime_bursts_tagger</block>
<block>gsm_txtime_setter</block>
<block>gsm_gmsk_mod</block>
</cat>
<cat>

3
grc/transmitter/CMakeLists.txt
View File

@ -19,5 +19,6 @@
install(FILES
gsm_gmsk_mod.xml
gsm_txtime_bursts_tagger.xml DESTINATION share/gnuradio/grc/blocks
gsm_txtime_bursts_tagger.xml
gsm_txtime_setter.xml DESTINATION share/gnuradio/grc/blocks
)

84
grc/transmitter/gsm_txtime_setter.xml Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0"?>
<block>
<name>txtime_setter</name>
<key>gsm_txtime_setter</key>
<import>import grgsm</import>
<make>grgsm.txtime_setter($init_fn if ($init_fn is not None) else 0xffffffff, $init_time_secs, $init_time_fracs, $time_hint_secs, $time_hint_fracs, $timing_advance, $delay_correction)</make>
<callback>set_fn_time_reference($init_fn, $init_time_secs, $init_time_fracs)</callback>
<callback>set_time_hint($time_hint_secs, $time_hint_secs)</callback>
<callback>set_timing_advance($timing_advance)</callback>
<callback>set_delay_correction($delay_correction)</callback>
<param>
<name>init_fn</name>
<key>init_fn</key>
<value>None</value>
<type>raw</type>
<hide>part</hide>
</param>
<param>
<name>init_time_secs</name>
<key>init_time_secs</key>
<value>0</value>
<type>int</type>
<hide>part</hide>
</param>
<param>
<name>init_time_fracs</name>
<key>init_time_fracs</key>
<value>0</value>
<type>float</type>
<hide>part</hide>
</param>
<param>
<name>time_hint_secs</name>
<key>time_hint_secs</key>
<value>0</value>
<type>int</type>
<hide>part</hide>
</param>
<param>
<name>time_hint_fracs</name>
<key>time_hint_fracs</key>
<value>0</value>
<type>float</type>
<hide>part</hide>
</param>
<param>
<name>timing_advance</name>
<key>timing_advance</key>
<value>0</value>
<type>float</type>
<hide>part</hide>
</param>
<param>
<name>delay_correction</name>
<key>delay_correction</key>
<value>0</value>
<type>float</type>
<hide>part</hide>
</param>
<sink>
<name>fn_time</name>
<type>message</type>
<optional>1</optional>
</sink>
<sink>
<name>bursts_in</name>
<type>message</type>
<optional>1</optional>
</sink>
<source>
<name>bursts_out</name>
<type>message</type>
<optional>1</optional>
</source>
</block>

1
include/grgsm/CMakeLists.txt
View File

@ -35,4 +35,5 @@ add_subdirectory(receiver)
add_subdirectory(misc_utils)
add_subdirectory(qa_utils)
add_subdirectory(flow_control)
add_subdirectory(transmitter)
add_subdirectory(trx_interface)

62
include/grgsm/transmitter/txtime_setter.h Normal file
View File

@ -0,0 +1,62 @@
/* -*- c++ -*- */
/* @file
* @author Piotr Krysik <ptrkrysik@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_TXTIME_SETTER_H
#define INCLUDED_GSM_TXTIME_SETTER_H
#include <grgsm/api.h>
#include <gnuradio/block.h>
namespace gr {
namespace gsm {
/*!
* \brief <+description of block+>
* \ingroup gsm
*
*/
class GRGSM_API txtime_setter : virtual public gr::block
{
public:
typedef boost::shared_ptr<txtime_setter> sptr;
/*!
* \brief Return a shared_ptr to a new instance of gsm::txtime_setter.
*
* To avoid accidental use of raw pointers, gsm::txtime_setter's
* constructor is in a private implementation
* class. gsm::txtime_setter::make is the public interface for
* creating new instances.
*/
static sptr make(uint32_t init_fn, uint64_t init_time_secs, double init_time_fracs, uint64_t time_hint_secs, double time_hint_fracs, double timing_advance, double delay_correction);
virtual void set_fn_time_reference(uint32_t fn, uint32_t ts, uint64_t time_secs, double time_fracs) = 0;
virtual void set_time_hint(uint64_t time_hint_secs, double time_hint_fracs) = 0;
virtual void set_delay_correction(double delay_correction) = 0;
virtual void set_timing_advance(double timing_advance) = 0;
};
} // namespace gsm
} // namespace gr
#endif /* INCLUDED_GSM_TXTIME_SETTER_H */

1
lib/CMakeLists.txt
View File

@ -70,6 +70,7 @@ add_subdirectory(flow_control)
add_subdirectory(misc_utils)
add_subdirectory(qa_utils)
add_subdirectory(receiver)
add_subdirectory(transmitter)
add_subdirectory(trx_interface)
########################################################################

22
lib/transmitter/CMakeLists.txt Normal file
View File

@ -0,0 +1,22 @@
# Copyright 2011,2012 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
# GNU Radio 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.
#
# GNU Radio 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 GNU Radio; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
add_sources(
txtime_setter_impl.cc
)

139
lib/transmitter/txtime_setter_impl.cc Normal file
View File

@ -0,0 +1,139 @@
/* -*- c++ -*- */
/* @file
* @author Piotr Krysik <ptrkrysik@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 <grgsm/gsmtap.h>
#include "txtime_setter_impl.h"
namespace gr {
namespace gsm {
txtime_setter::sptr
txtime_setter::make(uint32_t init_fn, uint64_t init_time_secs, double init_time_fracs, uint64_t time_hint_secs, double time_hint_fracs, double timing_advance, double delay_correction)
{
return gnuradio::get_initial_sptr
(new txtime_setter_impl(init_fn, init_time_secs, init_time_fracs, time_hint_secs, time_hint_fracs, timing_advance, delay_correction));
}
/*
* The private constructor
*/
txtime_setter_impl::txtime_setter_impl(uint32_t init_fn, uint64_t init_time_secs, double init_time_fracs, uint64_t time_hint_secs, double time_hint_fracs, double timing_advance, double delay_correction)
: gr::block("txtime_setter",
gr::io_signature::make(0, 0, 0),
gr::io_signature::make(0, 0, 0)),
d_fn_ref(init_fn),
d_ts_ref(0),
d_time_ref(init_time_secs,init_time_fracs),
d_time_hint(time_hint_secs,time_hint_fracs),
d_timing_advance(timing_advance),
d_delay_correction(delay_correction)
{
message_port_register_in(pmt::intern("fn_time"));
message_port_register_in(pmt::intern("bursts_in"));
message_port_register_out(pmt::intern("bursts_out"));
set_msg_handler(pmt::intern("fn_time"), boost::bind(&txtime_setter_impl::process_fn_time_reference, this, _1));
set_msg_handler(pmt::intern("bursts_in"), boost::bind(&txtime_setter_impl::process_txtime_of_burst, this, _1));
}
/*
* Our virtual destructor.
*/
txtime_setter_impl::~txtime_setter_impl()
{
}
void txtime_setter_impl::process_fn_time_reference(pmt::pmt_t msg)
{
// d_time_hint = pmt::to_python(pmt::dict_ref(msg, pmt::intern("time_hint"), pmt::PMT_NIL))
pmt::pmt_t not_found = pmt::intern("not_found");
pmt::pmt_t fn_time = pmt::dict_ref(msg, pmt::intern("fn_time"), not_found);
pmt::pmt_t time_hint = pmt::dict_ref(msg, pmt::intern("fn_time"), not_found);
if(fn_time != not_found)
{
uint32_t fn_ref = static_cast<uint32_t>(pmt::to_uint64(pmt::car(pmt::car(fn_time))));
uint32_t ts = static_cast<uint32_t>(pmt::to_uint64(pmt::cdr(pmt::car(fn_time))));
uint64_t time_secs = pmt::to_uint64(pmt::car(pmt::cdr(fn_time)));
double time_fracs = pmt::to_double(pmt::cdr(pmt::cdr(fn_time)));
set_fn_time_reference(fn_ref, ts, time_secs, time_fracs);
} else if(time_hint != not_found) {
set_time_hint(pmt::to_uint64(pmt::car(fn_time)), pmt::to_double(pmt::cdr(fn_time)));
}
}
void txtime_setter_impl::process_txtime_of_burst(pmt::pmt_t burst)
{
pmt::pmt_t header_plus_burst = pmt::cdr(burst);
int8_t * burst_int8 = (int8_t *)pmt::blob_data(header_plus_burst);
gsmtap_hdr * header = (gsmtap_hdr *)(burst_int8);
uint32_t frame_nr = be32toh(header->frame_number);
uint32_t ts_num = header->timeslot;
if(d_fn_ref != 0xffffffff)
{
time_format txtime = fn_time_delta_cpp(d_fn_ref, d_time_ref, frame_nr, d_time_hint, ts_num, d_ts_ref);
time_spec_t txtime_spec = time_spec_t(txtime.first, txtime.second);
txtime_spec = txtime_spec - d_delay_correction;
txtime_spec = txtime_spec - d_timing_advance;
pmt::pmt_t tags_dict = pmt::dict_add(pmt::make_dict(), pmt::intern("tx_time"), pmt::make_tuple(pmt::from_uint64(txtime_spec.get_full_secs()),pmt::from_double(txtime_spec.get_frac_secs())));
tags_dict = pmt::dict_add(tags_dict, pmt::intern("fn"), pmt::from_uint64(frame_nr));
tags_dict = pmt::dict_add(tags_dict, pmt::intern("ts"), pmt::from_uint64(ts_num));
pmt::pmt_t new_msg = pmt::cons(tags_dict, pmt::cdr(burst));
message_port_pub(pmt::intern("bursts_out"), new_msg);
}
}
void txtime_setter_impl::set_fn_time_reference(uint32_t fn, uint32_t ts, uint64_t time_secs, double time_fracs)
{
d_fn_ref = fn;
d_ts_ref = ts;
d_time_ref = std::make_pair(time_secs, time_fracs);
set_time_hint(time_secs, time_fracs);
}
void txtime_setter_impl::set_time_hint(uint64_t time_hint_secs, double time_hint_fracs)
{
d_time_hint = std::make_pair(time_hint_secs, time_hint_fracs);
}
void txtime_setter_impl::set_delay_correction(double delay_correction)
{
d_delay_correction = delay_correction;
}
void txtime_setter_impl::set_timing_advance(double timing_advance)
{
d_timing_advance = timing_advance;
}
} /* namespace gsm */
} /* namespace gr */

60
lib/transmitter/txtime_setter_impl.h Normal file
View File

@ -0,0 +1,60 @@
/* -*- c++ -*- */
/* @file
* @author Piotr Krysik <ptrkrysik@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_TXTIME_SETTER_IMPL_H
#define INCLUDED_GSM_TXTIME_SETTER_IMPL_H
#include <grgsm/transmitter/txtime_setter.h>
#include <grgsm/misc_utils/time_spec.h>
#include <grgsm/misc_utils/fn_time.h>
namespace gr {
namespace gsm {
class txtime_setter_impl : public txtime_setter
{
private:
uint32_t d_fn_ref;
uint32_t d_ts_ref;
time_format d_time_ref;
time_format d_time_hint;
double d_timing_advance;
double d_delay_correction;
public:
txtime_setter_impl(uint32_t init_fn, uint64_t init_time_secs, double init_time_fracs, uint64_t time_hint_secs, double time_hint_fracs, double timing_advance, double delay_correction);
~txtime_setter_impl();
// Where all the action really happens
void process_fn_time_reference(pmt::pmt_t msg);
void process_txtime_of_burst(pmt::pmt_t msg);
void set_fn_time_reference(uint32_t fn, uint32_t ts, uint64_t time_secs, double time_fracs);
void set_time_hint(uint64_t time_hint_secs, double time_hint_fracs);
void set_delay_correction(double delay_correction);
void set_timing_advance(double timing_advance);
};
} // namespace gsm
} // namespace gr
#endif /* INCLUDED_GSM_TXTIME_SETTER_IMPL_H */

1
python/CMakeLists.txt
View File

@ -59,3 +59,4 @@ GR_ADD_TEST(qa_dummy_burst_filter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DI
#GR_ADD_TEST(qa_msg_to_tag ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_msg_to_tag.py)
#GR_ADD_TEST(qa_controlled_fractional_resampler_cc ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_controlled_fractional_resampler_cc.py)
#GR_ADD_TEST(qa_uplink_downlink_splitter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_uplink_downlink_splitter.py)
GR_ADD_TEST(qa_txtime_setter ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/qa_txtime_setter.py)

43
python/qa_txtime_setter.py Executable file
View File

@ -0,0 +1,43 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# @file
# @author Piotr Krysik <ptrkrysik@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
from gnuradio import blocks
import grgsm_swig as grgsm
class qa_txtime_setter (gr_unittest.TestCase):
def setUp (self):
self.tb = gr.top_block ()
def tearDown (self):
self.tb = None
def test_001_t (self):
# set up fg
self.tb.run ()
# check data
if __name__ == '__main__':
gr_unittest.run(qa_txtime_setter, "qa_txtime_setter.xml")

3
swig/grgsm_swig.i
View File

@ -70,6 +70,7 @@
#include "grgsm/trx_interface/trx.h"
//#include "grgsm/misc_utils/time_spec.h"
#include "grgsm/misc_utils/fn_time.h"
#include "grgsm/transmitter/txtime_setter.h"
%}
%include "constants.i"
@ -175,3 +176,5 @@ GR_SWIG_BLOCK_MAGIC2(grgsm, trx);
//};
%include "grgsm/misc_utils/fn_time.h"
%include "grgsm/transmitter/txtime_setter.h"
GR_SWIG_BLOCK_MAGIC2(gsm, txtime_setter);