VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

ADSB demod: added Az/El and RSSI in command or speech tokens. Fixed deprecated QProcess::startDetached

Browse Source
This commit is contained in:
f4exb 2021-11-06 18:54:49 +01:00
parent 5fa3613b56
commit 0cf1d71a6c
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/channelrx/demodadsb/adsbdemodgui.cpp
View File

@ -1314,7 +1314,15 @@ void ADSBDemodGUI::speechNotification(Aircraft *aircraft, const QString &speech)
void ADSBDemodGUI::commandNotification(Aircraft *aircraft, const QString &command)
{
QProcess::startDetached(subAircraftString(aircraft, command));
QString commandLine = subAircraftString(aircraft, command);
QStringList allArgs = commandLine.split(" ");
if (allArgs.size() > 0)
{
QString program = allArgs[0];
allArgs.pop_front();
QProcess::startDetached(program, allArgs);
}
}
QString ADSBDemodGUI::subAircraftString(Aircraft *aircraft, const QString &string)
@ -1329,6 +1337,7 @@ QString ADSBDemodGUI::subAircraftString(Aircraft *aircraft, const QString &strin
s = s.replace("${speed}", aircraft->m_speedItem->data(Qt::DisplayRole).toString());
s = s.replace("${heading}", aircraft->m_headingItem->data(Qt::DisplayRole).toString());
s = s.replace("${range}", aircraft->m_rangeItem->data(Qt::DisplayRole).toString());
s = s.replace("${azel}", aircraft->m_azElItem->data(Qt::DisplayRole).toString());
s = s.replace("${category}", aircraft->m_emitterCategoryItem->data(Qt::DisplayRole).toString());
s = s.replace("${status}", aircraft->m_statusItem->data(Qt::DisplayRole).toString());
s = s.replace("${squawk}", aircraft->m_squawkItem->data(Qt::DisplayRole).toString());
@ -1336,6 +1345,7 @@ QString ADSBDemodGUI::subAircraftString(Aircraft *aircraft, const QString &strin
s = s.replace("${manufacturer}", aircraft->m_manufacturerNameItem->data(Qt::DisplayRole).toString());
s = s.replace("${owner}", aircraft->m_ownerItem->data(Qt::DisplayRole).toString());
s = s.replace("${operator}", aircraft->m_operatorICAOItem->data(Qt::DisplayRole).toString());
s = s.replace("${rssi}", aircraft->m_rssiItem->data(Qt::DisplayRole).toString());
s = s.replace("${flightstatus}", aircraft->m_flightStatusItem->data(Qt::DisplayRole).toString());
s = s.replace("${departure}", aircraft->m_depItem->data(Qt::DisplayRole).toString());
s = s.replace("${arrival}", aircraft->m_arrItem->data(Qt::DisplayRole).toString());

2
plugins/channelrx/demodadsb/readme.md
View File

@ -138,6 +138,7 @@ In the Speech and Command strings, variables can be used to substitute in data f
* ${speed}
* ${heading}
* ${range}
- ${azel}
* ${category}
* ${status}
* ${squawk}
@ -145,6 +146,7 @@ In the Speech and Command strings, variables can be used to substitute in data f
* ${manufacturer}
* ${owner}
* ${operator}
- ${rssi}
* ${flightstatus}
* ${departure}
* ${arrival}