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

allow switching underlying modulation (if available) refs #95

Browse Source
This commit is contained in:
Jakob Ketterl 2020-05-08 22:56:02 +02:00
parent 9563adacf7
commit af1cfee754
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/lib/DemodulatorPanel.js
View File

@ -86,8 +86,8 @@ DemodulatorPanel.prototype.render = function() {
this.el.find(".openwebrx-modes").html(html); this.el.find(".openwebrx-modes").html(html);
}; };
DemodulatorPanel.prototype.setMode = function(modulation) { DemodulatorPanel.prototype.setMode = function(requestedModulation) {
var mode = Modes.findByModulation(modulation); var mode = Modes.findByModulation(requestedModulation);
if (!mode) { if (!mode) {
return; return;
} }
@ -101,6 +101,14 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
if (mode.type === 'digimode') { if (mode.type === 'digimode') {
modulation = mode.underlying[0]; modulation = mode.underlying[0];
} else {
if (this.mode && this.mode.type === 'digimode' && this.mode.underlying.indexOf(requestedModulation) >= 0) {
// keep the mode, just switch underlying modulation
mode = this.mode;
modulation = requestedModulation;
} else {
modulation = mode.modulation;
}
} }
var current = this.collectParams(); var current = this.collectParams();
@ -112,6 +120,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
this.stopDemodulator(); this.stopDemodulator();
this.demodulator = new Demodulator(current.offset_frequency, modulation); this.demodulator = new Demodulator(current.offset_frequency, modulation);
this.demodulator.setSquelch(current.squelch_level); this.demodulator.setSquelch(current.squelch_level);
var self = this; var self = this;
var updateFrequency = function(freq) { var updateFrequency = function(freq) {
self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq); self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
@ -144,6 +153,8 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
}; };
DemodulatorPanel.prototype.disableDigiMode = function() { DemodulatorPanel.prototype.disableDigiMode = function() {
// just a little trick to get out of the digimode
delete this.mode;
this.setMode(this.getDemodulator().get_modulation()); this.setMode(this.getDemodulator().get_modulation());
}; };