mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add passband to rigctld and allow setting

half-duplex
Phil Taylor 2022-10-28 20:04:14 +01:00
rodzic 103dc9c86a
commit 3a07830d47
9 zmienionych plików z 251 dodań i 74 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

149
rigcommander.cpp
Wyświetl plik

@ -760,11 +760,11 @@ void rigCommander::setMode(mode_info m)
{
QByteArray payload;
if(rigCaps.model==model706)
if (rigCaps.model == model706)
{
m.filter = '\x01';
}
if(m.mk == modeWFM)
if (m.mk == modeWFM)
{
m.filter = '\x01';
}
@ -872,6 +872,42 @@ void rigCommander::getDuplexMode()
prepDataAndSend(payload);
}
void rigCommander::setPassband(quint16 pass)
{
QByteArray payload;
payload.setRawData("\x1A\x03", 2);
unsigned char calc;
/*
Mode Data Steps
SSB/CW/RTTY/PSK 0 to 9 50 ~ 500 Hz (50 Hz)
SSB/CW/PSK 10 to 40 600 Hz ~ 3.6 kHz (100 Hz)
RTTY 10 to 31 600 ~ 2.7 kHz (100 Hz)
AM 0 to 49 200 Hz ~ 10.0 kHz (200 Hz)
*/
if (state.getChar(MODE) == modeAM) { // AM 0-49
calc = quint16((pass / 200) - 1);
}
else if (pass >= 600 || pass <=3600) // SSB/CW/PSK 10-40 (10-31 for RTTY)
{
calc = quint16((pass / 100) + 4);
}
else { // SSB etc 0-9
calc = quint16((pass / 50) - 1);
}
qDebug() << "Setting rig passband" << pass << "Sending" << calc;
char tens = (calc / 10);
char units = (calc - (10 * tens));
char b1 = (units) | (tens << 4);
payload.append(b1);
prepDataAndSend(payload);
}
void rigCommander::getPassband()
{
QByteArray payload;
@ -2512,19 +2548,41 @@ void rigCommander::parseRegisters1A()
switch(payloadIn[01])
{
case '\x00':
{
// Memory contents
break;
}
case '\x01':
{
// band stacking register
parseBandStackReg();
break;
}
case '\x03':
emit havePassband(bcdHexToUChar((quint8)payloadIn[2]));
{
quint16 calc;
quint8 pass = bcdHexToUChar((quint8)payloadIn[2]);
if (state.getChar(MODE) == modeAM) {
calc = 200 + (pass * 200);
}
else if (pass <= 10)
{
calc = 50 + (pass * 50);
}
else {
calc = 600 + ((pass - 10) * 100);
}
emit havePassband(calc);
state.set(PASSBAND, calc, false);
break;
}
case '\x04':
{
state.set(AGC, (quint8)payloadIn[2], false);
break;
}
case '\x06':
{
// data mode
// emit havedataMode( (bool) payloadIn[somebit])
// index
@ -2536,13 +2594,20 @@ void rigCommander::parseRegisters1A()
emit haveDataMode((bool)payloadIn[03]);
state.set(DATAMODE, (quint8)payloadIn[3], false);
break;
}
case '\x07':
{
// IP+ status
break;
}
case '\x09':
{
state.set(MUTEFUNC, (quint8)payloadIn[2], false);
}
default:
{
break;
}
}
}
@ -4084,9 +4149,73 @@ void rigCommander::parseMode()
} else {
filter = 0;
}
emit haveMode((unsigned char)payloadIn[01], filter);
state.set(MODE,(unsigned char)payloadIn[01],false);
state.set(FILTER,filter,false);
unsigned char mode = (unsigned char)payloadIn[01];
emit haveMode(mode, filter);
state.set(MODE,mode,false);
state.set(FILTER, filter, false);
quint16 pass = 0;
if (!state.isValid(PASSBAND)) {
/* We haven't got a valid passband from the rig so we
need to create a 'fake' one from default values
This will be replaced with a valid one if we get it */
if (mode == 3 || mode == 7 || mode == 12 || mode == 17) {
switch (filter) {
case 1:
pass=1200;
case 2:
pass=500;
case 3:
pass=250;
}
}
else if (mode == 4 || mode == 8)
{
switch (filter) {
case 1:
pass=2400;
case 2:
pass=500;
case 3:
pass=250;
}
}
else if (mode == 2)
{
switch (filter) {
case 1:
pass=9000;
case 2:
pass=6000;
case 3:
pass=3000;
}
}
else if (mode == 5)
{
switch (filter) {
case 1:
pass=15000;
case 2:
pass=10000;
case 3:
pass=7000;
}
}
else { // SSB or unknown mode
switch (filter) {
case 1:
pass=3000;
case 2:
pass=2400;
case 3:
pass=1800;
}
}
}
state.set(PASSBAND, pass, false);
}
@ -4433,11 +4562,17 @@ void rigCommander::stateUpdated()
break;
case MODE:
case FILTER:
if (i.value()._valid) {
if (state.isValid(MODE) && state.isValid(FILTER)) {
setMode(state.getChar(MODE), state.getChar(FILTER));
}
getMode();
break;
case PASSBAND:
if (i.value()._valid && state.isValid(MODE)) {
setPassband(state.getUInt16(PASSBAND));
}
getPassband();
break;
case DUPLEX:
if (i.value()._valid) {
setDuplexMode(state.getDuplex(DUPLEX));

3
rigcommander.h
Wyświetl plik

@ -123,6 +123,7 @@ public slots:
void getRitValue();
void setRitValue(int ritValue);
void setRitEnable(bool ritEnabled);
void setPassband(quint16 pass);
// PTT, ATU, ATT, Antenna, and Preamp:
void getPTT();
@ -323,7 +324,7 @@ signals:
void haveBandStackReg(freqt f, char mode, char filter, bool dataOn);
void haveRitEnabled(bool ritEnabled);
void haveRitFrequency(int ritHz);
void havePassband(quint8 pass);
void havePassband(quint16 pass);
// Repeater:
void haveDuplexMode(duplexMode);

112
rigctld.cpp
Wyświetl plik

@ -325,8 +325,8 @@ void rigCtlClient::socketReadyRead()
response.append(resp);
resp = "";
response.append(QString("%1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("%1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("%1").arg(rigState->getUInt16(PASSBAND)));
if (rigState->getChar(CURRENTVFO) == 0) {
resp.append("VFOA");
}
@ -438,9 +438,12 @@ void rigCtlClient::socketReadyRead()
if (rigState->getChar(CURRENTVFO) == 0) {
resp.append("VFOA");
}
else {
else if (rigState->getChar(CURRENTVFO) == 1) {
resp.append("VFOB");
}
else if (rigState->getChar(CURRENTVFO) == 2) {
resp.append("MEM");
}
response.append(resp);
}
@ -455,11 +458,17 @@ void rigCtlClient::socketReadyRead()
response.append("Main");
response.append("MEM");
}
else if (command[1] == "VFOB" || command[1] == "Sub") {
else if (command[1] == "VFOA" || command[1] == "Main")
{
rigState->set(CURRENTVFO, (quint8)0, true);
}
else if (command[1] == "VFOB" || command[1] == "Sub")
{
rigState->set(CURRENTVFO, (quint8)1, true);
}
else {
rigState->set(CURRENTVFO, (quint8)0, true);
else if (command[1] == "MEM")
{
rigState->set(CURRENTVFO, (quint8)2, true);
}
}
else if (command[0] == "s" || command[0] == "get_split_vfo")
@ -519,7 +528,8 @@ void rigCtlClient::socketReadyRead()
response.append(QString("Freq: %1").arg(rigState->getInt64(VFOAFREQ)));
}
response.append(QString("Mode: %1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("Width: %1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("Width: %1").arg(rigState->getUInt16(PASSBAND)));
response.append(QString("Split: %1").arg(rigState->getDuplex(DUPLEX)));
response.append(QString("SatMode: %1").arg(0)); // Need to get satmode
}
@ -531,7 +541,8 @@ void rigCtlClient::socketReadyRead()
response.append(QString("%1").arg(rigState->getInt64(VFOAFREQ)));
}
response.append(QString("%1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("%1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("%1").arg(rigState->getUInt16(PASSBAND)));
}
}
else if (command[0] == "i" || command[0] == "get_split_freq")
@ -570,11 +581,11 @@ void rigCtlClient::socketReadyRead()
{
if (longReply) {
response.append(QString("TX Mode: %1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("TX Passband: %1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("TX Passband: %1").arg(rigState->getUInt16(PASSBAND)));
}
else {
response.append(QString("%1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("%1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("%1").arg(rigState->getUInt16(PASSBAND)));
}
}
@ -582,45 +593,60 @@ void rigCtlClient::socketReadyRead()
{
if (longReply) {
response.append(QString("TX Mode: %1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("TX Passband: %1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("TX Passband: %1").arg(rigState->getUInt16(PASSBAND)));
}
else {
response.append(QString("%1").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))));
response.append(QString("%1").arg(getFilter(rigState->getChar(MODE), rigState->getChar(FILTER))));
response.append(QString("%1").arg(rigState->getUInt16(PASSBAND)));
}
qDebug(logRigCtlD()) << QString("get_mode: %1 passband: %2").arg(getMode(rigState->getChar(MODE), rigState->getBool(DATAMODE))).arg(rigState->getUInt16(PASSBAND));
}
else if (command[0] == "M" || command[0] == "set_mode")
{
// Set mode
setCommand = true;
int width = -1;
quint8 width = 0;
quint16 passband = 0;
QString vfo = "VFOA";
QString mode = "USB";
if (command.length() == 3) {
width = command[2].toInt();
passband = command[2].toInt();
mode = command[1];
}
else if (command.length() == 4) {
width = command[3].toInt();
passband = command[3].toInt();
mode = command[2];
vfo = command[1];
}
qDebug(logRigCtlD()) << "setting mode: VFO:" << vfo << getMode(mode) << mode << "width" << width;
qDebug(logRigCtlD()) << "setting mode: VFO:" << vfo << getMode(mode) << mode << "passband" << passband << "command:" << commands;
if (width != -1 && width <= 1800)
width = 2;
else
width = 1;
rigState->set(MODE,getMode(mode),true);
rigState->set(FILTER,(quint8)width, true);
if (mode.mid(0, 3) == "PKT") {
rigState->set(DATAMODE, true, true);
if (!mode.isEmpty())
{
rigState->set(MODE, getMode(mode), true);
if (mode.mid(0, 3) == "PKT") {
rigState->set(DATAMODE, true, true);
}
else {
rigState->set(DATAMODE, false, true);
}
}
else {
rigState->set(DATAMODE, false, true);
}
if (passband > 0)
{
if (passband > 1800 && passband < 2700) {
width = 1;
}
else if (passband <= 1800)
{
width = 2;
}
else if (passband >= 2700)
{
width = 0;
}
rigState->set(FILTER, width, true);
rigState->set(PASSBAND, passband, true);
}
}
else if (command[0] == "s" || command[0] == "get_split_vfo")
{
@ -631,7 +657,7 @@ void rigCtlClient::socketReadyRead()
else
{
response.append("1");
response.append("VFOb");
response.append("VFOB");
}
}
@ -1164,7 +1190,6 @@ void rigCtlClient::sendData(QString data)
}
}
QString rigCtlClient::getFilter(unsigned char mode, unsigned char filter) {
if (mode == 3 || mode == 7 || mode == 12 || mode == 17) {
@ -1227,47 +1252,48 @@ QString rigCtlClient::getMode(unsigned char mode, bool datamode) {
QString ret;
switch (mode) {
case 0:
case modeLSB:
if (datamode) { ret = "PKT"; }
ret.append("LSB");
break;
case 1:
case modeUSB:
if (datamode) { ret = "PKT"; }
ret.append("USB");
break;
case 2:
case modeAM:
if (datamode) { ret = "PKT"; }
ret.append("AM");
break;
case 3:
case modeCW:
ret.append("CW");
break;
case 4:
case modeRTTY:
ret.append("RTTY");
break;
case 5:
case modeFM:
if (datamode) { ret = "PKT"; }
ret.append("FM");
break;
case 6:
case modeWFM:
ret.append("WFM");
break;
case 7:
case modeCW_R:
ret.append("CWR");
break;
case 8:
case modeRTTY_R:
ret.append("RTTYR");
break;
case 12:
case modePSK:
if (datamode) { ret = "PKT"; }
ret.append("USB");
break;
case 17:
case modeDV:
if (datamode) { ret = "PKT"; }
ret.append("LSB");
break;
case 22:
case 22: // We don't seem to have a mode for this?
if (datamode) { ret = "PKT"; }
ret.append("FM");
break;

26
rigstate.h
Wyświetl plik

@ -12,7 +12,7 @@
#include "rigidentities.h"
// Meters at the end as they are ALWAYS updated from the rig!
enum stateTypes { VFOAFREQ, VFOBFREQ, CURRENTVFO, PTT, MODE, FILTER, DUPLEX, DATAMODE, ANTENNA, RXANTENNA, CTCSS, TSQL, DTCS, CSQL,
enum stateTypes { VFOAFREQ, VFOBFREQ, CURRENTVFO, PTT, MODE, FILTER, PASSBAND, DUPLEX, DATAMODE, ANTENNA, RXANTENNA, CTCSS, TSQL, DTCS, CSQL,
PREAMP, AGC, ATTENUATOR, MODINPUT, AFGAIN, RFGAIN, SQUELCH, RFPOWER, MICGAIN, COMPLEVEL, MONITORLEVEL, VOXGAIN, ANTIVOXGAIN,
FAGCFUNC, NBFUNC, COMPFUNC, VOXFUNC, TONEFUNC, TSQLFUNC, SBKINFUNC, FBKINFUNC, ANFFUNC, NRFUNC, AIPFUNC, APFFUNC, MONFUNC, MNFUNC,RFFUNC,
AROFUNC, MUTEFUNC, VSCFUNC, REVFUNC, SQLFUNC, ABMFUNC, BCFUNC, MBCFUNC, RITFUNC, AFCFUNC, SATMODEFUNC, SCOPEFUNC,
@ -48,7 +48,7 @@ public:
}
}
void set(stateTypes s, qint32 x, bool u) {
if ((quint64)x != map[s]._value) {
if (static_cast<quint64>(x) != map[s]._value) {
_mutex.lock();
map[s]._value = (quint64)x;
map[s]._valid = true;
@ -58,7 +58,7 @@ public:
}
}
void set(stateTypes s, quint16 x, bool u) {
if ((quint64)x != map[s]._value) {
if (static_cast<quint64>(x) != map[s]._value) {
_mutex.lock();
map[s]._value = (quint64)x;
map[s]._valid = true;
@ -68,7 +68,7 @@ public:
}
}
void set(stateTypes s, quint8 x, bool u) {
if ((quint64)x != map[s]._value) {
if (static_cast<quint64>(x) != map[s]._value) {
_mutex.lock();
map[s]._value = (quint64)x;
map[s]._valid = true;
@ -78,7 +78,7 @@ public:
}
}
void set(stateTypes s, bool x, bool u) {
if ((quint64)x != map[s]._value) {
if (static_cast<quint64>(x) != map[s]._value) {
_mutex.lock();
map[s]._value = (quint64)x;
map[s]._valid = true;
@ -88,7 +88,7 @@ public:
}
}
void set(stateTypes s, duplexMode x, bool u) {
if ((quint64)x != map[s]._value) {
if (static_cast<quint64>(x) != map[s]._value) {
_mutex.lock();
map[s]._value = (quint64)x;
map[s]._valid = true;
@ -99,7 +99,7 @@ public:
}
void set(stateTypes s, rigInput x, bool u) {
if ((quint64)x != map[s]._value) {
if (static_cast<quint64>(x) != map[s]._value) {
_mutex.lock();
map[s]._value = (quint64)x;
map[s]._valid = true;
@ -110,12 +110,14 @@ public:
}
bool getBool(stateTypes s) { return map[s]._value != 0; }
quint8 getChar(stateTypes s) { return (quint8)map[s]._value; }
quint16 getInt16(stateTypes s) { return (qint16)map[s]._value; }
qint32 getInt32(stateTypes s) { return (qint32)map[s]._value; }
quint8 getChar(stateTypes s) { return static_cast<quint8>(map[s]._value); }
quint16 getInt16(stateTypes s) { return static_cast<qint16>(map[s]._value); }
quint16 getUInt16(stateTypes s) { return static_cast<quint16>(map[s]._value); }
qint32 getInt32(stateTypes s) { return static_cast<qint32>(map[s]._value); }
quint32 getUInt32(stateTypes s) { return static_cast<quint32>(map[s]._value); }
quint64 getInt64(stateTypes s) { return map[s]._value; }
duplexMode getDuplex(stateTypes s) { return(duplexMode)map[s]._value; }
rigInput getInput(stateTypes s) { return(rigInput)map[s]._value; }
duplexMode getDuplex(stateTypes s) { return static_cast<duplexMode>(map[s]._value); }
rigInput getInput(stateTypes s) { return static_cast<rigInput>(map[s]._value); }
QMap<stateTypes, value> map;

10
wfmain.cpp
Wyświetl plik

@ -330,7 +330,7 @@ void wfmain::rigConnections()
connect(this, SIGNAL(scopeDisplayEnable()), rig, SLOT(enableSpectrumDisplay()));
connect(rig, SIGNAL(haveMode(unsigned char, unsigned char)), this, SLOT(receiveMode(unsigned char, unsigned char)));
connect(rig, SIGNAL(haveDataMode(bool)), this, SLOT(receiveDataModeStatus(bool)));
connect(rig, SIGNAL(havePassband(quint8)), this, SLOT(receivePassband(quint8)));
connect(rig, SIGNAL(havePassband(quint16)), this, SLOT(receivePassband(quint16)));
connect(rpt, SIGNAL(getDuplexMode()), rig, SLOT(getDuplexMode()));
connect(rpt, SIGNAL(setDuplexMode(duplexMode)), rig, SLOT(setDuplexMode(duplexMode)));
@ -5535,9 +5535,9 @@ void wfmain::receiveLANGain(unsigned char level)
processModLevel(inputLAN, level);
}
void wfmain::receivePassband(quint8 pass)
void wfmain::receivePassband(quint16 pass)
{
int calc;
/* int calc;
if (currentModeInfo.mk == modeAM) {
calc = 200 + (pass * 200);
}
@ -5547,8 +5547,8 @@ void wfmain::receivePassband(quint8 pass)
}
else {
calc = 600 + ((pass - 10) * 100);
}
passBand = (double)(calc / 1000000.0);
} */
passBand = (double)(pass / 1000000.0);
}
void wfmain::receiveMeter(meterKind inMeter, unsigned char level)

2
wfmain.h
Wyświetl plik

@ -250,7 +250,7 @@ private slots:
void receiveRITValue(int ritValHz);
void receiveModInput(rigInput input, bool dataOn);
//void receiveDuplexMode(duplexMode dm);
void receivePassband(quint8 pass);
void receivePassband(quint16 pass);
// Levels:

1
wfview.pro
Wyświetl plik

@ -210,6 +210,7 @@ HEADERS += wfmain.h \
repeatersetup.h \
repeaterattributes.h \
rigctld.h \
rigstate.h \
ulaw.h \
transceiveradjustments.h \
audiotaper.h \

13
wfview.vcxproj
Wyświetl plik

@ -71,7 +71,7 @@
</PropertyGroup>
<PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<QtInstall>msvc2019</QtInstall>
<QtModules>core;xml;network;gui;multimedia;widgets;serialport;printsupport;xml</QtModules>
<QtModules>core;xml;network;gui;multimedia;widgets;serialport;printsupport</QtModules>
</PropertyGroup>
<ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
<Import Project="$(QtMsBuild)\qt.props" />
@ -87,7 +87,7 @@
<ExceptionHandling>Sync</ExceptionHandling>
<ObjectFileName>release\</ObjectFileName>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.50";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="cef827f";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.52";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="103dc9c";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<ProgramDataBaseFileName>
</ProgramDataBaseFileName>
@ -117,7 +117,7 @@
<WarningLevel>0</WarningLevel>
</Midl>
<ResourceCompile>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.50\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"cef827f\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_XML_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.52\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"103dc9c\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_XML_LIB;QT_CORE_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<QtMoc>
<CompilerFlavor>msvc</CompilerFlavor>
@ -150,7 +150,7 @@
<ExceptionHandling>Sync</ExceptionHandling>
<ObjectFileName>debug\</ObjectFileName>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.50";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="cef827f";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.52";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="103dc9c";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessToFile>false</PreprocessToFile>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<SuppressStartupBanner>true</SuppressStartupBanner>
@ -176,7 +176,7 @@
<WarningLevel>0</WarningLevel>
</Midl>
<ResourceCompile>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.50\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"cef827f\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_XML_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.52\";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX=\"/usr/local\";GITSHORT=\"103dc9c\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_XML_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<QtMoc>
<CompilerFlavor>msvc</CompilerFlavor>
@ -206,6 +206,7 @@
<ClCompile Include="calibrationwindow.cpp" />
<ClCompile Include="cluster.cpp" />
<ClCompile Include="commhandler.cpp" />
<ClCompile Include="database.cpp" />
<ClCompile Include="freqmemory.cpp" />
<ClCompile Include="logcategories.cpp" />
<ClCompile Include="loggingwindow.cpp" />
@ -249,6 +250,7 @@
<ClInclude Include="colorprefs.h" />
<QtMoc Include="commhandler.h">
</QtMoc>
<ClInclude Include="database.h" />
<ClInclude Include="freqmemory.h" />
<ClInclude Include="logcategories.h" />
<QtMoc Include="loggingwindow.h">
@ -286,6 +288,7 @@
</QtMoc>
<QtMoc Include="udpaudio.h">
</QtMoc>
<ClInclude Include="rigstate.h" />
<ClInclude Include="udpbase.h" />
<QtMoc Include="udpcivdata.h">
</QtMoc>

9
wfview.vcxproj.filters
Wyświetl plik

@ -68,6 +68,9 @@
<ClCompile Include="commhandler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="database.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="freqmemory.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@ -175,6 +178,9 @@
<QtMoc Include="commhandler.h">
<Filter>Header Files</Filter>
</QtMoc>
<ClInclude Include="database.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="freqmemory.h">
<Filter>Header Files</Filter>
</ClInclude>
@ -259,6 +265,9 @@
<QtMoc Include="wfmain.h">
<Filter>Header Files</Filter>
</QtMoc>
<ClInclude Include="rigstate.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="debug\moc_predefs.h.cbt">