From 9998c6ae08e08dd5acb32a0dc2229d099cafd775 Mon Sep 17 00:00:00 2001
From: MoritzLucaSchmid
Date: Fri, 11 Aug 2017 16:12:00 +0200
Subject: [PATCH 001/135] GUI: add GNU radio plots in developer mode
---
include/dab/firecode_check_bb.h | 2 +
include/dab/reed_solomon_decode_bb.h | 2 +
lib/firecode_check_bb_impl.cc | 2 +
lib/firecode_check_bb_impl.h | 4 +
lib/reed_solomon_decode_bb_impl.cc | 2 +
lib/reed_solomon_decode_bb_impl.h | 4 +
python/GUI/main.py | 127 +++++++++++++++++++++++----
python/GUI/user_frontend.py | 31 ++++++-
python/GUI/user_frontend.ui | 59 +++++++++++--
python/GUI/usrp_dab_rx.py | 20 ++++-
python/dabplus_audio_decoder_ff.py | 6 ++
11 files changed, 233 insertions(+), 26 deletions(-)
diff --git a/include/dab/firecode_check_bb.h b/include/dab/firecode_check_bb.h
index d1f1c5b3..e810a9af 100644
--- a/include/dab/firecode_check_bb.h
+++ b/include/dab/firecode_check_bb.h
@@ -46,6 +46,8 @@ namespace gr {
* creating new instances.
*/
static sptr make(int bit_rate_n);
+
+ virtual bool get_firecode_passed() = 0;
};
} // namespace dab
diff --git a/include/dab/reed_solomon_decode_bb.h b/include/dab/reed_solomon_decode_bb.h
index 04d774cd..609ab79f 100644
--- a/include/dab/reed_solomon_decode_bb.h
+++ b/include/dab/reed_solomon_decode_bb.h
@@ -47,6 +47,8 @@ namespace gr {
* creating new instances.
*/
static sptr make(int bit_rate_n);
+
+ virtual int get_corrected_errors() = 0;
};
} // namespace dab
diff --git a/lib/firecode_check_bb_impl.cc b/lib/firecode_check_bb_impl.cc
index 1a42f8ed..6a0b1f41 100644
--- a/lib/firecode_check_bb_impl.cc
+++ b/lib/firecode_check_bb_impl.cc
@@ -85,10 +85,12 @@ namespace gr {
memcpy(out + d_nproduced * d_frame_size, in + d_nconsumed * d_frame_size, d_frame_size * 5);
d_nproduced += 5;
d_nconsumed += 5;
+ d_firecode_passed = true;
} else {
GR_LOG_DEBUG(d_logger, format("fire code failed at frame %d") % (nitems_read(0) / d_frame_size));
// shift of one logical frame
d_nconsumed++;
+ d_firecode_passed = false;
}
}
// Tell runtime system how many input items we consumed on
diff --git a/lib/firecode_check_bb_impl.h b/lib/firecode_check_bb_impl.h
index 7f417a58..b7c74273 100644
--- a/lib/firecode_check_bb_impl.h
+++ b/lib/firecode_check_bb_impl.h
@@ -39,6 +39,7 @@ namespace gr {
int d_frame_size;
int d_bit_rate_n;
int d_nproduced, d_nconsumed;
+ bool d_firecode_passed;
firecode_checker fc;
public:
@@ -46,6 +47,9 @@ namespace gr {
~firecode_check_bb_impl();
+ virtual bool get_firecode_passed()
+ { return d_firecode_passed; }
+
// Where all the action really happens
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
diff --git a/lib/reed_solomon_decode_bb_impl.cc b/lib/reed_solomon_decode_bb_impl.cc
index 3468b5a1..bb84ac34 100644
--- a/lib/reed_solomon_decode_bb_impl.cc
+++ b/lib/reed_solomon_decode_bb_impl.cc
@@ -65,6 +65,7 @@ namespace gr {
d_superframe_size = bit_rate_n * 120;
d_superframe_size_rs = bit_rate_n * 110;
set_output_multiple(d_superframe_size_rs);
+ d_corrected_errors = 0;
}
/*
@@ -109,6 +110,7 @@ namespace gr {
}
}
GR_LOG_DEBUG(d_logger, format("RS corrected %d errors in superframe") % total_corr_count);
+ d_corrected_errors = total_corr_count;
}
diff --git a/lib/reed_solomon_decode_bb_impl.h b/lib/reed_solomon_decode_bb_impl.h
index 149a993e..0dcf011c 100644
--- a/lib/reed_solomon_decode_bb_impl.h
+++ b/lib/reed_solomon_decode_bb_impl.h
@@ -50,6 +50,7 @@ namespace gr {
void *rs_handle;
uint8_t rs_packet[120];
int corr_pos[10];
+ int d_corrected_errors;
void DecodeSuperframe(uint8_t *sf, size_t sf_len);
@@ -58,6 +59,9 @@ namespace gr {
~reed_solomon_decode_bb_impl();
+ virtual int get_corrected_errors()
+ { return d_corrected_errors; }
+
// Where all the action really happens
void forecast(int noutput_items, gr_vector_int &ninput_items_required);
diff --git a/python/GUI/main.py b/python/GUI/main.py
index 20d91a79..8ae8e69d 100644
--- a/python/GUI/main.py
+++ b/python/GUI/main.py
@@ -1,15 +1,17 @@
#!/usr/bin/env python
from PyQt4 import QtGui
-from PyQt4.QtCore import QThread
+from PyQt4 import QtCore
from PyQt4.QtCore import QTimer
import sys
+import time
import user_frontend
import usrp_dab_rx
import usrp_dab_tx
import math
import json
import sip
+import random
class DABstep(QtGui.QMainWindow, user_frontend.Ui_MainWindow):
def __init__(self, parent=None):
@@ -58,6 +60,7 @@ def __init__(self, parent=None):
# set file path
self.btn_file_path.clicked.connect(self.set_file_path)
# init button initializes receiver with center frequency
+ self.btn_init.clicked.connect(self.update_statusBar)
self.btn_init.clicked.connect(self.init_receiver)
# update button updates services in table
self.btn_update_info.clicked.connect(self.update_service_info)
@@ -72,6 +75,19 @@ def __init__(self, parent=None):
# record button
self.btn_record.clicked.connect(self.record_audio)
+ ######################################################################
+ # DEVELOPER MODE
+ ######################################################################
+ self.dev_mode_active = False
+ # hide close button and just show open button
+ self.btn_dev_mode_close.hide()
+ # dev mode open button pressed
+ self.btn_dev_mode_open.clicked.connect(self.dev_mode_open)
+ # dev mode close button pressed
+ self.btn_dev_mode_close.clicked.connect(self.dev_mode_close)
+ # firecode display
+ self.snr_timer.timeout.connect(self.update_firecode)
+
######################################################################
# TAB TRANSMISSION (defining variables, signals and slots)
######################################################################
@@ -177,20 +193,29 @@ def set_file_path(self):
self.label_path.setText(path)
def init_receiver(self):
- # set status bar message
- self.statusBar.showMessage("initializing receiver ...")
- self.btn_update_info.setEnabled(True)
# stop any processes that access to an instance of usrp_dab_rx
self.snr_timer.stop()
# set up and start flowgraph
self.my_receiver = usrp_dab_rx.usrp_dab_rx(self.spinbox_frequency.value(), self.bit_rate, self.address, self.size, self.protection,
self.src_is_USRP, self.file_path, self.recorder)
self.my_receiver.start()
- self.snr_timer.start(5000)
+ # status bar
+ self.statusBar.showMessage("initialization finished!")
+ # init dev mode
+ self.dev_mode_init()
+ # once scan ensemble automatically (after per clicking btn)
+ time.sleep(1)
+ self.update_service_info()
+ self.btn_update_info.setEnabled(True)
+ self.snr_update()
+ self.snr_timer.start(1000)
+
+ def update_statusBar(self):
+ self.statusBar.showMessage("initializing receiver ...")
def update_service_info(self):
# set status bar message
- self.statusBar.showMessage("scanning ensemble...", 1000)
+ self.statusBar.showMessage("scanning ensemble...")
# remove all old data from table at first
while (self.table_mci.rowCount() > 0):
self.table_mci.removeRow(0)
@@ -220,21 +245,16 @@ def update_service_info(self):
self.label_ensemble.setText(ensemble_data.keys()[0].strip())
self.label_country.setText(str(self.table.country_ID_ECC_E0[int(ensemble_data.values()[0]['country_ID'])]))
self.lcd_number_num_subch.display(self.num_subch)
+ # status bar
+ self.statusBar.showMessage("Select a Service Component.")
def selected_subch(self):
# enable/disable buttons
self.btn_play.setEnabled(True)
self.btn_record.setEnabled(True)
-
- # check if selected sub-channel is different to former selected sub-channel
- if self.table_mci.currentRow() is self.subch:
- self.need_new_init = False
- else:
- # new subch was selected
- self.subch = self.table_mci.currentRow()
- self.need_new_init = True
- self.btn_play.setText("Play")
- self.slider_volume.setEnabled(False)
+ # new subch was selected
+ self.btn_play.setText("Play")
+ self.slider_volume.setEnabled(False)
# get selected sub-channel by its ID
ID = self.table_mci.item(self.table_mci.currentRow(), 0).text()
@@ -259,6 +279,8 @@ def selected_subch(self):
# service component (=sub-channel) info
self.label_primary.setText(("primary" if service_data['primary'] == True else "secondary"))
self.label_dabplus.setText(("DAB+" if service_data['DAB+'] == True else "DAB"))
+ # status Bar
+ self.statusBar.showMessage("Play/Record the selected Service Component.")
def snr_update(self):
print "update snr"
@@ -293,13 +315,21 @@ def play_audio(self):
self.slider_volume.setValue(self.volume)
self.set_volume()
# if selected sub-channel is not the current sub-channel we have to reconfigure the receiver
- if self.need_new_init:
+ if self.subch is not self.table_mci.currentRow():
+ self.subch = self.table_mci.currentRow()
+ dev_mode_opened = False
+ if self.dev_mode_active:
+ dev_mode_opened = True
+ self.dev_mode_close()
self.snr_timer.stop()
self.my_receiver.stop()
self.my_receiver = usrp_dab_rx.usrp_dab_rx(self.frequency, self.bit_rate, self.address, self.size,
self.protection,
self.src_is_USRP, self.file_path, self.recorder)
self.my_receiver.start()
+ self.dev_mode_init()
+ if dev_mode_opened:
+ self.dev_mode_open()
self.snr_timer.start(5000)
else:
# mute button pressed
@@ -309,9 +339,15 @@ def play_audio(self):
self.slider_volume.setEnabled(False)
self.set_volume()
self.need_new_init = False
+ # start timer for snr update again
self.snr_timer.start(1000)
+ # update dev mode
def stop_reception(self):
+ # close dev mode
+ self.btn_dev_mode_close.hide()
+ self.btn_dev_mode_open.show()
+ self.btn_dev_mode_open.setEnabled(False)
# stop flowgraph
self.my_receiver.stop()
# enable/disable buttons
@@ -380,6 +416,63 @@ def get_sample_rate(self):
# TODO: set rational resampler in flowgraoph with sample rate
return self.my_receiver.get_sample_rate()
+ ################################
+ # Developer Mode
+ ################################
+
+ def dev_mode_init(self):
+ # FFT plot
+ self.fft_plot = sip.wrapinstance(self.my_receiver.fft_plot.pyqwidget(), QtGui.QWidget)
+ self.vertical_layout_dev_mode_right.addWidget(self.fft_plot)
+ self.fft_plot.hide()
+ # Waterfall plot
+ self.waterfall_plot = sip.wrapinstance(self.my_receiver.waterfall_plot.pyqwidget(), QtGui.QWidget)
+ self.vertical_layout_dev_mode_right.addWidget(self.waterfall_plot)
+ self.waterfall_plot.hide()
+ # Time plot
+ # self.time_plot = sip.wrapinstance(self.my_receiver.time_plot.pyqwidget(), QtGui.QWidget)
+ # self.vertical_layout_dev_mode_right.addWidget(self.time_plot)
+ #self.time_plot.hide()
+ # constellation plot
+ self.constellation = sip.wrapinstance(self.my_receiver.constellation_plot.pyqwidget(), QtGui.QWidget)
+ self.vertical_layout_dev_mode_right.addWidget(self.constellation)
+ self.constellation.hide()
+ # if dev mode is initialized, we can enable the dev mode open button
+ self.btn_dev_mode_open.setEnabled(True)
+
+ def dev_mode_open(self):
+ self.dev_mode_active = True
+ # hide open button and show close button
+ self.btn_dev_mode_open.hide()
+ self.btn_dev_mode_close.show()
+ # show widgets
+ self.fft_plot.show()
+ self.waterfall_plot.show()
+ self.constellation.show()
+ self.label_firecode.show()
+ self.label_firecode.setText("")
+
+ def dev_mode_close(self):
+ self.dev_mode_active = False
+ # hide close button and show open button
+ self.btn_dev_mode_close.hide()
+ self.btn_dev_mode_open.show()
+ # hide widgets
+ self.fft_plot.hide()
+ self.waterfall_plot.hide()
+ self.constellation.hide()
+ self.label_firecode.hide()
+
+ def update_firecode(self):
+ if self.dev_mode_active:
+ if not self.my_receiver.get_firecode_passed():
+ self.label_firecode.setText(self.label_firecode.text() + "X ")
+ else:
+ errors = self.my_receiver.get_corrected_errors()
+ self.label_firecode.setText(self.label_firecode.text() +("" + str(errors) +" "))
+ self.label_firecode.setWordWrap(True)
+
+
################################
# Transmitter functions
################################
diff --git a/python/GUI/user_frontend.py b/python/GUI/user_frontend.py
index 511e33b8..f6582801 100644
--- a/python/GUI/user_frontend.py
+++ b/python/GUI/user_frontend.py
@@ -43,6 +43,18 @@ def setupUi(self, MainWindow):
self.horizontalLayout_21.addWidget(self.label_6)
spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_21.addItem(spacerItem1)
+ self.btn_dev_mode_close = QtGui.QPushButton(self.centralwidget)
+ self.btn_dev_mode_close.setEnabled(True)
+ icon = QtGui.QIcon.fromTheme(_fromUtf8("list-remove"))
+ self.btn_dev_mode_close.setIcon(icon)
+ self.btn_dev_mode_close.setObjectName(_fromUtf8("btn_dev_mode_close"))
+ self.horizontalLayout_21.addWidget(self.btn_dev_mode_close)
+ self.btn_dev_mode_open = QtGui.QPushButton(self.centralwidget)
+ self.btn_dev_mode_open.setEnabled(False)
+ icon = QtGui.QIcon.fromTheme(_fromUtf8("list-add"))
+ self.btn_dev_mode_open.setIcon(icon)
+ self.btn_dev_mode_open.setObjectName(_fromUtf8("btn_dev_mode_open"))
+ self.horizontalLayout_21.addWidget(self.btn_dev_mode_open)
self.verticalLayout.addLayout(self.horizontalLayout_21)
self.mode_tabs = QtGui.QTabWidget(self.centralwidget)
self.mode_tabs.setEnabled(True)
@@ -190,7 +202,7 @@ def setupUi(self, MainWindow):
self.bar_snr.setStyleSheet(_fromUtf8("tfadsf"))
self.bar_snr.setMinimum(-20)
self.bar_snr.setMaximum(20)
- self.bar_snr.setProperty("value", -20)
+ self.bar_snr.setProperty("value", 0)
self.bar_snr.setFormat(_fromUtf8(""))
self.bar_snr.setObjectName(_fromUtf8("bar_snr"))
self.horizontalLayout_23.addWidget(self.bar_snr)
@@ -313,7 +325,13 @@ def setupUi(self, MainWindow):
self.horizontalLayout_4.addWidget(self.slider_volume)
self.verticalLayout_7.addLayout(self.horizontalLayout_4)
self.horizontalLayout_2.addLayout(self.verticalLayout_7)
+ self.vertical_layout_dev_mode_right = QtGui.QVBoxLayout()
+ self.vertical_layout_dev_mode_right.setObjectName(_fromUtf8("vertical_layout_dev_mode_right"))
+ self.horizontalLayout_2.addLayout(self.vertical_layout_dev_mode_right)
self.verticalLayout_2.addLayout(self.horizontalLayout_2)
+ self.test_layout = QtGui.QVBoxLayout()
+ self.test_layout.setObjectName(_fromUtf8("test_layout"))
+ self.verticalLayout_2.addLayout(self.test_layout)
self.mode_tabs.addTab(self.tab_reception, _fromUtf8(""))
self.tab_transmission = QtGui.QWidget()
self.tab_transmission.setObjectName(_fromUtf8("tab_transmission"))
@@ -384,7 +402,7 @@ def setupUi(self, MainWindow):
self.scrollArea.setWidgetResizable(True)
self.scrollArea.setObjectName(_fromUtf8("scrollArea"))
self.scrollAreaWidgetContents = QtGui.QWidget()
- self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, -587, 397, 954))
+ self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 397, 954))
self.scrollAreaWidgetContents.setObjectName(_fromUtf8("scrollAreaWidgetContents"))
self.verticalLayout_9 = QtGui.QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout_9.setObjectName(_fromUtf8("verticalLayout_9"))
@@ -878,6 +896,12 @@ def setupUi(self, MainWindow):
self.verticalLayout_3.addLayout(self.horizontalLayout_7)
self.mode_tabs.addTab(self.tab_transmission, _fromUtf8(""))
self.verticalLayout.addWidget(self.mode_tabs)
+ self.horizontalLayout_29 = QtGui.QHBoxLayout()
+ self.horizontalLayout_29.setObjectName(_fromUtf8("horizontalLayout_29"))
+ self.label_firecode = QtGui.QLabel(self.centralwidget)
+ self.label_firecode.setObjectName(_fromUtf8("label_firecode"))
+ self.horizontalLayout_29.addWidget(self.label_firecode)
+ self.verticalLayout.addLayout(self.horizontalLayout_29)
MainWindow.setCentralWidget(self.centralwidget)
self.statusBar = QtGui.QStatusBar(MainWindow)
self.statusBar.setAutoFillBackground(False)
@@ -892,6 +916,8 @@ def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow", None))
self.label_5.setText(_translate("MainWindow", "
", None))
self.label_6.setText(_translate("MainWindow", "