-
+
@@ -57,12 +57,14 @@
-
+
TP
-
+ TA
-
+
+
+ MS
@@ -154,13 +156,14 @@
@@ -177,14 +180,17 @@
0
-
-
Join our Discord community!
+
+ Join our OpenRadio Discord community!
-
+
Support the developer!
FM-DX WebServer by Noobish & the OpenRadio community.
-
This app uses librdsparser by Konrad Kosmatka.
+
This app works thanks to these amazing projects:
+ - librdsparser by Konrad Kosmatka
+ - 3LAS by JoJoBond
+ - flat-flags by luishdez
diff --git a/web/js/3las/3las.js b/web/js/3las/3las.js
index 057e7e8..7879f4e 100644
--- a/web/js/3las/3las.js
+++ b/web/js/3las/3las.js
@@ -2,7 +2,7 @@ var _3LAS_Settings = /** @class */ (function () {
function _3LAS_Settings() {
this.SocketHost = document.location.hostname ? document.location.hostname : "127.0.0.1";
this.SocketPort = localStorage.getItem('audioPort') ? localStorage.getItem('audioPort') : 8081;
- this.SocketPath = "/audio";
+ this.SocketPath = "/";
this.WebRTC = new WebRTC_Settings();
this.Fallback = new Fallback_Settings();
}
diff --git a/web/js/3las/fallback/3las.liveaudioplayer.js b/web/js/3las/fallback/3las.liveaudioplayer.js
index 0aef6c6..2f75996 100644
--- a/web/js/3las/fallback/3las.liveaudioplayer.js
+++ b/web/js/3las/fallback/3las.liveaudioplayer.js
@@ -143,5 +143,4 @@ var LiveAudioPlayer = /** @class */ (function () {
// Hystersis value for speed up/down trigger
LiveAudioPlayer.OffsetVariance = 0.2;
return LiveAudioPlayer;
-}());
-//# sourceMappingURL=3las.liveaudioplayer.js.map
\ No newline at end of file
+}());
\ No newline at end of file
diff --git a/web/js/3las/fallback/formats/3las.formatreader.mpeg.js b/web/js/3las/fallback/formats/3las.formatreader.mpeg.js
index 85a1a70..d676238 100644
--- a/web/js/3las/fallback/formats/3las.formatreader.mpeg.js
+++ b/web/js/3las/fallback/formats/3las.formatreader.mpeg.js
@@ -280,5 +280,4 @@ var AudioFormatReader_MPEG = /** @class */ (function (_super) {
// Slot size (MPEG unit of measurement) - use [layer]
AudioFormatReader_MPEG.MPEG_slot_size = new Array(0, 1, 1, 4); // Rsvd, 3, 2, 1
return AudioFormatReader_MPEG;
-}(AudioFormatReader));
-//# sourceMappingURL=3las.formatreader.mpeg.js.map
\ No newline at end of file
+}(AudioFormatReader));
\ No newline at end of file
diff --git a/web/js/3las/fallback/formats/3las.formatreader.wav.js b/web/js/3las/fallback/formats/3las.formatreader.wav.js
index 33ca22a..18552d3 100644
--- a/web/js/3las/fallback/formats/3las.formatreader.wav.js
+++ b/web/js/3las/fallback/formats/3las.formatreader.wav.js
@@ -219,5 +219,4 @@ var AudioFormatReader_WAV = /** @class */ (function (_super) {
this.ErrorCallback();
};
return AudioFormatReader_WAV;
-}(AudioFormatReader));
-//# sourceMappingURL=3las.formatreader.wav.js.map
\ No newline at end of file
+}(AudioFormatReader));
\ No newline at end of file
diff --git a/web/js/3las/util/3las.helpers.js b/web/js/3las/util/3las.helpers.js
index 052f9a2..f1a5631 100644
--- a/web/js/3las/util/3las.helpers.js
+++ b/web/js/3las/util/3las.helpers.js
@@ -126,5 +126,4 @@ var WakeLock = /** @class */ (function () {
WakeLock.VideoWebm = 'GkXfo0AgQoaBAUL3gQFC8oEEQvOBCEKCQAR3ZWJtQoeBAkKFgQIYU4BnQI0VSalmQCgq17FAAw9CQE2AQAZ3aGFtbXlXQUAGd2hhbW15RIlACECPQAAAAAAAFlSua0AxrkAu14EBY8WBAZyBACK1nEADdW5khkAFVl9WUDglhohAA1ZQOIOBAeBABrCBCLqBCB9DtnVAIueBAKNAHIEAAIAwAQCdASoIAAgAAUAmJaQAA3AA/vz0AAA=';
WakeLock.VideoMp4 = 'AAAAHGZ0eXBpc29tAAACAGlzb21pc28ybXA0MQAAAAhmcmVlAAAAG21kYXQAAAGzABAHAAABthADAowdbb9/AAAC6W1vb3YAAABsbXZoZAAAAAB8JbCAfCWwgAAAA+gAAAAAAAEAAAEAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIVdHJhawAAAFx0a2hkAAAAD3wlsIB8JbCAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAQAAAAAAIAAAACAAAAAABsW1kaWEAAAAgbWRoZAAAAAB8JbCAfCWwgAAAA+gAAAAAVcQAAAAAAC1oZGxyAAAAAAAAAAB2aWRlAAAAAAAAAAAAAAAAVmlkZW9IYW5kbGVyAAAAAVxtaW5mAAAAFHZtaGQAAAABAAAAAAAAAAAAAAAkZGluZgAAABxkcmVmAAAAAAAAAAEAAAAMdXJsIAAAAAEAAAEcc3RibAAAALhzdHNkAAAAAAAAAAEAAACobXA0dgAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAIAAgASAAAAEgAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABj//wAAAFJlc2RzAAAAAANEAAEABDwgEQAAAAADDUAAAAAABS0AAAGwAQAAAbWJEwAAAQAAAAEgAMSNiB9FAEQBFGMAAAGyTGF2YzUyLjg3LjQGAQIAAAAYc3R0cwAAAAAAAAABAAAAAQAAAAAAAAAcc3RzYwAAAAAAAAABAAAAAQAAAAEAAAABAAAAFHN0c3oAAAAAAAAAEwAAAAEAAAAUc3RjbwAAAAAAAAABAAAALAAAAGB1ZHRhAAAAWG1ldGEAAAAAAAAAIWhkbHIAAAAAAAAAAG1kaXJhcHBsAAAAAAAAAAAAAAAAK2lsc3QAAAAjqXRvbwAAABtkYXRhAAAAAQAAAABMYXZmNTIuNzguMw==';
return WakeLock;
-}());
-//# sourceMappingURL=3las.helpers.js.map
\ No newline at end of file
+}());
\ No newline at end of file
diff --git a/web/js/3las/util/3las.logging.js b/web/js/3las/util/3las.logging.js
index 12cdb1b..6b5906c 100644
--- a/web/js/3las/util/3las.logging.js
+++ b/web/js/3las/util/3las.logging.js
@@ -19,7 +19,7 @@ var Logging = /** @class */ (function () {
this.ParentElement.appendChild(line);
}
else {
- console.log(lineText);
+ //console.log(lineText);
}
};
return Logging;
diff --git a/web/js/main.js b/web/js/main.js
index b720e50..901b032 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -1,10 +1,21 @@
-$(document).ready(function() {
- var hostParts = window.location.host.split(':');
- var hostname = hostParts[0]; // Extract the hostname
- var port = hostParts[1] || '8080'; // Extract the port or use a default (e.g., 8080)
- var socketAddress = 'ws://' + hostname + ':' + port + '/text'; // Use 'wss' for secure WebSocket connections (recommended for external access)
- var socket = new WebSocket(socketAddress);
+var hostParts = window.location.host.split(':');
+var hostname = hostParts[0]; // Extract the hostname
+var port = hostParts[1] || '8080'; // Extract the port or use a default (e.g., 8080)
+var socketAddress = 'ws://' + hostname + ':' + port + '/text'; // Use 'wss' for secure WebSocket connections (recommended for external access)
+var socket = new WebSocket(socketAddress);
+
+const europe_programmes = [
+ "No PTY", "News", "Current Affairs", "Info",
+ "Sport", "Education", "Drama", "Culture", "Science", "Varied",
+ "Pop M", "Rock M", "Easy Listening", "Light Classical",
+ "Serious Classical", "Other Music", "Weather", "Finance",
+ "Children's Programmes", "Social Affairs", "Religion", "Phone-in",
+ "Travel", "Leisure", "Jazz Music", "Country Music", "National Music",
+ "Oldies Music", "Folk Music", "Documentary", "Alarm Test"
+];
+
+$(document).ready(function() {
var dataContainer = $('#data-container');
var canvas = $('#signal-canvas')[0];
var context = canvas.getContext('2d');
@@ -17,36 +28,6 @@ $(document).ready(function() {
var maxDataPoints = 300;
var pointWidth = (canvas.width - 80) / maxDataPoints;
- var europe_programmes = [
- "No PTY", "News", "Current Affairs", "Info",
- "Sport", "Education", "Drama", "Culture", "Science", "Varied",
- "Pop M", "Rock M", "Easy Listening", "Light Classical",
- "Serious Classical", "Other Music", "Weather", "Finance",
- "Children's Programmes", "Social Affairs", "Religion", "Phone-in",
- "Travel", "Leisure", "Jazz Music", "Country Music", "National Music",
- "Oldies Music", "Folk Music", "Documentary", "Alarm Test"
- ];
-
- function getInitialSettings() {
- $.ajax({
- url: '/static_data',
- dataType: 'json',
- success: function(data) {
- // Use the received data (data.qthLatitude, data.qthLongitude) as needed
- localStorage.setItem('qthLatitude', data.qthLatitude);
- localStorage.setItem('qthLongitude', data.qthLongitude);
- localStorage.setItem('webServerName', data.webServerName);
- localStorage.setItem('audioPort', data.audioPort);
- localStorage.setItem('streamEnabled', data.streamEnabled);
-
- document.title = 'FM-DX Webserver [' + data.webServerName + ']';
- },
- error: function(error) {
- console.error('Error:', error);
- }
- });
- }
-
getInitialSettings();
// Start updating the canvas
updateCanvas();
@@ -120,7 +101,7 @@ $(document).ready(function() {
context.fillStyle = color4;
context.font = '12px Titillium Web';
- const offset = signalToggle.prop('checked') ? 11.75 : 0;
+ const offset = signalToggle.prop('checked') ? 11.25 : 0;
context.textAlign = 'right';
context.fillText(`${(zoomMinValue - offset).toFixed(1)}`, 35, lowestY - 14);
context.fillText(`${(zoomMaxValue - offset).toFixed(1)}`, 35, highestY + 14);
@@ -136,37 +117,7 @@ $(document).ready(function() {
};
requestAnimationFrame(updateCanvas);
}
-
-
- function compareNumbers(a, b) {
- return a - b;
- }
-
- function escapeHTML(unsafeText) {
- let div = document.createElement('div');
- div.innerText = unsafeText;
- return div.innerHTML.replace(' ', ' ');
- }
-
- function processString(string, errors) {
- var output = '';
- const max_alpha = 70;
- const alpha_range = 50;
- const max_error = 10;
- errors = errors?.split(',');
-
- for (let i = 0; i < string.length; i++) {
- alpha = parseInt(errors[i]) * (alpha_range / (max_error + 1));
- if (alpha) {
- output += "
" + escapeHTML(string[i]) + "";
- } else {
- output += escapeHTML(string[i]);
- }
- }
-
- return output;
- }
-
+
function updatePanels(parsedData) {
const sortedAf = parsedData.af.sort(compareNumbers);
const scaledArray = sortedAf.map(element => element / 1000);
@@ -191,6 +142,14 @@ $(document).ready(function() {
$('#data-pi').html(parsedData.pi === '?' ? "
?" : parsedData.pi);
$('#data-ps').html(parsedData.ps === '?' ? "
?" : processString(parsedData.ps, parsedData.ps_errors));
$('#data-tp').html(parsedData.tp === false ? "
TP" : "TP");
+ $('#data-ta').html(parsedData.ta === 0 ? "
TA" : "TA");
+ $('#data-ms').html(parsedData.ms === 0
+ ? "
MS"
+ : (parsedData.ms === -1
+ ? "
MS"
+ : "
MS"
+ )
+ );
$('#data-pty').html(europe_programmes[parsedData.pty]);
$('#data-st').html(parsedData.st === false ? "
ST" : "ST");
$('#data-rt0').html(processString(parsedData.rt0, parsedData.rt0_errors));
@@ -203,7 +162,7 @@ $(document).ready(function() {
switch (signalUnit) {
case 'dbuv':
- signalValue = parsedData.signal - 11.75;
+ signalValue = parsedData.signal - 11.25;
signalText.text('dBµV');
break;
@@ -216,7 +175,6 @@ $(document).ready(function() {
signalText.text('dBf');
break;
}
- //const signalValue = signalToggle.is(':checked') ? (parsedData.signal - 11.75) : parsedData.signal;
const integerPart = Math.floor(signalValue);
const decimalPart = (signalValue - integerPart).toFixed(1).slice(1); // Adjusted this line
@@ -279,35 +237,20 @@ $(document).ready(function() {
});
document.onkeydown = checkKey;
+
+ $(window).on('wheel', function(e) {
+ var delta = e.originalEvent.deltaY;
- function checkKey(e) {
- e = e || window.event;
-
- getCurrentFreq();
-
- if (socket.readyState === WebSocket.OPEN) {
- if (e.keyCode == '38') {
- socket.send((currentFreq + 0.01).toFixed(2));
- }
- else if (e.keyCode == '40') {
- socket.send((currentFreq - 0.01).toFixed(2));
- }
- else if (e.keyCode == '37') {
- socket.send((currentFreq - 0.10).toFixed(1));
- }
- else if (e.keyCode == '39') {
- socket.send((currentFreq + 0.10).toFixed(1));
+ // Check if the scroll event originated from #af-list
+ if ($(e.target).closest('#af-list').length === 0) {
+ if (delta > 0) {
+ tuneDown();
+ } else {
+ tuneUp();
}
+ return false;
}
- }
-
- function getCurrentFreq() {
- currentFreq = $('#data-frequency').text();
- currentFreq = parseFloat(currentFreq).toFixed(3);
- currentFreq = parseFloat(currentFreq);
-
- return currentFreq;
- }
+ });
var freqUpButton = $('#freq-up')[0];
var freqDownButton = $('#freq-down')[0];
@@ -324,85 +267,161 @@ $(document).ready(function() {
$(freqContainer).on("click", function() {
textInput.focus();
});
+});
+
+function getInitialSettings() {
+ $.ajax({
+ url: '/static_data',
+ dataType: 'json',
+ success: function(data) {
+ // Use the received data (data.qthLatitude, data.qthLongitude) as needed
+ localStorage.setItem('qthLatitude', data.qthLatitude);
+ localStorage.setItem('qthLongitude', data.qthLongitude);
+ localStorage.setItem('webServerName', data.webServerName);
+ localStorage.setItem('audioPort', data.audioPort);
+ localStorage.setItem('streamEnabled', data.streamEnabled);
+
+ document.title = 'FM-DX Webserver [' + data.webServerName + ']';
+ },
+ error: function(error) {
+ console.error('Error:', error);
+ }
+ });
+}
+function compareNumbers(a, b) {
+ return a - b;
+}
+
+function escapeHTML(unsafeText) {
+ let div = document.createElement('div');
+ div.innerText = unsafeText;
+ return div.innerHTML.replace(' ', ' ');
+}
+
+function processString(string, errors) {
+ var output = '';
+ const max_alpha = 70;
+ const alpha_range = 50;
+ const max_error = 10;
+ errors = errors?.split(',');
- function tuneUp() {
- if (socket.readyState === WebSocket.OPEN) {
- getCurrentFreq();
+ for (let i = 0; i < string.length; i++) {
+ alpha = parseInt(errors[i]) * (alpha_range / (max_error + 1));
+ if (alpha) {
+ output += "
" + escapeHTML(string[i]) + "";
+ } else {
+ output += escapeHTML(string[i]);
+ }
+ }
+
+ return output;
+}
+
+function getCurrentFreq() {
+ currentFreq = $('#data-frequency').text();
+ currentFreq = parseFloat(currentFreq).toFixed(3);
+ currentFreq = parseFloat(currentFreq);
+
+ return currentFreq;
+}
+
+function checkKey(e) {
+ e = e || window.event;
+
+ getCurrentFreq();
+
+ if (socket.readyState === WebSocket.OPEN) {
+ if (e.keyCode == '38') {
+ socket.send((currentFreq + 0.01).toFixed(2));
+ }
+ else if (e.keyCode == '40') {
+ socket.send((currentFreq - 0.01).toFixed(2));
+ }
+ else if (e.keyCode == '37') {
+ socket.send((currentFreq - 0.10).toFixed(1));
+ }
+ else if (e.keyCode == '39') {
socket.send((currentFreq + 0.10).toFixed(1));
}
}
-
- function tuneDown() {
- if (socket.readyState === WebSocket.OPEN) {
- getCurrentFreq();
- socket.send((currentFreq - 0.10).toFixed(1));
- }
+}
+
+function tuneUp() {
+ if (socket.readyState === WebSocket.OPEN) {
+ getCurrentFreq();
+ socket.send((currentFreq + 0.10).toFixed(1));
}
+}
+
+function tuneDown() {
+ if (socket.readyState === WebSocket.OPEN) {
+ getCurrentFreq();
+ socket.send((currentFreq - 0.10).toFixed(1));
+ }
+}
+
+async function copyPs() {
+ var frequency = $('#data-frequency').text();
+ var pi = $('#data-pi').text();
+ var ps = $('#data-ps').text();
+ var signal = $('#data-signal').text();
+ var signalDecimal = $('#data-signal-decimal').text();
+ var signalUnit = $('#signal-units').text();
- async function copyPs() {
- var frequency = $('#data-frequency').text();
- var pi = $('#data-pi').text();
- var ps = $('#data-ps').text();
- var signal = $('#data-signal').text();
- var signalDecimal = $('#data-signal-decimal').text();
- var signalUnit = $('#signal-units').text();
+ try {
+ await copyToClipboard(frequency + " - " + pi + " | " + ps + " [" + signal + signalDecimal + " " + signalUnit + "]");
+ } catch(error) {
+ console.error(error);
+ }
+}
+
+async function copyRt() {
+ var rt0 = $('#data-rt0').text();
+ var rt1 = $('#data-rt1').text();
+
+ try {
+ await copyToClipboard("[0] RT: " + rt0 + "\n[1] RT: " + rt1);
+ } catch(error) {
+ console.error(error);
+ }
+}
+
+function copyToClipboard(textToCopy) {
+ // Navigator clipboard api needs a secure context (https)
+ if (navigator.clipboard && window.isSecureContext) {
+ navigator.clipboard.writeText(textToCopy)
+ .catch(function(err) {
+ console.error('Error:', err);
+ });
+ } else {
+ var textArea = $('
');
+ textArea.val(textToCopy);
+ textArea.css({
+ 'position': 'absolute',
+ 'left': '-999999px'
+ });
+
+ $('body').prepend(textArea);
+ textArea.select();
try {
- await copyToClipboard(frequency + " - " + pi + " | " + ps + " [" + signal + signalDecimal + " " + signalUnit + "]");
- } catch(error) {
- console.error(error);
+ document.execCommand('copy');
+ } catch (error) {
+ console.error('Error:', error);
+ } finally {
+ textArea.remove();
}
}
+}
+
+function findOnMaps() {
+ var frequency = $('#data-frequency').text();
+ var pi = $('#data-pi').text();
+ var latitude = localStorage.getItem('qthLongitude');
+ var longitude = localStorage.getItem('qthLatitude');
+ frequency = parseFloat(frequency).toFixed(1);
- async function copyRt() {
- var rt0 = $('#data-rt0').text();
- var rt1 = $('#data-rt1').text();
-
- try {
- await copyToClipboard("[0] RT: " + rt0 + "\n[1] RT: " + rt1);
- } catch(error) {
- console.error(error);
- }
- }
-
-
- function findOnMaps() {
- var frequency = $('#data-frequency').text();
- var pi = $('#data-pi').text();
- var latitude = localStorage.getItem('qthLongitude');
- var longitude = localStorage.getItem('qthLatitude');
- frequency = parseFloat(frequency).toFixed(1);
-
- var url = "https://maps.fmdx.pl/#qth=" + longitude + "," + latitude + "&freq=" + frequency + "&pi=" + pi;
- window.open(url, "_blank");
- }
-
- function copyToClipboard(textToCopy) {
- // Navigator clipboard api needs a secure context (https)
- if (navigator.clipboard && window.isSecureContext) {
- navigator.clipboard.writeText(textToCopy)
- .catch(function(err) {
- console.error('Error:', err);
- });
- } else {
- var textArea = $('
');
- textArea.val(textToCopy);
- textArea.css({
- 'position': 'absolute',
- 'left': '-999999px'
- });
-
- $('body').prepend(textArea);
- textArea.select();
-
- try {
- document.execCommand('copy');
- } catch (error) {
- console.error('Error:', error);
- } finally {
- textArea.remove();
- }
- }
- }
-});
\ No newline at end of file
+ var url = "https://maps.fmdx.pl/#qth=" + longitude + "," + latitude + "&freq=" + frequency + "&pi=" + pi;
+ window.open(url, "_blank");
+}
\ No newline at end of file
diff --git a/web/js/settings.js b/web/js/settings.js
index 1cc73c7..1d29b2d 100644
--- a/web/js/settings.js
+++ b/web/js/settings.js
@@ -1,21 +1,21 @@
/* Themes */
const themes = {
- theme1: ['#1d1838', '#8069fa'],
- theme2: ['#381818', '#ff7070'],
+ theme1: ['#111', '#aaa'],
+ theme2: ['#1f0c0c', '#ff7070'],
theme3: ['#121c0c', '#a9ff70'],
theme4: ['#0c1c1b', '#68f7ee'],
theme5: ['#171106', '#f5b642'],
theme6: ['#21091d', '#ed51d3'],
- theme7: ['#111', '#aaa']
+ theme7: ['#1d1838', '#8069fa'],
+ theme8: ['#000', '#888'],
};
-function setTheme(themeName) {
- const themeColors = themes[themeName];
- if (themeColors) {
- $(':root').css('--color-main', themeColors[0]);
- $(':root').css('--color-main-bright', themeColors[1]);
- }
-}
+/* Signal Units */
+const signalUnits = {
+ dbf: ['dBf'],
+ dbuv: ['dBµV'],
+ dbm: ['dBm'],
+};
$(document).ready(() => {
const themeSelector = $('#theme-selector');
@@ -31,16 +31,7 @@ $(document).ready(() => {
setTheme(selectedTheme);
localStorage.setItem('theme', selectedTheme);
});
-});
-/* Signal Units */
-const signalUnits = {
- dbf: ['dBf'],
- dbuv: ['dBµV'],
- dbm: ['dBm'],
-};
-
-$(document).ready(() => {
const signalSelector = $('#signal-selector');
if (localStorage.getItem('signalUnit')) {
@@ -51,4 +42,12 @@ $(document).ready(() => {
const selectedSignalUnit = event.target.value;
localStorage.setItem('signalUnit', selectedSignalUnit);
});
-});
\ No newline at end of file
+});
+
+function setTheme(themeName) {
+ const themeColors = themes[themeName];
+ if (themeColors) {
+ $(':root').css('--color-main', themeColors[0]);
+ $(':root').css('--color-main-bright', themeColors[1]);
+ }
+}