ha7ilm/openwebrx
1
0
Fork 0
mirror of https://github.com/ha7ilm/openwebrx.git synced 2026-04-07 23:43:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

introduce a fake tuning indicator for modes without bandpass

Browse source
This commit is contained in:
Jakob Ketterl 2024-02-12 22:28:36 +01:00
parent 92c09b08e4
commit 58b0ce5636
5 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
htdocs/lib/Demodulator.js
View file

@ -15,8 +15,6 @@ Filter.prototype.getLimits = function() {
max_bw = 50000;
} else if (this.demodulator.get_modulation() === "freedv") {
max_bw = 4000;
} else if (this.demodulator.get_modulation() === "dab") {
max_bw = 1000000;
} else if (this.demodulator.get_secondary_demod() === "ism") {
max_bw = 600000;
} else {
@ -56,8 +54,13 @@ Envelope.prototype.draw = function(visible_range){
var fake_indicator = !this.demodulator.low_cut || !this.demodulator.high_cut;
if (fake_indicator) {
// fake values just so that the tuning indicator shows up
from -= 100000;
to += 100000;
var fixedBw = 100000
// if we know the if rate, we can display that
if (this.demodulator.ifRate) {
fixedBw = this.demodulator.ifRate / 2;
}
from -= fixedBw;
to += fixedBw;
} else {
from += this.demodulator.low_cut;
to += this.demodulator.high_cut;
@ -231,10 +234,9 @@ function Demodulator(offset_frequency, modulation) {
this.state = {};
this.secondary_demod = false;
var mode = Modes.findByModulation(modulation);
if (mode && mode.bandpass) {
this.low_cut = mode.bandpass.low_cut;
this.high_cut = mode.bandpass.high_cut;
}
this.low_cut = mode && mode.bandpass && mode.bandpass.low_cut;
this.high_cut = mode && mode.bandpass && mode.bandpass.high_cut;
this.ifRate = mode && mode.ifRate;
this.listeners = {
"frequencychange": [],
"squelchchange": []
@ -390,6 +392,10 @@ Demodulator.prototype.getBandpass = function() {
};
};
Demodulator.prototype.setIfRate = function(ifRate) {
this.ifRate = ifRate;
};
Demodulator.prototype.set_secondary_demod = function(secondary_demod) {
if (this.secondary_demod === secondary_demod) {
return;

2
htdocs/lib/DemodulatorPanel.js
View file

@ -142,6 +142,8 @@ DemodulatorPanel.prototype.setMode = function(requestedModulation, underlyingMod
} else {
this.demodulator.disableBandpass();
}
var ifRate = mode.ifRate || (uMode && uMode.ifRate);
this.demodulator.setIfRate(ifRate);
} else {
this.demodulator.set_secondary_demod(false);
}

3
htdocs/lib/Modes.js
View file

@ -41,6 +41,9 @@ var Mode = function(json){
if (json.bandpass) {
this.bandpass = json.bandpass;
}
if (json.ifRate) {
this.ifRate = json.ifRate;
}
if (this.type === 'digimode') {
this.underlying = json.underlying;
this.secondaryFft = json.secondaryFft;