ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved waterfall monitoring for tune-by-squelch.

This commit is contained in:
Marat Fayzullin 2024-10-01 20:19:44 -04:00
parent 3142c744d2
commit affac7d3b5
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/openwebrx.js
View File

@ -39,7 +39,7 @@ var bandplan = null;
var scanner = null; var scanner = null;
var bookmarks = null; var bookmarks = null;
var audioEngine = null; var audioEngine = null;
var waterfall_last = null; var wf_data = null;
function zoomInOneStep() { function zoomInOneStep() {
zoom_set(zoom_level + 1); zoom_set(zoom_level + 1);
@ -68,7 +68,7 @@ function tuneBySteps(steps) {
function tuneBySquelch(dir) { function tuneBySquelch(dir) {
// Must have a copy of the last received waterfall // Must have a copy of the last received waterfall
if (waterfall_last == null) return; if (wf_data == null) return;
// Get current squelch threshold from the slider // Get current squelch threshold from the slider
// (why do we need to subtract ~13dB here to make FFT match the S-meter?) // (why do we need to subtract ~13dB here to make FFT match the S-meter?)
@ -82,16 +82,30 @@ function tuneBySquelch(dir) {
// Scan up or down the waterfall // Scan up or down the waterfall
dir = tuning_step * (dir>=0? 1 : -1); dir = tuning_step * (dir>=0? 1 : -1);
for(f += dir ; ; f += dir) { for(f += dir ; ; f += dir) {
var i = Math.round(waterfall_last.length * (f / bandwidth + 0.5)); var i = Math.round(wf_data.length * (f / bandwidth + 0.5));
if (i < 0 || i >= waterfall_last.length) { if (i < 0 || i >= wf_data.length) {
break; break;
} else if (waterfall_last[i] >= squelch) { } else if (wf_data[i] >= squelch) {
demodulator.set_offset_frequency(f); demodulator.set_offset_frequency(f);
break; break;
} }
} }
} }
function monitorLevels(data) {
if (wf_data == null || wf_data.length != data.length) {
wf_data = data;
} else {
for (var j = 0 ; j < data.length ; j++) {
if (data[j] >= wf_data[j]) {
wf_data[j] = data[j];
} else {
wf_data[j] += (data[j] - wf_data[j]) / 5.0;
}
}
}
}
function jumpBySteps(steps) { function jumpBySteps(steps) {
steps = Math.round(steps); steps = Math.round(steps);
if (steps != 0) { if (steps != 0) {
@ -1131,8 +1145,8 @@ function on_ws_recv(evt) {
spectrum.update(waterfall_f32); spectrum.update(waterfall_f32);
// Feed scanner with data // Feed scanner with data
scanner.update(waterfall_f32); scanner.update(waterfall_f32);
// Save waterfall for squelch-based tuning // Monitor waterfall levels for squelch-based tuning
waterfall_last = waterfall_f32; monitorLevels(waterfall_f32);
break; break;
case 2: case 2:
// audio data // audio data