kuba/fm-dx-webserver
1
0
Fork 0
mirror of https://github.com/KubaPro010/fm-dx-webserver.git synced 2026-02-26 22:13:53 +01:00
Code Issues Activity

backgrounds, new banlist, bugfixes, presets

Browse Source
This commit is contained in:
NoobishSVK
2024-03-24 18:24:19 +01:00
parent 72953a2529
commit f855cbb78a
14 changed files with 318 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/datahandler.js
View File

@@ -209,6 +209,7 @@ var dataToSend = {
previousFreq: 87.500.toFixed(3),
signal: 0,
highestSignal: -Infinity,
bw: 0,
st: false,
st_forced: false,
rds: false,
@@ -299,7 +300,8 @@ function handleData(ws, receivedData) {
}
break;
case receivedLine.startsWith('W'): // Bandwidth
console.log(receivedLine);
initialData.bw = receivedLine.substring(1);
dataToSend.bw = receivedLine.substring(1);
break;
case receivedLine.startsWith('Sm'):
processSignal(receivedLine, false, false);

10
server/endpoints.js
View File

@@ -16,6 +16,11 @@ const fmdxList = require('./fmdx_list');
// Endpoints
router.get('/', (req, res) => {
if(serverConfig.webserver.banlist.includes(req.connection.remoteAddress)) {
res.render('403');
return;
}
if (configExists() === false) {
let serialPorts;
@@ -45,7 +50,7 @@ router.get('/', (req, res) => {
tunerLock: serverConfig.lockToAdmin,
publicTuner: serverConfig.publicTuner,
ownerContact: serverConfig.identification.contact,
antennaSwitch: serverConfig.antennaSwitch,
antennas: serverConfig.antennas ? serverConfig.antennas : {},
tuningLimit: serverConfig.webserver.tuningLimit,
tuningLowerLimit: serverConfig.webserver.tuningLowerLimit,
tuningUpperLimit: serverConfig.webserver.tuningUpperLimit,
@@ -204,7 +209,8 @@ router.get('/static_data', (req, res) => {
qthLatitude: serverConfig.identification.lat,
qthLongitude: serverConfig.identification.lon,
presets: serverConfig.webserver.presets || [],
defaultTheme: serverConfig.webserver.defaultTheme || 'theme1'
defaultTheme: serverConfig.webserver.defaultTheme || 'theme1',
bgImage: serverConfig.webserver.bgImage || ''
});
});

4
server/index.js
View File

@@ -72,7 +72,7 @@ function connectToSerial() {
serialport.write('x\n');
serialport.write('W0\n');
serialport.write('M0\n');
serialport.write('Y100\n');
serverConfig.audio.startupVolume ? serialport.write('Y' + (serverConfig.audio.startupVolume * 100).toFixed(0) + '\n') : serialport.write('Y100\n');
serialport.write('D0\n');
serialport.write('A0\n');
serialport.write('F-1\n');
@@ -162,7 +162,7 @@ function connectToXdrd() {
client.write('x\n');
client.write(serverConfig.defaultFreq ? 'T' + Math.round(serverConfig.defaultFreq * 1000) + '\n' : 'T87500\n');
client.write('A0\n');
client.write('G00\n');
client.write(serverConfig.audio.startupVolume ? 'Y' + (serverConfig.audio.startupVolume * 100).toFixed(0) + '\n' : 'Y100\n');
client.off('data', authDataHandler);
return;
}