implement dmr timeslot muting

This commit is contained in:
Jakob Ketterl 2019-06-15 19:10:33 +02:00
parent 7362e48cf3
commit 8af8f93434
4 changed files with 74 additions and 18 deletions

26
csdr.py
View File

@ -67,7 +67,8 @@ class dsp(object):
self.secondary_fft_size = 1024 self.secondary_fft_size = 1024
self.secondary_process_fft = None self.secondary_process_fft = None
self.secondary_process_demod = None self.secondary_process_demod = None
self.pipe_names=["bpf_pipe", "shift_pipe", "squelch_pipe", "smeter_pipe", "meta_pipe", "iqtee_pipe", "iqtee2_pipe"] self.pipe_names=["bpf_pipe", "shift_pipe", "squelch_pipe", "smeter_pipe", "meta_pipe", "iqtee_pipe",
"iqtee2_pipe", "dmr_control_pipe"]
self.secondary_pipe_names=["secondary_shift_pipe"] self.secondary_pipe_names=["secondary_shift_pipe"]
self.secondary_offset_freq = 1000 self.secondary_offset_freq = 1000
self.unvoiced_quality = 1 self.unvoiced_quality = 1
@ -113,7 +114,7 @@ class dsp(object):
else: else:
chain += "rrc_filter | gfsk_demodulator | " chain += "rrc_filter | gfsk_demodulator | "
if which == "dmr": if which == "dmr":
chain += "dmr_decoder --fifo {meta_pipe} | mbe_synthesizer -f -u {unvoiced_quality} | " chain += "dmr_decoder --fifo {meta_pipe} --control-fifo {dmr_control_pipe} | mbe_synthesizer -f -u {unvoiced_quality} | "
elif which == "ysf": elif which == "ysf":
chain += "ysf_decoder --fifo {meta_pipe} | mbe_synthesizer -y -f -u {unvoiced_quality} | " chain += "ysf_decoder --fifo {meta_pipe} | mbe_synthesizer -y -f -u {unvoiced_quality} | "
max_gain = 0.0005 max_gain = 0.0005
@ -352,7 +353,7 @@ class dsp(object):
actual_squelch = 0 if self.isDigitalVoice() else self.squelch_level actual_squelch = 0 if self.isDigitalVoice() else self.squelch_level
if self.running: if self.running:
self.modification_lock.acquire() self.modification_lock.acquire()
self.squelch_pipe_file.write( "%g\n"%(float(actual_squelch)) ) self.squelch_pipe_file.write("%g\n"%(float(actual_squelch)))
self.squelch_pipe_file.flush() self.squelch_pipe_file.flush()
self.modification_lock.release() self.modification_lock.release()
@ -363,6 +364,11 @@ class dsp(object):
def get_unvoiced_quality(self): def get_unvoiced_quality(self):
return self.unvoiced_quality return self.unvoiced_quality
def set_dmr_filter(self, filter):
if self.dmr_control_pipe_file:
self.dmr_control_pipe_file.write("{0}\n".format(filter))
self.dmr_control_pipe_file.flush()
def mkfifo(self,path): def mkfifo(self,path):
try: try:
os.unlink(path) os.unlink(path)
@ -410,7 +416,7 @@ class dsp(object):
flowcontrol=int(self.samp_rate*2), start_bufsize=self.base_bufsize*self.decimation, nc_port=self.nc_port, flowcontrol=int(self.samp_rate*2), start_bufsize=self.base_bufsize*self.decimation, nc_port=self.nc_port,
squelch_pipe=self.squelch_pipe, smeter_pipe=self.smeter_pipe, meta_pipe=self.meta_pipe, iqtee_pipe=self.iqtee_pipe, iqtee2_pipe=self.iqtee2_pipe, squelch_pipe=self.squelch_pipe, smeter_pipe=self.smeter_pipe, meta_pipe=self.meta_pipe, iqtee_pipe=self.iqtee_pipe, iqtee2_pipe=self.iqtee2_pipe,
output_rate = self.get_output_rate(), smeter_report_every = int(self.if_samp_rate()/6000), output_rate = self.get_output_rate(), smeter_report_every = int(self.if_samp_rate()/6000),
unvoiced_quality = self.get_unvoiced_quality()) unvoiced_quality = self.get_unvoiced_quality(), dmr_control_pipe = self.dmr_control_pipe)
logger.debug("[openwebrx-dsp-plugin:csdr] Command = %s", command) logger.debug("[openwebrx-dsp-plugin:csdr] Command = %s", command)
my_env=os.environ.copy() my_env=os.environ.copy()
@ -430,13 +436,12 @@ class dsp(object):
self.output.add_output("audio", partial(self.process.stdout.read, int(self.get_fft_bytes_to_read()) if self.demodulator == "fft" else 256)) self.output.add_output("audio", partial(self.process.stdout.read, int(self.get_fft_bytes_to_read()) if self.demodulator == "fft" else 256))
# open control pipes for csdr # open control pipes for csdr
if self.bpf_pipe != None: if self.bpf_pipe:
self.bpf_pipe_file=open(self.bpf_pipe,"w") self.bpf_pipe_file = open(self.bpf_pipe, "w")
if self.shift_pipe: if self.shift_pipe:
self.shift_pipe_file=open(self.shift_pipe,"w") self.shift_pipe_file = open(self.shift_pipe, "w")
if self.squelch_pipe: if self.squelch_pipe:
self.squelch_pipe_file=open(self.squelch_pipe,"w") self.squelch_pipe_file = open(self.squelch_pipe, "w")
self.start_secondary_demodulator() self.start_secondary_demodulator()
self.modification_lock.release() self.modification_lock.release()
@ -468,6 +473,9 @@ class dsp(object):
return raw.rstrip("\n") return raw.rstrip("\n")
self.output.add_output("meta", read_meta) self.output.add_output("meta", read_meta)
if self.dmr_control_pipe:
self.dmr_control_pipe_file = open(self.dmr_control_pipe, "w")
def stop(self): def stop(self):
self.modification_lock.acquire() self.modification_lock.acquire()
self.running = False self.running = False

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

