VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-04-05 02:58:37 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #814 from srcejon/lora_aprs

Browse Source 
Add basic APRS support to ChirpChatDemod
This commit is contained in:
Edouard Griffiths 2021-03-26 02:43:31 +01:00 committed by GitHub
commit f134cdf9b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/channelrx/demodchirpchat/chirpchatdemod.cpp
View File

@ -34,6 +34,7 @@
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "feature/feature.h"
#include "util/ax25.h"
#include "util/db.h"
#include "maincore.h"
@ -188,6 +189,44 @@ bool ChirpChatDemod::handleMessage(const Message& cmd)
getMessageQueueToGUI()->push(msgToGUI);
}
// Is this an APRS packet?
// As per: https://github.com/oe3cjb/TTGO-T-Beam-LoRa-APRS/blob/master/lib/BG_RF95/BG_RF95.cpp
// There is a 3 byte header for LoRa APRS packets. Addressing follows in ASCII: srccall>dst:
// TODO: Should we check for valid CRC?
int colonIdx = m_lastMsgBytes.indexOf(':');
int greaterThanIdx = m_lastMsgBytes.indexOf('>');
if ((m_lastMsgBytes[0] == '<') && (greaterThanIdx != -1) && (colonIdx != -1))
{
QByteArray packet;
// Extract addresses
const char *d = m_lastMsgBytes.data();
QString srcString = QString::fromLatin1(d + 3, greaterThanIdx - 3);
QString dstString = QString::fromLatin1(d + greaterThanIdx + 1, colonIdx - greaterThanIdx - 1);
// Convert to AX.25 format
packet.append(AX25Packet::encodeAddress(dstString));
packet.append(AX25Packet::encodeAddress(srcString, 1));
packet.append(3);
packet.append(-16); // 0xf0
packet.append(m_lastMsgBytes.mid(colonIdx+1));
packet.append((char)0); // dummy crc
packet.append((char)0);
// Forward to APRS and other packet features
MessagePipes& messagePipes = MainCore::instance()->getMessagePipes();
QList<MessageQueue*> *packetMessageQueues = messagePipes.getMessageQueues(this, "packets");
if (packetMessageQueues)
{
QList<MessageQueue*>::iterator it = packetMessageQueues->begin();
for (; it != packetMessageQueues->end(); ++it)
{
MainCore::MsgPacket *msg = MainCore::MsgPacket::create(this, packet, QDateTime::currentDateTime());
(*it)->push(msg);
}
}
}
if (m_settings.m_autoNbSymbolsMax)
{
ChirpChatDemodSettings settings = m_settings;

4
plugins/feature/aprs/aprssettings.cpp
View File

@ -24,11 +24,13 @@
#include "aprssettings.h"
const QStringList APRSSettings::m_pipeTypes = {
QStringLiteral("PacketDemod")
QStringLiteral("PacketDemod"),
QStringLiteral("ChirpChatDemod")
};
const QStringList APRSSettings::m_pipeURIs = {
QStringLiteral("sdrangel.channel.packetdemod"),
QStringLiteral("sdrangel.channel.chirpchatdemod")
};
APRSSettings::APRSSettings()

4
plugins/feature/aprs/readme.md
View File

@ -2,7 +2,7 @@
<h2>Introduction</h2>
The APRS plugin displays APRS (Automatic Packet Reporting System) packets. APRS packets can be received over RF via one or more Packet Demodulator source channels or from the Internet via an APRS-IS IGate.
The APRS plugin displays APRS (Automatic Packet Reporting System) packets. APRS packets can be received over RF via one or more Packet Demodulator or ChirpChat Demodulator source channels or from the Internet via an APRS-IS IGate.
<h2>Interface</h2>
@ -10,7 +10,7 @@ The APRS plugin displays APRS (Automatic Packet Reporting System) packets. APRS
<h3>1: Source channels</h3>
This displays a list of the Packet Demodulator channels the APRS feature is receiving packets from.
This displays a list of the Packet Demodulator or ChirpChat Demodulator channels the APRS feature is receiving packets from.
<h3>2: Enable APRS-IS IGate</h3>