joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packet decoding as secondary demodulator, finally displayin something on

Browse Source 
the webpage
This commit is contained in:
Jakob Ketterl
2019-08-11 13:52:19 +02:00
parent 2fed83659f
commit e63569e3e9
4 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/css/openwebrx.css
View File

@ -698,11 +698,6 @@ img.openwebrx-mirror-img
transform-origin: 0% 50%;
}
#openwebrx-digimode-content .part .subpart
{
}
@keyframes new-digimode-data
{
0%{ opacity: 0; }
@ -862,7 +857,8 @@ img.openwebrx-mirror-img
#openwebrx-panel-digimodes[data-mode="wspr"] #openwebrx-digimode-select-channel,
#openwebrx-panel-digimodes[data-mode="jt65"] #openwebrx-digimode-select-channel,
#openwebrx-panel-digimodes[data-mode="jt9"] #openwebrx-digimode-select-channel,
#openwebrx-panel-digimodes[data-mode="ft4"] #openwebrx-digimode-select-channel
#openwebrx-panel-digimodes[data-mode="ft4"] #openwebrx-digimode-select-channel,
#openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-select-channel
{
display: none;
}
@ -876,3 +872,7 @@ img.openwebrx-mirror-img
height: 200px;
margin: -10px;
}
#openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-content-container {
height: 250px;
}

4
htdocs/index.html
View File

@ -74,9 +74,6 @@
<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-ysf"
style="display:none;" data-feature="digital_voice_digiham"
onclick="demodulator_analog_replace('ysf');">YSF</div>
<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-packet"
style="display:none;" data-feature="packet"
onclick="demodulator_analog_replace('packet');">Packet</div>
</div>
<div class="openwebrx-panel-line">
<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>
@ -88,6 +85,7 @@
<option value="jt65" data-feature="wsjt-x">JT65</option>
<option value="jt9" data-feature="wsjt-x">JT9</option>
<option value="ft4" data-feature="wsjt-x">FT4</option>
<option value="packet" data-feature="packet">Packet</option>
</select>
<div id="openwebrx-secondary-demod-dial-button" class="openwebrx-button openwebrx-dial-button" onclick="dial_button_click();">
<svg version="1.1" id="Layer_1" x="0px" y="0px" width="246px" height="246px" viewBox="0 0 246 246" xmlns="http://www.w3.org/2000/svg">

40
htdocs/openwebrx.js
View File

@ -444,11 +444,6 @@ function demodulator_default_analog(offset_frequency,subtype)
{
this.low_cut=-3250;
this.high_cut=3250;
}
else if(subtype=="packet")
{
this.low_cut=-4000;
this.high_cut=4000;
}
else if(subtype=="am")
{
@ -2748,6 +2743,11 @@ function demodulator_digital_replace(subtype)
demodulator_analog_replace('usb', true);
demodulator_buttons_update();
break;
case "packet":
secondary_demod_start(subtype);
demodulator_analog_replace('nfm', true);
demodulator_buttons_update();
break;
}
$('#openwebrx-panel-digimodes').attr('data-mode', subtype);
toggle_panel("openwebrx-panel-digimodes", true);
@ -2848,19 +2848,20 @@ function secondary_demod_push_binary_data(x)
function secondary_demod_push_data(x)
{
x=Array.from(x).map((y)=>{
x=Array.from(x).filter((y) => {
var c=y.charCodeAt(0);
if(y=="\r") return "&nbsp;";
if(y=="\n") return "&nbsp;";
//if(y=="\n") return "<br />";
if(c<32||c>126) return "";
return (c == 10 || (c >= 32 && c <= 126));
}).map((y) => {
if(y=="&") return "&amp;";
if(y=="<") return "&lt;";
if(y==">") return "&gt;";
if(y==" ") return "&nbsp;";
return y;
}).map((y) => {
if (y == "\n") return "<br />";
return "<span class=\"part\">"+y+"</span>";
}).join("");
$("#openwebrx-cursor-blink").before("<span class=\"part\"><span class=\"subpart\">"+x+"</span></span>");
$("#openwebrx-cursor-blink").before(x);
}
function secondary_demod_data_clear()
@ -2915,19 +2916,10 @@ function secondary_demod_listbox_changed()
{
if (secondary_demod_listbox_updating) return;
var sdm = $("#openwebrx-secondary-demod-listbox")[0].value;
switch (sdm) {
case "none":
demodulator_analog_replace_last();
break;
case "bpsk31":
case "rtty":
case "ft8":
case "wspr":
case "jt65":
case "jt9":
case "ft4":
demodulator_digital_replace(sdm);
break;
if (sdm == "none") {
demodulator_analog_replace_last();
} else {
demodulator_digital_replace(sdm);
}
update_dial_button();
}