kopia lustrzana https://gitlab.com/eliggett/wfview
Fixed busted keystroke assignments (mode and transmit).
rodzic
88d31063f9
commit
d03d781713
22
freqmemory.h
22
freqmemory.h
|
@ -9,16 +9,18 @@
|
||||||
// modes << "FM" << "CW-R" << "RTTY-R" << "LSB-D" << "USB-D";
|
// modes << "FM" << "CW-R" << "RTTY-R" << "LSB-D" << "USB-D";
|
||||||
|
|
||||||
enum mode_kind {
|
enum mode_kind {
|
||||||
modeLSB=0,
|
modeLSB=0x00,
|
||||||
modeUSB,
|
modeUSB=0x01,
|
||||||
modeAM,
|
modeAM=0x02,
|
||||||
modeCW,
|
modeCW=0x03,
|
||||||
modeRTTY,
|
modeRTTY=0x04,
|
||||||
modeFM,
|
modeFM=0x05,
|
||||||
modeCW_R,
|
modeCW_R=0x07,
|
||||||
modeRTTY_R,
|
modeRTTY_R=0x08,
|
||||||
modeLSB_D,
|
modeLSB_D=0x80,
|
||||||
modeUSB_D
|
modeUSB_D=0x81,
|
||||||
|
modeDV=0x17,
|
||||||
|
modeDD=0x27
|
||||||
};
|
};
|
||||||
|
|
||||||
struct preset_kind {
|
struct preset_kind {
|
||||||
|
|
53
wfmain.cpp
53
wfmain.cpp
|
@ -1005,43 +1005,37 @@ void wfmain::shortcutF4()
|
||||||
void wfmain::shortcutF5()
|
void wfmain::shortcutF5()
|
||||||
{
|
{
|
||||||
// LSB
|
// LSB
|
||||||
ui->modeSelectCombo->setCurrentIndex(0);
|
changeMode(modeLSB, false);
|
||||||
on_modeSelectCombo_activated(0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::shortcutF6()
|
void wfmain::shortcutF6()
|
||||||
{
|
{
|
||||||
// USB
|
// USB
|
||||||
ui->modeSelectCombo->setCurrentIndex(1);
|
changeMode(modeUSB, false);
|
||||||
on_modeSelectCombo_activated(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::shortcutF7()
|
void wfmain::shortcutF7()
|
||||||
{
|
{
|
||||||
// AM
|
// AM
|
||||||
ui->modeSelectCombo->setCurrentIndex(2);
|
changeMode(modeAM, false);
|
||||||
on_modeSelectCombo_activated(2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::shortcutF8()
|
void wfmain::shortcutF8()
|
||||||
{
|
{
|
||||||
// CW
|
// CW
|
||||||
ui->modeSelectCombo->setCurrentIndex(3);
|
changeMode(modeCW, false);
|
||||||
on_modeSelectCombo_activated(3);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::shortcutF9()
|
void wfmain::shortcutF9()
|
||||||
{
|
{
|
||||||
// USB-D
|
// USB-D
|
||||||
ui->modeSelectCombo->setCurrentIndex(9);
|
changeMode(modeUSB, true);
|
||||||
on_modeSelectCombo_activated(9);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::shortcutF10()
|
void wfmain::shortcutF10()
|
||||||
{
|
{
|
||||||
// Build information, debug, whatever you wish
|
// FM
|
||||||
QString buildInfo = QString("Build " + QString(GITSHORT) + " on " + QString(__DATE__) + " at " + __TIME__ + " by " + UNAME + "@" + HOST);
|
changeMode(modeFM, false);
|
||||||
showStatusBarText(buildInfo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::shortcutF12()
|
void wfmain::shortcutF12()
|
||||||
|
@ -1938,6 +1932,37 @@ void wfmain::on_scopeEdgeCombo_currentIndexChanged(int index)
|
||||||
emit setScopeEdge((char)index+1);
|
emit setScopeEdge((char)index+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wfmain::changeMode(mode_kind mode)
|
||||||
|
{
|
||||||
|
bool dataOn = false;
|
||||||
|
if(((unsigned char) mode >> 4) == 0x08)
|
||||||
|
{
|
||||||
|
dataOn = true;
|
||||||
|
mode = (mode_kind)((int)mode & 0x0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
changeMode(mode, dataOn);
|
||||||
|
}
|
||||||
|
|
||||||
|
void wfmain::changeMode(mode_kind mode, bool dataOn)
|
||||||
|
{
|
||||||
|
int filter = ui->modeFilterCombo->currentData().toInt();
|
||||||
|
emit setMode((unsigned char)mode, filter);
|
||||||
|
if(dataOn)
|
||||||
|
{
|
||||||
|
issueDelayedCommand(cmdSetDataModeOn);
|
||||||
|
ui->dataModeBtn->blockSignals(true);
|
||||||
|
ui->dataModeBtn->setChecked(true);
|
||||||
|
ui->dataModeBtn->blockSignals(false);
|
||||||
|
} else {
|
||||||
|
issueDelayedCommand(cmdSetDataModeOff);
|
||||||
|
ui->dataModeBtn->blockSignals(true);
|
||||||
|
ui->dataModeBtn->setChecked(false);
|
||||||
|
ui->dataModeBtn->blockSignals(false);
|
||||||
|
}
|
||||||
|
issueDelayedCommand(cmdGetMode);
|
||||||
|
}
|
||||||
|
|
||||||
void wfmain::on_modeSelectCombo_activated(int index)
|
void wfmain::on_modeSelectCombo_activated(int index)
|
||||||
{
|
{
|
||||||
// The "acticvated" signal means the user initiated a mode change.
|
// The "acticvated" signal means the user initiated a mode change.
|
||||||
|
@ -2342,6 +2367,7 @@ void wfmain::handlePttLimit()
|
||||||
// transmission time exceeded!
|
// transmission time exceeded!
|
||||||
showStatusBarText("Transmit timeout at 3 minutes. Sending PTT OFF command now.");
|
showStatusBarText("Transmit timeout at 3 minutes. Sending PTT OFF command now.");
|
||||||
emit setPTT(false);
|
emit setPTT(false);
|
||||||
|
issueDelayedCommand(cmdGetPTT);
|
||||||
}
|
}
|
||||||
|
|
||||||
void wfmain::on_saveSettingsBtn_clicked()
|
void wfmain::on_saveSettingsBtn_clicked()
|
||||||
|
@ -2549,6 +2575,7 @@ void wfmain::on_transmitBtn_clicked()
|
||||||
} else {
|
} else {
|
||||||
// Currently transmitting
|
// Currently transmitting
|
||||||
emit setPTT(false);
|
emit setPTT(false);
|
||||||
|
pttTimer->stop();
|
||||||
issueDelayedCommand(cmdGetPTT);
|
issueDelayedCommand(cmdGetPTT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
3
wfmain.h
3
wfmain.h
|
@ -489,6 +489,9 @@ private:
|
||||||
void issueDelayedCommandPriority(cmds cmd);
|
void issueDelayedCommandPriority(cmds cmd);
|
||||||
void changeSliderQuietly(QSlider *slider, int value);
|
void changeSliderQuietly(QSlider *slider, int value);
|
||||||
|
|
||||||
|
void changeMode(mode_kind mode);
|
||||||
|
void changeMode(mode_kind mode, bool dataOn);
|
||||||
|
|
||||||
int oldFreqDialVal;
|
int oldFreqDialVal;
|
||||||
|
|
||||||
rigCapabilities rigCaps;
|
rigCapabilities rigCaps;
|
||||||
|
|
Ładowanie…
Reference in New Issue