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

allow wider filter for pocsag; fix filter display;

Browse Source
This commit is contained in:
Jakob Ketterl 2020-01-10 23:26:29 +01:00
parent 14198aaa17
commit ad5683279e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/openwebrx.js
View File

@ -366,8 +366,18 @@ function Demodulator_default_analog(offset_frequency, subtype) {
this.subtype = subtype; this.subtype = subtype;
this.filter = { this.filter = {
min_passband: 100, min_passband: 100,
high_cut_limit: (audioEngine.getOutputRate() / 2) - 1, getLimits: function() {
low_cut_limit: (-audioEngine.getOutputRate() / 2) + 1 var max_bw;
if (secondary_demod === 'pocsag') {
max_bw = 12500;
} else {
max_bw = (audioEngine.getOutputRate() / 2) - 1;
}
return {
high: max_bw,
low: -max_bw
};
}
}; };
//Subtypes only define some filter parameters and the mod string sent to server, //Subtypes only define some filter parameters and the mod string sent to server,
//so you may set these parameters in your custom child class. //so you may set these parameters in your custom child class.
@ -417,8 +427,7 @@ function Demodulator_default_analog(offset_frequency, subtype) {
timeout_this.wait_for_timer = false; timeout_this.wait_for_timer = false;
if (timeout_this.set_after) timeout_this.set(); if (timeout_this.set_after) timeout_this.set();
}, demodulator_response_time); }, demodulator_response_time);
} } else {
else {
this.set_after = true; this.set_after = true;
} }
}; };
@ -431,6 +440,7 @@ function Demodulator_default_analog(offset_frequency, subtype) {
}; };
if (first_time) params.mod = this.server_mod; if (first_time) params.mod = this.server_mod;
ws.send(JSON.stringify({"type": "dspcontrol", "params": params})); ws.send(JSON.stringify({"type": "dspcontrol", "params": params}));
mkenvelopes(get_visible_freq_range());
}; };
this.doset(true); //we set parameters on object creation this.doset(true); //we set parameters on object creation
@ -476,7 +486,7 @@ function Demodulator_default_analog(offset_frequency, subtype) {
//frequency. //frequency.
if (this.dragged_range === dr.beginning || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) { if (this.dragged_range === dr.beginning || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
//we don't let low_cut go beyond its limits //we don't let low_cut go beyond its limits
if ((new_value = this.drag_origin.low_cut + minus * freq_change) < this.parent.filter.low_cut_limit) return true; if ((new_value = this.drag_origin.low_cut + minus * freq_change) < this.parent.filter.getLimits().low) return true;
//nor the filter passband be too small //nor the filter passband be too small
if (this.parent.high_cut - new_value < this.parent.filter.min_passband) return true; if (this.parent.high_cut - new_value < this.parent.filter.min_passband) return true;
//sanity check to prevent GNU Radio "firdes check failed: fa <= fb" //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
@ -485,7 +495,7 @@ function Demodulator_default_analog(offset_frequency, subtype) {
} }
if (this.dragged_range === dr.ending || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) { if (this.dragged_range === dr.ending || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
//we don't let high_cut go beyond its limits //we don't let high_cut go beyond its limits
if ((new_value = this.drag_origin.high_cut + minus * freq_change) > this.parent.filter.high_cut_limit) return true; if ((new_value = this.drag_origin.high_cut + minus * freq_change) > this.parent.filter.getLimits().high) return true;
//nor the filter passband be too small //nor the filter passband be too small
if (new_value - this.parent.low_cut < this.parent.filter.min_passband) return true; if (new_value - this.parent.low_cut < this.parent.filter.min_passband) return true;
//sanity check to prevent GNU Radio "firdes check failed: fa <= fb" //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"