kopia lustrzana https://gitlab.com/eliggett/wfview
Add gamepad detection
Phil Taylor
rodzic
677eb3c944
commit
358375be8a
|
|
@ -1,13 +1,13 @@
|
|||
#include "shuttlesetup.h"
|
||||
#include "ui_shuttlesetup.h"
|
||||
#include "controllersetup.h"
|
||||
#include "ui_controllersetup.h"
|
||||
#include "logcategories.h"
|
||||
|
||||
shuttleSetup::shuttleSetup(QWidget* parent) :
|
||||
controllerSetup::controllerSetup(QWidget* parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::shuttleSetup)
|
||||
ui(new Ui::controllerSetup)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
scene = new shuttleScene();
|
||||
scene = new controllerScene();
|
||||
connect(scene, SIGNAL(mousePressed(QPoint)), this, SLOT(mousePressed(QPoint)));
|
||||
ui->graphicsView->setScene(scene);
|
||||
textItem = scene->addText("No USB controller found");
|
||||
|
|
@ -18,7 +18,7 @@ shuttleSetup::shuttleSetup(QWidget* parent) :
|
|||
connect(&offEvent, SIGNAL(currentIndexChanged(int)), this, SLOT(offEventIndexChanged(int)));
|
||||
}
|
||||
|
||||
shuttleSetup::~shuttleSetup()
|
||||
controllerSetup::~controllerSetup()
|
||||
{
|
||||
delete textItem;
|
||||
delete scene;
|
||||
|
|
@ -29,7 +29,7 @@ shuttleSetup::~shuttleSetup()
|
|||
}
|
||||
}
|
||||
|
||||
void shuttleSetup::mousePressed(QPoint p)
|
||||
void controllerSetup::mousePressed(QPoint p)
|
||||
{
|
||||
// Receive mouse event from the scene
|
||||
qDebug() << "Looking for button Point x=" << p.x() << " y=" << p.y();
|
||||
|
|
@ -71,7 +71,7 @@ void shuttleSetup::mousePressed(QPoint p)
|
|||
|
||||
}
|
||||
|
||||
void shuttleSetup::onEventIndexChanged(int index) {
|
||||
void controllerSetup::onEventIndexChanged(int index) {
|
||||
qDebug() << "On Event for button" << currentButton->num << "Event" << index;
|
||||
if (currentButton != Q_NULLPTR && index < commands->size()) {
|
||||
currentButton->onCommand = &commands->at(index);
|
||||
|
|
@ -80,7 +80,7 @@ void shuttleSetup::onEventIndexChanged(int index) {
|
|||
}
|
||||
|
||||
|
||||
void shuttleSetup::offEventIndexChanged(int index) {
|
||||
void controllerSetup::offEventIndexChanged(int index) {
|
||||
qDebug() << "Off Event for button" << currentButton->num << "Event" << index;
|
||||
if (currentButton != Q_NULLPTR && index < commands->size()) {
|
||||
currentButton->offCommand = &commands->at(index);
|
||||
|
|
@ -89,7 +89,7 @@ void shuttleSetup::offEventIndexChanged(int index) {
|
|||
}
|
||||
|
||||
|
||||
void shuttleSetup::newDevice(unsigned char devType, QVector<BUTTON>* but, QVector<COMMAND>* cmd)
|
||||
void controllerSetup::newDevice(unsigned char devType, QVector<BUTTON>* but, QVector<COMMAND>* cmd)
|
||||
{
|
||||
buttons = but;
|
||||
commands = cmd;
|
||||
|
|
@ -116,17 +116,21 @@ void shuttleSetup::newDevice(unsigned char devType, QVector<BUTTON>* but, QVecto
|
|||
|
||||
switch (devType) {
|
||||
case shuttleXpress:
|
||||
image.load(":/resources/shuttlexpress.png");
|
||||
image.load(":/resources/controllerxpress.png");
|
||||
deviceName = "shuttleXpress";
|
||||
break;
|
||||
case shuttlePro2:
|
||||
image.load(":/resources/shuttlepro.png");
|
||||
image.load(":/resources/controllerpro.png");
|
||||
deviceName = "shuttlePro2";
|
||||
break;
|
||||
case RC28:
|
||||
image.load(":/resources/rc28.png");
|
||||
deviceName = "RC28";
|
||||
break;
|
||||
case xBoxGamepad:
|
||||
image.load(":resources/xbox.png");
|
||||
deviceName = "XBox";
|
||||
break;
|
||||
default:
|
||||
textItem->show();
|
||||
ui->graphicsView->setSceneRect(scene->itemsBoundingRect());
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef SHUTTLESETUP_H
|
||||
#define SHUTTLESETUP_H
|
||||
#ifndef CONTROLLERSETUP_H
|
||||
#define CONTROLLERSETUP_H
|
||||
|
||||
#include <QDialog>
|
||||
#include <QGraphicsView>
|
||||
|
|
@ -22,16 +22,16 @@
|
|||
|
||||
|
||||
namespace Ui {
|
||||
class shuttleSetup;
|
||||
class controllerSetup;
|
||||
}
|
||||
|
||||
class shuttleSetup : public QDialog
|
||||
class controllerSetup : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit shuttleSetup(QWidget* parent = 0);
|
||||
~shuttleSetup();
|
||||
explicit controllerSetup(QWidget* parent = 0);
|
||||
~controllerSetup();
|
||||
|
||||
signals:
|
||||
|
||||
|
|
@ -43,9 +43,9 @@ public slots:
|
|||
void offEventIndexChanged(int index);
|
||||
|
||||
private:
|
||||
enum { NONE=0, shuttleXpress, shuttlePro2, RC28 } usbDevice;
|
||||
enum { NONE=0, shuttleXpress, shuttlePro2, RC28, xBoxGamepad, unknownGamepad } usbDevice;
|
||||
|
||||
Ui::shuttleSetup* ui;
|
||||
Ui::controllerSetup* ui;
|
||||
QGraphicsScene* scene;
|
||||
QGraphicsTextItem* textItem;
|
||||
QGraphicsItem* bgImage = Q_NULLPTR;
|
||||
|
|
@ -64,7 +64,7 @@ private:
|
|||
|
||||
|
||||
|
||||
class shuttleScene : public QGraphicsScene
|
||||
class controllerScene : public QGraphicsScene
|
||||
{
|
||||
Q_OBJECT
|
||||
QGraphicsLineItem* item = Q_NULLPTR;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>shuttleSetup</class>
|
||||
<widget class="QDialog" name="shuttleSetup">
|
||||
<class>controllerSetup</class>
|
||||
<widget class="QDialog" name="controllerSetup">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Shuttle setup</string>
|
||||
<string>Controller setup</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<connection>
|
||||
<sender>okButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>shuttleSetup</receiver>
|
||||
<receiver>controllerSetup</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
<connection>
|
||||
<sender>cancelButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>shuttleSetup</receiver>
|
||||
<receiver>controllerSetup</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
Plik binarny nie jest wyświetlany.
|
Po Szerokość: | Wysokość: | Rozmiar: 240 KiB |
|
|
@ -14,6 +14,11 @@ usbController::~usbController()
|
|||
qInfo(logUsbControl) << "Ending usbController()";
|
||||
hid_close(handle);
|
||||
hid_exit();
|
||||
if (gamepad != Q_NULLPTR)
|
||||
{
|
||||
delete gamepad;
|
||||
gamepad = Q_NULLPTR;
|
||||
}
|
||||
}
|
||||
|
||||
void usbController::init()
|
||||
|
|
@ -68,6 +73,78 @@ void usbController::run()
|
|||
return;
|
||||
}
|
||||
|
||||
if (gamepad == Q_NULLPTR) {
|
||||
auto gamepads = QGamepadManager::instance()->connectedGamepads();
|
||||
if (!gamepads.isEmpty()) {
|
||||
// If we got here, we have detected a gamepad of some description!
|
||||
gamepad = new QGamepad(*gamepads.begin(), this);
|
||||
|
||||
if (gamepad->name() == "Microsoft X-Box 360 pad 0")
|
||||
{
|
||||
usbDevice = xBoxGamepad;
|
||||
}
|
||||
else {
|
||||
usbDevice = unknownGamepad;
|
||||
}
|
||||
connect(gamepad, &QGamepad::axisLeftXChanged, this, [](double value) {
|
||||
qDebug() << "Left X" << value;
|
||||
});
|
||||
connect(gamepad, &QGamepad::axisLeftYChanged, this, [](double value) {
|
||||
qDebug() << "Left Y" << value;
|
||||
});
|
||||
connect(gamepad, &QGamepad::axisRightXChanged, this, [](double value) {
|
||||
qDebug() << "Right X" << value;
|
||||
});
|
||||
connect(gamepad, &QGamepad::axisRightYChanged, this, [](double value) {
|
||||
qDebug() << "Right Y" << value;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonAChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button A" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonBChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button B" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonXChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button X" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonYChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button Y" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonL1Changed, this, [](bool pressed) {
|
||||
qDebug() << "Button L1" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonR1Changed, this, [](bool pressed) {
|
||||
qDebug() << "Button R1" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonL2Changed, this, [](double value) {
|
||||
qDebug() << "Button L2: " << value;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonR2Changed, this, [](double value) {
|
||||
qDebug() << "Button R2: " << value;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonSelectChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button Select" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonStartChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button Start" << pressed;
|
||||
});
|
||||
connect(gamepad, &QGamepad::buttonGuideChanged, this, [](bool pressed) {
|
||||
qDebug() << "Button Guide" << pressed;
|
||||
});
|
||||
|
||||
emit newDevice(usbDevice, buttonList, commands); // Let the UI know we have a new controller
|
||||
QTimer::singleShot(0, this, SLOT(runTimer()));
|
||||
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!gamepad->isConnected()) {
|
||||
delete gamepad;
|
||||
gamepad = Q_NULLPTR;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
handle = hid_open(0x0b33, 0x0020, NULL);
|
||||
if (!handle) {
|
||||
handle = hid_open(0x0b33, 0x0030, NULL);
|
||||
|
|
@ -120,6 +197,7 @@ void usbController::run()
|
|||
emit newDevice(usbDevice, buttonList, commands); // Let the UI know we have a new controller
|
||||
QTimer::singleShot(0, this, SLOT(runTimer()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void usbController::runTimer()
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include <QGraphicsTextItem>
|
||||
#include <QColor>
|
||||
#include <QVector>
|
||||
#include <QGamepad>
|
||||
|
||||
#ifndef Q_OS_WIN
|
||||
#include "hidapi/hidapi.h"
|
||||
|
|
@ -99,7 +100,7 @@ signals:
|
|||
|
||||
private:
|
||||
hid_device* handle;
|
||||
enum { NONE, shuttleXpress, shuttlePro2, RC28 }usbDevice;
|
||||
enum { NONE, shuttleXpress, shuttlePro2, RC28, xBoxGamepad, unknownGamepad }usbDevice;
|
||||
bool isOpen=false;
|
||||
unsigned int buttons=0;
|
||||
unsigned char jogpos=0;
|
||||
|
|
@ -114,6 +115,7 @@ private:
|
|||
QString product="";
|
||||
QString manufacturer="";
|
||||
QString serial="<none>";
|
||||
QGamepad* gamepad=Q_NULLPTR;
|
||||
|
||||
protected:
|
||||
};
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ wfmain::wfmain(const QString settingsFile, const QString logFile, bool debugMode
|
|||
rpt = new repeaterSetup();
|
||||
sat = new satelliteSetup();
|
||||
trxadj = new transceiverAdjustments();
|
||||
shut = new shuttleSetup();
|
||||
shut = new controllerSetup();
|
||||
abtBox = new aboutbox();
|
||||
selRad = new selectRadio();
|
||||
|
||||
|
|
@ -1423,7 +1423,7 @@ void wfmain::setupUsbControllerDevice()
|
|||
connect(usbControllerDev, SIGNAL(doShuttle(bool, unsigned char)), this, SLOT(doShuttle(bool, unsigned char)));
|
||||
connect(usbControllerDev, SIGNAL(button(const COMMAND*)), this, SLOT(buttonControl(const COMMAND*)));
|
||||
connect(usbControllerDev, SIGNAL(setBand(int)), this, SLOT(setBand(int)));
|
||||
connect(this, SIGNAL(shuttleLed(bool, unsigned char)), usbControllerDev, SLOT(ledControl(bool, unsigned char)));
|
||||
connect(this, SIGNAL(controllerLed(bool, unsigned char)), usbControllerDev, SLOT(ledControl(bool, unsigned char)));
|
||||
connect(usbControllerDev, SIGNAL(newDevice(unsigned char, QVector<BUTTON>*, QVector<COMMAND>*)), shut, SLOT(newDevice(unsigned char, QVector<BUTTON>*, QVector<COMMAND>*)));
|
||||
usbControllerThread->start(QThread::LowestPriority);
|
||||
|
||||
|
|
@ -1443,7 +1443,7 @@ void wfmain::pttToggle(bool status)
|
|||
}
|
||||
|
||||
emit setPTT(status);
|
||||
emit shuttleLed(status, 1);
|
||||
emit controllerLed(status, 1);
|
||||
// Start 3 minute timer
|
||||
if (status)
|
||||
pttTimer->start();
|
||||
|
|
|
|||
6
wfmain.h
6
wfmain.h
|
|
@ -45,7 +45,7 @@
|
|||
#include <qcustomplot.h>
|
||||
#include <qserialportinfo.h>
|
||||
#include "usbcontroller.h"
|
||||
#include "shuttlesetup.h"
|
||||
#include "controllersetup.h"
|
||||
|
||||
#include <deque>
|
||||
#include <memory>
|
||||
|
|
@ -193,7 +193,7 @@ signals:
|
|||
void openShuttle();
|
||||
void requestRigState();
|
||||
void stateUpdated();
|
||||
void shuttleLed(bool, unsigned char);
|
||||
void controllerLed(bool, unsigned char);
|
||||
void sendUsbControllerCommands(QVector<COMMAND>* cmds);
|
||||
void sendUsbControllerButtons(QVector<BUTTON>* buts);
|
||||
void setClusterUdpPort(int port);
|
||||
|
|
@ -1068,7 +1068,7 @@ private:
|
|||
repeaterSetup *rpt;
|
||||
satelliteSetup *sat;
|
||||
transceiverAdjustments *trxadj;
|
||||
shuttleSetup* shut;
|
||||
controllerSetup* shut;
|
||||
aboutbox *abtBox;
|
||||
selectRadio *selRad;
|
||||
loggingWindow *logWindow;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT += core gui serialport network multimedia xml
|
||||
QT += core gui serialport network multimedia xml gamepad
|
||||
|
||||
#QT += sql
|
||||
#DEFINES += USESQL
|
||||
|
|
@ -181,7 +181,7 @@ SOURCES += main.cpp\
|
|||
repeatersetup.cpp \
|
||||
rigctld.cpp \
|
||||
usbcontroller.cpp \
|
||||
shuttlesetup.cpp \
|
||||
controllersetup.cpp \
|
||||
transceiveradjustments.cpp \
|
||||
selectradio.cpp \
|
||||
tcpserver.cpp \
|
||||
|
|
@ -220,7 +220,7 @@ HEADERS += wfmain.h \
|
|||
rigctld.h \
|
||||
ulaw.h \
|
||||
usbcontroller.h \
|
||||
shuttlesetup.h \
|
||||
controllersetup.h \
|
||||
transceiveradjustments.h \
|
||||
audiotaper.h \
|
||||
selectradio.h \
|
||||
|
|
@ -236,7 +236,7 @@ FORMS += wfmain.ui \
|
|||
selectradio.ui \
|
||||
repeatersetup.ui \
|
||||
transceiveradjustments.ui \
|
||||
shuttlesetup.ui \
|
||||
controllersetup.ui \
|
||||
aboutbox.ui
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" /><ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')"><Import Project="$(QtMsBuild)\qt_defaults.props" /></ImportGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><OutDir>wfview-debug\</OutDir><IntDir>debug\</IntDir><TargetName>wfview</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"><OutDir>wfview-release\</OutDir><IntDir>release\</IntDir><TargetName>wfview</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary><LinkIncremental>false</LinkIncremental></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><QtInstall>msvc2019</QtInstall><QtModules>core;network;gui;multimedia;widgets;serialport;printsupport</QtModules></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"><QtInstall>msvc2019</QtInstall><QtModules>core;network;gui;multimedia;widgets;serialport;printsupport</QtModules></PropertyGroup><ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')"><Import Project="$(QtMsBuild)\qt.props" /></ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" /><ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')"><Import Project="$(QtMsBuild)\qt_defaults.props" /></ImportGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><OutDir>wfview-debug\</OutDir><IntDir>debug\</IntDir><TargetName>wfview</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary></PropertyGroup><PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"><OutDir>wfview-release\</OutDir><IntDir>release\</IntDir><TargetName>wfview</TargetName><IgnoreImportLibrary>true</IgnoreImportLibrary><LinkIncremental>false</LinkIncremental></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"><QtInstall>msvc2019</QtInstall><QtModules>core;xml;network;gui;multimedia;widgets;serialport;printsupport;gamepad</QtModules></PropertyGroup><PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"><QtInstall>msvc2019</QtInstall><QtModules>core;xml;network;gui;multimedia;widgets;serialport;printsupport;gamepad</QtModules></PropertyGroup><ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')"><Import Project="$(QtMsBuild)\qt.props" /></ImportGroup>
|
||||
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<ObjectFileName>release\</ObjectFileName>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.45";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="546330e";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="677eb3c";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessToFile>false</PreprocessToFile>
|
||||
<ProgramDataBaseFileName></ProgramDataBaseFileName>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
<WarningLevel>0</WarningLevel>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.45\";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=\"546330e\";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_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=\"677eb3c\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_GAMEPAD_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><Include>./$(Configuration)/moc_predefs.h</Include><ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription><DynamicSource>output</DynamicSource><QtMocDir>$(Configuration)</QtMocDir><QtMocFileName>moc_%(Filename).cpp</QtMocFileName></QtMoc><QtRcc><Compression>default</Compression><ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription><QtRccDir>$(Configuration)</QtRccDir><QtRccFileName>qrc_%(Filename).cpp</QtRccFileName></QtRcc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<ObjectFileName>debug\</ObjectFileName>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.45";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="546330e";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="677eb3c";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessToFile>false</PreprocessToFile>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<SuppressStartupBanner>true</SuppressStartupBanner>
|
||||
|
|
@ -124,7 +124,7 @@
|
|||
<WarningLevel>0</WarningLevel>
|
||||
</Midl>
|
||||
<ResourceCompile>
|
||||
<PreprocessorDefinitions>_WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.45\";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=\"546330e\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_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=\"677eb3c\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_GAMEPAD_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><Include>./$(Configuration)/moc_predefs.h</Include><ExecutionDescription>Moc'ing %(Identity)...</ExecutionDescription><DynamicSource>output</DynamicSource><QtMocDir>$(Configuration)</QtMocDir><QtMocFileName>moc_%(Filename).cpp</QtMocFileName></QtMoc><QtRcc><Compression>default</Compression><ExecutionDescription>Rcc'ing %(Identity)...</ExecutionDescription><QtRccDir>$(Configuration)</QtRccDir><QtRccFileName>qrc_%(Filename).cpp</QtRccFileName></QtRcc><QtUic><ExecutionDescription>Uic'ing %(Identity)...</ExecutionDescription><QtUicDir>$(ProjectDir)</QtUicDir><QtUicFileName>ui_%(Filename).h</QtUicFileName></QtUic></ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
|
|
@ -133,7 +133,10 @@
|
|||
<ClCompile Include="audioconverter.cpp" />
|
||||
<ClCompile Include="audiohandler.cpp" />
|
||||
<ClCompile Include="calibrationwindow.cpp" />
|
||||
<ClCompile Include="cluster.cpp" />
|
||||
<ClCompile Include="commhandler.cpp" />
|
||||
<ClCompile Include="controllersetup.cpp" />
|
||||
<ClCompile Include="database.cpp" />
|
||||
<ClCompile Include="freqmemory.cpp" />
|
||||
<ClCompile Include="..\hidapi\windows\hid.c" />
|
||||
<ClCompile Include="logcategories.cpp" />
|
||||
|
|
@ -152,7 +155,6 @@
|
|||
<ClCompile Include="rthandler.cpp" />
|
||||
<ClCompile Include="satellitesetup.cpp" />
|
||||
<ClCompile Include="selectradio.cpp" />
|
||||
<ClCompile Include="shuttlesetup.cpp" />
|
||||
<ClCompile Include="tcpserver.cpp" />
|
||||
<ClCompile Include="transceiveradjustments.cpp" />
|
||||
<ClCompile Include="udpaudio.cpp" />
|
||||
|
|
@ -206,6 +208,16 @@
|
|||
|
||||
|
||||
|
||||
</QtMoc>
|
||||
<QtMoc Include="cluster.h">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</QtMoc>
|
||||
<ClInclude Include="colorprefs.h" />
|
||||
<QtMoc Include="commhandler.h">
|
||||
|
|
@ -218,6 +230,17 @@
|
|||
|
||||
|
||||
</QtMoc>
|
||||
<QtMoc Include="controllersetup.h">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</QtMoc>
|
||||
<ClInclude Include="database.h" />
|
||||
<ClInclude Include="freqmemory.h" />
|
||||
<ClInclude Include="logcategories.h" />
|
||||
<QtMoc Include="loggingwindow.h">
|
||||
|
|
@ -343,16 +366,6 @@
|
|||
|
||||
|
||||
|
||||
</QtMoc>
|
||||
<QtMoc Include="shuttlesetup.h">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</QtMoc>
|
||||
<ClInclude Include="resampler\speex_resampler.h" />
|
||||
<QtMoc Include="tcpserver.h">
|
||||
|
|
@ -455,6 +468,10 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<CustomBuild Include="debug\moc_predefs.h.cbt">
|
||||
<FileType>Document</FileType>
|
||||
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||
|
|
@ -515,8 +532,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -543,6 +558,17 @@
|
|||
|
||||
|
||||
|
||||
</QtUic>
|
||||
<QtUic Include="controllersetup.ui">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</QtUic>
|
||||
<QtUic Include="loggingwindow.ui">
|
||||
|
||||
|
|
@ -587,17 +613,6 @@
|
|||
|
||||
|
||||
|
||||
</QtUic>
|
||||
<QtUic Include="shuttlesetup.ui">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</QtUic>
|
||||
<QtUic Include="transceiveradjustments.ui">
|
||||
|
||||
|
|
|
|||
|
|
@ -62,9 +62,18 @@
|
|||
<ClCompile Include="calibrationwindow.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="cluster.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="commhandler.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="controllersetup.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="database.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="freqmemory.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -119,9 +128,6 @@
|
|||
<ClCompile Include="selectradio.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="shuttlesetup.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="tcpserver.cpp">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -172,12 +178,21 @@
|
|||
<QtMoc Include="calibrationwindow.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<QtMoc Include="cluster.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<ClInclude Include="colorprefs.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<QtMoc Include="commhandler.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<QtMoc Include="controllersetup.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<ClInclude Include="database.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="freqmemory.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -232,9 +247,6 @@
|
|||
<QtMoc Include="selectradio.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<QtMoc Include="shuttlesetup.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</QtMoc>
|
||||
<ClInclude Include="resampler\speex_resampler.h">
|
||||
<Filter>Header Files</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -286,6 +298,10 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<CustomBuild Include="debug\moc_predefs.h.cbt">
|
||||
<Filter>Generated Files</Filter>
|
||||
</CustomBuild>
|
||||
|
|
@ -336,8 +352,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -349,6 +363,9 @@
|
|||
<QtUic Include="calibrationwindow.ui">
|
||||
<Filter>Form Files</Filter>
|
||||
</QtUic>
|
||||
<QtUic Include="controllersetup.ui">
|
||||
<Filter>Form Files</Filter>
|
||||
</QtUic>
|
||||
<QtUic Include="loggingwindow.ui">
|
||||
<Filter>Form Files</Filter>
|
||||
</QtUic>
|
||||
|
|
@ -361,9 +378,6 @@
|
|||
<QtUic Include="selectradio.ui">
|
||||
<Filter>Form Files</Filter>
|
||||
</QtUic>
|
||||
<QtUic Include="shuttlesetup.ui">
|
||||
<Filter>Form Files</Filter>
|
||||
</QtUic>
|
||||
<QtUic Include="transceiveradjustments.ui">
|
||||
<Filter>Form Files</Filter>
|
||||
</QtUic>
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue