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

Merge pull request #4 from kkonradpl/main

Browse Source 
Add support for legacy RDS message
This commit is contained in:
Marek Farkaš
2024-01-22 23:08:55 +01:00
committed by GitHub
parent 8d18c238b5 451bdcc982
commit 2a7ff7797a
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
datahandler.js
View File

@@ -6,8 +6,6 @@ const win32 = (os.platform() == "win32");
const unicode_type = (win32 ? 'int16_t' : 'int32_t'); const unicode_type = (win32 ? 'int16_t' : 'int32_t');
const lib = koffi.load(path.join(__dirname, "librdsparser." + (win32 ? "dll" : "so"))); const lib = koffi.load(path.join(__dirname, "librdsparser." + (win32 ? "dll" : "so")));
var rdsBuffer = [];
koffi.proto('void callback_pi(void *rds, void *user_data)'); koffi.proto('void callback_pi(void *rds, void *user_data)');
koffi.proto('void callback_pty(void *rds, void *user_data)'); koffi.proto('void callback_pty(void *rds, void *user_data)');
koffi.proto('void callback_tp(void *rds, void *user_data)'); koffi.proto('void callback_tp(void *rds, void *user_data)');
@@ -200,16 +198,10 @@ var dataToSend = {
country_iso: 'UN', country_iso: 'UN',
users: '', users: '',
}; };
var legacyRdsPiBuffer = null;
const initialData = { ...dataToSend }; const initialData = { ...dataToSend };
const resetToDefault = dataToSend => Object.assign(dataToSend, initialData); const resetToDefault = dataToSend => Object.assign(dataToSend, initialData);
function handleBuffer() {
for (let group of rdsBuffer)
{
rdsparser.parse_string(rds, group);
}
}
function handleData(ws, receivedData) { function handleData(ws, receivedData) {
// Retrieve the last update time for this client // Retrieve the last update time for this client
let lastUpdateTime = clientUpdateIntervals.get(ws) || 0; let lastUpdateTime = clientUpdateIntervals.get(ws) || 0;
@@ -221,12 +213,12 @@ function handleData(ws, receivedData) {
switch (true) { switch (true) {
case receivedLine.startsWith('P'): case receivedLine.startsWith('P'):
modifiedData = receivedLine.slice(1); modifiedData = receivedLine.slice(1);
legacyRdsPiBuffer = modifiedData;
if (dataToSend.pi.length >= modifiedData.length || dataToSend.pi == '?') { if (dataToSend.pi.length >= modifiedData.length || dataToSend.pi == '?') {
dataToSend.pi = modifiedData; dataToSend.pi = modifiedData;
} }
break; break;
case receivedLine.startsWith('T'): case receivedLine.startsWith('T'):
rdsBuffer = [];
resetToDefault(dataToSend); resetToDefault(dataToSend);
dataToSend.af.length = 0; dataToSend.af.length = 0;
rdsparser.clear(rds); rdsparser.clear(rds);
@@ -261,15 +253,33 @@ function handleData(ws, receivedData) {
case receivedLine.startsWith('R'): case receivedLine.startsWith('R'):
modifiedData = receivedLine.slice(1); modifiedData = receivedLine.slice(1);
if (rdsBuffer.length > 1000) { if (modifiedData.length == 14) {
rdsBuffer.shift(); // Handle legacy RDS message
var errorsNew = 0;
var pi;
if (legacyRdsPiBuffer !== null &&
legacyRdsPiBuffer.length >= 4) {
pi = legacyRdsPiBuffer.slice(0, 4);
// PI message does not carry explicit information about
// error correction, but this is a good substitute.
errorsNew = (legacyRdsPiBuffer.length - 4) << 6;
} else {
pi = '0000';
errorsNew = (0x03 << 6);
}
let errorsOld = parseInt(modifiedData.slice(12), 16);
errorsNew |= (errorsOld & 0x03) << 4;
errorsNew |= (errorsOld & 0x0C);
errorsNew |= (errorsOld & 0x30) >> 4;
modifiedData = pi + modifiedData.slice(0, 12);
modifiedData += errorsNew.toString(16).padStart(2, '0');
} }
rdsBuffer.push(modifiedData); rdsparser.parse_string(rds, modifiedData);
legacyRdsPiBuffer = null;
if (rdsBuffer.length > 1) {
handleBuffer();
}
break; break;
} }
} }