VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-12-02 13:03:15 -05:00
Code Issues Projects Releases Wiki Activity

LoRa modulator: implement basic messaging

Browse Source
This commit is contained in:
f4exb 2020-02-14 18:04:20 +01:00
parent cb5463ce7f
commit d4ede8457b
13 changed files with 1028 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
plugins/channeltx/modlora/loramod.cpp
View File

@ -40,6 +40,7 @@
#include "loramod.h"
MESSAGE_CLASS_DEFINITION(LoRaMod::MsgConfigureLoRaMod, Message)
MESSAGE_CLASS_DEFINITION(LoRaMod::MsgReportPayloadTime, Message)
const QString LoRaMod::m_channelIdURI = "sdrangel.channeltx.modlora";
const QString LoRaMod::m_channelId = "LoRaMod";
@ -130,7 +131,7 @@ bool LoRaMod::handleMessage(const Message& cmd)
void LoRaMod::applySettings(const LoRaModSettings& settings, bool force)
{
qDebug() << "NFMMod::applySettings:"
qDebug() << "LoRaMod::applySettings:"
<< " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset
<< " m_rfBandwidth: " << settings.m_bandwidthIndex
<< " bandwidth: " << LoRaModSettings::bandwidths[settings.m_bandwidthIndex]
@ -154,6 +155,107 @@ void LoRaMod::applySettings(const LoRaModSettings& settings, bool force)
reverseAPIKeys.append("channelMute");
}
if ((settings.m_spreadFactor != m_settings.m_spreadFactor)
|| (settings.m_deBits != m_settings.m_deBits) || force) {
m_encoder.setNbSymbolBits(settings.m_spreadFactor - settings.m_deBits);
}
if ((settings.m_codingScheme != m_settings.m_codingScheme) || force) {
m_encoder.setCodingScheme(settings.m_codingScheme);
}
LoRaModBaseband::MsgConfigureLoRaModPayload *payloadMsg = nullptr;
std::vector<unsigned int> symbols;
if ((settings.m_messageType == LoRaModSettings::MessageNone)
&& ((settings.m_messageType != m_settings.m_messageType) || force))
{
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create();
}
else if ((settings.m_messageType == LoRaModSettings::MessageBeacon)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_beaconMessage != m_settings.m_beaconMessage) || force))
{
m_encoder.encodeString(m_settings.m_beaconMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageCQ)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_cqMessage != m_settings.m_cqMessage) || force))
{
m_encoder.encodeString(m_settings.m_cqMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageReply)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_replyMessage != m_settings.m_replyMessage) || force))
{
m_encoder.encodeString(m_settings.m_replyMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageReport)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_reportMessage != m_settings.m_reportMessage) || force))
{
m_encoder.encodeString(m_settings.m_reportMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageReplyReport)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_replyReportMessage != m_settings.m_replyReportMessage) || force))
{
m_encoder.encodeString(m_settings.m_replyReportMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageRRR)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_rrrMessage != m_settings.m_rrrMessage) || force))
{
m_encoder.encodeString(m_settings.m_rrrMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::Message73)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_73Message != m_settings.m_73Message) || force))
{
m_encoder.encodeString(m_settings.m_73Message, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageQSOText)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_qsoTextMessage != m_settings.m_qsoTextMessage) || force))
{
m_encoder.encodeString(m_settings.m_qsoTextMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageText)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_textMessage != m_settings.m_textMessage) || force))
{
m_encoder.encodeString(m_settings.m_textMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
else if ((settings.m_messageType == LoRaModSettings::MessageBytes)
&& ((settings.m_messageType != m_settings.m_messageType)
|| (settings.m_bytesMessage != m_settings.m_bytesMessage) || force))
{
m_encoder.encodeBytes(m_settings.m_bytesMessage, symbols);
payloadMsg = LoRaModBaseband::MsgConfigureLoRaModPayload::create(symbols);
}
if (payloadMsg)
{
m_basebandSource->getInputMessageQueue()->push(payloadMsg);
if (getMessageQueueToGUI())
{
MsgReportPayloadTime *rpt = MsgReportPayloadTime::create(
(symbols.size()*(1<<settings.m_spreadFactor)*1000) / LoRaModSettings::bandwidths[settings.m_bandwidthIndex]
);
getMessageQueueToGUI()->push(rpt);
}
}
if (m_settings.m_streamIndex != settings.m_streamIndex)
{
if (m_deviceAPI->getSampleMIMO()) // change of stream is possible for MIMO devices only
@ -406,3 +508,8 @@ uint32_t LoRaMod::getNumberOfDeviceStreams() const
{
return m_deviceAPI->getNbSinkStreams();
}
bool LoRaMod::getModulatorActive() const
{
return m_basebandSource->getActive();
}

22
plugins/channeltx/modlora/loramod.h
View File

@ -30,6 +30,7 @@
#include "util/message.h"
#include "loramodsettings.h"
#include "loramodencoder.h"
class QNetworkAccessManager;
class QNetworkReply;
@ -65,6 +66,25 @@ public:
{ }
};
class MsgReportPayloadTime : public Message {
MESSAGE_CLASS_DECLARATION
public:
unsigned int getPayloadTimeMs() const { return m_timeMs; }
static MsgReportPayloadTime* create(unsigned int timeMs) {
return new MsgReportPayloadTime(timeMs);
}
private:
unsigned int m_timeMs; //!< time in milliseconds
MsgReportPayloadTime(unsigned int timeMs) :
Message(),
m_timeMs(timeMs)
{}
};
//=================================================================
LoRaMod(DeviceAPI *deviceAPI);
@ -120,6 +140,7 @@ public:
CWKeyer *getCWKeyer();
void setLevelMeter(QObject *levelMeter);
uint32_t getNumberOfDeviceStreams() const;
bool getModulatorActive() const;
static const QString m_channelIdURI;
static const QString m_channelId;
@ -128,6 +149,7 @@ private:
DeviceAPI* m_deviceAPI;
QThread *m_thread;
LoRaModBaseband* m_basebandSource;
LoRaModEncoder m_encoder; // TODO: check if it needs to be on its own thread
LoRaModSettings m_settings;
SampleVector m_sampleBuffer;

14
plugins/channeltx/modlora/loramodbaseband.cpp
View File

@ -24,6 +24,7 @@
#include "loramodbaseband.h"
MESSAGE_CLASS_DEFINITION(LoRaModBaseband::MsgConfigureLoRaModBaseband, Message)
MESSAGE_CLASS_DEFINITION(LoRaModBaseband::MsgConfigureLoRaModPayload, Message)
LoRaModBaseband::LoRaModBaseband() :
m_mutex(QMutex::Recursive)
@ -134,20 +135,29 @@ bool LoRaModBaseband::handleMessage(const Message& cmd)
{
if (MsgConfigureLoRaModBaseband::match(cmd))
{
qDebug() << "LoRaModBaseband::handleMessage: MsgConfigureLoRaModBaseband";
QMutexLocker mutexLocker(&m_mutex);
MsgConfigureLoRaModBaseband& cfg = (MsgConfigureLoRaModBaseband&) cmd;
qDebug() << "LoRaModBaseband::handleMessage: MsgConfigureLoRaModBaseband";
applySettings(cfg.getSettings(), cfg.getForce());
return true;
}
else if (MsgConfigureLoRaModPayload::match(cmd))
{
QMutexLocker mutexLocker(&m_mutex);
MsgConfigureLoRaModPayload& cfg = (MsgConfigureLoRaModPayload&) cmd;
qDebug() << "LoRaModBaseband::handleMessage: MsgConfigureLoRaModPayload:" << cfg.getPayload().size();
m_source.setSymbols(cfg.getPayload());
return true;
}
else if (DSPSignalNotification::match(cmd))
{
QMutexLocker mutexLocker(&m_mutex);
DSPSignalNotification& notif = (DSPSignalNotification&) cmd;
qDebug() << "LoRaModBaseband::handleMessage: DSPSignalNotification: basebandSampleRate: " << notif.getSampleRate();
m_sampleFifo.resize(SampleSourceFifo::getSizePolicy(notif.getSampleRate()));
qDebug() << "LoRaModBaseband::handleMessage: DSPSignalNotification: basebandSampleRate: " << notif.getSampleRate();
m_channelizer->setBasebandSampleRate(notif.getSampleRate());
m_source.applyChannelSettings(
m_channelizer->getChannelSampleRate(),

25
plugins/channeltx/modlora/loramodbaseband.h
View File

@ -56,6 +56,30 @@ public:
{ }
};
class MsgConfigureLoRaModPayload : public Message {
MESSAGE_CLASS_DECLARATION
public:
const std::vector<unsigned int>& getPayload() const { return m_payload; }
static MsgConfigureLoRaModPayload* create() {
return new MsgConfigureLoRaModPayload();
}
static MsgConfigureLoRaModPayload* create(const std::vector<unsigned int>& payload) {
return new MsgConfigureLoRaModPayload(payload);
}
private:
std::vector<unsigned int> m_payload;
MsgConfigureLoRaModPayload() : // This is empty payload notification
Message()
{}
MsgConfigureLoRaModPayload(const std::vector<unsigned int>& payload) :
Message()
{ m_payload = payload; }
};
LoRaModBaseband();
~LoRaModBaseband();
void reset();
@ -63,6 +87,7 @@ public:
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
double getMagSq() const { return m_source.getMagSq(); }
int getChannelSampleRate() const;
bool getActive() const { return m_source.getActive(); }
signals:
/**

15
plugins/channeltx/modlora/loramodencoder.cpp
View File

@ -105,11 +105,26 @@ void LoRaModEncoder::encodeString(const QString& str, std::vector<unsigned int>&
case LoRaModSettings::CodingASCII:
encodeStringASCII(str, symbols);
break;
case LoRaModSettings::CodingLoRa:
// TODO
break;
default:
break;
}
}
void LoRaModEncoder::encodeBytes(const QByteArray& bytes, std::vector<unsigned int>& symbols)
{
switch (m_codingScheme)
{
case LoRaModSettings::CodingLoRa:
// TODO
break;
default:
break;
};
}
void LoRaModEncoder::encodeStringASCII(const QString& str, std::vector<unsigned int>& symbols)
{
if (m_nbSymbolBits != 7) {

1
plugins/channeltx/modlora/loramodencoder.h
View File

@ -30,6 +30,7 @@ public:
void setCodingScheme(LoRaModSettings::CodingScheme codingScheme) { m_codingScheme = codingScheme; }
void setNbSymbolBits(unsigned int symbolBits) { m_nbSymbolBits = symbolBits; }
void encodeString(const QString& str, std::vector<unsigned int>& symbols);
void encodeBytes(const QByteArray& bytes, std::vector<unsigned int>& symbols);
private:
enum TTYState

165
plugins/channeltx/modlora/loramodgui.cpp
View File

@ -105,6 +105,12 @@ bool LoRaModGUI::handleMessage(const Message& message)
blockApplySettings(false);
return true;
}
else if (LoRaMod::MsgReportPayloadTime::match(message))
{
const LoRaMod::MsgReportPayloadTime& rpt = (LoRaMod::MsgReportPayloadTime&) message;
ui->msgTimeText->setText(tr("%1").arg(rpt.getPayloadTimeMs()));
return true;
}
else if (DSPSignalNotification::match(message))
{
DSPSignalNotification& notif = (DSPSignalNotification&) message;
@ -216,6 +222,107 @@ void LoRaModGUI::on_syncWord_editingFinished()
}
}
void LoRaModGUI::on_scheme_currentIndexChanged(int index)
{
m_settings.m_codingScheme = (LoRaModSettings::CodingScheme) index;
applySettings();
}
void LoRaModGUI::on_myCall_editingFinished()
{
m_settings.m_myCall = ui->myCall->text();
applySettings();
}
void LoRaModGUI::on_urCall_editingFinished()
{
m_settings.m_urCall = ui->urCall->text();
applySettings();
}
void LoRaModGUI::on_myLocator_editingFinished()
{
m_settings.m_myLoc = ui->myLocator->text();
applySettings();
}
void LoRaModGUI::on_report_editingFinished()
{
m_settings.m_myRpt = ui->report->text();
applySettings();
}
void LoRaModGUI::on_msgType_currentIndexChanged(int index)
{
m_settings.m_messageType = (LoRaModSettings::MessageType) index;
displayCurrentPayloadMessage();
applySettings();
}
void LoRaModGUI::on_resetMessages_clicked(bool checked)
{
(void) checked;
m_settings.setDefaultTemplates();
displayCurrentPayloadMessage();
applySettings();
}
void LoRaModGUI::on_playMessage_clicked(bool checked)
{
(void) checked;
// Switch to message None then back to current message type to trigger sending process
LoRaModSettings::MessageType msgType = m_settings.m_messageType;
m_settings.m_messageType = LoRaModSettings::MessageNone;
applySettings();
m_settings.m_messageType = msgType;
applySettings();
}
void LoRaModGUI::on_repeatMessage_valueChanged(int value)
{
m_settings.m_messageRepeat = value;
ui->repeatText->setText(tr("%1").arg(m_settings.m_messageRepeat));
applySettings();
}
void LoRaModGUI::on_generateMessages_clicked(bool checked)
{
(void) checked;
m_settings.generateMessages();
displayCurrentPayloadMessage();
applySettings();
}
void LoRaModGUI::on_messageText_editingFinished()
{
if (m_settings.m_messageType == LoRaModSettings::MessageBeacon) {
m_settings.m_beaconMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageCQ) {
m_settings.m_cqMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageReply) {
m_settings.m_replyMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageReport) {
m_settings.m_reportMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageReplyReport) {
m_settings.m_replyReportMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageRRR) {
m_settings.m_rrrMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::Message73) {
m_settings.m_73Message = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageQSOText) {
m_settings.m_qsoTextMessage = ui->messageText->toPlainText();
} else if (m_settings.m_messageType == LoRaModSettings::MessageText) {
m_settings.m_textMessage = ui->messageText->toPlainText();
}
applySettings();
}
void LoRaModGUI::on_hexText_editingFinished()
{
}
void LoRaModGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{
(void) widget;
@ -351,6 +458,7 @@ void LoRaModGUI::displaySettings()
setWindowTitle(m_channelMarker.getTitle());
displayStreamIndex();
displayCurrentPayloadMessage();
blockApplySettings(true);
ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
@ -366,6 +474,14 @@ void LoRaModGUI::displaySettings()
ui->idleTimeText->setText(tr("%1").arg(m_settings.m_quietMillis / 1000.0, 0, 'f', 1));
ui->syncWord->setText((tr("%1").arg(m_settings.m_syncWord, 2, 16)));
ui->channelMute->setChecked(m_settings.m_channelMute);
ui->scheme->setCurrentIndex((int) m_settings.m_codingScheme);
ui->myCall->setText(m_settings.m_myCall);
ui->urCall->setText(m_settings.m_urCall);
ui->myLocator->setText(m_settings.m_myLoc);
ui->report->setText(m_settings.m_myRpt);
ui->repeatMessage->setValue(m_settings.m_messageRepeat);
ui->repeatText->setText(tr("%1").arg(m_settings.m_messageRepeat));
ui->msgType->setCurrentIndex((int) m_settings.m_messageType);
blockApplySettings(false);
}
@ -378,6 +494,35 @@ void LoRaModGUI::displayStreamIndex()
}
}
void LoRaModGUI::displayCurrentPayloadMessage()
{
ui->messageText->blockSignals(true);
if (m_settings.m_messageType == LoRaModSettings::MessageNone) {
ui->messageText->clear();
} else if (m_settings.m_messageType == LoRaModSettings::MessageBeacon) {
ui->messageText->setText(m_settings.m_beaconMessage);
} else if (m_settings.m_messageType == LoRaModSettings::MessageCQ) {
ui->messageText->setText(m_settings.m_cqMessage);
} else if (m_settings.m_messageType == LoRaModSettings::MessageReply) {
ui->messageText->setText(m_settings.m_replyMessage);
} else if (m_settings.m_messageType == LoRaModSettings::MessageReport) {
ui->messageText->setText(m_settings.m_reportMessage);
} else if (m_settings.m_messageType == LoRaModSettings::MessageReplyReport) {
ui->messageText->setText(m_settings.m_replyReportMessage);
} else if (m_settings.m_messageType == LoRaModSettings::MessageRRR) {
ui->messageText->setText(m_settings.m_rrrMessage);
} else if (m_settings.m_messageType == LoRaModSettings::Message73) {
ui->messageText->setText(m_settings.m_73Message);
} else if (m_settings.m_messageType == LoRaModSettings::MessageQSOText) {
ui->messageText->setText(m_settings.m_qsoTextMessage);
} else if (m_settings.m_messageType == LoRaModSettings::MessageText) {
ui->messageText->setText(m_settings.m_textMessage);
}
ui->messageText->blockSignals(false);
}
void LoRaModGUI::setBandwidths()
{
int maxBandwidth = m_basebandSampleRate / LoRaModSettings::oversampling;
@ -407,7 +552,21 @@ void LoRaModGUI::enterEvent(QEvent*)
void LoRaModGUI::tick()
{
double powDb = CalcDb::dbPower(m_loRaMod->getMagSq());
m_channelPowerDbAvg(powDb);
ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.asDouble(), 0, 'f', 1));
if (m_tickCount < 10)
{
m_tickCount++;
}
else
{
m_tickCount = 0;
double powDb = CalcDb::dbPower(m_loRaMod->getMagSq());
m_channelPowerDbAvg(powDb);
ui->channelPower->setText(tr("%1 dB").arg(m_channelPowerDbAvg.asDouble(), 0, 'f', 1));
if (m_loRaMod->getModulatorActive()) {
ui->playMessage->setStyleSheet("QPushButton { background-color : green; }");
} else {
ui->playMessage->setStyleSheet("QPushButton { background:rgb(79,79,79); }");
}
}
}

13
plugins/channeltx/modlora/loramodgui.h
View File

@ -78,6 +78,7 @@ private:
void applySettings(bool force = false);
void displaySettings();
void displayStreamIndex();
void displayCurrentPayloadMessage();
void setBandwidths();
void leaveEvent(QEvent*);
@ -93,6 +94,18 @@ private slots:
void on_idleTime_valueChanged(int value);
void on_syncWord_editingFinished();
void on_channelMute_toggled(bool checked);
void on_scheme_currentIndexChanged(int index);
void on_myCall_editingFinished();
void on_urCall_editingFinished();
void on_myLocator_editingFinished();
void on_report_editingFinished();
void on_msgType_currentIndexChanged(int index);
void on_resetMessages_clicked(bool checked);
void on_playMessage_clicked(bool checked);
void on_repeatMessage_valueChanged(int value);
void on_generateMessages_clicked(bool checked);
void on_messageText_editingFinished();
void on_hexText_editingFinished();
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDialogCalled(const QPoint& p);
void tick();

535
plugins/channeltx/modlora/loramodgui.ui
View File

@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>350</width>
<height>220</height>
<width>380</width>
<height>411</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>350</width>
<width>380</width>
<height>180</height>
</size>
</property>
@ -30,7 +30,7 @@
<rect>
<x>10</x>
<y>20</y>
<width>331</width>
<width>370</width>
<height>150</height>
</rect>
</property>
@ -74,7 +74,7 @@
<rect>
<x>40</x>
<y>50</y>
<width>170</width>
<width>221</width>
<height>16</height>
</rect>
</property>
@ -102,7 +102,7 @@
<rect>
<x>40</x>
<y>70</y>
<width>70</width>
<width>81</width>
<height>16</height>
</rect>
</property>
@ -131,7 +131,7 @@
<widget class="QLabel" name="spreadText">
<property name="geometry">
<rect>
<x>120</x>
<x>130</x>
<y>70</y>
<width>30</width>
<height>16</height>
@ -153,7 +153,7 @@
<widget class="QLabel" name="bwText">
<property name="geometry">
<rect>
<x>240</x>
<x>280</x>
<y>50</y>
<width>80</width>
<height>16</height>
@ -175,7 +175,7 @@
<widget class="QLabel" name="deBitsLabel">
<property name="geometry">
<rect>
<x>170</x>
<x>180</x>
<y>70</y>
<width>32</width>
<height>16</height>
@ -188,7 +188,7 @@
<widget class="QLabel" name="deBitsText">
<property name="geometry">
<rect>
<x>290</x>
<x>320</x>
<y>70</y>
<width>30</width>
<height>16</height>
@ -210,9 +210,9 @@
<widget class="QSlider" name="deBits">
<property name="geometry">
<rect>
<x>210</x>
<x>220</x>
<y>70</y>
<width>70</width>
<width>81</width>
<height>16</height>
</rect>
</property>
@ -243,7 +243,7 @@
<rect>
<x>10</x>
<y>10</y>
<width>311</width>
<width>351</width>
<height>26</height>
</rect>
</property>
@ -366,7 +366,7 @@
<rect>
<x>40</x>
<y>90</y>
<width>70</width>
<width>81</width>
<height>16</height>
</rect>
</property>
@ -408,7 +408,7 @@
<widget class="QLabel" name="preambleChirpsText">
<property name="geometry">
<rect>
<x>120</x>
<x>130</x>
<y>90</y>
<width>30</width>
<height>16</height>
@ -430,7 +430,7 @@
<widget class="QLabel" name="idleTimeLabel">
<property name="geometry">
<rect>
<x>170</x>
<x>180</x>
<y>90</y>
<width>32</width>
<height>16</height>
@ -443,9 +443,9 @@
<widget class="QSlider" name="idleTime">
<property name="geometry">
<rect>
<x>210</x>
<x>220</x>
<y>90</y>
<width>70</width>
<width>81</width>
<height>16</height>
</rect>
</property>
@ -456,7 +456,7 @@
<number>1</number>
</property>
<property name="maximum">
<number>600</number>
<number>900</number>
</property>
<property name="pageStep">
<number>1</number>
@ -474,7 +474,7 @@
<widget class="QLabel" name="idleTimeText">
<property name="geometry">
<rect>
<x>290</x>
<x>320</x>
<y>90</y>
<width>30</width>
<height>16</height>
@ -497,7 +497,7 @@
<property name="geometry">
<rect>
<x>2</x>
<y>110</y>
<y>114</y>
<width>32</width>
<height>16</height>
</rect>
@ -510,9 +510,9 @@
<property name="geometry">
<rect>
<x>40</x>
<y>110</y>
<y>112</y>
<width>30</width>
<height>16</height>
<height>20</height>
</rect>
</property>
<property name="focusPolicy">
@ -528,6 +528,490 @@
<string>00</string>
</property>
</widget>
<widget class="QLabel" name="schemeLabel">
<property name="geometry">
<rect>
<x>90</x>
<y>114</y>
<width>50</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Scheme</string>
</property>
</widget>
<widget class="QComboBox" name="scheme">
<property name="geometry">
<rect>
<x>140</x>
<y>112</y>
<width>86</width>
<height>20</height>
</rect>
</property>
<item>
<property name="text">
<string>LoRa</string>
</property>
</item>
<item>
<property name="text">
<string>ASCII</string>
</property>
</item>
<item>
<property name="text">
<string>TTY</string>
</property>
</item>
</widget>
</widget>
<widget class="QWidget" name="messageContainer" native="true">
<property name="geometry">
<rect>
<x>10</x>
<y>180</y>
<width>370</width>
<height>210</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>210</height>
</size>
</property>
<property name="windowTitle">
<string>Payload</string>
</property>
<widget class="QLabel" name="qsoLabel">
<property name="geometry">
<rect>
<x>2</x>
<y>10</y>
<width>32</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>QSO</string>
</property>
</widget>
<widget class="QLabel" name="myCallLabel">
<property name="geometry">
<rect>
<x>40</x>
<y>10</y>
<width>40</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>MyCall</string>
</property>
</widget>
<widget class="QLabel" name="urCallLabel">
<property name="geometry">
<rect>
<x>200</x>
<y>10</y>
<width>50</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>YourCall</string>
</property>
</widget>
<widget class="QLineEdit" name="myCall">
<property name="geometry">
<rect>
<x>90</x>
<y>10</y>
<width>90</width>
<height>16</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="toolTip">
<string>Caller callsign</string>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>10</number>
</property>
</widget>
<widget class="QLineEdit" name="urCall">
<property name="geometry">
<rect>
<x>260</x>
<y>10</y>
<width>90</width>
<height>16</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="toolTip">
<string>Callee callsign</string>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>10</number>
</property>
</widget>
<widget class="QLabel" name="myLocatorLabel">
<property name="geometry">
<rect>
<x>40</x>
<y>30</y>
<width>40</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>MyLoc</string>
</property>
</widget>
<widget class="QLineEdit" name="myLocator">
<property name="geometry">
<rect>
<x>90</x>
<y>30</y>
<width>90</width>
<height>16</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="toolTip">
<string>Caller QRA locator</string>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>10</number>
</property>
</widget>
<widget class="QLabel" name="reportLabel">
<property name="geometry">
<rect>
<x>200</x>
<y>30</y>
<width>50</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Report</string>
</property>
</widget>
<widget class="QLineEdit" name="report">
<property name="geometry">
<rect>
<x>260</x>
<y>30</y>
<width>90</width>
<height>16</height>
</rect>
</property>
<property name="focusPolicy">
<enum>Qt::ClickFocus</enum>
</property>
<property name="toolTip">
<string>Report to callee</string>
</property>
<property name="text">
<string/>
</property>
<property name="maxLength">
<number>10</number>
</property>
</widget>
<widget class="QPushButton" name="generateMessages">
<property name="geometry">
<rect>
<x>310</x>
<y>58</y>
<width>40</width>
<height>20</height>
</rect>
</property>
<property name="toolTip">
<string>Generate standard messages</string>
</property>
<property name="text">
<string>Gen</string>
</property>
</widget>
<widget class="QComboBox" name="msgType">
<property name="geometry">
<rect>
<x>40</x>
<y>58</y>
<width>90</width>
<height>20</height>
</rect>
</property>
<property name="toolTip">
<string>Message type</string>
</property>
<item>
<property name="text">
<string>None</string>
</property>
</item>
<item>
<property name="text">
<string>Beacon</string>
</property>
</item>
<item>
<property name="text">
<string>CQ</string>
</property>
</item>
<item>
<property name="text">
<string>Reply</string>
</property>
</item>
<item>
<property name="text">
<string>Report</string>
</property>
</item>
<item>
<property name="text">
<string>R-Report</string>
</property>
</item>
<item>
<property name="text">
<string>RRR</string>
</property>
</item>
<item>
<property name="text">
<string>73</string>
</property>
</item>
<item>
<property name="text">
<string>QSO Text</string>
</property>
</item>
<item>
<property name="text">
<string>Text</string>
</property>
</item>
<item>
<property name="text">
<string>Bytes</string>
</property>
</item>
<item>
<property name="text">
<string>Test</string>
</property>
</item>
</widget>
<widget class="QLabel" name="msgLabel">
<property name="geometry">
<rect>
<x>2</x>
<y>60</y>
<width>32</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Msg</string>
</property>
</widget>
<widget class="CustomTextEdit" name="messageText">
<property name="geometry">
<rect>
<x>40</x>
<y>90</y>
<width>311</width>
<height>60</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="hexLabel">
<property name="geometry">
<rect>
<x>2</x>
<y>160</y>
<width>32</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Hex</string>
</property>
</widget>
<widget class="QLineEdit" name="hexText">
<property name="geometry">
<rect>
<x>40</x>
<y>160</y>
<width>311</width>
<height>20</height>
</rect>
</property>
</widget>
<widget class="QPushButton" name="resetMessages">
<property name="geometry">
<rect>
<x>140</x>
<y>58</y>
<width>20</width>
<height>20</height>
</rect>
</property>
<property name="toolTip">
<string>Restore default message templates</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
</property>
</widget>
<widget class="QPushButton" name="playMessage">
<property name="geometry">
<rect>
<x>170</x>
<y>58</y>
<width>20</width>
<height>20</height>
</rect>
</property>
<property name="toolTip">
<string>Play message</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/play.png</normaloff>:/play.png</iconset>
</property>
<property name="checkable">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="repeatLabel">
<property name="geometry">
<rect>
<x>200</x>
<y>60</y>
<width>51</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Repeat</string>
</property>
</widget>
<widget class="QDial" name="repeatMessage">
<property name="geometry">
<rect>
<x>250</x>
<y>56</y>
<width>24</width>
<height>24</height>
</rect>
</property>
<property name="toolTip">
<string>Message repetition (0 for infinite)</string>
</property>
<property name="maximum">
<number>20</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>1</number>
</property>
</widget>
<widget class="QLabel" name="repeatText">
<property name="geometry">
<rect>
<x>280</x>
<y>60</y>
<width>22</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="msgTimeLabel">
<property name="geometry">
<rect>
<x>2</x>
<y>190</y>
<width>40</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Time</string>
</property>
</widget>
<widget class="QLabel" name="msgTimeText">
<property name="geometry">
<rect>
<x>40</x>
<y>190</y>
<width>50</width>
<height>16</height>
</rect>
</property>
<property name="toolTip">
<string>Payload time in milliseconds</string>
</property>
<property name="text">
<string>00000</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="msgTimeUnits">
<property name="geometry">
<rect>
<x>95</x>
<y>190</y>
<width>20</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>ms</string>
</property>
</widget>
</widget>
</widget>
<customwidgets>
@ -543,6 +1027,11 @@
<header>gui/valuedialz.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>CustomTextEdit</class>
<extends>QTextEdit</extends>
<header>gui/customtextedit.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../../../sdrgui/resources/res.qrc"/>

80
plugins/channeltx/modlora/loramodsettings.cpp
View File

@ -42,9 +42,15 @@ void LoRaModSettings::resetToDefaults()
m_deBits = 0;
m_preambleChirps = 8;
m_quietMillis = 1000;
m_message = "Hello LoRa";
m_codingScheme = CodingLoRa;
m_textMessage = "Hello LoRa";
m_myCall = "MYCALL";
m_urCall = "URCALL";
m_myLoc = "AA00AA";
m_myRpt = "59";
m_syncWord = 0x34;
m_channelMute = false;
m_messageRepeat = 1;
m_rgbColor = QColor(255, 0, 255).rgb();
m_title = "LoRa Modulator";
m_streamIndex = 0;
@ -53,7 +59,40 @@ void LoRaModSettings::resetToDefaults()
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_reverseAPIChannelIndex = 0;
setDefaultTemplates();
}
void LoRaModSettings::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 LoRaModSettings::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);
}
QByteArray LoRaModSettings::serialize() const
@ -62,7 +101,7 @@ QByteArray LoRaModSettings::serialize() const
s.writeS32(1, m_inputFrequencyOffset);
s.writeS32(2, m_bandwidthIndex);
s.writeS32(3, m_spreadFactor);
s.writeString(4, m_message);
s.writeS32(4, m_codingScheme);
if (m_channelMarker) {
s.writeBlob(5, m_channelMarker->serialize());
@ -79,6 +118,22 @@ QByteArray LoRaModSettings::serialize() const
s.writeU32(14, m_reverseAPIPort);
s.writeU32(15, m_reverseAPIDeviceIndex);
s.writeU32(16, m_reverseAPIChannelIndex);
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);
s.writeString(40, m_myCall);
s.writeString(41, m_urCall);
s.writeString(42, m_myLoc);
s.writeString(43, m_myRpt);
s.writeS32(44, m_messageRepeat);
return s.final();
}
@ -97,11 +152,13 @@ bool LoRaModSettings::deserialize(const QByteArray& data)
{
QByteArray bytetmp;
unsigned int utmp;
int tmp;
d.readS32(1, &m_inputFrequencyOffset, 0);
d.readS32(2, &m_bandwidthIndex, 0);
d.readS32(3, &m_spreadFactor, 0);
d.readString(4, &m_message, "Hello LoRa");
d.readS32(4, &tmp, 0);
m_codingScheme = (CodingScheme) tmp;
if (m_channelMarker)
{
@ -130,6 +187,23 @@ bool LoRaModSettings::deserialize(const QByteArray& data)
m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp;
d.readU32(15, &utmp, 0);
m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp;
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(30, &tmp, 0);
m_messageType = (MessageType) tmp;
d.readString(40, &m_myCall, "MYCALL");
d.readString(41, &m_urCall, "URCALL");
d.readString(42, &m_myLoc, "AA00AA");
d.readString(43, &m_myRpt, "59");
d.readS32(44, &m_messageRepeat, 1);
return true;
}

35
plugins/channeltx/modlora/loramodsettings.h
View File

@ -29,9 +29,25 @@ struct LoRaModSettings
{
enum CodingScheme
{
CodingTTY, //!< plain TTY (5 bits)
CodingLoRa, //!< Standard LoRa
CodingASCII, //!< plain ASCII (7 bits)
CodingLoRa //!< Standard LoRa
CodingTTY //!< plain TTY (5 bits)
};
enum MessageType
{
MessageNone,
MessageBeacon,
MessageCQ,
MessageReply,
MessageReport,
MessageReplyReport,
MessageRRR,
Message73,
MessageQSOText,
MessageText,
MessageBytes,
MessageTest
};
int m_inputFrequencyOffset;
@ -43,11 +59,22 @@ struct LoRaModSettings
unsigned char m_syncWord;
bool m_channelMute;
CodingScheme m_codingScheme;
QString m_message; //!< Freeflow message
QString m_myCall; //!< QSO mode: my callsign
QString m_urCall; //!< QSO mode: your callsign
QString m_myLoc; //!< QSO mode: my locator
QString m_myRpt; //!< QSO mode: my report
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;
uint32_t m_rgbColor;
QString m_title;
int m_streamIndex;
@ -65,6 +92,8 @@ struct LoRaModSettings
LoRaModSettings();
void resetToDefaults();
void setDefaultTemplates();
void generateMessages();
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
QByteArray serialize() const;
bool deserialize(const QByteArray& data);

49
plugins/channeltx/modlora/loramodsource.cpp
View File

@ -30,7 +30,9 @@ LoRaModSource::LoRaModSource() :
m_modPhasor(0.0f),
m_levelCalcCount(0),
m_peakLevel(0.0f),
m_levelSum(0.0f)
m_levelSum(0.0f),
m_repeatCount(0),
m_active(false)
{
m_magsq = 0.0;
@ -184,11 +186,36 @@ void LoRaModSource::modulateSample()
m_modSample = Complex{0.0, 0.0};
m_sampleCounter++;
if (m_sampleCounter == m_quietSamples*LoRaModSettings::oversampling)
if (m_sampleCounter == m_quietSamples*LoRaModSettings::oversampling) // done with quiet time
{
m_chirp0 = 0;
m_chirp = m_fftLength*LoRaModSettings::oversampling - 1;
m_state = LoRaStatePreamble;
if (m_symbols.size() != 0) // some payload to transmit
{
if (m_settings.m_messageRepeat == 0) // infinite
{
m_state = LoRaStatePreamble;
m_active = true;
}
else
{
if (m_repeatCount != 0)
{
m_repeatCount--;
m_state = LoRaStatePreamble;
m_active = true;
}
else
{
m_active = false;
}
}
}
else
{
m_active = false;
}
}
}
else if (m_state == LoRaStatePreamble)
@ -356,6 +383,10 @@ void LoRaModSource::applySettings(const LoRaModSettings& settings, bool force)
reset();
}
if ((settings.m_messageRepeat != m_settings.m_messageRepeat) || force) {
m_repeatCount = settings.m_messageRepeat;
}
m_settings = settings;
}
@ -388,4 +419,14 @@ void LoRaModSource::applyChannelSettings(int channelSampleRate, int bandwidth, i
m_quietSamples = (bandwidth*m_settings.m_quietMillis) / 1000;
m_state = LoRaStateIdle;
reset();
}
}
void LoRaModSource::setSymbols(const std::vector<unsigned int>& symbols)
{
m_symbols = symbols;
qDebug("LoRaModSource::setSymbols: m_symbols: %lu", m_symbols.size());
m_repeatCount = m_settings.m_messageRepeat;
m_state = LoRaStateIdle; // first reset to idle
reset();
m_sampleCounter = m_quietSamples*LoRaModSettings::oversampling - 1; // start immediately
}

4
plugins/channeltx/modlora/loramodsource.h
View File

@ -47,6 +47,8 @@ public:
}
void applySettings(const LoRaModSettings& settings, bool force = false);
void applyChannelSettings(int channelSampleRate, int bandwidth, int channelFrequencyOffset, bool force = false);
void setSymbols(const std::vector<unsigned int>& symbols);
bool getActive() const { return m_active; }
private:
enum LoRaMode
@ -83,6 +85,8 @@ private:
unsigned int m_chirpCount; //!< chirp or quarter chirp counter
unsigned int m_quietSamples; //!< number of samples during quiet period
unsigned int m_quarterSamples; //!< number of samples in a quarter chirp
unsigned int m_repeatCount; //!< message repetition counter
bool m_active; //!< modulator is in a sending sequence (icluding periodic quiet times)
NCO m_carrierNco;
double m_modPhasor; //!< baseband modulator phasor