From 993055342d9076da075ee7962113165228c560f3 Mon Sep 17 00:00:00 2001 From: Piotr Krysik Date: Sat, 5 May 2018 12:38:11 +0200 Subject: Moving trx burst interface to trx directory and to new 'Transceiver' cathegory in gnuradio-companion --- grc/CMakeLists.txt | 1 + grc/gsm_block_tree.xml | 5 +++- grc/misc_utils/CMakeLists.txt | 1 - grc/misc_utils/gsm_trx_burst_if.xml | 58 ------------------------------------- grc/trx/CMakeLists.txt | 23 +++++++++++++++ grc/trx/gsm_trx_burst_if.xml | 58 +++++++++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+), 60 deletions(-) delete mode 100644 grc/misc_utils/gsm_trx_burst_if.xml create mode 100644 grc/trx/CMakeLists.txt create mode 100644 grc/trx/gsm_trx_burst_if.xml (limited to 'grc') diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index c3646a2..ae06065 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -24,6 +24,7 @@ add_subdirectory(receiver) add_subdirectory(flow_control) add_subdirectory(misc_utils) add_subdirectory(transmitter) +add_subdirectory(trx) install(FILES gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks ) diff --git a/grc/gsm_block_tree.xml b/grc/gsm_block_tree.xml index 7415bf0..2e502d0 100644 --- a/grc/gsm_block_tree.xml +++ b/grc/gsm_block_tree.xml @@ -29,6 +29,10 @@ gsm_preprocess_tx_burst gsm_gen_test_ab + + Transceiver + gsm_trx_burst_if + Logical channels demapping gsm_universal_ctrl_chans_demapper @@ -75,7 +79,6 @@ gsm_clock_offset_corrector_tagged gsm_msg_to_tag gsm_tmsi_dumper - gsm_trx_burst_if gsm_burst_to_fn_time diff --git a/grc/misc_utils/CMakeLists.txt b/grc/misc_utils/CMakeLists.txt index 78f66c9..bad53e6 100644 --- a/grc/misc_utils/CMakeLists.txt +++ b/grc/misc_utils/CMakeLists.txt @@ -32,7 +32,6 @@ install(FILES gsm_burst_file_source.xml gsm_message_file_sink.xml gsm_message_file_source.xml - gsm_trx_burst_if.xml gsm_msg_to_tag.xml gsm_controlled_fractional_resampler_cc.xml gsm_burst_to_fn_time.xml diff --git a/grc/misc_utils/gsm_trx_burst_if.xml b/grc/misc_utils/gsm_trx_burst_if.xml deleted file mode 100644 index 99427b3..0000000 --- a/grc/misc_utils/gsm_trx_burst_if.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - TRX Burst Interface - gsm_trx_burst_if - import grgsm - grgsm.trx_burst_if($remote_addr, $base_port) - - - base_port - base_port - 5700 - string - - - - remote_addr - remote_addr - 127.0.0.1 - string - - - - bursts - message - 1 - - - - bursts - message - 1 - - - - OsmoTRX like UDP burst interface for external applications. - - There are two UDP connections, where each message carries - one radio burst with header. Give a base port B (5700 by default). - One connection at port P=B+100+2 is used for sending received bursts - to an external application. Another one at port P=B+2 is used to - obtain to be transmitted bursts. - - Received burst format: - 1 byte timeslot index - 4 bytes GSM frame number, big endian - 1 byte RSSI in -dBm - 2 bytes correlator timing offset in 1/256 symbol steps, - 2's-comp, big endian - 148 bytes soft symbol estimates, 0 -> definite "0", - 255 -> definite "1" - - To be transmitted burst format: - 1 byte timeslot index - 4 bytes GSM frame number, big endian - 1 byte transmit level wrt ARFCN max, -dB (attenuation) - 148 bytes output symbol values, 0 & 1 - - diff --git a/grc/trx/CMakeLists.txt b/grc/trx/CMakeLists.txt new file mode 100644 index 0000000..ac4ae13 --- /dev/null +++ b/grc/trx/CMakeLists.txt @@ -0,0 +1,23 @@ +# 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. + +install(FILES + gsm_trx_burst_if.xml + DESTINATION share/gnuradio/grc/blocks +) diff --git a/grc/trx/gsm_trx_burst_if.xml b/grc/trx/gsm_trx_burst_if.xml new file mode 100644 index 0000000..99427b3 --- /dev/null +++ b/grc/trx/gsm_trx_burst_if.xml @@ -0,0 +1,58 @@ + + + TRX Burst Interface + gsm_trx_burst_if + import grgsm + grgsm.trx_burst_if($remote_addr, $base_port) + + + base_port + base_port + 5700 + string + + + + remote_addr + remote_addr + 127.0.0.1 + string + + + + bursts + message + 1 + + + + bursts + message + 1 + + + + OsmoTRX like UDP burst interface for external applications. + + There are two UDP connections, where each message carries + one radio burst with header. Give a base port B (5700 by default). + One connection at port P=B+100+2 is used for sending received bursts + to an external application. Another one at port P=B+2 is used to + obtain to be transmitted bursts. + + Received burst format: + 1 byte timeslot index + 4 bytes GSM frame number, big endian + 1 byte RSSI in -dBm + 2 bytes correlator timing offset in 1/256 symbol steps, + 2's-comp, big endian + 148 bytes soft symbol estimates, 0 -> definite "0", + 255 -> definite "1" + + To be transmitted burst format: + 1 byte timeslot index + 4 bytes GSM frame number, big endian + 1 byte transmit level wrt ARFCN max, -dB (attenuation) + 148 bytes output symbol values, 0 & 1 + + -- cgit v1.2.3