VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-23 02:24:16 -04:00
Code Issues Projects Releases Wiki Activity

M17: implemented APRS

Browse Source
This commit is contained in:
f4exb
2022-07-03 10:06:12 +02:00
parent b69275949a
commit 3cf3938757
17 changed files with 647 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/demodm17/m17demodprocessor.cpp
+38 -7
View File
@@ -23,6 +23,7 @@
#include <QDebug>
#include "audio/audiofifo.h"
#include "util/ax25.h"
#include "m17/ax25_frame.h"
#include "m17demod.h"
@@ -148,10 +149,6 @@ void M17DemodProcessor::diagnostic_callback(
oss << buffer;
qDebug() << "M17DemodProcessor::diagnostic_callback: " << oss.str().c_str();
}
if (status == 0) { // unlocked
m_this->resetInfo();
}
}
bool M17DemodProcessor::decode_lich(mobilinkd::M17FrameDecoder::lich_buffer_t const& lich)
@@ -361,9 +358,9 @@ bool M17DemodProcessor::decode_packet(mobilinkd::M17FrameDecoder::packet_buffer_
oss << *it;
}
qDebug() << "M17DemodProcessor::decode_packet: "
<< " From:" << getSrcCall()
<< " To:" << getDestcCall()
qDebug() << "M17DemodProcessor::decode SMS_packet: "
<< " Src:" << getSrcCall()
<< " Dest:" << getDestcCall()
<< " SMS:" << oss.str().c_str();
if (m_demodInputMessageQueue)
@@ -376,6 +373,40 @@ bool M17DemodProcessor::decode_packet(mobilinkd::M17FrameDecoder::packet_buffer_
m_demodInputMessageQueue->push(msg);
}
}
else if (m_stdPacketProtocol == StdPacketAPRS)
{
AX25Packet ax25;
QByteArray packet = QByteArray(reinterpret_cast<const char*>(&m_currentPacket[1]), m_currentPacket.size()-3);
if (ax25.decode(packet))
{
qDebug() << "M17DemodProcessor::decode APRS_packet: "
<< " Src:" << getSrcCall()
<< " Dest:" << getDestcCall()
<< " From:" << ax25.m_from
<< " To: " << ax25.m_to
<< " Via: " << ax25.m_via
<< " Type: " << ax25.m_type
<< " PID: " << ax25.m_pid
<< " Data: " << ax25.m_dataASCII;
if (m_demodInputMessageQueue)
{
M17Demod::MsgReportAPRS *msg = M17Demod::MsgReportAPRS::create(
getSrcCall(),
getDestcCall(),
ax25.m_from,
ax25.m_to,
ax25.m_via,
ax25.m_type,
ax25.m_pid,
ax25.m_dataASCII
);
msg->getPacket() = packet;
m_demodInputMessageQueue->push(msg);
}
}
}
return true;
}