VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-25 11:34:09 -04:00
Code Issues Projects Releases Wiki Activity

Meshtastic modulator: removed ASCII. RTTY and FT coding schemes and keep only text type message

Browse Source
This commit is contained in:
f4exb
2026-03-18 21:22:24 +01:00
parent a756e3d7fb
commit f966a96148
15 changed files with 87 additions and 697 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channeltx/modmeshtastic/meshtasticmodencoder.cpp
+17 -77
View File
@@ -18,14 +18,12 @@
#include <QDebug>
#include "meshtasticmodencoder.h"
#include "meshtasticmodencodertty.h"
#include "meshtasticmodencoderascii.h"
#include "meshtasticmodencoderlora.h"
#include "meshtasticmodencoderft.h"
#include "meshtasticpacket.h"
const MeshtasticModSettings::CodingScheme MeshtasticModEncoder::m_codingScheme = MeshtasticModSettings::CodingLoRa;
MeshtasticModEncoder::MeshtasticModEncoder() :
m_codingScheme(MeshtasticModSettings::CodingTTY),
m_nbSymbolBits(5),
m_nbParityBits(1),
m_hasCRC(true),
@@ -50,86 +48,28 @@ void MeshtasticModEncoder::setNbSymbolBits(unsigned int spreadFactor, unsigned i
void MeshtasticModEncoder::encode(MeshtasticModSettings settings, std::vector<unsigned short>& symbols)
{
if (settings.m_codingScheme == MeshtasticModSettings::CodingFT)
if (m_nbSymbolBits >= 5)
{
MeshtasticModEncoderFT::encodeMsg(
settings.m_myCall,
settings.m_urCall,
settings.m_myLoc,
settings.m_myRpt,
settings.m_textMessage,
settings.m_messageType,
m_nbSymbolBits,
symbols
);
}
else
{
if (settings.m_messageType == MeshtasticModSettings::MessageBytes) {
encodeBytes(settings.m_bytesMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageBeacon) {
encodeString(settings.m_beaconMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageCQ) {
encodeString(settings.m_cqMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageReply) {
encodeString(settings.m_replyMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageReport) {
encodeString(settings.m_reportMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageReplyReport) {
encodeString(settings.m_replyReportMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageRRR) {
encodeString(settings.m_rrrMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::Message73) {
encodeString(settings.m_73Message, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageQSOText) {
encodeString(settings.m_qsoTextMessage, symbols);
} else if (settings.m_messageType == MeshtasticModSettings::MessageText) {
encodeString(settings.m_textMessage, symbols);
}
}
}
QByteArray bytes;
QString summary;
QString error;
void MeshtasticModEncoder::encodeString(const QString& str, std::vector<unsigned short>& symbols)
{
switch (m_codingScheme)
{
case MeshtasticModSettings::CodingTTY:
if (m_nbSymbolBits == 5) {
MeshtasticModEncoderTTY::encodeString(str, symbols);
}
break;
case MeshtasticModSettings::CodingASCII:
if (m_nbSymbolBits == 7) {
MeshtasticModEncoderASCII::encodeString(str, symbols);
}
break;
case MeshtasticModSettings::CodingLoRa:
if (m_nbSymbolBits >= 5)
if (modemmeshtastic::Packet::isCommand(settings.m_textMessage))
{
QByteArray bytes;
QString summary;
QString error;
if (modemmeshtastic::Packet::isCommand(str))
if (!modemmeshtastic::Packet::buildFrameFromCommand(settings.m_textMessage, bytes, summary, error))
{
if (!modemmeshtastic::Packet::buildFrameFromCommand(str, bytes, summary, error))
{
qWarning() << "MeshtasticModEncoder::encodeString: Meshtastic command error:" << error;
return;
}
qInfo() << "MeshtasticModEncoder::encodeString:" << summary;
}
else
{
bytes = str.toUtf8();
qWarning() << "MeshtasticModEncoder::encode: Meshtastic command error:" << error;
return;
}
encodeBytesLoRa(bytes, symbols);
qInfo() << "MeshtasticModEncoder::encode:" << summary;
}
break;
default:
break;
else
{
bytes = settings.m_textMessage.toUtf8();
}
encodeBytesLoRa(bytes, symbols);
}
}