kopia lustrzana https://gitlab.com/eliggett/wfview
Added CW logging category and additional (and needed) debug info for the
CW features.half-duplex
rodzic
5664842f47
commit
fd1dc860c1
|
@ -16,6 +16,7 @@ cwSender::cwSender(QWidget *parent) :
|
||||||
|
|
||||||
cwSender::~cwSender()
|
cwSender::~cwSender()
|
||||||
{
|
{
|
||||||
|
qInfo(logCW()) << "Running CW Sender destructor.";
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,8 +28,10 @@ void cwSender::showEvent(QShowEvent *event)
|
||||||
|
|
||||||
void cwSender::handleKeySpeed(unsigned char wpm)
|
void cwSender::handleKeySpeed(unsigned char wpm)
|
||||||
{
|
{
|
||||||
|
qInfo(logCW()) << "Told that current WPM is" << wpm;
|
||||||
if((wpm >= 6) && (wpm <=48))
|
if((wpm >= 6) && (wpm <=48))
|
||||||
{
|
{
|
||||||
|
qInfo(logCW()) << "Setting WPM UI control to" << wpm;
|
||||||
ui->wpmSpin->blockSignals(true);
|
ui->wpmSpin->blockSignals(true);
|
||||||
ui->wpmSpin->setValue(wpm);
|
ui->wpmSpin->setValue(wpm);
|
||||||
ui->wpmSpin->blockSignals(false);
|
ui->wpmSpin->blockSignals(false);
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <QFont>
|
#include <QFont>
|
||||||
#include <QInputDialog>
|
#include <QInputDialog>
|
||||||
#include "wfviewtypes.h"
|
#include "wfviewtypes.h"
|
||||||
|
#include "logcategories.h"
|
||||||
|
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
|
|
|
@ -6,7 +6,8 @@ Q_LOGGING_CATEGORY(logGui, "gui")
|
||||||
Q_LOGGING_CATEGORY(logLogger, "log")
|
Q_LOGGING_CATEGORY(logLogger, "log")
|
||||||
Q_LOGGING_CATEGORY(logUser, "user")
|
Q_LOGGING_CATEGORY(logUser, "user")
|
||||||
Q_LOGGING_CATEGORY(logRig, "rig")
|
Q_LOGGING_CATEGORY(logRig, "rig")
|
||||||
Q_LOGGING_CATEGORY(logRigcommands, "rigCommands")
|
Q_LOGGING_CATEGORY(logRigTraffic, "rigTraffic")
|
||||||
|
Q_LOGGING_CATEGORY(logCW, "cw")
|
||||||
Q_LOGGING_CATEGORY(logAudio, "audio")
|
Q_LOGGING_CATEGORY(logAudio, "audio")
|
||||||
Q_LOGGING_CATEGORY(logUdp, "udp")
|
Q_LOGGING_CATEGORY(logUdp, "udp")
|
||||||
Q_LOGGING_CATEGORY(logUdpServer, "udp.server")
|
Q_LOGGING_CATEGORY(logUdpServer, "udp.server")
|
||||||
|
|
|
@ -9,7 +9,8 @@ Q_DECLARE_LOGGING_CATEGORY(logGui)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(logLogger)
|
Q_DECLARE_LOGGING_CATEGORY(logLogger)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(logUser)
|
Q_DECLARE_LOGGING_CATEGORY(logUser)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(logRig)
|
Q_DECLARE_LOGGING_CATEGORY(logRig)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(rigCommands)
|
Q_DECLARE_LOGGING_CATEGORY(logRigTraffic)
|
||||||
|
Q_DECLARE_LOGGING_CATEGORY(logCW)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(logAudio)
|
Q_DECLARE_LOGGING_CATEGORY(logAudio)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(logUdp)
|
Q_DECLARE_LOGGING_CATEGORY(logUdp)
|
||||||
Q_DECLARE_LOGGING_CATEGORY(logUdpServer)
|
Q_DECLARE_LOGGING_CATEGORY(logUdpServer)
|
||||||
|
|
|
@ -1586,6 +1586,7 @@ void rigCommander::parseLevels()
|
||||||
break;
|
break;
|
||||||
case '\x0C':
|
case '\x0C':
|
||||||
state.set(KEYSPD, level, false);
|
state.set(KEYSPD, level, false);
|
||||||
|
qInfo(logRig()) << "Have received key speed in RC, raw level: " << level << ", WPM: " << (level/6.071)+6;
|
||||||
emit haveKeySpeed((level/6.071)+6);
|
emit haveKeySpeed((level/6.071)+6);
|
||||||
break;
|
break;
|
||||||
case '\x0D':
|
case '\x0D':
|
||||||
|
@ -4612,6 +4613,8 @@ void rigCommander::setKeySpeed(unsigned char wpm)
|
||||||
|
|
||||||
unsigned char wpmRadioSend = (wpm-6) * (6.071);
|
unsigned char wpmRadioSend = (wpm-6) * (6.071);
|
||||||
|
|
||||||
|
qInfo(logRig()) << "Setting keyspeed to " << wpm << "WPM, via command value" << wpmRadioSend;
|
||||||
|
|
||||||
QByteArray payload;
|
QByteArray payload;
|
||||||
payload.setRawData("\x14\x0C", 2);
|
payload.setRawData("\x14\x0C", 2);
|
||||||
payload.append(wpmRadioSend);
|
payload.append(wpmRadioSend);
|
||||||
|
@ -4620,6 +4623,7 @@ void rigCommander::setKeySpeed(unsigned char wpm)
|
||||||
|
|
||||||
void rigCommander::getKeySpeed()
|
void rigCommander::getKeySpeed()
|
||||||
{
|
{
|
||||||
|
qInfo(logRig()) << "Getting key speed from radio...";
|
||||||
QByteArray payload;
|
QByteArray payload;
|
||||||
payload.setRawData("\x14\x0C", 2);
|
payload.setRawData("\x14\x0C", 2);
|
||||||
prepDataAndSend(payload);
|
prepDataAndSend(payload);
|
||||||
|
|
|
@ -8171,7 +8171,7 @@ void wfmain::messageHandler(QtMsgType type, const QMessageLogContext& context, c
|
||||||
out << context.category << ": " << msg << "\n";
|
out << context.category << ": " << msg << "\n";
|
||||||
out.flush(); // Clear the buffered data
|
out.flush(); // Clear the buffered data
|
||||||
|
|
||||||
if(QString(context.category) != QString("rigCommands"))
|
if(QString(context.category) != QString("rigTraffic"))
|
||||||
{
|
{
|
||||||
text.append(context.category);
|
text.append(context.category);
|
||||||
text.append(": ");
|
text.append(": ");
|
||||||
|
|
Ładowanie…
Reference in New Issue