kopia lustrzana https://gitlab.com/eliggett/wfview
Merge branch 'master' into sidetone
commit
b2af4c898e
18
CHANGELOG
18
CHANGELOG
|
@ -1,3 +1,21 @@
|
||||||
|
commit 2186a74490d6d62ee5581ba9956aac7e738f9791
|
||||||
|
Author: Phil Taylor <phil@m0vse.uk>
|
||||||
|
Date: Mon Feb 20 13:05:23 2023 +0000
|
||||||
|
|
||||||
|
Minor change to p and P commands in rigctld
|
||||||
|
|
||||||
|
commit b9288175bd67df8609996ba008268514c80515c1
|
||||||
|
Author: Phil Taylor <phil@m0vse.uk>
|
||||||
|
Date: Mon Feb 20 12:43:26 2023 +0000
|
||||||
|
|
||||||
|
Add remaining rigctld commands (mainly unimplemented)
|
||||||
|
|
||||||
|
commit ce9e3e9f2cd8a343ab65d068904475126bfc8483
|
||||||
|
Author: Roeland Jansen <roeland.jansen69@gmail.com>
|
||||||
|
Date: Tue Feb 14 16:10:38 2023 +0100
|
||||||
|
|
||||||
|
ecoder, collission-detection added
|
||||||
|
|
||||||
commit dd4770a85ff462913c223fcb1a9aeff65cce0a5d
|
commit dd4770a85ff462913c223fcb1a9aeff65cce0a5d
|
||||||
Merge: 32e6622 3582c95
|
Merge: 32e6622 3582c95
|
||||||
Author: Phil Taylor <phil@m0vse.uk>
|
Author: Phil Taylor <phil@m0vse.uk>
|
||||||
|
|
14
rigctld.cpp
14
rigctld.cpp
|
@ -1030,11 +1030,11 @@ void rigCtlClient::socketReadyRead()
|
||||||
int value=0;
|
int value=0;
|
||||||
setCommand = true;
|
setCommand = true;
|
||||||
if (command[1] == "ANN") {
|
if (command[1] == "ANN") {
|
||||||
value = command[2].toFloat() * 255;
|
value = command[2].toInt();
|
||||||
rigState->set(ANN, quint8(value), true);
|
rigState->set(ANN, quint8(value), true);
|
||||||
}
|
}
|
||||||
else if (command[1] == "APO") {
|
else if (command[1] == "APO") {
|
||||||
value = command[2].toFloat() * 255;
|
value = command[2].toInt();
|
||||||
rigState->set(APO, quint8(value), true);
|
rigState->set(APO, quint8(value), true);
|
||||||
}
|
}
|
||||||
else if (command[1] == "BACKLIGHT") {
|
else if (command[1] == "BACKLIGHT") {
|
||||||
|
@ -1042,7 +1042,7 @@ void rigCtlClient::socketReadyRead()
|
||||||
rigState->set(BACKLIGHT, quint8(value), true);
|
rigState->set(BACKLIGHT, quint8(value), true);
|
||||||
}
|
}
|
||||||
else if (command[1] == "BEEP") {
|
else if (command[1] == "BEEP") {
|
||||||
value = command[2].toFloat() * 255;
|
value = command[2].toInt();
|
||||||
rigState->set(BEEP, quint8(value), true);
|
rigState->set(BEEP, quint8(value), true);
|
||||||
}
|
}
|
||||||
else if (command[1] == "TIME") {
|
else if (command[1] == "TIME") {
|
||||||
|
@ -1068,20 +1068,20 @@ void rigCtlClient::socketReadyRead()
|
||||||
{
|
{
|
||||||
QString resp;
|
QString resp;
|
||||||
if (longReply) {
|
if (longReply) {
|
||||||
resp.append("Level Value: ");
|
resp.append(QString("get_parm: %1%2").arg(command[1]).arg(sep));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (command[1] == "ANN") {
|
if (command[1] == "ANN") {
|
||||||
resp.append(QString("%1").arg((float)rigState->getChar(ANN) / 255.0));
|
resp.append(QString("%1").arg(rigState->getChar(ANN)));
|
||||||
}
|
}
|
||||||
else if (command[1] == "APO") {
|
else if (command[1] == "APO") {
|
||||||
resp.append(QString("%1").arg((float)rigState->getChar(APO) / 255.0));
|
resp.append(QString("%1").arg(rigState->getChar(APO)));
|
||||||
}
|
}
|
||||||
else if (command[1] == "BACKLIGHT") {
|
else if (command[1] == "BACKLIGHT") {
|
||||||
resp.append(QString("%1").arg((float)rigState->getChar(BACKLIGHT) / 255.0));
|
resp.append(QString("%1").arg((float)rigState->getChar(BACKLIGHT) / 255.0));
|
||||||
}
|
}
|
||||||
else if (command[1] == "BEEP") {
|
else if (command[1] == "BEEP") {
|
||||||
resp.append(QString("%1").arg((float)rigState->getChar(BEEP) / 255.0));
|
resp.append(QString("%1").arg(rigState->getChar(BEEP)));
|
||||||
}
|
}
|
||||||
else if (command[1] == "TIME") {
|
else if (command[1] == "TIME") {
|
||||||
resp.append(QString("%1").arg(rigState->getInt64(TIME)));
|
resp.append(QString("%1").arg(rigState->getInt64(TIME)));
|
||||||
|
|
|
@ -187,9 +187,8 @@ private:
|
||||||
usbDeviceType usbDevice = usbNone;
|
usbDeviceType usbDevice = usbNone;
|
||||||
|
|
||||||
unsigned short knownUsbDevices[6][5] = {
|
unsigned short knownUsbDevices[6][5] = {
|
||||||
{shuttleXpress,0x0b33,0x0020,0x0001,0x000c},
|
{shuttleXpress,0x0b33,0x0020,0x0000,0x0000},
|
||||||
{shuttlePro2,0x0b33,0x0030,0x0001,0x000c},
|
{shuttlePro2,0x0b33,0x0030,0x0000,0x0000},
|
||||||
//{eCoderPlus,0x0c26,0x001e}, // Only enable for testing!
|
|
||||||
{RC28,0x0c26,0x001e,0x0004,0x0004},
|
{RC28,0x0c26,0x001e,0x0004,0x0004},
|
||||||
{eCoderPlus, 0x1fc9, 0x0003,0x0000,0x0000},
|
{eCoderPlus, 0x1fc9, 0x0003,0x0000,0x0000},
|
||||||
{QuickKeys, 0x28bd, 0x5202,0x0001,0xff0a},
|
{QuickKeys, 0x28bd, 0x5202,0x0001,0xff0a},
|
||||||
|
|
|
@ -12,10 +12,10 @@ QT += core gui serialport network multimedia xml
|
||||||
#Uncomment The following line to enable USB controllers (Shuttle/RC-28 etc.)
|
#Uncomment The following line to enable USB controllers (Shuttle/RC-28 etc.)
|
||||||
DEFINES += USB_CONTROLLER
|
DEFINES += USB_CONTROLLER
|
||||||
|
|
||||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
|
||||||
|
|
||||||
contains(DEFINES,USB_CONTROLLER){
|
contains(DEFINES,USB_CONTROLLER){
|
||||||
lessThan(QT_MAJOR_VERSION, 6): QT += gamepad printsupport
|
lessThan(QT_MAJOR_VERSION, 6): QT += gamepad
|
||||||
}
|
}
|
||||||
|
|
||||||
TARGET = wfview
|
TARGET = wfview
|
||||||
|
|
Ładowanie…
Reference in New Issue