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

Fix for band +/- buttons

failbranch
Phil Taylor 2023-01-30 23:54:45 +00:00
rodzic 63a7ec0a21
commit 2696d2c8d9
2 zmienionych plików z 10 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
rigcommander.cpp
Wyświetl plik

@ -3348,8 +3348,8 @@ void rigCommander::determineRigCaps()
bandType bandDefGen(bandGen, 10000, 30000000, modeAM);
standardHF = { bandDef6m, bandDef10m, bandDef12m, bandDef15m, bandDef17m,
bandDef20m, bandDef30m, bandDef40m, bandDef60m, bandDef80m, bandDef160m};
standardHF = { bandDef160m, bandDef80m, bandDef60m, bandDef40m, bandDef30m,
bandDef20m, bandDef17m, bandDef15m, bandDef12m, bandDef10m, bandDef6m };
standardVU = { bandDef2m, bandDef70cm };

12
wfmain.cpp
Wyświetl plik

@ -1699,11 +1699,11 @@ void wfmain::buttonControl(const COMMAND* cmd)
case cmdGetBandStackReg:
issueCmd((cmds)cmd->command, cmd->band);
break;
case cmdSetBandUp:
case cmdSetBandDown:
for (size_t i = 0; i < rigCaps.bands.size(); i++) {
if (rigCaps.bands[i].band == lastRequestedBand)
{
if (i>0) {
if (i > 0) {
issueCmd(cmdGetBandStackReg, rigCaps.bands[i - 1].band);
}
else {
@ -1712,7 +1712,7 @@ void wfmain::buttonControl(const COMMAND* cmd)
}
}
break;
case cmdSetBandDown:
case cmdSetBandUp:
for (size_t i = 0; i < rigCaps.bands.size(); i++) {
if (rigCaps.bands[i].band == lastRequestedBand)
{
@ -4450,6 +4450,10 @@ void wfmain::receiveRigID(rigCapabilities rigCaps)
}
haveRigCaps = true;
if (rigCaps.bands.size() > 0) {
lastRequestedBand = rigCaps.bands[0].band;
}
// Added so that server receives rig capabilities.
emit sendRigCaps(rigCaps);
rpt->setRig(rigCaps);
@ -9083,7 +9087,7 @@ void wfmain::resetUsbButtons()
usbButtons.append(BUTTON(2, 14, QRect(280, 195, 25, 80), Qt::red, &usbCommands[0], &usbCommands[0]));
// RC28
usbButtons.append(BUTTON(3, 0, QRect(52, 445, 238, 64), Qt::red, &usbCommands[0], &usbCommands[0]));
usbButtons.append(BUTTON(3, 0, QRect(52, 445, 238, 64), Qt::red, &usbCommands[1], &usbCommands[2])); // PTT On/OFF
usbButtons.append(BUTTON(3, 1, QRect(52, 373, 98, 46), Qt::red, &usbCommands[0], &usbCommands[0]));
usbButtons.append(BUTTON(3, 2, QRect(193, 373, 98, 46), Qt::red, &usbCommands[0], &usbCommands[0]));