VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-04 15:04:38 -04:00
Code Issues Projects Releases Wiki Activity

LoRa demod: REST API

Browse Source
This commit is contained in:
f4exb
2020-02-23 16:33:21 +01:00
parent 9aaa4756a2
commit 33f066c1c1
34 changed files with 3141 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/demodlora/CMakeLists.txt
+3 -1
View File
@@ -30,6 +30,7 @@ set(lora_HEADERS
)
include_directories(
${CMAKE_SOURCE_DIR}/swagger/sdrangel/code/qt5/client
)
add_library(demodlora SHARED
@@ -40,7 +41,8 @@ target_link_libraries(demodlora
Qt5::Core
Qt5::Widgets
sdrbase
sdrgui
sdrgui
swagger
)
install(TARGETS demodlora DESTINATION ${INSTALL_PLUGINS_DIR})
plugins/channelrx/demodlora/lorademod.cpp
+424 -28
View File
@@ -23,9 +23,17 @@
#include <QTime>
#include <QDebug>
#include <QThread>
#include <QNetworkAccessManager>
#include <QNetworkReply>
#include <QBuffer>
#include "dsp/dspcommands.h"
#include "device/deviceapi.h"
#include "util/db.h"
#include "SWGChannelSettings.h"
#include "SWGChannelReport.h"
#include "SWGLoRaDemodReport.h"
#include "lorademodmsg.h"
#include "lorademod.h"
@@ -40,7 +48,20 @@ const QString LoRaDemod::m_channelId = "LoRaDemod";
LoRaDemod::LoRaDemod(DeviceAPI* deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI),
m_basebandSampleRate(0)
m_basebandSampleRate(0),
m_lastMsgSignalDb(0.0),
m_lastMsgNoiseDb(0.0),
m_lastMsgSyncWord(0),
m_lastMsgPacketLength(0),
m_lastMsgNbParityBits(0),
m_lastMsgHasCRC(false),
m_lastMsgNbSymbols(0),
m_lastMsgNbCodewords(0),
m_lastMsgEarlyEOM(false),
m_lastMsgHeaderCRC(false),
m_lastMsgHeaderParityStatus(0),
m_lastMsgPayloadCRC(false),
m_lastMsgPayloadParityStatus(0)
{
setObjectName(m_channelId);
@@ -104,42 +125,62 @@ bool LoRaDemod::handleMessage(const Message& cmd)
{
qDebug() << "LoRaDemod::handleMessage: MsgDecodeSymbols";
LoRaDemodMsg::MsgDecodeSymbols& msg = (LoRaDemodMsg::MsgDecodeSymbols&) cmd;
m_lastMsgSignalDb = msg.getSingalDb();
m_lastMsgNoiseDb = msg.getNoiseDb();
m_lastMsgSyncWord = msg.getSyncWord();
if (m_settings.m_codingScheme == LoRaDemodSettings::CodingLoRa)
{
QByteArray payload;
m_decoder.decodeSymbols(msg.getSymbols(), payload);
m_decoder.decodeSymbols(msg.getSymbols(), m_lastMsgBytes);
QDateTime dt = QDateTime::currentDateTime();
m_lastMsgTimestamp = dt.toString(Qt::ISODateWithMs);
m_lastMsgPacketLength = m_decoder.getPacketLength();
m_lastMsgNbParityBits = m_decoder.getNbParityBits();
m_lastMsgHasCRC = m_decoder.getHasCRC();
m_lastMsgNbSymbols = m_decoder.getNbSymbols();
m_lastMsgNbCodewords = m_decoder.getNbCodewords();
m_lastMsgEarlyEOM = m_decoder.getEarlyEOM();
m_lastMsgHeaderCRC = m_decoder.getHeaderCRCStatus();
m_lastMsgHeaderParityStatus = m_decoder.getHeaderParityStatus();
m_lastMsgPayloadCRC = m_decoder.getPayloadCRCStatus();
m_lastMsgPayloadParityStatus = m_decoder.getPayloadParityStatus();
QByteArray bytesCopy(m_lastMsgBytes);
bytesCopy.truncate(m_lastMsgPacketLength);
bytesCopy.replace('\0', " ");
m_lastMsgString = QString(bytesCopy.toStdString().c_str());
if (getMessageQueueToGUI())
{
MsgReportDecodeBytes *msgToGUI = MsgReportDecodeBytes::create(payload);
msgToGUI->setSyncWord(msg.getSyncWord());
msgToGUI->setSignalDb(msg.getSingalDb());
msgToGUI->setNoiseDb(msg.getNoiseDb());
msgToGUI->setPacketSize(m_decoder.getPacketLength());
msgToGUI->setNbParityBits(m_decoder.getNbParityBits());
msgToGUI->setHasCRC(m_decoder.getHasCRC());
msgToGUI->setNbSymbols(m_decoder.getNbSymbols());
msgToGUI->setNbCodewords(m_decoder.getNbCodewords());
msgToGUI->setEarlyEOM(m_decoder.getEarlyEOM());
msgToGUI->setHeaderParityStatus(m_decoder.getHeaderParityStatus());
msgToGUI->setHeaderCRCStatus(m_decoder.getHeaderCRCStatus());
msgToGUI->setPayloadParityStatus(m_decoder.getPayloadParityStatus());
msgToGUI->setPayloadCRCStatus(m_decoder.getPayloadCRCStatus());
MsgReportDecodeBytes *msgToGUI = MsgReportDecodeBytes::create(m_lastMsgBytes);
msgToGUI->setSyncWord(m_lastMsgSyncWord);
msgToGUI->setSignalDb(m_lastMsgSignalDb);
msgToGUI->setNoiseDb(m_lastMsgNoiseDb);
msgToGUI->setPacketSize(m_lastMsgPacketLength);
msgToGUI->setNbParityBits(m_lastMsgNbParityBits);
msgToGUI->setHasCRC(m_lastMsgHasCRC);
msgToGUI->setNbSymbols(m_lastMsgNbSymbols);
msgToGUI->setNbCodewords(m_lastMsgNbCodewords);
msgToGUI->setEarlyEOM(m_lastMsgEarlyEOM);
msgToGUI->setHeaderParityStatus(m_lastMsgHeaderParityStatus);
msgToGUI->setHeaderCRCStatus(m_lastMsgHeaderCRC);
msgToGUI->setPayloadParityStatus(m_lastMsgPayloadParityStatus);
msgToGUI->setPayloadCRCStatus(m_lastMsgPayloadCRC);
getMessageQueueToGUI()->push(msgToGUI);
}
}
else
{
QString payload;
m_decoder.decodeSymbols(msg.getSymbols(), payload);
m_decoder.decodeSymbols(msg.getSymbols(), m_lastMsgString);
QDateTime dt = QDateTime::currentDateTime();
m_lastMsgTimestamp = dt.toString(Qt::ISODateWithMs);
if (getMessageQueueToGUI())
{
MsgReportDecodeString *msgToGUI = MsgReportDecodeString::create(payload);
msgToGUI->setSyncWord(msg.getSyncWord());
msgToGUI->setSignalDb(msg.getSingalDb());
msgToGUI->setNoiseDb(msg.getNoiseDb());
MsgReportDecodeString *msgToGUI = MsgReportDecodeString::create(m_lastMsgString);
msgToGUI->setSyncWord(m_lastMsgSyncWord);
msgToGUI->setSignalDb(m_lastMsgSignalDb);
msgToGUI->setNoiseDb(m_lastMsgNoiseDb);
getMessageQueueToGUI()->push(msgToGUI);
}
}
@@ -207,38 +248,393 @@ void LoRaDemod::applySettings(const LoRaDemodSettings& settings, bool force)
<< " m_title: " << settings.m_title
<< " force: " << force;
QList<QString> reverseAPIKeys;
if ((settings.m_inputFrequencyOffset != m_settings.m_inputFrequencyOffset) || force) {
reverseAPIKeys.append("inputFrequencyOffset");
}
if ((settings.m_bandwidthIndex != m_settings.m_bandwidthIndex) || force) {
reverseAPIKeys.append("bandwidthIndex");
}
if ((settings.m_spreadFactor != m_settings.m_spreadFactor) || force) {
reverseAPIKeys.append("spreadFactor");
}
if ((settings.m_deBits != m_settings.m_deBits) || force) {
reverseAPIKeys.append("deBits");
}
if ((settings.m_spreadFactor != m_settings.m_spreadFactor)
|| (settings.m_deBits != m_settings.m_deBits) || force) {
m_decoder.setNbSymbolBits(settings.m_spreadFactor, settings.m_deBits);
}
if ((settings.m_codingScheme != m_settings.m_codingScheme) || force) {
if ((settings.m_codingScheme != m_settings.m_codingScheme) || force)
{
reverseAPIKeys.append("codingScheme");
m_decoder.setCodingScheme(settings.m_codingScheme);
}
if ((settings.m_hasHeader != m_settings.m_hasHeader) || force) {
if ((settings.m_hasHeader != m_settings.m_hasHeader) || force)
{
reverseAPIKeys.append("hasHeader");
m_decoder.setLoRaHasHeader(settings.m_hasHeader);
}
if ((settings.m_hasCRC != m_settings.m_hasCRC) || force) {
if ((settings.m_hasCRC != m_settings.m_hasCRC) || force)
{
reverseAPIKeys.append("hasCRC");
m_decoder.setLoRaHasCRC(settings.m_hasCRC);
}
if ((settings.m_nbParityBits != m_settings.m_nbParityBits) || force) {
if ((settings.m_nbParityBits != m_settings.m_nbParityBits) || force)
{
reverseAPIKeys.append("nbParityBits");
m_decoder.setLoRaParityBits(settings.m_nbParityBits);
}
if ((settings.m_packetLength != m_settings.m_packetLength) || force) {
if ((settings.m_packetLength != m_settings.m_packetLength) || force)
{
reverseAPIKeys.append("packetLength");
m_decoder.setLoRaPacketLength(settings.m_packetLength);
}
if ((settings.m_decodeActive != m_settings.m_decodeActive) || force) {
reverseAPIKeys.append("decodeActive");
}
if ((settings.m_eomSquelchTenths != m_settings.m_eomSquelchTenths) || force) {
reverseAPIKeys.append("eomSquelchTenths");
}
if ((settings.m_nbSymbolsMax != m_settings.m_nbSymbolsMax) || force) {
reverseAPIKeys.append("nbSymbolsMax");
}
if ((settings.m_preambleChirps != m_settings.m_preambleChirps) || force) {
reverseAPIKeys.append("preambleChirps");
}
if ((settings.m_rgbColor != m_settings.m_rgbColor) || force) {
reverseAPIKeys.append("rgbColor");
}
if ((settings.m_title != m_settings.m_title) || force) {
reverseAPIKeys.append("title");
}
if (m_settings.m_streamIndex != settings.m_streamIndex)
{
if (m_deviceAPI->getSampleMIMO()) // change of stream is possible for MIMO devices only
{
m_deviceAPI->removeChannelSinkAPI(this);
m_deviceAPI->removeChannelSink(this, m_settings.m_streamIndex);
m_deviceAPI->addChannelSink(this, settings.m_streamIndex);
m_deviceAPI->addChannelSinkAPI(this);
}
reverseAPIKeys.append("streamIndex");
}
LoRaDemodBaseband::MsgConfigureLoRaDemodBaseband *msg = LoRaDemodBaseband::MsgConfigureLoRaDemodBaseband::create(settings, force);
m_basebandSink->getInputMessageQueue()->push(msg);
if (settings.m_useReverseAPI)
{
bool fullUpdate = ((m_settings.m_useReverseAPI != settings.m_useReverseAPI) && settings.m_useReverseAPI) ||
(m_settings.m_reverseAPIAddress != settings.m_reverseAPIAddress) ||
(m_settings.m_reverseAPIPort != settings.m_reverseAPIPort) ||
(m_settings.m_reverseAPIDeviceIndex != settings.m_reverseAPIDeviceIndex) ||
(m_settings.m_reverseAPIChannelIndex != settings.m_reverseAPIChannelIndex);
webapiReverseSendSettings(reverseAPIKeys, settings, fullUpdate || force);
}
m_settings = settings;
}
int LoRaDemod::webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage)
{
(void) errorMessage;
response.setLoRaDemodSettings(new SWGSDRangel::SWGLoRaDemodSettings());
response.getLoRaDemodSettings()->init();
webapiFormatChannelSettings(response, m_settings);
return 200;
}
int LoRaDemod::webapiSettingsPutPatch(
bool force,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage)
{
(void) errorMessage;
LoRaDemodSettings settings = m_settings;
webapiUpdateChannelSettings(settings, channelSettingsKeys, response);
MsgConfigureLoRaDemod *msg = MsgConfigureLoRaDemod::create(settings, force);
m_inputMessageQueue.push(msg);
if (m_guiMessageQueue) // forward to GUI if any
{
MsgConfigureLoRaDemod *msgToGUI = MsgConfigureLoRaDemod::create(settings, force);
m_guiMessageQueue->push(msgToGUI);
}
webapiFormatChannelSettings(response, settings);
return 200;
}
void LoRaDemod::webapiUpdateChannelSettings(
LoRaDemodSettings& settings,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response)
{
if (channelSettingsKeys.contains("inputFrequencyOffset")) {
settings.m_inputFrequencyOffset = response.getLoRaDemodSettings()->getInputFrequencyOffset();
}
if (channelSettingsKeys.contains("bandwidthIndex")) {
settings.m_bandwidthIndex = response.getLoRaDemodSettings()->getBandwidthIndex();
}
if (channelSettingsKeys.contains("spreadFactor")) {
settings.m_spreadFactor = response.getLoRaDemodSettings()->getSpreadFactor();
}
if (channelSettingsKeys.contains("deBits")) {
settings.m_deBits = response.getLoRaDemodSettings()->getDeBits();
}
if (channelSettingsKeys.contains("codingScheme")) {
settings.m_codingScheme = (LoRaDemodSettings::CodingScheme) response.getLoRaDemodSettings()->getCodingScheme();
}
if (channelSettingsKeys.contains("decodeActive")) {
settings.m_decodeActive = response.getLoRaDemodSettings()->getDecodeActive() != 0;
}
if (channelSettingsKeys.contains("eomSquelchTenths")) {
settings.m_eomSquelchTenths = response.getLoRaDemodSettings()->getEomSquelchTenths();
}
if (channelSettingsKeys.contains("nbSymbolsMax")) {
settings.m_nbSymbolsMax = response.getLoRaDemodSettings()->getNbSymbolsMax();
}
if (channelSettingsKeys.contains("preambleChirps")) {
settings.m_preambleChirps = response.getLoRaDemodSettings()->getPreambleChirps();
}
if (channelSettingsKeys.contains("nbParityBits")) {
settings.m_nbParityBits = response.getLoRaDemodSettings()->getNbParityBits();
}
if (channelSettingsKeys.contains("packetLength")) {
settings.m_packetLength = response.getLoRaDemodSettings()->getPacketLength();
}
if (channelSettingsKeys.contains("hasCRC")) {
settings.m_hasCRC = response.getLoRaDemodSettings()->getHasCrc() != 0;
}
if (channelSettingsKeys.contains("hasHeader")) {
settings.m_hasHeader = response.getLoRaDemodSettings()->getHasHeader() != 0;
}
if (channelSettingsKeys.contains("rgbColor")) {
settings.m_rgbColor = response.getLoRaDemodSettings()->getRgbColor();
}
if (channelSettingsKeys.contains("title")) {
settings.m_title = *response.getLoRaDemodSettings()->getTitle();
}
if (channelSettingsKeys.contains("streamIndex")) {
settings.m_streamIndex = response.getLoRaDemodSettings()->getStreamIndex();
}
if (channelSettingsKeys.contains("useReverseAPI")) {
settings.m_useReverseAPI = response.getLoRaDemodSettings()->getUseReverseApi() != 0;
}
if (channelSettingsKeys.contains("reverseAPIAddress")) {
settings.m_reverseAPIAddress = *response.getLoRaDemodSettings()->getReverseApiAddress();
}
if (channelSettingsKeys.contains("reverseAPIPort")) {
settings.m_reverseAPIPort = response.getLoRaDemodSettings()->getReverseApiPort();
}
if (channelSettingsKeys.contains("reverseAPIDeviceIndex")) {
settings.m_reverseAPIDeviceIndex = response.getLoRaDemodSettings()->getReverseApiDeviceIndex();
}
if (channelSettingsKeys.contains("reverseAPIChannelIndex")) {
settings.m_reverseAPIChannelIndex = response.getLoRaDemodSettings()->getReverseApiChannelIndex();
}
}
int LoRaDemod::webapiReportGet(
SWGSDRangel::SWGChannelReport& response,
QString& errorMessage)
{
(void) errorMessage;
response.setLoRaDemodReport(new SWGSDRangel::SWGLoRaDemodReport());
response.getLoRaDemodReport()->init();
webapiFormatChannelReport(response);
return 200;
}
void LoRaDemod::webapiFormatChannelSettings(SWGSDRangel::SWGChannelSettings& response, const LoRaDemodSettings& settings)
{
response.getLoRaDemodSettings()->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
response.getLoRaDemodSettings()->setBandwidthIndex(settings.m_bandwidthIndex);
response.getLoRaDemodSettings()->setSpreadFactor(settings.m_spreadFactor);
response.getLoRaDemodSettings()->setDeBits(settings.m_deBits);
response.getLoRaDemodSettings()->setCodingScheme((int) settings.m_codingScheme);
response.getLoRaDemodSettings()->setDecodeActive(settings.m_decodeActive ? 1 : 0);
response.getLoRaDemodSettings()->setEomSquelchTenths(settings.m_eomSquelchTenths);
response.getLoRaDemodSettings()->setNbSymbolsMax(settings.m_nbSymbolsMax);
response.getLoRaDemodSettings()->setPreambleChirps(settings.m_preambleChirps);
response.getLoRaDemodSettings()->setNbParityBits(settings.m_nbParityBits);
response.getLoRaDemodSettings()->setHasCrc(settings.m_hasCRC ? 1 : 0);
response.getLoRaDemodSettings()->setHasHeader(settings.m_hasHeader ? 1 : 0);
response.getLoRaDemodSettings()->setRgbColor(settings.m_rgbColor);
if (response.getLoRaDemodSettings()->getTitle()) {
*response.getLoRaDemodSettings()->getTitle() = settings.m_title;
} else {
response.getLoRaDemodSettings()->setTitle(new QString(settings.m_title));
}
response.getLoRaDemodSettings()->setUseReverseApi(settings.m_useReverseAPI ? 1 : 0);
if (response.getLoRaDemodSettings()->getReverseApiAddress()) {
*response.getLoRaDemodSettings()->getReverseApiAddress() = settings.m_reverseAPIAddress;
} else {
response.getLoRaDemodSettings()->setReverseApiAddress(new QString(settings.m_reverseAPIAddress));
}
response.getLoRaDemodSettings()->setReverseApiPort(settings.m_reverseAPIPort);
response.getLoRaDemodSettings()->setReverseApiDeviceIndex(settings.m_reverseAPIDeviceIndex);
response.getLoRaDemodSettings()->setReverseApiChannelIndex(settings.m_reverseAPIChannelIndex);
}
void LoRaDemod::webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response)
{
response.getLoRaDemodReport()->setChannelPowerDb(CalcDb::dbPower(getTotalPower()));
response.getLoRaDemodReport()->setSignalPowerDb(m_lastMsgSignalDb);
response.getLoRaDemodReport()->setNoisePowerDb(CalcDb::dbPower(getCurrentNoiseLevel()));
response.getLoRaDemodReport()->setSnrPowerDb(m_lastMsgSignalDb - m_lastMsgNoiseDb);
response.getLoRaDemodReport()->setChannelSampleRate(m_basebandSink->getChannelSampleRate());
response.getLoRaDemodReport()->setHasCrc(m_lastMsgHasCRC);
response.getLoRaDemodReport()->setNbParityBits(m_lastMsgNbParityBits);
response.getLoRaDemodReport()->setPacketLength(m_lastMsgPacketLength);
response.getLoRaDemodReport()->setNbSymbols(m_lastMsgNbSymbols);
response.getLoRaDemodReport()->setNbCodewords(m_lastMsgNbCodewords);
response.getLoRaDemodReport()->setHeaderParityStatus(m_lastMsgHeaderParityStatus);
response.getLoRaDemodReport()->setHeaderCrcStatus(m_lastMsgHeaderCRC);
response.getLoRaDemodReport()->setPayloadParityStatus(m_lastMsgPayloadParityStatus);
response.getLoRaDemodReport()->setPayloadCrcStatus(m_lastMsgPayloadCRC);
response.getLoRaDemodReport()->setMessageTimestamp(new QString(m_lastMsgTimestamp));
response.getLoRaDemodReport()->setMessageString(new QString(m_lastMsgString));
response.getLoRaDemodReport()->setMessageBytes(new QList<QString *>);
QList<QString *> *bytesStr = response.getLoRaDemodReport()->getMessageBytes();
for (QByteArray::const_iterator it = m_lastMsgBytes.begin(); it != m_lastMsgBytes.end(); ++it)
{
unsigned char b = *it;
bytesStr->push_back(new QString(tr("%1").arg(b, 2, 16, QChar('0'))));
}
}
void LoRaDemod::webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LoRaDemodSettings& settings, bool force)
{
SWGSDRangel::SWGChannelSettings *swgChannelSettings = new SWGSDRangel::SWGChannelSettings();
swgChannelSettings->setDirection(1); // single source (Tx)
swgChannelSettings->setOriginatorChannelIndex(getIndexInDeviceSet());
swgChannelSettings->setOriginatorDeviceSetIndex(getDeviceSetIndex());
swgChannelSettings->setChannelType(new QString("LoRaMod"));
swgChannelSettings->setLoRaModSettings(new SWGSDRangel::SWGLoRaModSettings());
SWGSDRangel::SWGLoRaDemodSettings *swgLoRaDemodSettings = swgChannelSettings->getLoRaDemodSettings();
// transfer data that has been modified. When force is on transfer all data except reverse API data
if (channelSettingsKeys.contains("inputFrequencyOffset") || force) {
swgLoRaDemodSettings->setInputFrequencyOffset(settings.m_inputFrequencyOffset);
}
if (channelSettingsKeys.contains("bandwidthIndex") || force) {
swgLoRaDemodSettings->setBandwidthIndex(settings.m_bandwidthIndex);
}
if (channelSettingsKeys.contains("spreadFactor") || force) {
swgLoRaDemodSettings->setSpreadFactor(settings.m_spreadFactor);
}
if (channelSettingsKeys.contains("deBits") || force) {
swgLoRaDemodSettings->setDeBits(settings.m_deBits);
}
if (channelSettingsKeys.contains("codingScheme") || force) {
swgLoRaDemodSettings->setCodingScheme((int) settings.m_codingScheme);
}
if (channelSettingsKeys.contains("decodeActive") || force) {
swgLoRaDemodSettings->setDecodeActive(settings.m_decodeActive ? 1 : 0);
}
if (channelSettingsKeys.contains("decodeActive") || force) {
swgLoRaDemodSettings->setEomSquelchTenths(settings.m_eomSquelchTenths ? 1 : 0);
}
if (channelSettingsKeys.contains("decodeActive") || force) {
swgLoRaDemodSettings->setNbSymbolsMax(settings.m_nbSymbolsMax ? 1 : 0);
}
if (channelSettingsKeys.contains("preambleChirps") || force) {
swgLoRaDemodSettings->setPreambleChirps(settings.m_preambleChirps);
}
if (channelSettingsKeys.contains("nbParityBits") || force) {
swgLoRaDemodSettings->setNbParityBits(settings.m_nbParityBits);
}
if (channelSettingsKeys.contains("hasCRC") || force) {
swgLoRaDemodSettings->setHasCrc(settings.m_hasCRC ? 1 : 0);
}
if (channelSettingsKeys.contains("hasHeader") || force) {
swgLoRaDemodSettings->setHasHeader(settings.m_hasHeader ? 1 : 0);
}
if (channelSettingsKeys.contains("rgbColor") || force) {
swgLoRaDemodSettings->setRgbColor(settings.m_rgbColor);
}
if (channelSettingsKeys.contains("title") || force) {
swgLoRaDemodSettings->setTitle(new QString(settings.m_title));
}
QString channelSettingsURL = QString("http://%1:%2/sdrangel/deviceset/%3/channel/%4/settings")
.arg(settings.m_reverseAPIAddress)
.arg(settings.m_reverseAPIPort)
.arg(settings.m_reverseAPIDeviceIndex)
.arg(settings.m_reverseAPIChannelIndex);
m_networkRequest.setUrl(QUrl(channelSettingsURL));
m_networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
QBuffer *buffer = new QBuffer();
buffer->open((QBuffer::ReadWrite));
buffer->write(swgChannelSettings->asJson().toUtf8());
buffer->seek(0);
// Always use PATCH to avoid passing reverse API settings
QNetworkReply *reply = m_networkManager->sendCustomRequest(m_networkRequest, "PATCH", buffer);
buffer->setParent(reply);
delete swgChannelSettings;
}
void LoRaDemod::networkManagerFinished(QNetworkReply *reply)
{
QNetworkReply::NetworkError replyError = reply->error();
if (replyError)
{
qWarning() << "LoRaDemod::networkManagerFinished:"
<< " error(" << (int) replyError
<< "): " << replyError
<< ": " << reply->errorString();
}
else
{
QString answer = reply->readAll();
answer.chop(1); // remove last \n
qDebug("LoRaDemod::networkManagerFinished: reply:\n%s", answer.toStdString().c_str());
}
reply->deleteLater();
}
bool LoRaDemod::getDemodActive() const
{
return m_basebandSink->getDemodActive();
}
double LoRaDemod::getCurrentNoiseLevel() const
{
return m_basebandSink->getCurrentNoiseLevel();
}
double LoRaDemod::getTotalPower() const
{
return m_basebandSink->getTotalPower();
}
plugins/channelrx/demodlora/lorademod.h
+53
View File
@@ -22,6 +22,8 @@
#include <vector>
#include <QNetworkRequest>
#include "dsp/basebandsamplesink.h"
#include "channel/channelapi.h"
#include "util/message.h"
@@ -29,6 +31,8 @@
#include "lorademodbaseband.h"
#include "lorademoddecoder.h"
class QNetworkAccessManager;
class QNetworkReply;
class DeviceAPI;
class QThread;
@@ -219,7 +223,32 @@ public:
return 0;
}
virtual int webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage);
virtual int webapiSettingsPutPatch(
bool force,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage);
virtual int webapiReportGet(
SWGSDRangel::SWGChannelReport& response,
QString& errorMessage);
static void webapiFormatChannelSettings(
SWGSDRangel::SWGChannelSettings& response,
const LoRaDemodSettings& settings);
static void webapiUpdateChannelSettings(
LoRaDemodSettings& settings,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response);
bool getDemodActive() const;
double getCurrentNoiseLevel() const;
double getTotalPower() const;
static const QString m_channelIdURI;
static const QString m_channelId;
@@ -231,8 +260,32 @@ private:
LoRaDemodDecoder m_decoder;
LoRaDemodSettings m_settings;
int m_basebandSampleRate; //!< stored from device message used when starting baseband sink
float m_lastMsgSignalDb;
float m_lastMsgNoiseDb;
int m_lastMsgSyncWord;
int m_lastMsgPacketLength;
int m_lastMsgNbParityBits;
bool m_lastMsgHasCRC;
int m_lastMsgNbSymbols;
int m_lastMsgNbCodewords;
bool m_lastMsgEarlyEOM;
bool m_lastMsgHeaderCRC;
int m_lastMsgHeaderParityStatus;
bool m_lastMsgPayloadCRC;
int m_lastMsgPayloadParityStatus;
QString m_lastMsgTimestamp;
QString m_lastMsgString;
QByteArray m_lastMsgBytes;
QNetworkAccessManager *m_networkManager;
QNetworkRequest m_networkRequest;
void applySettings(const LoRaDemodSettings& settings, bool force = false);
void webapiFormatChannelReport(SWGSDRangel::SWGChannelReport& response);
void webapiReverseSendSettings(QList<QString>& channelSettingsKeys, const LoRaDemodSettings& settings, bool force);
private slots:
void networkManagerFinished(QNetworkReply *reply);
};
#endif // INCLUDE_LORADEMOD_H
plugins/channelrx/demodlora/lorademodbaseband.h
+2
View File
@@ -63,6 +63,8 @@ public:
MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
int getChannelSampleRate() const;
bool getDemodActive() const { return m_sink.getDemodActive(); }
double getCurrentNoiseLevel() const { return m_sink.getCurrentNoiseLevel(); }
double getTotalPower() const { return m_sink.getTotalPower(); }
void setBasebandSampleRate(int sampleRate);
void setDecoderMessageQueue(MessageQueue *messageQueue) { m_sink.setDecoderMessageQueue(messageQueue); }
void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_sink.setSpectrumSink(spectrumSink); }
plugins/channelrx/demodlora/lorademodgui.cpp
+15 -7
View File
@@ -27,6 +27,7 @@
#include "gui/glspectrumgui.h"
#include "plugin/pluginapi.h"
#include "util/simpleserializer.h"
#include "util/db.h"
#include "mainwindow.h"
#include "lorademod.h"
@@ -494,8 +495,9 @@ void LoRaDemodGUI::showLoRaMessage(const Message& message)
{
const LoRaDemod::MsgReportDecodeBytes& msg = (LoRaDemod::MsgReportDecodeBytes&) message;
QByteArray bytes = msg.getBytes();
QString syncWordStr((tr("%1").arg(msg.getSyncWord(), 2, 16, QChar('0'))));
ui->syncWord->setText((tr("%1").arg(msg.getSyncWord(), 2, 16)));
ui->syncWord->setText(tr("%1").arg(syncWordStr));
ui->sText->setText(tr("%1").arg(msg.getSingalDb(), 0, 'f', 1));
ui->snrText->setText(tr("%1").arg(msg.getSingalDb() - msg.getNoiseDb(), 0, 'f', 1));
unsigned int packetLength;
@@ -521,7 +523,7 @@ void LoRaDemodGUI::showLoRaMessage(const Message& message)
{
QString loRaStatus = tr("%1 %2 S:%3 SN:%4 HF:%5 HC:%6 EOM:too early")
.arg(dateStr)
.arg(msg.getSyncWord(), 2, 16)
.arg(syncWordStr)
.arg(msg.getSingalDb(), 0, 'f', 1)
.arg(msg.getSingalDb() - msg.getNoiseDb(), 0, 'f', 1)
.arg(getParityStr(msg.getHeaderParityStatus()))
@@ -535,7 +537,7 @@ void LoRaDemodGUI::showLoRaMessage(const Message& message)
{
QString loRaHeader = tr("%1 %2 S:%3 SN:%4 HF:%5 HC:%6 FEC:%7 CRC:%8")
.arg(dateStr)
.arg(msg.getSyncWord(), 2, 16)
.arg(syncWordStr)
.arg(msg.getSingalDb(), 0, 'f', 1)
.arg(msg.getSingalDb() - msg.getNoiseDb(), 0, 'f', 1)
.arg(getParityStr(msg.getHeaderParityStatus()))
@@ -549,8 +551,9 @@ void LoRaDemodGUI::showLoRaMessage(const Message& message)
bytesCopy.truncate(packetLength);
bytesCopy.replace('\0', " ");
QString str = QString(bytesCopy.toStdString().c_str());
displayText(dateStr, str);
QString textHeader(tr("%1 (%2)").arg(dateStr).arg(syncWordStr));
displayText(textHeader, str);
displayLoRaStatus(msg.getHeaderParityStatus(), msg.getHeaderCRCStatus(), msg.getPayloadParityStatus(), msg.getPayloadCRCStatus());
}
@@ -564,8 +567,10 @@ void LoRaDemodGUI::showTextMessage(const Message& message)
QDateTime dt = QDateTime::currentDateTime();
QString dateStr = dt.toString("HH:mm:ss");
displayText(dateStr, msg.getString());
ui->syncWord->setText((tr("%1").arg(msg.getSyncWord(), 2, 16)));
QString syncWordStr((tr("%1").arg(msg.getSyncWord(), 2, 16, QChar('0'))));
QString textHeader(tr("%1 (%2)").arg(dateStr).arg(syncWordStr));
displayText(textHeader, msg.getString());
ui->syncWord->setText(syncWordStr);
ui->sText->setText(tr("%1").arg(msg.getSingalDb(), 0, 'f', 1));
ui->snrText->setText(tr("%1").arg(msg.getSingalDb() - msg.getNoiseDb(), 0, 'f', 1));
@@ -608,7 +613,7 @@ void LoRaDemodGUI::displayBytes(const QString& header, const QByteArray& bytes)
cursor.insertText(tr("%1|").arg(i, 3, 10, QChar('0')));
}
cursor.insertText(tr("%1").arg(b, 2, 16));
cursor.insertText(tr("%1").arg(b, 2, 16, QChar('0')));
if (i%16 == 15) {
cursor.insertText("\n");
@@ -658,6 +663,9 @@ void LoRaDemodGUI::tick()
{
m_tickCount = 0;
ui->nText->setText(tr("%1").arg(CalcDb::dbPower(m_LoRaDemod->getCurrentNoiseLevel()), 0, 'f', 1));
ui->channelPower->setText(tr("%1 dB").arg(CalcDb::dbPower(m_LoRaDemod->getTotalPower()), 0, 'f', 1));
if (m_LoRaDemod->getDemodActive()) {
ui->mute->setStyleSheet("QToolButton { background-color : green; }");
} else {
plugins/channelrx/demodlora/lorademodgui.ui
+152 -77
View File
@@ -6,13 +6,13 @@
<rect>
<x>0</x>
<y>0</y>
<width>512</width>
<width>532</width>
<height>660</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>512</width>
<width>532</width>
<height>660</height>
</size>
</property>
@@ -30,7 +30,7 @@
<rect>
<x>1</x>
<y>20</y>
<width>510</width>
<width>530</width>
<height>90</height>
</rect>
</property>
@@ -74,7 +74,7 @@
<rect>
<x>30</x>
<y>50</y>
<width>381</width>
<width>231</width>
<height>16</height>
</rect>
</property>
@@ -153,20 +153,14 @@
<widget class="QLabel" name="BWText">
<property name="geometry">
<rect>
<x>420</x>
<x>269</x>
<y>50</y>
<width>80</width>
<width>70</width>
<height>16</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>7813 Hz</string>
<string>500000 Hz</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -243,7 +237,7 @@
<rect>
<x>10</x>
<y>10</y>
<width>491</width>
<width>511</width>
<height>26</height>
</rect>
</property>
@@ -320,73 +314,27 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="sLabel">
<property name="text">
<string>S</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="sText">
<widget class="QLabel" name="channelPower">
<property name="minimumSize">
<size>
<width>30</width>
<width>60</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>De-chirped signal level</string>
<string>De-chirped channel power</string>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>-50.0</string>
<string>-100.0 dB</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="snrLabel">
<property name="minimumSize">
<size>
<width>35</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>SNR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="snrText">
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>De-chirped SNR level</string>
</property>
<property name="text">
<string>10.0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="sUnits">
<property name="text">
<string>dB</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QLabel" name="preambleChirpsText">
@@ -455,13 +403,140 @@
<enum>Qt::Horizontal</enum>
</property>
</widget>
<widget class="QLabel" name="sUnits">
<property name="geometry">
<rect>
<x>500</x>
<y>50</y>
<width>20</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>dB</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="snrText">
<property name="geometry">
<rect>
<x>470</x>
<y>50</y>
<width>28</width>
<height>16</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>De-chirped Signal to Noise Ratio</string>
</property>
<property name="text">
<string>-10.0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="snrLabel">
<property name="geometry">
<rect>
<x>460</x>
<y>50</y>
<width>5</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>/</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="sText">
<property name="geometry">
<rect>
<x>425</x>
<y>50</y>
<width>30</width>
<height>16</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>De-chirped signal power</string>
</property>
<property name="text">
<string>-50.0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="sLabel">
<property name="geometry">
<rect>
<x>410</x>
<y>50</y>
<width>9</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>S</string>
</property>
</widget>
<widget class="QLabel" name="nText">
<property name="geometry">
<rect>
<x>375</x>
<y>50</y>
<width>30</width>
<height>16</height>
</rect>
</property>
<property name="toolTip">
<string>De-chirped noise power</string>
</property>
<property name="text">
<string>-50.0</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="nLabel">
<property name="geometry">
<rect>
<x>360</x>
<y>50</y>
<width>10</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>N</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="payloadContainer" native="true">
<property name="geometry">
<rect>
<x>1</x>
<y>120</y>
<width>510</width>
<width>530</width>
<height>230</height>
</rect>
</property>
@@ -505,7 +580,7 @@
<rect>
<x>30</x>
<y>60</y>
<width>471</width>
<width>490</width>
<height>80</height>
</rect>
</property>
@@ -712,7 +787,7 @@
<widget class="QLineEdit" name="syncWord">
<property name="geometry">
<rect>
<x>480</x>
<x>492</x>
<y>10</y>
<width>25</width>
<height>20</height>
@@ -832,7 +907,7 @@
<rect>
<x>30</x>
<y>145</y>
<width>471</width>
<width>490</width>
<height>75</height>
</rect>
</property>
@@ -897,7 +972,7 @@
<widget class="QLabel" name="syncWordLabel">
<property name="geometry">
<rect>
<x>440</x>
<x>456</x>
<y>10</y>
<width>30</width>
<height>19</height>
@@ -910,7 +985,7 @@
<widget class="QLabel" name="headerHammingStatus">
<property name="geometry">
<rect>
<x>380</x>
<x>395</x>
<y>35</y>
<width>20</width>
<height>16</height>
@@ -926,7 +1001,7 @@
<widget class="QLabel" name="headerCRCStatus">
<property name="geometry">
<rect>
<x>410</x>
<x>425</x>
<y>35</y>
<width>20</width>
<height>16</height>
@@ -942,7 +1017,7 @@
<widget class="QLabel" name="payloadFECStatus">
<property name="geometry">
<rect>
<x>440</x>
<x>455</x>
<y>35</y>
<width>25</width>
<height>16</height>
@@ -958,7 +1033,7 @@
<widget class="QLabel" name="payloadCRCStatus">
<property name="geometry">
<rect>
<x>475</x>
<x>490</x>
<y>35</y>
<width>28</width>
<height>16</height>
@@ -1031,7 +1106,7 @@
<rect>
<x>1</x>
<y>360</y>
<width>510</width>
<width>530</width>
<height>260</height>
</rect>
</property>
plugins/channelrx/demodlora/lorademodsettings.cpp
+56 -2
View File
@@ -24,8 +24,33 @@
#include "settings/serializable.h"
#include "lorademodsettings.h"
const int LoRaDemodSettings::bandwidths[] = {2500, 7813, 10417, 15625, 20833, 31250, 41667, 62500, 125000, 250000, 500000};
const int LoRaDemodSettings::nbBandwidths = 11;
const int LoRaDemodSettings::bandwidths[] = {
2604, // 333k / 128
3125, // 400k / 128
3906, // 500k / 128
5208, // 333k / 64
6250, // 400k / 64
7813, // 500k / 64
10417, // 333k / 32
12500, // 400k / 32
15625, // 500k / 32
20833, // 333k / 16
25000, // 400k / 16
31250, // 500k / 16
41667, // 333k / 8
50000, // 400k / 8
62500, // 500k / 8
83333, // 333k / 4
100000, // 400k / 4
125000, // 500k / 4
166667, // 333k / 2
200000, // 400k / 2
250000, // 500k / 2
333333, // 333k / 1
400000, // 400k / 1
500000 // 500k / 1
};
const int LoRaDemodSettings::nbBandwidths = 3*8;
const int LoRaDemodSettings::oversampling = 2;
LoRaDemodSettings::LoRaDemodSettings() :
@@ -52,6 +77,12 @@ void LoRaDemodSettings::resetToDefaults()
m_hasHeader = true;
m_rgbColor = QColor(255, 0, 255).rgb();
m_title = "LoRa Demodulator";
m_streamIndex = 0;
m_useReverseAPI = false;
m_reverseAPIAddress = "127.0.0.1";
m_reverseAPIPort = 8888;
m_reverseAPIDeviceIndex = 0;
m_reverseAPIChannelIndex = 0;
}
QByteArray LoRaDemodSettings::serialize() const
@@ -80,6 +111,12 @@ QByteArray LoRaDemodSettings::serialize() const
s.writeBool(14, m_hasCRC);
s.writeBool(15, m_hasHeader);
s.writeS32(17, m_preambleChirps);
s.writeBool(20, m_useReverseAPI);
s.writeString(21, m_reverseAPIAddress);
s.writeU32(22, m_reverseAPIPort);
s.writeU32(23, m_reverseAPIDeviceIndex);
s.writeU32(24, m_reverseAPIChannelIndex);
s.writeS32(25, m_streamIndex);
return s.final();
}
@@ -98,6 +135,7 @@ bool LoRaDemodSettings::deserialize(const QByteArray& data)
{
QByteArray bytetmp;
int tmp;
unsigned int utmp;
d.readS32(1, &m_inputFrequencyOffset, 0);
d.readS32(2, &m_bandwidthIndex, 0);
@@ -126,6 +164,22 @@ bool LoRaDemodSettings::deserialize(const QByteArray& data)
d.readBool(15, &m_hasHeader, true);
d.readS32(17, &m_preambleChirps, 8);
d.readBool(20, &m_useReverseAPI, false);
d.readString(21, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(22, &utmp, 0);
if ((utmp > 1023) && (utmp < 65535)) {
m_reverseAPIPort = utmp;
} else {
m_reverseAPIPort = 8888;
}
d.readU32(23, &utmp, 0);
m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp;
d.readU32(24, &utmp, 0);
m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp;
d.readS32(25, &m_streamIndex, 0);
return true;
}
else
plugins/channelrx/demodlora/lorademodsettings.h
+6
View File
@@ -50,6 +50,12 @@ struct LoRaDemodSettings
bool m_hasHeader; //!< Header present before actual payload (LoRa)
uint32_t m_rgbColor;
QString m_title;
int m_streamIndex;
bool m_useReverseAPI;
QString m_reverseAPIAddress;
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIDeviceIndex;
uint16_t m_reverseAPIChannelIndex;
Serializable *m_channelMarker;
Serializable *m_spectrumGUI;
plugins/channelrx/demodlora/lorademodsink.cpp
+24 -2
View File
@@ -136,6 +136,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
{
m_demodActive = false;
reset();
std::queue<double>().swap(m_magsqQueue); // this clears the queue
m_state = LoRaStateDetectPreamble;
}
else if (m_state == LoRaStateDetectPreamble) // look for preamble
@@ -148,13 +149,14 @@ void LoRaDemodSink::processSample(const Complex& ci)
std::fill(m_fft->in()+m_fftLength, m_fft->in()+m_fftInterpolation*m_fftLength, Complex{0.0, 0.0});
m_fft->transform();
m_fftCounter = 0;
double magsq;
double magsq, magsqTotal;
unsigned int imax = argmax(
m_fft->out(),
m_fftInterpolation,
m_fftLength,
magsq,
magsqTotal,
m_spectrumBuffer,
m_fftInterpolation
) / m_fftInterpolation;
@@ -163,6 +165,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
m_magsqQueue.pop();
}
m_magsqTotalAvg(magsqTotal);
m_magsqQueue.push(magsq);
m_argMaxHistory[m_argMaxHistoryCounter++] = imax;
@@ -233,12 +236,14 @@ void LoRaDemodSink::processSample(const Complex& ci)
m_fftCounter = 0;
double magsq, magsqSFD;
double magsqTotal, magsqSFDTotal;
unsigned int imaxSFD = argmax(
m_fftSFD->out(),
m_fftInterpolation,
m_fftLength,
magsqSFD,
magsqTotal,
nullptr,
m_fftInterpolation
) / m_fftInterpolation;
@@ -248,6 +253,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
m_fftInterpolation,
m_fftLength,
magsq,
magsqSFDTotal,
m_spectrumBuffer,
m_fftInterpolation
) / m_fftInterpolation;
@@ -257,6 +263,8 @@ void LoRaDemodSink::processSample(const Complex& ci)
if (magsq < magsqSFD) // preamble drop
{
m_magsqTotalAvg(magsqSFDTotal);
if (m_chirpCount < 3) // too early
{
m_state = LoRaStateReset;
@@ -292,6 +300,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
else if (m_chirpCount > (m_settings.m_preambleChirps - m_requiredPreambleChirps + 2)) // SFD missed start over
{
qDebug("LoRaDemodSink::processSample: SFD search: number of possible chirps exceeded");
m_magsqTotalAvg(magsqTotal);
m_state = LoRaStateReset;
}
else
@@ -301,6 +310,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
}
qDebug("LoRaDemodSink::processSample: SFD search: up: %4u|%11.6f - down: %4u|%11.6f", imax, magsq, imaxSFD, magsqSFD);
m_magsqTotalAvg(magsqTotal);
m_magsqOnAvg(magsq);
}
}
@@ -339,7 +349,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
std::fill(m_fft->in()+m_fftLength, m_fft->in()+m_fftInterpolation*m_fftLength, Complex{0.0, 0.0});
m_fft->transform();
m_fftCounter = 0;
double magsq;
double magsq, magsqTotal;
unsigned short symbol = evalSymbol(
argmax(
@@ -347,6 +357,7 @@ void LoRaDemodSink::processSample(const Complex& ci)
m_fftInterpolation,
m_fftLength,
magsq,
magsqTotal,
m_spectrumBuffer,
m_fftInterpolation
)
@@ -360,6 +371,8 @@ void LoRaDemodSink::processSample(const Complex& ci)
m_magsqMax = magsq;
}
m_magsqTotalAvg(magsq);
m_decodeMsg->pushBackSymbol(symbol);
if ((m_chirpCount == 0)
@@ -426,16 +439,19 @@ unsigned int LoRaDemodSink::argmax(
unsigned int fftMult,
unsigned int fftLength,
double& magsqMax,
double& magsqTotal,
Complex *specBuffer,
unsigned int specDecim)
{
magsqMax = 0.0;
magsqTotal = 0.0;
unsigned int imax;
double magSum = 0.0;
for (unsigned int i = 0; i < fftMult*fftLength; i++)
{
double magsq = std::norm(fftBins[i]);
magsqTotal += magsq;
if (magsq > magsqMax)
{
@@ -455,6 +471,8 @@ unsigned int LoRaDemodSink::argmax(
}
}
magsqTotal /= fftMult*fftLength;
return imax;
}
@@ -464,11 +482,13 @@ unsigned int LoRaDemodSink::argmaxSpreaded(
unsigned int fftLength,
double& magsqMax,
double& magsqNoise,
double& magSqTotal,
Complex *specBuffer,
unsigned int specDecim)
{
magsqMax = 0.0;
magsqNoise = 0.0;
magSqTotal = 0.0;
unsigned int imax = 0;
double magSum = 0.0;
double magSymbol = 0.0;
@@ -480,6 +500,7 @@ unsigned int LoRaDemodSink::argmaxSpreaded(
unsigned int i = i2 % (fftMult*fftLength);
double magsq = std::norm(fftBins[i]);
magSymbol += magsq;
magSqTotal += magsq;
if (i % spread == spread/2) // boundary (inclusive)
{
@@ -507,6 +528,7 @@ unsigned int LoRaDemodSink::argmaxSpreaded(
magsqNoise -= magsqMax;
magsqNoise /= fftLength;
magSqTotal /= fftMult*fftLength;
return imax / spread;
}
plugins/channelrx/demodlora/lorademodsink.h
+5
View File
@@ -49,6 +49,8 @@ public:
void setSpectrumSink(BasebandSampleSink* spectrumSink) { m_spectrumSink = spectrumSink; }
void applyChannelSettings(int channelSampleRate, int bandwidth, int channelFrequencyOffset, bool force = false);
void applySettings(const LoRaDemodSettings& settings, bool force = false);
double getCurrentNoiseLevel() const { return m_magsqOffAvg.instantAverage() / (1<<m_settings.m_spreadFactor); }
double getTotalPower() const { return m_magsqTotalAvg.instantAverage() / (1<<m_settings.m_spreadFactor); }
private:
enum LoRaState
@@ -92,6 +94,7 @@ private:
double m_magsqMax;
MovingAverageUtil<double, double, 10> m_magsqOnAvg;
MovingAverageUtil<double, double, 10> m_magsqOffAvg;
MovingAverageUtil<double, double, 10> m_magsqTotalAvg;
std::queue<double> m_magsqQueue;
unsigned int m_chirpCount; //!< Generic chirp counter
unsigned int m_sfdSkip; //!< Number of samples in a SFD skip or slide (1/4) period
@@ -117,6 +120,7 @@ private:
unsigned int fftMult,
unsigned int fftLength,
double& magsqMax,
double& magSqTotal,
Complex *specBuffer,
unsigned int specDecim
);
@@ -126,6 +130,7 @@ private:
unsigned int fftLength,
double& magsqMax,
double& magsqNoise,
double& magSqTotal,
Complex *specBuffer,
unsigned int specDecim
);
plugins/channelrx/demodlora/lorademodwebapiadapter.cpp
+49
View File
@@ -0,0 +1,49 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2020 Edouard Griffiths, F4EXB. //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include "SWGChannelSettings.h"
#include "lorademod.h"
#include "lorademodwebapiadapter.h"
LoRaDemodWebAPIAdapter::LoRaDemodWebAPIAdapter()
{}
LoRaDemodWebAPIAdapter::~LoRaDemodWebAPIAdapter()
{}
int LoRaDemodWebAPIAdapter::webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage)
{
(void) errorMessage;
response.setLoRaDemodSettings(new SWGSDRangel::SWGLoRaDemodSettings());
response.getLoRaDemodSettings()->init();
LoRaDemod::webapiFormatChannelSettings(response, m_settings);
return 200;
}
int LoRaDemodWebAPIAdapter::webapiSettingsPutPatch(
bool force,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage)
{
(void) errorMessage;
LoRaDemod::webapiUpdateChannelSettings(m_settings, channelSettingsKeys, response);
LoRaDemod::webapiFormatChannelSettings(response, m_settings);
return 200;
}
plugins/channelrx/demodlora/lorademodwebapiadapter.h
+49
View File
@@ -0,0 +1,49 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2020 Edouard Griffiths, F4EXB. //
// //
// This program is free software; you can redistribute it and/or modify //
// it under the terms of the GNU General Public License as published by //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_LORADEMOD_WEBAPIADAPTER_H
#define INCLUDE_LORADEMOD_WEBAPIADAPTER_H
#include "channel/channelwebapiadapter.h"
#include "lorademodsettings.h"
/**
* Standalone API adapter only for the settings
*/
class LoRaDemodWebAPIAdapter : public ChannelWebAPIAdapter {
public:
LoRaDemodWebAPIAdapter();
virtual ~LoRaDemodWebAPIAdapter();
virtual QByteArray serialize() const { return m_settings.serialize(); }
virtual bool deserialize(const QByteArray& data) { return m_settings.deserialize(data); }
virtual int webapiSettingsGet(
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage);
virtual int webapiSettingsPutPatch(
bool force,
const QStringList& channelSettingsKeys,
SWGSDRangel::SWGChannelSettings& response,
QString& errorMessage);
private:
LoRaDemodSettings m_settings;
};
#endif // INCLUDE_LORAMOD_WEBAPIADAPTER_H
plugins/channeltx/modlora/loramodsettings.cpp
+49 -2
View File
@@ -24,8 +24,33 @@
#include "settings/serializable.h"
#include "loramodsettings.h"
const int LoRaModSettings::bandwidths[] = {2500, 7813, 10417, 15625, 20833, 31250, 41667, 62500, 125000, 250000, 500000};
const int LoRaModSettings::nbBandwidths = 11;
const int LoRaModSettings::bandwidths[] = {
2604, // 333k / 128
3125, // 400k / 128
3906, // 500k / 128
5208, // 333k / 64
6250, // 400k / 64
7813, // 500k / 64
10417, // 333k / 32
12500, // 400k / 32
15625, // 500k / 32
20833, // 333k / 16
25000, // 400k / 16
31250, // 500k / 16
41667, // 333k / 8
50000, // 400k / 8
62500, // 500k / 8
83333, // 333k / 4
100000, // 400k / 4
125000, // 500k / 4
166667, // 333k / 2
200000, // 400k / 2
250000, // 500k / 2
333333, // 333k / 1
400000, // 400k / 1
500000 // 500k / 1
};
const int LoRaModSettings::nbBandwidths = 3*8;
const int LoRaModSettings::oversampling = 4;
LoRaModSettings::LoRaModSettings() :
@@ -140,6 +165,12 @@ QByteArray LoRaModSettings::serialize() const
s.writeString(42, m_myLoc);
s.writeString(43, m_myRpt);
s.writeS32(44, m_messageRepeat);
s.writeBool(50, m_useReverseAPI);
s.writeString(51, m_reverseAPIAddress);
s.writeU32(52, m_reverseAPIPort);
s.writeU32(53, m_reverseAPIDeviceIndex);
s.writeU32(54, m_reverseAPIChannelIndex);
s.writeS32(55, m_streamIndex);
return s.final();
}
@@ -214,6 +245,22 @@ bool LoRaModSettings::deserialize(const QByteArray& data)
d.readString(43, &m_myRpt, "59");
d.readS32(44, &m_messageRepeat, 1);
d.readBool(50, &m_useReverseAPI, false);
d.readString(51, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(52, &utmp, 0);
if ((utmp > 1023) && (utmp < 65535)) {
m_reverseAPIPort = utmp;
} else {
m_reverseAPIPort = 8888;
}
d.readU32(53, &utmp, 0);
m_reverseAPIDeviceIndex = utmp > 99 ? 99 : utmp;
d.readU32(54, &utmp, 0);
m_reverseAPIChannelIndex = utmp > 99 ? 99 : utmp;
d.readS32(55, &m_streamIndex, 0);
return true;
}
else