mirror of
https://github.com/f4exb/sdrangel.git
synced 2026-08-14 15:33:34 -04:00
Meshtastic modulator: make hasCRC and hasHeader static and remove useless messages
This commit is contained in:
f4exb
@@ -219,14 +219,6 @@ void MeshtasticMod::applySettings(const MeshtasticModSettings& settings, bool fo
|
||||
<< " m_rfBandwidth: " << settings.m_bandwidthIndex
|
||||
<< " bandwidth: " << MeshtasticModSettings::bandwidths[settings.m_bandwidthIndex]
|
||||
<< " m_channelMute: " << settings.m_channelMute
|
||||
<< " m_beaconMessage: " << settings.m_beaconMessage
|
||||
<< " m_cqMessage: " << settings.m_cqMessage
|
||||
<< " m_replyMessage: " << settings.m_replyMessage
|
||||
<< " m_reportMessage:" << settings.m_reportMessage
|
||||
<< " m_replyReportMessage: " << settings.m_replyReportMessage
|
||||
<< " m_rrrMessage: " << settings.m_rrrMessage
|
||||
<< " m_73message: " << settings.m_73Message
|
||||
<< " m_qsoTextMessage: " << settings.m_qsoTextMessage
|
||||
<< " m_textMessage: " << settings.m_textMessage
|
||||
<< " m_bytesMessage: " << settings.m_bytesMessage.toHex()
|
||||
<< " m_spreadFactor: " << settings.m_spreadFactor
|
||||
@@ -290,42 +282,6 @@ void MeshtasticMod::applySettings(const MeshtasticModSettings& settings, bool fo
|
||||
m_encoder.setLoRaParityBits(settings.m_nbParityBits);
|
||||
}
|
||||
|
||||
if ((settings.m_hasCRC != m_settings.m_hasCRC) || force)
|
||||
{
|
||||
reverseAPIKeys.append("hasCRC");
|
||||
m_encoder.setLoRaHasCRC(settings.m_hasCRC);
|
||||
}
|
||||
|
||||
if ((settings.m_hasHeader != m_settings.m_hasHeader) || force)
|
||||
{
|
||||
reverseAPIKeys.append("hasHeader");
|
||||
m_encoder.setLoRaHasHeader(settings.m_hasHeader);
|
||||
}
|
||||
|
||||
if ((settings.m_beaconMessage != m_settings.m_beaconMessage) || force) {
|
||||
reverseAPIKeys.append("beaconMessage");
|
||||
}
|
||||
if ((settings.m_cqMessage != m_settings.m_cqMessage) || force) {
|
||||
reverseAPIKeys.append("cqMessage");
|
||||
}
|
||||
if ((settings.m_replyMessage != m_settings.m_replyMessage) || force) {
|
||||
reverseAPIKeys.append("replyMessage");
|
||||
}
|
||||
if ((settings.m_reportMessage != m_settings.m_reportMessage) || force) {
|
||||
reverseAPIKeys.append("reportMessage");
|
||||
}
|
||||
if ((settings.m_replyReportMessage != m_settings.m_replyReportMessage) || force) {
|
||||
reverseAPIKeys.append("replyReportMessage");
|
||||
}
|
||||
if ((settings.m_rrrMessage != m_settings.m_rrrMessage) || force) {
|
||||
reverseAPIKeys.append("rrrMessage");
|
||||
}
|
||||
if ((settings.m_73Message != m_settings.m_73Message) || force) {
|
||||
reverseAPIKeys.append("73Message");
|
||||
}
|
||||
if ((settings.m_qsoTextMessage != m_settings.m_qsoTextMessage) || force) {
|
||||
reverseAPIKeys.append("qsoTextMessage");
|
||||
}
|
||||
if ((settings.m_textMessage != m_settings.m_textMessage) || force) {
|
||||
reverseAPIKeys.append("textMessage");
|
||||
}
|
||||
@@ -527,12 +483,6 @@ void MeshtasticMod::webapiUpdateChannelSettings(
|
||||
if (channelSettingsKeys.contains("nbParityBits")) {
|
||||
settings.m_nbParityBits = response.getChirpChatModSettings()->getNbParityBits();
|
||||
}
|
||||
if (channelSettingsKeys.contains("hasCRC")) {
|
||||
settings.m_hasCRC = response.getChirpChatModSettings()->getHasCrc() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("hasHeader")) {
|
||||
settings.m_hasHeader = response.getChirpChatModSettings()->getHasHeader() != 0;
|
||||
}
|
||||
if (channelSettingsKeys.contains("myCall")) {
|
||||
settings.m_myCall = *response.getChirpChatModSettings()->getMyCall();
|
||||
}
|
||||
@@ -545,30 +495,6 @@ void MeshtasticMod::webapiUpdateChannelSettings(
|
||||
if (channelSettingsKeys.contains("myRpt")) {
|
||||
settings.m_myRpt = *response.getChirpChatModSettings()->getMyRpt();
|
||||
}
|
||||
if (channelSettingsKeys.contains("beaconMessage")) {
|
||||
settings.m_beaconMessage = *response.getChirpChatModSettings()->getBeaconMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("cqMessage")) {
|
||||
settings.m_cqMessage = *response.getChirpChatModSettings()->getCqMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("replyMessage")) {
|
||||
settings.m_replyMessage = *response.getChirpChatModSettings()->getReplyMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("reportMessage")) {
|
||||
settings.m_reportMessage = *response.getChirpChatModSettings()->getReportMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("replyReportMessage")) {
|
||||
settings.m_replyReportMessage = *response.getChirpChatModSettings()->getReplyReportMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("rrrMessage")) {
|
||||
settings.m_rrrMessage = *response.getChirpChatModSettings()->getRrrMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("message73")) {
|
||||
settings.m_73Message = *response.getChirpChatModSettings()->getMessage73();
|
||||
}
|
||||
if (channelSettingsKeys.contains("qsoTextMessage")) {
|
||||
settings.m_qsoTextMessage = *response.getChirpChatModSettings()->getQsoTextMessage();
|
||||
}
|
||||
if (channelSettingsKeys.contains("textMessage")) {
|
||||
settings.m_textMessage = *response.getChirpChatModSettings()->getTextMessage();
|
||||
}
|
||||
@@ -686,54 +612,6 @@ void MeshtasticMod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings&
|
||||
|
||||
response.getChirpChatModSettings()->setMessageType((int) settings.m_messageType);
|
||||
|
||||
if (response.getChirpChatModSettings()->getBeaconMessage()) {
|
||||
*response.getChirpChatModSettings()->getBeaconMessage() = settings.m_beaconMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setBeaconMessage(new QString(settings.m_beaconMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getCqMessage()) {
|
||||
*response.getChirpChatModSettings()->getCqMessage() = settings.m_cqMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setCqMessage(new QString(settings.m_cqMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getReplyMessage()) {
|
||||
*response.getChirpChatModSettings()->getReplyMessage() = settings.m_replyMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setReplyMessage(new QString(settings.m_replyMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getReportMessage()) {
|
||||
*response.getChirpChatModSettings()->getReportMessage() = settings.m_reportMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setReportMessage(new QString(settings.m_reportMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getReplyReportMessage()) {
|
||||
*response.getChirpChatModSettings()->getReplyReportMessage() = settings.m_replyReportMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setReplyReportMessage(new QString(settings.m_replyReportMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getRrrMessage()) {
|
||||
*response.getChirpChatModSettings()->getRrrMessage() = settings.m_rrrMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setRrrMessage(new QString(settings.m_rrrMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getMessage73()) {
|
||||
*response.getChirpChatModSettings()->getMessage73() = settings.m_73Message;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setMessage73(new QString(settings.m_73Message));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getQsoTextMessage()) {
|
||||
*response.getChirpChatModSettings()->getQsoTextMessage() = settings.m_qsoTextMessage;
|
||||
} else {
|
||||
response.getChirpChatModSettings()->setQsoTextMessage(new QString(settings.m_qsoTextMessage));
|
||||
}
|
||||
|
||||
if (response.getChirpChatModSettings()->getTextMessage()) {
|
||||
*response.getChirpChatModSettings()->getTextMessage() = settings.m_textMessage;
|
||||
} else {
|
||||
@@ -933,30 +811,6 @@ void MeshtasticMod::webapiFormatChannelSettings(
|
||||
if (channelSettingsKeys.contains("messageType") || force) {
|
||||
swgMeshtasticModSettings->setMessageType((int) settings.m_messageType);
|
||||
}
|
||||
if (channelSettingsKeys.contains("beaconMessage") || force) {
|
||||
swgMeshtasticModSettings->setBeaconMessage(new QString(settings.m_beaconMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("cqMessage") || force) {
|
||||
swgMeshtasticModSettings->setCqMessage(new QString(settings.m_cqMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("replyMessage") || force) {
|
||||
swgMeshtasticModSettings->setReplyMessage(new QString(settings.m_replyMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("reportMessage") || force) {
|
||||
swgMeshtasticModSettings->setReportMessage(new QString(settings.m_reportMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("replyReportMessage") || force) {
|
||||
swgMeshtasticModSettings->setReplyReportMessage(new QString(settings.m_replyReportMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("rrrMessage") || force) {
|
||||
swgMeshtasticModSettings->setRrrMessage(new QString(settings.m_rrrMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("message73") || force) {
|
||||
swgMeshtasticModSettings->setMessage73(new QString(settings.m_73Message));
|
||||
}
|
||||
if (channelSettingsKeys.contains("qsoTextMessage") || force) {
|
||||
swgMeshtasticModSettings->setQsoTextMessage(new QString(settings.m_qsoTextMessage));
|
||||
}
|
||||
if (channelSettingsKeys.contains("textMessage") || force) {
|
||||
swgMeshtasticModSettings->setTextMessage(new QString(settings.m_textMessage));
|
||||
}
|
||||
|
||||
@@ -22,12 +22,12 @@
|
||||
#include "meshtasticpacket.h"
|
||||
|
||||
const MeshtasticModSettings::CodingScheme MeshtasticModEncoder::m_codingScheme = MeshtasticModSettings::CodingLoRa;
|
||||
const bool MeshtasticModEncoder::m_hasCRC = true;
|
||||
const bool MeshtasticModEncoder::m_hasHeader = true;
|
||||
|
||||
MeshtasticModEncoder::MeshtasticModEncoder() :
|
||||
m_nbSymbolBits(5),
|
||||
m_nbParityBits(1),
|
||||
m_hasCRC(true),
|
||||
m_hasHeader(true)
|
||||
m_nbParityBits(1)
|
||||
{}
|
||||
|
||||
MeshtasticModEncoder::~MeshtasticModEncoder()
|
||||
|
||||
@@ -31,8 +31,6 @@ public:
|
||||
|
||||
void setNbSymbolBits(unsigned int spreadFactor, unsigned int deBits);
|
||||
void setLoRaParityBits(unsigned int parityBits) { m_nbParityBits = parityBits; }
|
||||
void setLoRaHasHeader(bool hasHeader) { m_hasHeader = hasHeader; }
|
||||
void setLoRaHasCRC(bool hasCRC) { m_hasCRC = hasCRC; }
|
||||
void encodeBytes(const QByteArray& bytes, std::vector<unsigned short>& symbols);
|
||||
void encode(MeshtasticModSettings settings, std::vector<unsigned short>& symbols);
|
||||
|
||||
@@ -47,8 +45,8 @@ private:
|
||||
unsigned int m_nbSymbolBits;
|
||||
// LoRa attributes
|
||||
unsigned int m_nbParityBits; //!< 1 to 4 Hamming FEC bits for 4 payload bits
|
||||
bool m_hasCRC;
|
||||
bool m_hasHeader;
|
||||
static const bool m_hasCRC;
|
||||
static const bool m_hasHeader;
|
||||
};
|
||||
|
||||
#endif // PLUGINS_CHANNELTX_MODMESHTASTIC_MESHTASTICMODENCODER_H_
|
||||
|
||||
@@ -152,22 +152,6 @@ QString MeshtasticModGUI::getActivePayloadText() const
|
||||
{
|
||||
switch (m_settings.m_messageType)
|
||||
{
|
||||
case MeshtasticModSettings::MessageBeacon:
|
||||
return m_settings.m_beaconMessage;
|
||||
case MeshtasticModSettings::MessageCQ:
|
||||
return m_settings.m_cqMessage;
|
||||
case MeshtasticModSettings::MessageReply:
|
||||
return m_settings.m_replyMessage;
|
||||
case MeshtasticModSettings::MessageReport:
|
||||
return m_settings.m_reportMessage;
|
||||
case MeshtasticModSettings::MessageReplyReport:
|
||||
return m_settings.m_replyReportMessage;
|
||||
case MeshtasticModSettings::MessageRRR:
|
||||
return m_settings.m_rrrMessage;
|
||||
case MeshtasticModSettings::Message73:
|
||||
return m_settings.m_73Message;
|
||||
case MeshtasticModSettings::MessageQSOText:
|
||||
return m_settings.m_qsoTextMessage;
|
||||
case MeshtasticModSettings::MessageText:
|
||||
return m_settings.m_textMessage;
|
||||
case MeshtasticModSettings::MessageBytes:
|
||||
@@ -364,18 +348,6 @@ void MeshtasticModGUI::on_fecParity_valueChanged(int value)
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void MeshtasticModGUI::on_crc_stateChanged(int state)
|
||||
{
|
||||
m_settings.m_hasCRC = (state == Qt::Checked);
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void MeshtasticModGUI::on_header_stateChanged(int state)
|
||||
{
|
||||
m_settings.m_hasHeader = (state == Qt::Checked);
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void MeshtasticModGUI::on_myCall_editingFinished()
|
||||
{
|
||||
m_settings.m_myCall = ui->myCall->text();
|
||||
@@ -403,7 +375,6 @@ void MeshtasticModGUI::on_report_editingFinished()
|
||||
void MeshtasticModGUI::on_resetMessages_clicked(bool checked)
|
||||
{
|
||||
(void) checked;
|
||||
m_settings.setDefaultTemplates();
|
||||
displayCurrentPayloadMessage();
|
||||
applySettings();
|
||||
}
|
||||
@@ -426,30 +397,13 @@ void MeshtasticModGUI::on_repeatMessage_valueChanged(int value)
|
||||
void MeshtasticModGUI::on_generateMessages_clicked(bool checked)
|
||||
{
|
||||
(void) checked;
|
||||
m_settings.generateMessages();
|
||||
displayCurrentPayloadMessage();
|
||||
applySettings();
|
||||
}
|
||||
|
||||
void MeshtasticModGUI::on_messageText_editingFinished()
|
||||
{
|
||||
if (m_settings.m_messageType == MeshtasticModSettings::MessageBeacon) {
|
||||
m_settings.m_beaconMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageCQ) {
|
||||
m_settings.m_cqMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageReply) {
|
||||
m_settings.m_replyMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageReport) {
|
||||
m_settings.m_reportMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageReplyReport) {
|
||||
m_settings.m_replyReportMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageRRR) {
|
||||
m_settings.m_rrrMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::Message73) {
|
||||
m_settings.m_73Message = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageQSOText) {
|
||||
m_settings.m_qsoTextMessage = ui->messageText->toPlainText();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageText) {
|
||||
if (m_settings.m_messageType == MeshtasticModSettings::MessageText) {
|
||||
m_settings.m_textMessage = ui->messageText->toPlainText();
|
||||
}
|
||||
|
||||
@@ -749,22 +703,6 @@ void MeshtasticModGUI::displayCurrentPayloadMessage()
|
||||
|
||||
if (m_settings.m_messageType == MeshtasticModSettings::MessageNone) {
|
||||
ui->messageText->clear();
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageBeacon) {
|
||||
ui->messageText->setText(m_settings.m_beaconMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageCQ) {
|
||||
ui->messageText->setText(m_settings.m_cqMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageReply) {
|
||||
ui->messageText->setText(m_settings.m_replyMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageReport) {
|
||||
ui->messageText->setText(m_settings.m_reportMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageReplyReport) {
|
||||
ui->messageText->setText(m_settings.m_replyReportMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageRRR) {
|
||||
ui->messageText->setText(m_settings.m_rrrMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::Message73) {
|
||||
ui->messageText->setText(m_settings.m_73Message);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageQSOText) {
|
||||
ui->messageText->setText(m_settings.m_qsoTextMessage);
|
||||
} else if (m_settings.m_messageType == MeshtasticModSettings::MessageText) {
|
||||
ui->messageText->setText(m_settings.m_textMessage);
|
||||
}
|
||||
@@ -838,8 +776,6 @@ void MeshtasticModGUI::makeUIConnections()
|
||||
QObject::connect(ui->syncWord, &QLineEdit::editingFinished, this, &MeshtasticModGUI::on_syncWord_editingFinished);
|
||||
QObject::connect(ui->channelMute, &QToolButton::toggled, this, &MeshtasticModGUI::on_channelMute_toggled);
|
||||
QObject::connect(ui->fecParity, &QDial::valueChanged, this, &MeshtasticModGUI::on_fecParity_valueChanged);
|
||||
QObject::connect(ui->crc, &QCheckBox::stateChanged, this, &MeshtasticModGUI::on_crc_stateChanged);
|
||||
QObject::connect(ui->header, &QCheckBox::stateChanged, this, &MeshtasticModGUI::on_header_stateChanged);
|
||||
QObject::connect(ui->myCall, &QLineEdit::editingFinished, this, &MeshtasticModGUI::on_myCall_editingFinished);
|
||||
QObject::connect(ui->urCall, &QLineEdit::editingFinished, this, &MeshtasticModGUI::on_urCall_editingFinished);
|
||||
QObject::connect(ui->myLocator, &QLineEdit::editingFinished, this, &MeshtasticModGUI::on_myLocator_editingFinished);
|
||||
|
||||
@@ -110,8 +110,6 @@ private slots:
|
||||
void on_syncWord_editingFinished();
|
||||
void on_channelMute_toggled(bool checked);
|
||||
void on_fecParity_valueChanged(int value);
|
||||
void on_crc_stateChanged(int state);
|
||||
void on_header_stateChanged(int state);
|
||||
void on_myCall_editingFinished();
|
||||
void on_urCall_editingFinished();
|
||||
void on_myLocator_editingFinished();
|
||||
|
||||
@@ -58,6 +58,8 @@ const int MeshtasticModSettings::bandwidths[] = {
|
||||
|
||||
const MeshtasticModSettings::CodingScheme MeshtasticModSettings::m_codingScheme = MeshtasticModSettings::CodingLoRa;
|
||||
const MeshtasticModSettings::MessageType MeshtasticModSettings::m_messageType = MeshtasticModSettings::MessageText;
|
||||
const bool MeshtasticModSettings::m_hasCRC = true;
|
||||
const bool MeshtasticModSettings::m_hasHeader = true;
|
||||
const int MeshtasticModSettings::nbBandwidths = 3*8 + 4;
|
||||
const int MeshtasticModSettings::oversampling = 4;
|
||||
|
||||
@@ -77,8 +79,6 @@ void MeshtasticModSettings::resetToDefaults()
|
||||
m_preambleChirps = 8;
|
||||
m_quietMillis = 1000;
|
||||
m_nbParityBits = 1;
|
||||
m_hasCRC = true;
|
||||
m_hasHeader = true;
|
||||
m_textMessage = "Hello LoRa";
|
||||
m_myCall = "MYCALL";
|
||||
m_urCall = "URCALL";
|
||||
@@ -101,41 +101,6 @@ void MeshtasticModSettings::resetToDefaults()
|
||||
m_reverseAPIChannelIndex = 0;
|
||||
m_workspaceIndex = 0;
|
||||
m_hidden = false;
|
||||
|
||||
setDefaultTemplates();
|
||||
}
|
||||
|
||||
void MeshtasticModSettings::setDefaultTemplates()
|
||||
{
|
||||
// %1: myCall %2: urCall %3: myLoc %4: report
|
||||
m_beaconMessage = "VVV DE %1 %2"; // Beacon
|
||||
m_cqMessage = "CQ DE %1 %2"; // caller calls CQ
|
||||
m_replyMessage = "%1 %2 %3"; // Reply to CQ from caller
|
||||
m_reportMessage = "%1 %2 %3"; // Report to caller
|
||||
m_replyReportMessage = "%1 %2 R%3"; // Report to callee
|
||||
m_rrrMessage = "%1 %2 RRR"; // RRR to callee
|
||||
m_73Message = "%1 %2 73"; // 73 to caller
|
||||
m_qsoTextMessage = "%1 %2 %3"; // Freeflow message to caller - %3 is m_textMessage
|
||||
}
|
||||
|
||||
void MeshtasticModSettings::generateMessages()
|
||||
{
|
||||
m_beaconMessage = m_beaconMessage
|
||||
.arg(m_myCall).arg(m_myLoc);
|
||||
m_cqMessage = m_cqMessage
|
||||
.arg(m_myCall).arg(m_myLoc);
|
||||
m_replyMessage = m_replyMessage
|
||||
.arg(m_urCall).arg(m_myCall).arg(m_myLoc);
|
||||
m_reportMessage = m_reportMessage
|
||||
.arg(m_urCall).arg(m_myCall).arg(m_myRpt);
|
||||
m_replyReportMessage = m_replyReportMessage
|
||||
.arg(m_urCall).arg(m_myCall).arg(m_myRpt);
|
||||
m_rrrMessage = m_rrrMessage
|
||||
.arg(m_urCall).arg(m_myCall);
|
||||
m_73Message = m_73Message
|
||||
.arg(m_urCall).arg(m_myCall);
|
||||
m_qsoTextMessage = m_qsoTextMessage
|
||||
.arg(m_urCall).arg(m_myCall).arg(m_textMessage);
|
||||
}
|
||||
|
||||
unsigned int MeshtasticModSettings::getNbSFDFourths() const
|
||||
@@ -173,14 +138,6 @@ QByteArray MeshtasticModSettings::serialize() const
|
||||
s.writeU32(10, m_preambleChirps);
|
||||
s.writeS32(11, m_quietMillis);
|
||||
s.writeBool(12, m_invertRamps);
|
||||
s.writeString(20, m_beaconMessage);
|
||||
s.writeString(21, m_cqMessage);
|
||||
s.writeString(22, m_replyMessage);
|
||||
s.writeString(23, m_reportMessage);
|
||||
s.writeString(24, m_replyReportMessage);
|
||||
s.writeString(25, m_rrrMessage);
|
||||
s.writeString(26, m_73Message);
|
||||
s.writeString(27, m_qsoTextMessage);
|
||||
s.writeString(28, m_textMessage);
|
||||
s.writeBlob(29, m_bytesMessage);
|
||||
s.writeS32(30, (int) m_messageType);
|
||||
@@ -247,19 +204,9 @@ bool MeshtasticModSettings::deserialize(const QByteArray& data)
|
||||
d.readS32(11, &m_quietMillis, 1000);
|
||||
d.readBool(11, &m_useReverseAPI, false);
|
||||
d.readBool(12, &m_invertRamps, false);
|
||||
d.readString(20, &m_beaconMessage, "VVV DE %1 %2");
|
||||
d.readString(21, &m_cqMessage, "CQ DE %1 %2");
|
||||
d.readString(22, &m_replyMessage, "%2 %1 %3");
|
||||
d.readString(23, &m_reportMessage, "%2 %1 %3");
|
||||
d.readString(24, &m_replyReportMessage, "%2 %1 R%3");
|
||||
d.readString(25, &m_rrrMessage, "%2 %1 RRR");
|
||||
d.readString(26, &m_73Message, "%2 %1 73");
|
||||
d.readString(27, &m_qsoTextMessage, "%2 %1 Hello LoRa");
|
||||
d.readString(28, &m_textMessage, "Hello LoRa");
|
||||
d.readBlob(29, &m_bytesMessage);
|
||||
d.readS32(31, &m_nbParityBits, 1);
|
||||
d.readBool(32, &m_hasCRC, true);
|
||||
d.readBool(33, &m_hasHeader, true);
|
||||
d.readString(40, &m_myCall, "MYCALL");
|
||||
d.readString(41, &m_urCall, "URCALL");
|
||||
d.readString(42, &m_myLoc, "AA00AA");
|
||||
@@ -360,32 +307,12 @@ void MeshtasticModSettings::applySettings(const QStringList& settingsKeys, const
|
||||
m_channelMarker->deserialize(settings.m_channelMarker->serialize());
|
||||
if (settingsKeys.contains("rollupState") && m_rollupState && settings.m_rollupState)
|
||||
m_rollupState->deserialize(settings.m_rollupState->serialize());
|
||||
if (settingsKeys.contains("beaconMessage"))
|
||||
m_beaconMessage = settings.m_beaconMessage;
|
||||
if (settingsKeys.contains("cqMessage"))
|
||||
m_cqMessage = settings.m_cqMessage;
|
||||
if (settingsKeys.contains("replyMessage"))
|
||||
m_replyMessage = settings.m_replyMessage;
|
||||
if (settingsKeys.contains("reportMessage"))
|
||||
m_reportMessage = settings.m_reportMessage;
|
||||
if (settingsKeys.contains("replyReportMessage"))
|
||||
m_replyReportMessage = settings.m_replyReportMessage;
|
||||
if (settingsKeys.contains("rrrMessage"))
|
||||
m_rrrMessage = settings.m_rrrMessage;
|
||||
if (settingsKeys.contains("73Message"))
|
||||
m_73Message = settings.m_73Message;
|
||||
if (settingsKeys.contains("qsoTextMessage"))
|
||||
m_qsoTextMessage = settings.m_qsoTextMessage;
|
||||
if (settingsKeys.contains("textMessage"))
|
||||
m_textMessage = settings.m_textMessage;
|
||||
if (settingsKeys.contains("bytesMessage"))
|
||||
m_bytesMessage = settings.m_bytesMessage;
|
||||
if (settingsKeys.contains("nbParityBits"))
|
||||
m_nbParityBits = settings.m_nbParityBits;
|
||||
if (settingsKeys.contains("hasCRC"))
|
||||
m_hasCRC = settings.m_hasCRC;
|
||||
if (settingsKeys.contains("hasHeader"))
|
||||
m_hasHeader = settings.m_hasHeader;
|
||||
if (settingsKeys.contains("myCall"))
|
||||
m_myCall = settings.m_myCall;
|
||||
if (settingsKeys.contains("urCall"))
|
||||
@@ -445,22 +372,6 @@ QString MeshtasticModSettings::getDebugString(const QStringList& settingsKeys, b
|
||||
debug += QString("Workspace Index: %1\n").arg(m_workspaceIndex);
|
||||
if (settingsKeys.contains("hidden") || force)
|
||||
debug += QString("Hidden: %1\n").arg(m_hidden);
|
||||
if (settingsKeys.contains("beaconMessage") || force)
|
||||
debug += QString("Beacon Message: %1\n").arg(m_beaconMessage);
|
||||
if (settingsKeys.contains("cqMessage") || force)
|
||||
debug += QString("CQ Message: %1\n").arg(m_cqMessage);
|
||||
if (settingsKeys.contains("replyMessage") || force)
|
||||
debug += QString("Reply Message: %1\n").arg(m_replyMessage);
|
||||
if (settingsKeys.contains("reportMessage") || force)
|
||||
debug += QString("Report Message: %1\n").arg(m_reportMessage);
|
||||
if (settingsKeys.contains("replyReportMessage") || force)
|
||||
debug += QString("Reply Report Message: %1\n").arg(m_replyReportMessage);
|
||||
if (settingsKeys.contains("rrrMessage") || force)
|
||||
debug += QString("RRR Message: %1\n").arg(m_rrrMessage);
|
||||
if (settingsKeys.contains("73Message") || force)
|
||||
debug += QString("73 Message: %1\n").arg(m_73Message);
|
||||
if (settingsKeys.contains("qsoTextMessage") || force)
|
||||
debug += QString("QSO Text Message: %1\n").arg(m_qsoTextMessage);
|
||||
if (settingsKeys.contains("textMessage") || force)
|
||||
debug += QString("Text Message: %1\n").arg(m_textMessage);
|
||||
if (settingsKeys.contains("messageType") || force)
|
||||
|
||||
@@ -60,8 +60,8 @@ struct MeshtasticModSettings
|
||||
unsigned int m_preambleChirps; //!< Number of preamble chirps
|
||||
int m_quietMillis; //!< Number of milliseconds to pause between transmissions
|
||||
int m_nbParityBits; //!< Hamming parity bits (LoRa)
|
||||
bool m_hasCRC; //!< Payload has CRC (LoRa)
|
||||
bool m_hasHeader; //!< Header present before actual payload (LoRa)
|
||||
static const bool m_hasCRC; //!< Payload has CRC (LoRa)
|
||||
static const bool m_hasHeader; //!< Header present before actual payload (LoRa)
|
||||
unsigned char m_syncWord;
|
||||
bool m_channelMute;
|
||||
static const CodingScheme m_codingScheme;
|
||||
@@ -70,14 +70,6 @@ struct MeshtasticModSettings
|
||||
QString m_myLoc; //!< QSO mode: my locator
|
||||
QString m_myRpt; //!< QSO mode: my report
|
||||
static const MessageType m_messageType;
|
||||
QString m_beaconMessage;
|
||||
QString m_cqMessage;
|
||||
QString m_replyMessage;
|
||||
QString m_reportMessage;
|
||||
QString m_replyReportMessage;
|
||||
QString m_rrrMessage;
|
||||
QString m_73Message;
|
||||
QString m_qsoTextMessage;
|
||||
QString m_textMessage;
|
||||
QByteArray m_bytesMessage;
|
||||
int m_messageRepeat;
|
||||
@@ -106,8 +98,6 @@ struct MeshtasticModSettings
|
||||
|
||||
MeshtasticModSettings();
|
||||
void resetToDefaults();
|
||||
void setDefaultTemplates();
|
||||
void generateMessages();
|
||||
unsigned int getNbSFDFourths() const; //!< Get the number of SFD period fourths (depends on coding scheme)
|
||||
bool hasSyncWord() const; //!< Only LoRa has a syncword (for the moment)
|
||||
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
|
||||
|
||||
Reference in New Issue
Block a user