Merge branch 'master' of https://github.com/mrjacobagilbert/gr-gsm into mrjaco-master
Added appropriate changes to grc files, corrected CMakeLists files
diff --git a/apps/airprobe_rtlsdr.py b/apps/airprobe_rtlsdr.py
index 29134c3..c1f816d 100755
--- a/apps/airprobe_rtlsdr.py
+++ b/apps/airprobe_rtlsdr.py
@@ -2,7 +2,7 @@
##################################################
# Gnuradio Python Flow Graph
# Title: Airprobe Rtlsdr
-# Generated: Sat Dec 13 09:54:44 2014
+# Generated: Sat Jan 3 00:02:56 2015
##################################################
from PyQt4 import Qt
@@ -17,6 +17,7 @@
import PyQt4.Qwt5 as Qwt
import grgsm
import osmosdr
+import pmt
import sip
import sys
import time
@@ -72,7 +73,7 @@
# Blocks
##################################################
self._ppm_layout = Qt.QHBoxLayout()
- self._ppm_layout.addWidget(Qt.QLabel("clock_correction [ppm]"+": "))
+ self._ppm_layout.addWidget(Qt.QLabel("PPM Offset"+": "))
class qwt_counter_pyslot(Qwt.QwtCounter):
def __init__(self, parent=None):
Qwt.QwtCounter.__init__(self, parent)
@@ -88,7 +89,7 @@
self._ppm_counter.valueChanged.connect(self.set_ppm)
self.top_layout.addLayout(self._ppm_layout)
self._g_layout = Qt.QHBoxLayout()
- self._g_layout.addWidget(Qt.QLabel("gain"+": "))
+ self._g_layout.addWidget(Qt.QLabel("Gain"+": "))
class qwt_counter_pyslot(Qwt.QwtCounter):
def __init__(self, parent=None):
Qwt.QwtCounter.__init__(self, parent)
@@ -106,7 +107,7 @@
self._fc_layout = Qt.QVBoxLayout()
self._fc_tool_bar = Qt.QToolBar(self)
self._fc_layout.addWidget(self._fc_tool_bar)
- self._fc_tool_bar.addWidget(Qt.QLabel("center_frequency"+": "))
+ self._fc_tool_bar.addWidget(Qt.QLabel("Frequency"+": "))
class qwt_counter_pyslot(Qwt.QwtCounter):
def __init__(self, parent=None):
Qwt.QwtCounter.__init__(self, parent)
@@ -149,11 +150,36 @@
)
self.qtgui_freq_sink_x_0.set_update_time(0.10)
self.qtgui_freq_sink_x_0.set_y_axis(-140, 10)
+ self.qtgui_freq_sink_x_0.set_trigger_mode(qtgui.TRIG_MODE_FREE, 0.0, 0, "")
+ self.qtgui_freq_sink_x_0.enable_autoscale(False)
+ self.qtgui_freq_sink_x_0.enable_grid(False)
+ self.qtgui_freq_sink_x_0.set_fft_average(1.0)
+
+ if complex == type(float()):
+ self.qtgui_freq_sink_x_0.set_plot_pos_half(not True)
+
+ labels = ["", "", "", "", "",
+ "", "", "", "", ""]
+ widths = [1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1]
+ colors = ["blue", "red", "green", "black", "cyan",
+ "magenta", "yellow", "dark red", "dark green", "dark blue"]
+ alphas = [1.0, 1.0, 1.0, 1.0, 1.0,
+ 1.0, 1.0, 1.0, 1.0, 1.0]
+ for i in xrange(1):
+ if len(labels[i]) == 0:
+ self.qtgui_freq_sink_x_0.set_line_label(i, "Data {0}".format(i))
+ else:
+ self.qtgui_freq_sink_x_0.set_line_label(i, labels[i])
+ self.qtgui_freq_sink_x_0.set_line_width(i, widths[i])
+ self.qtgui_freq_sink_x_0.set_line_color(i, colors[i])
+ self.qtgui_freq_sink_x_0.set_line_alpha(i, alphas[i])
+
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 = 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_message_printer_1 = grgsm.message_printer(pmt.intern(""))
self.gsm_input_0 = grgsm.gsm_input(
ppm=0,
osr=4,
@@ -162,24 +188,24 @@
)
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)
+ self.blocks_socket_pdu_0 = blocks.socket_pdu("UDP_CLIENT", "127.0.0.1", "4729", 10000, False)
##################################################
# Connections
##################################################
- self.connect((self.rtlsdr_source_0, 0), (self.qtgui_freq_sink_x_0, 0))
- self.connect((self.rtlsdr_source_0, 0), (self.gsm_input_0, 0))
self.connect((self.gsm_input_0, 0), (self.gsm_receiver_0, 0))
+ self.connect((self.rtlsdr_source_0, 0), (self.gsm_input_0, 0))
+ self.connect((self.rtlsdr_source_0, 0), (self.qtgui_freq_sink_x_0, 0))
##################################################
- # Asynch Message Connections
+ # Message Connections
##################################################
- self.msg_connect(self.gsm_clock_offset_control_0, "ppm", self.gsm_input_0, "ppm_in")
- self.msg_connect(self.gsm_receiver_0, "C0", self.gsm_universal_ctrl_chans_demapper_0, "bursts")
- self.msg_connect(self.gsm_control_channels_decoder_0, "msgs", self.gsm_message_printer_1, "msgs")
- self.msg_connect(self.gsm_control_channels_decoder_0, "msgs", self.blocks_socket_pdu_0, "pdus")
- 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")
+ self.msg_connect(self.gsm_universal_ctrl_chans_demapper_0, "bursts", self.gsm_control_channels_decoder_0, "bursts")
+ self.msg_connect(self.gsm_control_channels_decoder_0, "msgs", self.blocks_socket_pdu_0, "pdus")
+ self.msg_connect(self.gsm_control_channels_decoder_0, "msgs", self.gsm_message_printer_1, "msgs")
+ self.msg_connect(self.gsm_receiver_0, "C0", self.gsm_universal_ctrl_chans_demapper_0, "bursts")
+ self.msg_connect(self.gsm_clock_offset_control_0, "ppm", self.gsm_input_0, "ppm_in")
def closeEvent(self, event):
self.settings = Qt.QSettings("GNU Radio", "airprobe_rtlsdr")
@@ -198,8 +224,8 @@
def set_samp_rate(self, samp_rate):
self.samp_rate = samp_rate
- self.rtlsdr_source_0.set_sample_rate(self.samp_rate)
self.gsm_input_0.set_samp_rate_in(self.samp_rate)
+ self.rtlsdr_source_0.set_sample_rate(self.samp_rate)
self.qtgui_freq_sink_x_0.set_frequency_range(self.fc, self.samp_rate)
def get_ppm(self):
@@ -207,8 +233,8 @@
def set_ppm(self, ppm):
self.ppm = ppm
- Qt.QMetaObject.invokeMethod(self._ppm_counter, "setValue", Qt.Q_ARG("double", self.ppm))
self.rtlsdr_source_0.set_freq_corr(self.ppm, 0)
+ Qt.QMetaObject.invokeMethod(self._ppm_counter, "setValue", Qt.Q_ARG("double", self.ppm))
def get_g(self):
return self.g
@@ -223,11 +249,11 @@
def set_fc(self, fc):
self.fc = fc
+ self.gsm_input_0.set_fc(self.fc)
+ self.rtlsdr_source_0.set_center_freq(self.fc, 0)
+ self.qtgui_freq_sink_x_0.set_frequency_range(self.fc, self.samp_rate)
Qt.QMetaObject.invokeMethod(self._fc_counter, "setValue", Qt.Q_ARG("double", self.fc))
Qt.QMetaObject.invokeMethod(self._fc_slider, "setValue", Qt.Q_ARG("double", self.fc))
- self.rtlsdr_source_0.set_center_freq(self.fc, 0)
- self.gsm_input_0.set_fc(self.fc)
- self.qtgui_freq_sink_x_0.set_frequency_range(self.fc, self.samp_rate)
def get_SDCCH(self):
return self.SDCCH