Changed grgsm install directories and prefixes from "gsm" to "grgsm". The old prefix caused conflicts with libraries already available.

trx_hopping
ptrkrysik 2014-12-13 10:11:00 +01:00
parent 0cd9ef0a80
commit 3be74a732b
61 changed files with 151 additions and 154 deletions

View File

@ -70,11 +70,11 @@ endif()
include(GrPlatform) #define LIB_SUFFIX
set(GR_RUNTIME_DIR bin)
set(GR_LIBRARY_DIR lib${LIB_SUFFIX})
set(GR_INCLUDE_DIR include/gsm)
set(GR_INCLUDE_DIR include/gsm/misc_utils)
set(GR_INCLUDE_DIR include/gsm/receiver)
set(GR_INCLUDE_DIR include/gsm/demapping)
set(GR_INCLUDE_DIR include/gsm/decoding)
set(GR_INCLUDE_DIR include/grgsm)
set(GR_INCLUDE_DIR include/ggrsm/misc_utils)
set(GR_INCLUDE_DIR include/grgsm/receiver)
set(GR_INCLUDE_DIR include/grgsm/demapping)
set(GR_INCLUDE_DIR include/grgsm/decoding)
set(GR_DATA_DIR share)
set(GR_PKG_DATA_DIR ${GR_DATA_DIR}/${CMAKE_PROJECT_NAME})
set(GR_DOC_DIR ${GR_DATA_DIR}/doc)
@ -151,7 +151,7 @@ add_custom_target(uninstall
########################################################################
# Add subdirectories
########################################################################
add_subdirectory(include/gsm)
add_subdirectory(include/grgsm)
add_subdirectory(include/plotting)
add_subdirectory(lib)
add_subdirectory(swig)
@ -164,5 +164,5 @@ add_subdirectory(docs)
# Install cmake search helper for this library
########################################################################
install(FILES cmake/Modules/gsmConfig.cmake
DESTINATION lib/cmake/gsm
DESTINATION lib/cmake/grgsm
)

View File

@ -2,7 +2,7 @@
##################################################
# Gnuradio Python Flow Graph
# Title: Airprobe File
# Generated: Sat Dec 6 15:32:40 2014
# Generated: Sat Dec 13 09:44:41 2014
##################################################
from gnuradio import blocks
@ -11,7 +11,7 @@ from gnuradio import gr
from gnuradio.eng_option import eng_option
from gnuradio.filter import firdes
from optparse import OptionParser
import gsm
import grgsm
class airprobe_file(gr.top_block):
@ -39,10 +39,10 @@ class airprobe_file(gr.top_block):
##################################################
# Blocks
##################################################
self.gsm_universal_ctrl_chans_demapper_0 = gsm.universal_ctrl_chans_demapper(([2,6,12,16,22,26,32,36,42,46]), ([BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]))
self.gsm_receiver_0 = gsm.receiver(4, ([0]), ([]))
self.gsm_message_printer_0 = gsm.message_printer()
self.gsm_input_0 = gsm.gsm_input(
self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper(([2,6,12,16,22,26,32,36,42,46]), ([BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]))
self.gsm_receiver_0 = grgsm.receiver(4, ([0]), ([]))
self.gsm_message_printer_0 = grgsm.message_printer()
self.gsm_input_0 = grgsm.gsm_input(
ppm=0,
osr=4,
fc=fc,
@ -69,7 +69,6 @@ class airprobe_file(gr.top_block):
self.msg_connect(self.gsm_clock_offset_control_0, "ppm", self.gsm_input_0, "ppm_in")
self.msg_connect(self.gsm_control_channels_decoder_0, "msgs", self.blocks_socket_pdu_0, "pdus")
# QT sink close method reimplementation
def get_input_file_name(self):
return self.input_file_name
@ -146,4 +145,3 @@ if __name__ == '__main__':
tb = airprobe_file(input_file_name=options.input_file_name, fc=options.fc, samp_rate=options.samp_rate)
tb.start()
tb.wait()

View File

@ -2,7 +2,7 @@
##################################################
# Gnuradio Python Flow Graph
# Title: Airprobe Rtlsdr
# Generated: Sat Dec 6 15:20:59 2014
# Generated: Sat Dec 13 09:54:44 2014
##################################################
from PyQt4 import Qt
@ -15,11 +15,13 @@ from gnuradio.eng_option import eng_option
from gnuradio.filter import firdes
from optparse import OptionParser
import PyQt4.Qwt5 as Qwt
import gsm
import grgsm
import osmosdr
import sip
import sys
import time
from distutils.version import StrictVersion
class airprobe_rtlsdr(gr.top_block, Qt.QWidget):
def __init__(self, ppm_param=0):
@ -149,17 +151,17 @@ class airprobe_rtlsdr(gr.top_block, Qt.QWidget):
self.qtgui_freq_sink_x_0.set_y_axis(-140, 10)
self._qtgui_freq_sink_x_0_win = sip.wrapinstance(self.qtgui_freq_sink_x_0.pyqwidget(), Qt.QWidget)
self.top_layout.addWidget(self._qtgui_freq_sink_x_0_win)
self.gsm_universal_ctrl_chans_demapper_0 = gsm.universal_ctrl_chans_demapper(([2,6,12,16,22,26,32,36,42,46]), ([BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]))
self.gsm_receiver_0 = gsm.receiver(4, ([0]), ([]))
self.gsm_message_printer_1 = gsm.message_printer()
self.gsm_input_0 = gsm.gsm_input(
self.gsm_universal_ctrl_chans_demapper_0 = grgsm.universal_ctrl_chans_demapper(([2,6,12,16,22,26,32,36,42,46]), ([BCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH,CCCH]))
self.gsm_receiver_0 = grgsm.receiver(4, ([0]), ([]))
self.gsm_message_printer_1 = grgsm.message_printer()
self.gsm_input_0 = grgsm.gsm_input(
ppm=0,
osr=4,
fc=fc,
samp_rate_in=samp_rate,
)
self.gsm_control_channels_decoder_0 = gsm.control_channels_decoder()
self.gsm_clock_offset_control_0 = gsm.clock_offset_control(fc)
self.gsm_control_channels_decoder_0 = grgsm.control_channels_decoder()
self.gsm_clock_offset_control_0 = grgsm.clock_offset_control(fc)
self.blocks_socket_pdu_0 = blocks.socket_pdu("UDP_CLIENT", "127.0.0.1", "4729", 10000)
##################################################
@ -179,7 +181,6 @@ class airprobe_rtlsdr(gr.top_block, Qt.QWidget):
self.msg_connect(self.gsm_universal_ctrl_chans_demapper_0, "bursts", self.gsm_control_channels_decoder_0, "bursts")
self.msg_connect(self.gsm_receiver_0, "measurements", self.gsm_clock_offset_control_0, "measurements")
# QT sink close method reimplementation
def closeEvent(self, event):
self.settings = Qt.QSettings("GNU Radio", "airprobe_rtlsdr")
self.settings.setValue("geometry", self.saveGeometry())
@ -283,7 +284,8 @@ if __name__ == '__main__':
parser.add_option("-p", "--ppm-param", dest="ppm_param", type="intx", default=0,
help="Set ppm [default=%default]")
(options, args) = parser.parse_args()
Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster'))
if(StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0")):
Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster'))
qapp = Qt.QApplication(sys.argv)
tb = airprobe_rtlsdr(ppm_param=options.ppm_param)
tb.start()
@ -294,4 +296,3 @@ if __name__ == '__main__':
qapp.connect(qapp, Qt.SIGNAL("aboutToQuit()"), quitting)
qapp.exec_()
tb = None #to clean up Qt widgets

View File

@ -2,8 +2,8 @@
<block>
<name>Control channels decoder</name>
<key>gsm_control_channels_decoder</key>
<import>import gsm</import>
<make>gsm.control_channels_decoder()</make>
<import>import grgsm</import>
<make>grgsm.control_channels_decoder()</make>
<sink>
<name>bursts</name>
<type>message</type>

View File

@ -2,8 +2,8 @@
<block>
<name>Demapper for BCCH and CCCH</name>
<key>gsm_get_bcch_or_ccch_bursts</key>
<import>import gsm</import>
<make>gsm.get_bcch_or_ccch_bursts($d_fn51_start)</make>
<import>import grgsm</import>
<make>grgsm.get_bcch_or_ccch_bursts($d_fn51_start)</make>
<param>
<name>d_fn51_start</name>
<key>d_fn51_start</key>

View File

@ -2,8 +2,8 @@
<block>
<name>Universal ctrl chans demapper</name>
<key>gsm_universal_ctrl_chans_demapper</key>
<import>import gsm</import>
<make>gsm.universal_ctrl_chans_demapper($starts_fn_mod51, $channel_types)</make>
<import>import grgsm</import>
<make>grgsm.universal_ctrl_chans_demapper($starts_fn_mod51, $channel_types)</make>
<param>
<name>starts_fn_mod51</name>

View File

@ -2,8 +2,8 @@
<block>
<name>Bursts printer</name>
<key>gsm_bursts_printer</key>
<import>import gsm</import>
<make>gsm.bursts_printer()</make>
<import>import grgsm</import>
<make>grgsm.bursts_printer()</make>
<sink>
<name>bursts</name>
<type>message</type>

View File

@ -1,8 +1,8 @@
<block>
<name>Clock offset corrector</name>
<key>gsm_clock_offset_corrector</key>
<import>import gsm</import>
<make>gsm.clock_offset_corrector(
<import>import grgsm</import>
<make>grgsm.clock_offset_corrector(
fc=$fc,
ppm=$ppm,
samp_rate_in=$samp_rate_in,

View File

@ -2,8 +2,8 @@
<block>
<name>Controlled const source</name>
<key>gsm_controlled_const_source_f</key>
<import>import gsm</import>
<make>gsm.controlled_const_source_f($constant)</make>
<import>import grgsm</import>
<make>grgsm.controlled_const_source_f($constant)</make>
<callback>set_constant($constant)</callback>
<param>

View File

@ -2,8 +2,8 @@
<block>
<name>Controlled rotator</name>
<key>gsm_controlled_rotator_cc</key>
<import>import gsm</import>
<make>gsm.controlled_rotator_cc($phase_inc,$samp_rate)</make>
<import>import grgsm</import>
<make>grgsm.controlled_rotator_cc($phase_inc,$samp_rate)</make>
<callback>set_phase_inc($phase_inc)</callback>
<callback>set_samp_rate($samp_rate)</callback>
<param>

View File

@ -2,8 +2,8 @@
<block>
<name>Extract system info</name>
<key>gsm_extract_system_info</key>
<import>import gsm</import>
<make>gsm.extract_system_info()</make>
<import>import grgsm</import>
<make>grgsm.extract_system_info()</make>
<sink>
<name>msgs</name>

View File

@ -2,8 +2,8 @@
<block>
<name>Message printer</name>
<key>gsm_message_printer</key>
<import>import gsm</import>
<make>gsm.message_printer()</make>
<import>import grgsm</import>
<make>grgsm.message_printer()</make>
<sink>
<name>msgs</name>

View File

@ -2,8 +2,8 @@
<block>
<name>GSM clock offset control</name>
<key>gsm_clock_offset_control</key>
<import>import gsm</import>
<make>gsm.clock_offset_control($fc)</make>
<import>import grgsm</import>
<make>grgsm.clock_offset_control($fc)</make>
<callback></callback>
<param>
<name>fc</name>

View File

@ -2,8 +2,8 @@
<block>
<name>FCCH burst tagger</name>
<key>gsm_fcch_burst_tagger</key>
<import>import gsm</import>
<make>gsm.fcch_burst_tagger($OSR)</make>
<import>import grgsm</import>
<make>grgsm.fcch_burst_tagger($OSR)</make>
<param>
<name>OSR</name>
<key>OSR</key>

View File

@ -2,8 +2,8 @@
<block>
<name>FCCH bursts detector</name>
<key>gsm_fcch_detector</key>
<import>import gsm</import>
<make>gsm.fcch_detector($OSR)</make>
<import>import grgsm</import>
<make>grgsm.fcch_detector($OSR)</make>
<callback>set_OSR($OSR)</callback>
<param>
<name>OverSamplingRatio</name>

View File

@ -2,8 +2,8 @@
<name>GSM input adaptor</name>
<key>gsm_input</key>
<category></category>
<import>import gsm</import>
<make>gsm.gsm_input(
<import>import grgsm</import>
<make>grgsm.gsm_input(
ppm=$ppm,
osr=$osr,
fc=$fc,

View File

@ -2,8 +2,8 @@
<block>
<name>GSM Receiver</name>
<key>gsm_receiver</key>
<import>import gsm</import>
<make>gsm.receiver($osr, $cell_allocation, $tseq_nums)</make>
<import>import grgsm</import>
<make>grgsm.receiver($osr, $cell_allocation, $tseq_nums)</make>
<param>
<name>Oversampling ratio</name>

View File

@ -2,8 +2,8 @@
<block>
<name>SCH bursts detector</name>
<key>gsm_sch_detector</key>
<import>import gsm</import>
<make>gsm.sch_detector($OSR)</make>
<import>import grgsm</import>
<make>grgsm.sch_detector($OSR)</make>
<callback>set_OSR($OSR)</callback>
<param>
<name>OSR</name>

View File

@ -27,5 +27,5 @@ add_subdirectory(receiver)
install(FILES
api.h
gsmtap.h DESTINATION include/gsm
gsmtap.h DESTINATION include/grgsm
)

View File

@ -21,5 +21,5 @@
# Install public header files
########################################################################
install(FILES
control_channels_decoder.h DESTINATION include/gsm/decoding
control_channels_decoder.h DESTINATION include/grgsm/decoding
)

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_H
#define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/block.h>
namespace gr {

View File

@ -22,5 +22,5 @@
########################################################################
install(FILES
universal_ctrl_chans_demapper.h
get_bcch_or_ccch_bursts.h DESTINATION include/gsm/demapping
get_bcch_or_ccch_bursts.h DESTINATION include/grgsm/demapping
)

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_H
#define INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/block.h>
namespace gr {

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_H
#define INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/block.h>
namespace gr {

View File

@ -25,5 +25,5 @@ install(FILES
extract_system_info.h
controlled_rotator_cc.h
controlled_const_source_f.h
message_printer.h DESTINATION include/gsm/misc_utils
message_printer.h DESTINATION include/grgsm/misc_utils
)

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_BURSTS_PRINTER_H
#define INCLUDED_GSM_BURSTS_PRINTER_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/block.h>
#include <string>
#include <vector>

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_H
#define INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/sync_block.h>
namespace gr {

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_H
#define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/sync_block.h>
namespace gr {

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_H
#define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/block.h>
namespace gr {

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_MESSAGE_PRINTER_H
#define INCLUDED_GSM_MESSAGE_PRINTER_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/sync_block.h>
namespace gr {

View File

@ -21,5 +21,5 @@
# Install public header files
########################################################################
install(FILES
receiver.h DESTINATION include/gsm/receiver
receiver.h DESTINATION include/grgsm/receiver
)

View File

@ -24,7 +24,7 @@
#ifndef INCLUDED_GSM_RECEIVER_H
#define INCLUDED_GSM_RECEIVER_H
#include <gsm/api.h>
#include <grgsm/api.h>
#include <gnuradio/block.h>
#include <gnuradio/feval.h>
#include <gnuradio/sync_block.h>

View File

@ -25,7 +25,7 @@
#endif
#include <gnuradio/io_signature.h>
#include <gsm/gsmtap.h>
#include <grgsm/gsmtap.h>
#include "control_channels_decoder_impl.h"
#define DATA_BYTES 23

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
#define INCLUDED_GSM_CONTROL_CHANNELS_DECODER_IMPL_H
#include <gsm/decoding/control_channels_decoder.h>
#include <grgsm/decoding/control_channels_decoder.h>
#include "fire_crc.h"
#include "cch.h"

View File

@ -25,8 +25,8 @@
#endif
#include <gnuradio/io_signature.h>
#include <gsm/endian.h>
#include <gsm/gsmtap.h>
#include <grgsm/endian.h>
#include <grgsm/gsmtap.h>
#include "get_bcch_or_ccch_bursts_impl.h"
namespace gr {

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
#define INCLUDED_GSM_GET_BCCH_OR_CCCH_BURSTS_IMPL_H
#include <gsm/demapping/get_bcch_or_ccch_bursts.h>
#include <grgsm/demapping/get_bcch_or_ccch_bursts.h>
namespace gr {
namespace gsm {

View File

@ -26,8 +26,8 @@
#include <gnuradio/io_signature.h>
#include "universal_ctrl_chans_demapper_impl.h"
#include <gsm/endian.h>
#include <gsm/gsmtap.h>
#include <grgsm/endian.h>
#include <grgsm/gsmtap.h>
namespace gr {
namespace gsm {

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_IMPL_H
#define INCLUDED_GSM_UNIVERSAL_CTRL_CHANS_DEMAPPER_IMPL_H
#include <gsm/demapping/universal_ctrl_chans_demapper.h>
#include <grgsm/demapping/universal_ctrl_chans_demapper.h>
namespace gr {
namespace gsm {

View File

@ -25,7 +25,7 @@
#endif
#include <gnuradio/io_signature.h>
#include <gsm/gsmtap.h>
#include <grgsm/gsmtap.h>
#include <iterator>
#include <algorithm>
#include "bursts_printer_impl.h"

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
#define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
#include <gsm/misc_utils/bursts_printer.h>
#include <grgsm/misc_utils/bursts_printer.h>
#include <set>
namespace gr {

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
#define INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
#include <gsm/misc_utils/controlled_const_source_f.h>
#include <grgsm/misc_utils/controlled_const_source_f.h>
namespace gr {
namespace gsm {

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
#define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
#include <gsm/misc_utils/controlled_rotator_cc.h>
#include <grgsm/misc_utils/controlled_rotator_cc.h>
#include <gnuradio/blocks/rotator.h>
namespace gr {

View File

@ -25,7 +25,7 @@
#endif
#include <gnuradio/io_signature.h>
#include <gsm/gsmtap.h>
#include <grgsm/gsmtap.h>
#include <unistd.h>
#include <set>
#include <iterator>

View File

@ -23,8 +23,7 @@
#ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
#define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
#include <gsm/misc_utils/extract_system_info.h>
#include <grgsm/misc_utils/extract_system_info.h>
namespace gr {

View File

@ -27,7 +27,7 @@
#include <gnuradio/io_signature.h>
#include <stdio.h>
#include "message_printer_impl.h"
#include "gsm/gsmtap.h"
#include "grgsm/gsmtap.h"
namespace gr {
namespace gsm {

View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
#define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
#include <gsm/misc_utils/message_printer.h>
#include <grgsm/misc_utils/message_printer.h>
namespace gr {
namespace gsm {

View File

@ -24,9 +24,6 @@
#include "config.h"
#endif
#include <gnuradio/io_signature.h>
#include "receiver_impl.h"
#include <gnuradio/io_signature.h>
#include <gnuradio/math.h>
#include <math.h>
@ -35,11 +32,13 @@
#include <numeric>
#include <viterbi_detector.h>
#include <string.h>
#include <sch.h>
#include <iostream>
#include <iomanip>
#include <boost/scoped_ptr.hpp>
#include <gsm/endian.h>
#include <sch.h>
#include "receiver_impl.h"
#include <grgsm/endian.h>
//files included for debuging
//#include "plotting/plotting.hpp"

View File

@ -23,8 +23,8 @@
#ifndef INCLUDED_GSM_RECEIVER_IMPL_H
#define INCLUDED_GSM_RECEIVER_IMPL_H
#include <gsm/receiver/receiver.h>
#include <gsm/gsmtap.h>
#include <grgsm/receiver/receiver.h>
#include <grgsm/gsmtap.h>
#include <gsm_constants.h>
#include <receiver_config.h>

View File

@ -2,7 +2,7 @@
#ifndef __SCH_H__
#define __SCH_H__ 1
#include <gsm/api.h>
#include <grgsm/api.h>
#ifdef __cplusplus
extern "C"

View File

@ -37,7 +37,7 @@ GR_PYTHON_INSTALL(
receiver/fcch_detector.py
receiver/chirpz.py
receiver/clock_offset_control.py
misc_utils/clock_offset_corrector.py DESTINATION ${GR_PYTHON_DIR}/gsm
misc_utils/clock_offset_corrector.py DESTINATION ${GR_PYTHON_DIR}/grgsm
)
########################################################################

View File

@ -42,7 +42,7 @@ if _RTLD_GLOBAL != 0:
# import swig generated symbols into the gsm namespace
from gsm_swig import *
from grgsm_swig import *
# import any pure python here

View File

@ -10,7 +10,7 @@ from gnuradio import blocks
from gnuradio import filter
from gnuradio import gr
from gnuradio.filter import firdes
import gsm
import grgsm
import math
class clock_offset_corrector(gr.hier_block2):
@ -38,8 +38,8 @@ class clock_offset_corrector(gr.hier_block2):
# Blocks
##################################################
self.ppm_in = None;self.message_port_register_hier_out("ppm_in")
self.gsm_controlled_rotator_cc_0 = gsm.controlled_rotator_cc(0,samp_rate_out)
self.gsm_controlled_const_source_f_0 = gsm.controlled_const_source_f(ppm)
self.gsm_controlled_rotator_cc_0 = grgsm.controlled_rotator_cc(0,samp_rate_out)
self.gsm_controlled_const_source_f_0 = grgsm.controlled_const_source_f(ppm)
self.fractional_resampler_xx_0 = filter.fractional_resampler_cc(0, samp_rate_in/samp_rate_out)
self.blocks_multiply_const_vxx_0_0 = blocks.multiply_const_vff((1.0e-6*samp_rate_in/samp_rate_out, ))
self.blocks_multiply_const_vxx_0 = blocks.multiply_const_vff((fc/samp_rate_out*(2*math.pi)/1e6, ))

View File

@ -23,7 +23,7 @@ from numpy import *
#from pylab import *
from gnuradio import gr
import pmt
from gsm.chirpz import ZoomFFT
from grgsm.chirpz import ZoomFFT
class fcch_burst_tagger(gr.sync_block):
"""

View File

@ -13,7 +13,7 @@
from gnuradio import blocks
from gnuradio import gr
from gnuradio.filter import firdes
import gsm
import grgsm
class fcch_detector(gr.hier_block2):
@ -38,7 +38,7 @@ class fcch_detector(gr.hier_block2):
##################################################
# Blocks
##################################################
self.gsm_fcch_burst_tagger_0 = gsm.fcch_burst_tagger(OSR)
self.gsm_fcch_burst_tagger_0 = grgsm.fcch_burst_tagger(OSR)
self.blocks_threshold_ff_0_0 = blocks.threshold_ff(0, 0, 0)
self.blocks_threshold_ff_0 = blocks.threshold_ff(int((138)*samp_rate/f_symb), int((138)*samp_rate/f_symb), 0)
self.blocks_multiply_conjugate_cc_0 = blocks.multiply_conjugate_cc(1)

View File

@ -10,7 +10,7 @@
from gnuradio import filter
from gnuradio import gr
from gnuradio.filter import firdes
import gsm
import grgsm
class gsm_input(gr.hier_block2):
@ -40,7 +40,7 @@ class gsm_input(gr.hier_block2):
self.ppm_in = None;self.message_port_register_hier_out("ppm_in")
self.low_pass_filter_0_0 = filter.fir_filter_ccf(1, firdes.low_pass(
1, samp_rate_out, 125e3, 5e3, firdes.WIN_HAMMING, 6.76))
self.gsm_clock_offset_corrector_0 = gsm.clock_offset_corrector(
self.gsm_clock_offset_corrector_0 = grgsm.clock_offset_corrector(
fc=936.6e6,
ppm=0,
samp_rate_in=samp_rate_in,

View File

@ -36,22 +36,22 @@ foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
endforeach(incdir)
set(GR_SWIG_LIBRARIES gnuradio-gsm)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/gsm_swig_doc.i)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i)
set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
GR_SWIG_MAKE(gsm_swig gsm_swig.i)
GR_SWIG_MAKE(grgsm_swig grgsm_swig.i)
########################################################################
# Install the build swig module
########################################################################
GR_SWIG_INSTALL(TARGETS gsm_swig DESTINATION ${GR_PYTHON_DIR}/gsm)
GR_SWIG_INSTALL(TARGETS grgsm_swig DESTINATION ${GR_PYTHON_DIR}/grgsm)
########################################################################
# Install swig .i files for development
########################################################################
install(
FILES
gsm_swig.i
${CMAKE_CURRENT_BINARY_DIR}/gsm_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/gsm/swig
grgsm_swig.i
${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i
DESTINATION ${GR_INCLUDE_DIR}/grgsm/swig
)

43
swig/grgsm_swig.i Normal file
View File

@ -0,0 +1,43 @@
/* -*- c++ -*- */
#define GSM_API
%include "gnuradio.i" // the common stuff
//load generated python docstrings
%include "grgsm_swig_doc.i"
%{
#include "grgsm/receiver/receiver.h"
#include "grgsm/demapping/get_bcch_or_ccch_bursts.h"
#include "grgsm/demapping/universal_ctrl_chans_demapper.h"
#include "grgsm/decoding/control_channels_decoder.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"
#include "grgsm/misc_utils/extract_system_info.h"
#include "grgsm/misc_utils/message_printer.h"
%}
%include "grgsm/receiver/receiver.h"
GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
%include "grgsm/decoding/control_channels_decoder.h"
GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder);
%include "grgsm/demapping/get_bcch_or_ccch_bursts.h"
GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
%include "grgsm/demapping/universal_ctrl_chans_demapper.h"
GR_SWIG_BLOCK_MAGIC2(gsm, universal_ctrl_chans_demapper);
%include "grgsm/misc_utils/bursts_printer.h"
GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
%include "grgsm/misc_utils/extract_system_info.h"
GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info);
%include "grgsm/misc_utils/controlled_rotator_cc.h"
GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc);
%include "grgsm/misc_utils/controlled_const_source_f.h"
GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f);
%include "grgsm/misc_utils/message_printer.h"
GR_SWIG_BLOCK_MAGIC2(gsm, message_printer);

View File

@ -1,43 +0,0 @@
/* -*- c++ -*- */
#define GSM_API
%include "gnuradio.i" // the common stuff
//load generated python docstrings
%include "gsm_swig_doc.i"
%{
#include "gsm/receiver/receiver.h"
#include "gsm/demapping/get_bcch_or_ccch_bursts.h"
#include "gsm/demapping/universal_ctrl_chans_demapper.h"
#include "gsm/decoding/control_channels_decoder.h"
#include "gsm/misc_utils/bursts_printer.h"
#include "gsm/misc_utils/controlled_const_source_f.h"
#include "gsm/misc_utils/controlled_rotator_cc.h"
#include "gsm/misc_utils/extract_system_info.h"
#include "gsm/misc_utils/message_printer.h"
%}
%include "gsm/receiver/receiver.h"
GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
%include "gsm/decoding/control_channels_decoder.h"
GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder);
%include "gsm/demapping/get_bcch_or_ccch_bursts.h"
GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
%include "gsm/demapping/universal_ctrl_chans_demapper.h"
GR_SWIG_BLOCK_MAGIC2(gsm, universal_ctrl_chans_demapper);
%include "gsm/misc_utils/bursts_printer.h"
GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
%include "gsm/misc_utils/extract_system_info.h"
GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info);
%include "gsm/misc_utils/controlled_rotator_cc.h"
GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc);
%include "gsm/misc_utils/controlled_const_source_f.h"
GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f);
%include "gsm/misc_utils/message_printer.h"
GR_SWIG_BLOCK_MAGIC2(gsm, message_printer);