Skip to content

Commit

Permalink
GUI: add DAB mode (next to DAB+)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MLsmd
MLsmd committed Aug 15, 2017
1 parent e5d66b6 commit 7d521bc
Show file tree
Hide file tree
Showing 10 changed files with 604 additions and 103 deletions.
2 changes: 2 additions & 0 deletions include/dab/mp2_decode_bs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ namespace gr {
* creating new instances.
*/
static sptr make(int bit_rate_n);

virtual int32_t get_sample_rate() = 0;
};

} // namespace dab
Expand Down
3 changes: 2 additions & 1 deletion lib/mp2_decode_bs_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,9 @@ namespace gr {
|| ((frame[1] & 0xF6) != 0xF4) // no MPEG-1/2 Audio Layer II?
|| ((frame[2] - 0x10) >= 0xE0)) // invalid bitrate?
return 0;
return sample_rates[(((frame[1] & 0x08) >> 1) ^ 4) // MPEG-1/2 switch
d_sample_rate = sample_rates[(((frame[1] & 0x08) >> 1) ^ 4) // MPEG-1/2 switch
+ ((frame[2] >> 2) & 3)]; // actual rate
return d_sample_rate;
}

struct quantizer_spec *mp2_decode_bs_impl::read_allocation(int sb, int b2_table)
Expand Down
4 changes: 4 additions & 0 deletions lib/mp2_decode_bs_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ namespace gr {
int d_bit_rate;
int d_nproduced;
uint16_t *d_out;
int32_t d_sample_rate;

int16_t d_V_offs;
int32_t d_baud_rate;
Expand Down Expand Up @@ -105,6 +106,9 @@ namespace gr {

~mp2_decode_bs_impl();

virtual int32_t get_sample_rate()
{return d_sample_rate;}

// Where all the action really happens
void forecast(int noutput_items, gr_vector_int &ninput_items_required);

Expand Down
118 changes: 82 additions & 36 deletions python/GUI/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
import sys
import time
import user_frontend
import usrp_dabplus_rx
import usrp_dab_rx
import usrp_dabplus_tx
import usrp_dab_tx
import math
import json
Expand All @@ -17,6 +19,8 @@ def __init__(self, parent=None):
super(DABstep, self).__init__(parent)
self.setupUi(self)

# window title
self.setWindowTitle("DABstep - A DAB/DAB+ transceiver app")
# show logo if it exists
if os.path.exists("DAB_logo.png"):
self.label_logo.setText("<img src=\"DAB_logo.png\">")
Expand All @@ -33,13 +37,13 @@ def __init__(self, parent=None):
# TAB RECEPTION (defining variables, signals and slots)
######################################################################
# receiver variables
self.frequency = 208.064e6
self.bit_rate = 8
self.address = 0
self.size = 6
self.protection = 2
self.volume = 80
self.subch = -1
self.dabplus = True
self.need_new_init = True
self.recorder = False
self.file_path = "None"
Expand All @@ -53,6 +57,7 @@ def __init__(self, parent=None):
header.setResizeMode(3, QtGui.QHeaderView.ResizeToContents)
header.setStretchLastSection(False)
self.table_mci.verticalHeader().hide()
self.table_mci.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)

# timer for update of SNR
self.snr_timer = QTimer()
Expand Down Expand Up @@ -97,8 +102,6 @@ def __init__(self, parent=None):
self.label_firecode.hide()
self.content_count = 0



######################################################################
# TAB TRANSMISSION (defining variables, signals and slots)
######################################################################
Expand Down Expand Up @@ -204,22 +207,26 @@ def set_file_path(self):
self.label_path.setText(path)

def init_receiver(self):
# stop any processes that access to an instance of usrp_dab_rx
# stop any processes that access to an instance of usrp_dabplus_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()
# 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(500)
# check if file path is selected in case that file is the selected source
if (not self.src_is_USRP) and (self.file_path == "None"):
self.label_path.setStyleSheet('color: red')
else:
# set up and start flowgraph
self.my_receiver = usrp_dabplus_rx.usrp_dabplus_rx(self.spin_dab_mode.value(), 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()
# 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(500)

def update_statusBar(self):
self.statusBar.showMessage("initializing receiver ...")
Expand Down Expand Up @@ -275,13 +282,14 @@ def selected_subch(self):
service_data = next((item for item in self.get_service_info() if item['ID'] == int(ID)), {"reference":-1, "ID": -1, "primary": True})
service_label = next((item for item in self.get_service_labels() if item['reference'] == int(reference)), {"reference": -1, "label":"not found"})
subch_data = next((item for item in self.get_subch_info() if item['ID'] == int(ID)), {"ID":-1, "address":0, "protection":0,"size":0})
#programme_type = next((item for item in self.get_programme_type() if item["reference"] == reference), {"programme_type":0,"language":0})
programme_type = next((item for item in self.get_programme_type() if item["reference"] == reference), {"programme_type":0})

# update sub-channel info for receiver
self.address = int(subch_data['address'])
self.size = int(subch_data['size'])
self.protection = int(subch_data['protection'])
self.bit_rate = self.size * 8/6
#self.dabplus = service_data['DAB+']

# display info to selected sub-channel
# service info
Expand All @@ -290,12 +298,17 @@ 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"))
# programme type
if programme_type["programme_type"] is 0:
self.label_programme_type.setText("\n")
else:
self.label_programme_type.setText(self.table.programme_types[programme_type["programme_type"]] + "\n")
# status Bar
self.statusBar.showMessage("Play/Record the selected Service Component.")

def snr_update(self):
print "update snr"
# display snr in progress bar if an instance of usrp_dab_rx is existing
# display snr in progress bar if an instance of usrp_dabplus_rx is existing
if hasattr(self, 'my_receiver'):
SNR = self.my_receiver.get_snr()
if SNR > 10:
Expand Down Expand Up @@ -334,9 +347,18 @@ def play_audio(self):
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)
if self.dabplus:
self.my_receiver = usrp_dabplus_rx.usrp_dabplus_rx(self.spin_dab_mode.value(),
self.spinbox_frequency.value(), self.bit_rate,
self.address, self.size,
self.protection,
self.src_is_USRP, self.file_path, self.recorder)
else:
self.my_receiver = usrp_dab_rx.usrp_dab_rx(self.spin_dab_mode.value(),
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.dev_mode_init()
if dev_mode_opened:
Expand Down Expand Up @@ -379,9 +401,16 @@ def record_audio(self):
self.btn_stop.setEnabled(True)
self.recorder = True
# start flowgraph
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)
if self.dabplus:
self.my_receiver = usrp_dabplus_rx.usrp_dabplus_rx(self.spin_dab_mode.value(), self.spinbox_frequency.value(), self.bit_rate, self.address, self.size,
self.protection,
self.src_is_USRP, self.file_path, self.recorder)
else:
self.my_receiver = usrp_dab_rx.usrp_dab_rx(self.spin_dab_mode.value(),
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()

def set_volume(self):
Expand Down Expand Up @@ -573,16 +602,33 @@ def t_init_transmitter(self):

if arguments_incomplete is False:
# init transmitter
self.my_transmitter = usrp_dab_tx.usrp_dab_tx(self.t_spinbox_frequency.value(),
self.t_spin_num_subch.value(),
str(self.t_edit_ensemble_label.text()),
str(self.t_edit_service_label.text()),
self.t_combo_language.currentIndex(),
protection_array, data_rate_n_array,
audio_paths,
self.t_spin_listen_to_component.value(),
self.t_rbtn_USRP.isChecked(),
str(self.t_label_sink.text())+ "/" +str(self.t_edit_file_name.text()))
if self.t_combo_dabplus.currentIndex() is 1:
# transmitting in DAB mode
self.my_transmitter = usrp_dab_tx.usrp_dab_tx(self.t_spin_dab_mode.value(), self.t_spinbox_frequency.value(),
self.t_spin_num_subch.value(),
str(self.t_edit_ensemble_label.text()),
str(self.t_edit_service_label.text()),
self.t_combo_language.currentIndex(),
protection_array, data_rate_n_array, 48000,
audio_paths,
self.t_spin_listen_to_component.value(),
self.t_rbtn_USRP.isChecked(),
str(self.t_label_sink.text())+ "/" +str(self.t_edit_file_name.text()))
else:
# transmitting in DAB+ mode
self.my_transmitter = usrp_dabplus_tx.usrp_dabplus_tx(self.t_spin_dab_mode.value(),
self.t_spinbox_frequency.value(),
self.t_spin_num_subch.value(),
str(self.t_edit_ensemble_label.text()),
str(self.t_edit_service_label.text()),
self.t_combo_language.currentIndex(),
protection_array, data_rate_n_array,
audio_paths,
self.t_spin_listen_to_component.value(),
self.t_rbtn_USRP.isChecked(),
str(self.t_label_sink.text()) + "/" + str(
self.t_edit_file_name.text()))

# enable play button
self.t_btn_play.setEnabled(True)
self.t_label_status.setText("ready to transmit")
Expand Down
Loading

0 comments on commit 7d521bc

Please sign in to comment.