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

optimised serialport code

Browse Source
This commit is contained in:
Amateur Audio Dude
2025-04-20 21:23:18 +10:00
committed by GitHub
parent b23211f408
commit 4c71b736a6
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/index.js
View File

@@ -18,7 +18,7 @@ const path = require('path');
const net = require('net'); const net = require('net');
const client = new net.Socket(); const client = new net.Socket();
const { SerialPort } = require('serialport'); const { SerialPort } = require('serialport');
const tunnel = require('./tunnel') const tunnel = require('./tunnel');
// File imports // File imports
const helpers = require('./helpers'); const helpers = require('./helpers');
@@ -118,12 +118,12 @@ connectToSerial();
tunnel.connect(); tunnel.connect();
// Serialport retry code when port is open but communication is lost (additional code in datahandler.js) // Serialport retry code when port is open but communication is lost (additional code in datahandler.js)
isSerialportRetrying = false; dataHandler.state.isSerialportRetrying = false;
setInterval(() => { setInterval(() => {
if (!isSerialportAlive && serverConfig.xdrd.wirelessConnection === false) { if (!dataHandler.state.isSerialportAlive && serverConfig.xdrd.wirelessConnection === false) {
isSerialportAlive = true; dataHandler.state.isSerialportAlive = true;
isSerialportRetrying = true; dataHandler.state.isSerialportRetrying = true;
if (serialport && serialport.isOpen) { if (serialport && serialport.isOpen) {
logWarn('Communication lost from ' + serverConfig.xdrd.comPort + ', force closing serialport.'); logWarn('Communication lost from ' + serverConfig.xdrd.comPort + ', force closing serialport.');
setTimeout(() => { setTimeout(() => {
@@ -163,7 +163,7 @@ if (serverConfig.xdrd.wirelessConnection === false) {
} }
logInfo('Using COM device: ' + serverConfig.xdrd.comPort); logInfo('Using COM device: ' + serverConfig.xdrd.comPort);
isSerialportAlive = true; dataHandler.state.isSerialportAlive = true;
setTimeout(() => { setTimeout(() => {
serialport.write('x\n'); serialport.write('x\n');
}, 3000); }, 3000);
@@ -177,12 +177,12 @@ if (serverConfig.xdrd.wirelessConnection === false) {
serialport.write('T' + Math.round(serverConfig.defaultFreq * 1000) + '\n'); serialport.write('T' + Math.round(serverConfig.defaultFreq * 1000) + '\n');
dataHandler.initialData.freq = Number(serverConfig.defaultFreq).toFixed(3); dataHandler.initialData.freq = Number(serverConfig.defaultFreq).toFixed(3);
dataHandler.dataToSend.freq = Number(serverConfig.defaultFreq).toFixed(3); dataHandler.dataToSend.freq = Number(serverConfig.defaultFreq).toFixed(3);
} else if (lastFrequencyAlive && isSerialportRetrying) { // Serialport retry code when port is open but communication is lost } else if (dataHandler.state.lastFrequencyAlive && dataHandler.state.isSerialportRetrying) { // Serialport retry code when port is open but communication is lost
serialport.write('T' + (lastFrequencyAlive * 1000) + '\n'); serialport.write('T' + (dataHandler.state.lastFrequencyAlive * 1000) + '\n');
} else { } else {
serialport.write('T87500\n'); serialport.write('T87500\n');
} }
isSerialportRetrying = false; dataHandler.state.isSerialportRetrying = false;
serialport.write('A0\n'); serialport.write('A0\n');
serialport.write('F-1\n'); serialport.write('F-1\n');
@@ -207,7 +207,7 @@ if (serverConfig.xdrd.wirelessConnection === false) {
serialport.on('close', () => { serialport.on('close', () => {
logWarn('Disconnected from ' + serverConfig.xdrd.comPort + '. Attempting to reconnect.'); logWarn('Disconnected from ' + serverConfig.xdrd.comPort + '. Attempting to reconnect.');
setTimeout(() => { setTimeout(() => {
isSerialportRetrying = true; dataHandler.state.isSerialportRetrying = true;
connectToSerial(); connectToSerial();
}, 5000); }, 5000);
}); });