FM-DX WebServer
by Noobish & the OpenRadio community.
librds & maps.fmdx.pl by Konrad Kosmatka
3LAS by JoJoBond
diff --git a/web/js/main.js b/web/js/main.js
index 387cd5d..9a16824 100644
--- a/web/js/main.js
+++ b/web/js/main.js
@@ -2,9 +2,8 @@ var url = new URL('text', window.location.href);
url.protocol = url.protocol.replace('http', 'ws');
var socketAddress = url.href;
var socket = new WebSocket(socketAddress);
-var parsedData;
+var parsedData, signalChart, previousFreq;
var data = [];
-let signalChart;
let updateCounter = 0;
const europe_programmes = [
@@ -71,7 +70,8 @@ $(document).ready(function () {
});
textInput.on('keyup', function (event) {
- if (event.key !== 'Backspace') {
+
+ if (event.key !== 'Backspace' && localStorage.getItem('extendedFreqRange') != "true") {
let inputValue = textInput.val();
inputValue = inputValue.replace(/[^0-9.]/g, '');
@@ -174,17 +174,13 @@ function getInitialSettings() {
}
function getLocalizedTime(serverTime) {
- // Convert server time to a Date object
const serverDate = new Date(serverTime);
-
- // Calculate local time by adding the offset
- const localTime = new Date(serverDate.getTime());
-
- // Format local time
+
+ // Format server time using options for local time formatting
const options = { year: 'numeric', month: 'short', day: 'numeric', hour: '2-digit', minute: '2-digit', hour12: false };
- const formattedLocalTime = localTime.toLocaleString(navigator.language ? navigator.language : 'en-US', options);
+ const formattedServerTime = serverDate.toLocaleString(navigator.language ? navigator.language : 'en-US', options);
- return formattedLocalTime;
+ return formattedServerTime;
}
function getServerTime() {
@@ -192,12 +188,8 @@ function getServerTime() {
url: './server_time',
dataType: 'json',
success: function (data) {
- // Convert server time to local time format
- const localizedTimeServer = getLocalizedTime(data.serverTime);
- const localizedTimeClient = getLocalizedTime(new Date().toISOString());
-
- $('#server-time').text(localizedTimeServer);
- $('#client-time').text(localizedTimeClient);
+ $('#server-time').text(getLocalizedTime(data.serverTime));
+ $('#client-time').text(getLocalizedTime(new Date()));
},
error: function (error) {
console.error('Error:', error);
@@ -389,6 +381,9 @@ function checkKey(e) {
if (socket.readyState === WebSocket.OPEN) {
switch (e.keyCode) {
+ case 66: // Back to previous frequency
+ socket.send("T" + (previousFreq * 1000));
+ break;
case 82: // RDS Reset (R key)
socket.send("T" + (currentFreq.toFixed(1) * 1000));
break;
@@ -408,6 +403,7 @@ function checkKey(e) {
// Handle default case if needed
break;
}
+ previousFreq = currentFreq;
}
}
@@ -571,6 +567,9 @@ function updateDataElements(parsedData) {
$('#data-frequency').text(parsedData.freq);
$("#commandinput").attr("aria-label", "Current frequency: " + parsedData.freq);
$('#data-pi').html(parsedData.pi === '?' ? "?" : parsedData.pi);
+ if (localStorage.getItem('psUnderscores') === 'true') {
+ parsedData.ps = parsedData.ps.replace(/\s/g, '_');
+ }
$('#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");
@@ -582,15 +581,30 @@ function updateDataElements(parsedData) {
)
);
$('.data-pty').html(europe_programmes[parsedData.pty]);
- $('.data-st').html(parsedData.st === false ? "ST" : "ST");
+
+
+ if(parsedData.st === true) {
+ if (parsedData.st_forced == true) {
+ $('.data-st').html("MO");
+ } else {
+ $('.data-st').html("ST");
+ }
+ } else {
+ if (parsedData.st_forced == true) {
+ $('.data-st').html("MO");
+ } else {
+ $('.data-st').html("ST");
+ }
+ }
+ console.log(parsedData.st, parsedData.st_forced);
+
$('#data-rt0').html(processString(parsedData.rt0, parsedData.rt0_errors));
$('#data-rt1').html(processString(parsedData.rt1, parsedData.rt1_errors));
$('.data-flag').html(``);
$('#data-ant input').val($('#data-ant li[data-value="' + parsedData.ant + '"]').text());
if (parsedData.txInfo.station.length > 1) {
- const sanitizedStation = parsedData.txInfo.station.replace(/%/g, '%25');
- $('#data-station-name').text(decodeURIComponent(sanitizedStation.replace(/\u009e/g, '\u017E')));
+ $('#data-station-name').text(parsedData.txInfo.station.replace(/%/g, '%25'));
$('#data-station-erp').text(parsedData.txInfo.erp);
$('#data-station-city').text(parsedData.txInfo.city);
$('#data-station-itu').text(parsedData.txInfo.itu);
diff --git a/web/js/settings.js b/web/js/settings.js
index a7a550d..66969ce 100644
--- a/web/js/settings.js
+++ b/web/js/settings.js
@@ -104,6 +104,28 @@
});
});
+ var extendedFreqRange = localStorage.getItem("extendedFreqRange");
+ if (extendedFreqRange === "true") {
+ $("#extended-frequency-range").prop("checked", true);
+ }
+
+ // Save the value of the checkbox into local storage when its state changes
+ $("#extended-frequency-range").change(function() {
+ var isChecked = $(this).is(":checked");
+ localStorage.setItem("extendedFreqRange", isChecked);
+ });
+
+ var extendedFreqRange = localStorage.getItem("psUnderscores");
+ if (extendedFreqRange === "true") {
+ $("#ps-underscores").prop("checked", true);
+ }
+
+ // Save the value of the checkbox into local storage when its state changes
+ $("#ps-underscores").change(function() {
+ var isChecked = $(this).is(":checked");
+ localStorage.setItem("psUnderscores", isChecked);
+ });
+
});