@ -937,11 +937,32 @@ img.openwebrx-mirror-img
background-color: #676767; background-color: #676767;
padding: 2px 0; padding: 2px 0;
color: #333; color: #333;
text-align: center;
position: relative;
}
.openwebrx-meta-slot, .openwebrx-meta-slot.muted:before {
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
-moz-border-radius: 5px; -moz-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
}
text-align: center; .openwebrx-meta-slot.muted:before {
display: block;
content: "";
background-image: url("gfx/openwebrx-mute.png");
width:100%;
height:133px;
background-position: center;
background-repeat: no-repeat;
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
background-color: rgba(0,0,0,.3);
} }
.openwebrx-meta-slot.active { .openwebrx-meta-slot.active {
@ -977,3 +998,7 @@ img.openwebrx-mirror-img
.openwebrx-meta-slot.active .openwebrx-meta-user-image.group { .openwebrx-meta-slot.active .openwebrx-meta-user-image.group {
background-image: url("gfx/openwebrx-groupcall.png"); background-image: url("gfx/openwebrx-groupcall.png");
} }
.openwebrx-dmr-timeslot-panel * {
cursor: pointer;
}

View File

@ -619,7 +619,7 @@ function demodulator_analog_replace(subtype, for_digital)
} }
demodulator_add(new demodulator_default_analog(temp_offset,subtype)); demodulator_add(new demodulator_default_analog(temp_offset,subtype));
demodulator_buttons_update(); demodulator_buttons_update();
clear_metadata(); hide_digitalvoice_panels();
toggle_panel("openwebrx-panel-metadata-" + subtype, true); toggle_panel("openwebrx-panel-metadata-" + subtype, true);
} }
@ -1338,8 +1338,7 @@ function update_metadata(meta) {
$(el).find(".openwebrx-dmr-target").text(target); $(el).find(".openwebrx-dmr-target").text(target);
$(el).find(".openwebrx-meta-user-image")[group ? "addClass" : "removeClass"]("group"); $(el).find(".openwebrx-meta-user-image")[group ? "addClass" : "removeClass"]("group");
} else { } else {
$(".openwebrx-meta-panel .openwebrx-meta-autoclear").text(""); clear_metadata();
$(".openwebrx-meta-panel").removeClass("active").removeClass("sync");
} }
break; break;
case 'YSF': case 'YSF':
@ -1365,17 +1364,22 @@ function update_metadata(meta) {
break; break;
} else { } else {
$(".openwebrx-meta-panel .openwebrx-meta-autoclear").text(""); clear_metadata();
$(".openwebrx-meta-panel").removeClass("active").removeClass("sync");
} }
} }
function clear_metadata() { function hide_digitalvoice_panels() {
$(".openwebrx-meta-panel").each(function(_, p){ $(".openwebrx-meta-panel").each(function(_, p){
toggle_panel(p.id, false); toggle_panel(p.id, false);
}); });
update_metadata({}); clear_metadata();
}
function clear_metadata() {
$(".openwebrx-meta-panel .openwebrx-meta-autoclear").text("");
$(".openwebrx-meta-slot").removeClass("active").removeClass("sync");
$(".openwebrx-dmr-timeslot-panel").removeClass("muted");
} }
function add_problem(what) function add_problem(what)
@ -2327,7 +2331,7 @@ function openwebrx_init()
init_rx_photo(); init_rx_photo();
open_websocket(); open_websocket();
secondary_demod_init(); secondary_demod_init();
clear_metadata(); digimodes_init();
place_panels(first_show_panel); place_panels(first_show_panel);
window.setTimeout(function(){window.setInterval(debug_audio,1000);},1000); window.setTimeout(function(){window.setInterval(debug_audio,1000);},1000);
window.addEventListener("resize",openwebrx_resize); window.addEventListener("resize",openwebrx_resize);
@ -2338,6 +2342,25 @@ function openwebrx_init()
} }
function digimodes_init() {
hide_digitalvoice_panels();
// initialze DMR timeslot muting
$('.openwebrx-dmr-timeslot-panel').click(function(e) {
$(e.currentTarget).toggleClass("muted");
update_dmr_timeslot_filtering();
});
}
function update_dmr_timeslot_filtering() {
var filter = $('.openwebrx-dmr-timeslot-panel').map(function(index, el){
return (!$(el).hasClass("muted")) << index;
}).toArray().reduce(function(acc, v){
return acc | v;
}, 0);
webrx_set_param("dmr_filter", filter);
}
function iosPlayButtonClick() function iosPlayButtonClick()
{ {
//On iOS, we can only start audio from a click or touch event. //On iOS, we can only start audio from a click or touch event.