metadata for ysf

This commit is contained in:
Jakob Ketterl 2017-01-20 12:26:09 +00:00
parent 89740b1a93
commit ac6e001fd6
2 changed files with 14 additions and 2 deletions

View File

@ -1255,6 +1255,18 @@ function on_ws_recv(evt)
slotEl.innerHTML = html; slotEl.innerHTML = html;
}; };
} }
break;
case 'YSF':
var strings = [];
if (meta.source) strings.push("Source: " + meta.source);
if (meta.target) strings.push("Destination: " + meta.target);
if (meta.up) strings.push("Up: " + meta.up);
if (meta.down) strings.push("Down: " + meta.down);
var html = strings.join(' ');
update = function(el) {
el.innerHTML = html;
}
break;
} }
metaPanels.forEach(update); metaPanels.forEach(update);

View File

@ -75,7 +75,7 @@ class dsp_plugin:
if which == "nfm": return chain_begin + "csdr fmdemod_quadri_cf | csdr limit_ff | csdr fractional_decimator_ff {last_decimation} | csdr deemphasis_nfm_ff 11025 | csdr convert_f_s16"+chain_end if which == "nfm": return chain_begin + "csdr fmdemod_quadri_cf | csdr limit_ff | csdr fractional_decimator_ff {last_decimation} | csdr deemphasis_nfm_ff 11025 | csdr convert_f_s16"+chain_end
if which in [ "dstar", "nxdn" ]: if which in [ "dstar", "nxdn" ]:
c = chain_begin c = chain_begin
c += "csdr fmdemod_quadri_cf | csdr convert_f_s16" c += "csdr fmdemod_quadri_cf | csdr fastdcblock_ff | csdr convert_f_s16"
if which == "dstar": if which == "dstar":
c += " | dsd -fd" c += " | dsd -fd"
elif which == "nxdn": elif which == "nxdn":
@ -94,7 +94,7 @@ class dsp_plugin:
elif which == "ysf": elif which == "ysf":
c = chain_begin c = chain_begin
c += "csdr fmdemod_quadri_cf | csdr fastdcblock_ff | csdr convert_f_s16" c += "csdr fmdemod_quadri_cf | csdr fastdcblock_ff | csdr convert_f_s16"
c += " | rrc_filter | gfsk_demodulator | ysf_decoder --fifo {meta_pipe} | mbe_synthesizer" c += " | rrc_filter | gfsk_demodulator | ysf_decoder --fifo {meta_pipe} | mbe_synthesizer -y"
c += " | sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r 11025 -e signed-integer -b 16 -c 1 - | csdr setbuf 256" c += " | sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r 11025 -e signed-integer -b 16 -c 1 - | csdr setbuf 256"
c += chain_end c += chain_end
return c return c