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

Simplify command creation

failbranch
Phil Taylor 2023-02-02 23:46:39 +00:00
rodzic 4ea80af164
commit a511282505
1 zmienionych plików z 55 dodań i 54 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

109
wfmain.cpp
Wyświetl plik

@ -9206,60 +9206,61 @@ void wfmain::resetUsbButtons()
void wfmain::resetUsbCommands()
{
usbCommands.clear();
usbCommands.append(COMMAND(0, "None", cmdNone, 0x0));
usbCommands.append(COMMAND(1, "PTT On", cmdSetPTT, 0x1));
usbCommands.append(COMMAND(2, "PTT Off", cmdSetPTT, 0x0));
usbCommands.append(COMMAND(3, "PTT Toggle", cmdPTTToggle, 0x0));
usbCommands.append(COMMAND(4, "Tune", cmdStartATU, 0x0));
usbCommands.append(COMMAND(5, "Step+", cmdSetStepUp, 0x0));
usbCommands.append(COMMAND(6, "Step-", cmdSetStepDown, 0x0));
usbCommands.append(COMMAND(7, "Span+", cmdSetSpanUp, 0x0));
usbCommands.append(COMMAND(8, "Span-", cmdSetSpanDown, 0x0));
usbCommands.append(COMMAND(9, "Mode+", cmdSetModeUp, 0x0));
usbCommands.append(COMMAND(10, "Mode-", cmdSetModeDown, 0x0));
usbCommands.append(COMMAND(11, "Mode LSB", cmdSetMode, modeLSB));
usbCommands.append(COMMAND(12, "Mode USB", cmdSetMode, modeUSB));
usbCommands.append(COMMAND(13, "Mode LSBD", cmdSetMode, modeLSB_D));
usbCommands.append(COMMAND(14, "Mode USBD", cmdSetMode, modeUSB_D));
usbCommands.append(COMMAND(15, "Mode CW", cmdSetMode, modeCW));
usbCommands.append(COMMAND(16, "Mode CWR", cmdSetMode, modeCW_R));
usbCommands.append(COMMAND(17, "Mode FM", cmdSetMode, modeFM));
usbCommands.append(COMMAND(18, "Mode AM", cmdSetMode, modeAM));
usbCommands.append(COMMAND(19, "Mode RTTY", cmdSetMode, modeRTTY));
usbCommands.append(COMMAND(20, "Mode RTTYR", cmdSetMode, modeRTTY_R));
usbCommands.append(COMMAND(21, "Mode PSK", cmdSetMode, modePSK));
usbCommands.append(COMMAND(22, "Mode PSKR", cmdSetMode, modePSK_R));
usbCommands.append(COMMAND(23, "Mode DV", cmdSetMode, modeDV));
usbCommands.append(COMMAND(24, "Mode DD", cmdSetMode, modeDD));
usbCommands.append(COMMAND(25, "Band+", cmdSetBandUp, 0x0));
usbCommands.append(COMMAND(26, "Band-", cmdSetBandDown, 0x0));
usbCommands.append(COMMAND(27, "23cm", cmdGetBandStackReg, band23cm));
usbCommands.append(COMMAND(28, "70cm", cmdGetBandStackReg, band70cm));
usbCommands.append(COMMAND(29, "2m", cmdGetBandStackReg, band2m));
usbCommands.append(COMMAND(30, "AIR", cmdGetBandStackReg, bandAir));
usbCommands.append(COMMAND(31, "WFM", cmdGetBandStackReg, bandWFM));
usbCommands.append(COMMAND(32, "4m", cmdGetBandStackReg, band4m));
usbCommands.append(COMMAND(33, "6m", cmdGetBandStackReg, band6m));
usbCommands.append(COMMAND(34, "10m", cmdGetBandStackReg, band10m));
usbCommands.append(COMMAND(35, "12m", cmdGetBandStackReg, band12m));
usbCommands.append(COMMAND(36, "15m", cmdGetBandStackReg, band15m));
usbCommands.append(COMMAND(37, "17m", cmdGetBandStackReg, band17m));
usbCommands.append(COMMAND(38, "20m", cmdGetBandStackReg, band20m));
usbCommands.append(COMMAND(39, "30m", cmdGetBandStackReg, band30m));
usbCommands.append(COMMAND(40, "40m", cmdGetBandStackReg, band40m));
usbCommands.append(COMMAND(41, "60m", cmdGetBandStackReg, band60m));
usbCommands.append(COMMAND(42, "80m", cmdGetBandStackReg, band80m));
usbCommands.append(COMMAND(43, "160m", cmdGetBandStackReg, band160m));
usbCommands.append(COMMAND(44, "630m", cmdGetBandStackReg, band630m));
usbCommands.append(COMMAND(45, "2200m", cmdGetBandStackReg, band2200m));
usbCommands.append(COMMAND(46, "GEN", cmdGetBandStackReg, bandGen));
usbCommands.append(COMMAND(47, "NR On", cmdNone, 0x0));
usbCommands.append(COMMAND(48, "NR Off", cmdNone, 0x0));
usbCommands.append(COMMAND(49, "NB On", cmdNone, 0x0));
usbCommands.append(COMMAND(50, "NB Off", cmdNone, 0x0));
usbCommands.append(COMMAND(51, "Split On", cmdNone, 0x01));
usbCommands.append(COMMAND(52, "Split Off", cmdNone, 0x0));
usbCommands.append(COMMAND(53, "Swap VFOs", cmdVFOSwap, 0x0));
int num = 0;
usbCommands.append(COMMAND(num++, "None", cmdNone, 0x0));
usbCommands.append(COMMAND(num++, "PTT On", cmdSetPTT, 0x1));
usbCommands.append(COMMAND(num++, "PTT Off", cmdSetPTT, 0x0));
usbCommands.append(COMMAND(num++, "PTT Toggle", cmdPTTToggle, 0x0));
usbCommands.append(COMMAND(num++, "Tune", cmdStartATU, 0x0));
usbCommands.append(COMMAND(num++, "Step+", cmdSetStepUp, 0x0));
usbCommands.append(COMMAND(num++, "Step-", cmdSetStepDown, 0x0));
usbCommands.append(COMMAND(num++, "Span+", cmdSetSpanUp, 0x0));
usbCommands.append(COMMAND(num++, "Span-", cmdSetSpanDown, 0x0));
usbCommands.append(COMMAND(num++, "Mode+", cmdSetModeUp, 0x0));
usbCommands.append(COMMAND(num++, "Mode-", cmdSetModeDown, 0x0));
usbCommands.append(COMMAND(num++, "Mode LSB", cmdSetMode, modeLSB));
usbCommands.append(COMMAND(num++, "Mode USB", cmdSetMode, modeUSB));
usbCommands.append(COMMAND(num++, "Mode LSBD", cmdSetMode, modeLSB_D));
usbCommands.append(COMMAND(num++, "Mode USBD", cmdSetMode, modeUSB_D));
usbCommands.append(COMMAND(num++, "Mode CW", cmdSetMode, modeCW));
usbCommands.append(COMMAND(num++, "Mode CWR", cmdSetMode, modeCW_R));
usbCommands.append(COMMAND(num++, "Mode FM", cmdSetMode, modeFM));
usbCommands.append(COMMAND(num++, "Mode AM", cmdSetMode, modeAM));
usbCommands.append(COMMAND(num++, "Mode RTTY", cmdSetMode, modeRTTY));
usbCommands.append(COMMAND(num++, "Mode RTTYR", cmdSetMode, modeRTTY_R));
usbCommands.append(COMMAND(num++, "Mode PSK", cmdSetMode, modePSK));
usbCommands.append(COMMAND(num++, "Mode PSKR", cmdSetMode, modePSK_R));
usbCommands.append(COMMAND(num++, "Mode DV", cmdSetMode, modeDV));
usbCommands.append(COMMAND(num++, "Mode DD", cmdSetMode, modeDD));
usbCommands.append(COMMAND(num++, "Band+", cmdSetBandUp, 0x0));
usbCommands.append(COMMAND(num++, "Band-", cmdSetBandDown, 0x0));
usbCommands.append(COMMAND(num++, "23cm", cmdGetBandStackReg, band23cm));
usbCommands.append(COMMAND(num++, "70cm", cmdGetBandStackReg, band70cm));
usbCommands.append(COMMAND(num++, "2m", cmdGetBandStackReg, band2m));
usbCommands.append(COMMAND(num++, "AIR", cmdGetBandStackReg, bandAir));
usbCommands.append(COMMAND(num++, "WFM", cmdGetBandStackReg, bandWFM));
usbCommands.append(COMMAND(num++, "4m", cmdGetBandStackReg, band4m));
usbCommands.append(COMMAND(num++, "6m", cmdGetBandStackReg, band6m));
usbCommands.append(COMMAND(num++, "10m", cmdGetBandStackReg, band10m));
usbCommands.append(COMMAND(num++, "12m", cmdGetBandStackReg, band12m));
usbCommands.append(COMMAND(num++, "15m", cmdGetBandStackReg, band15m));
usbCommands.append(COMMAND(num++, "17m", cmdGetBandStackReg, band17m));
usbCommands.append(COMMAND(num++, "20m", cmdGetBandStackReg, band20m));
usbCommands.append(COMMAND(num++, "30m", cmdGetBandStackReg, band30m));
usbCommands.append(COMMAND(num++, "40m", cmdGetBandStackReg, band40m));
usbCommands.append(COMMAND(num++, "60m", cmdGetBandStackReg, band60m));
usbCommands.append(COMMAND(num++, "80m", cmdGetBandStackReg, band80m));
usbCommands.append(COMMAND(num++, "160m", cmdGetBandStackReg, band160m));
usbCommands.append(COMMAND(num++, "630m", cmdGetBandStackReg, band630m));
usbCommands.append(COMMAND(num++, "2200m", cmdGetBandStackReg, band2200m));
usbCommands.append(COMMAND(num++, "GEN", cmdGetBandStackReg, bandGen));
usbCommands.append(COMMAND(num++, "NR On", cmdNone, 0x0));
usbCommands.append(COMMAND(num++, "NR Off", cmdNone, 0x0));
usbCommands.append(COMMAND(num++, "NB On", cmdNone, 0x0));
usbCommands.append(COMMAND(num++, "NB Off", cmdNone, 0x0));
usbCommands.append(COMMAND(num++, "Split On", cmdNone, 0x01));
usbCommands.append(COMMAND(num++, "Split Off", cmdNone, 0x0));
usbCommands.append(COMMAND(num++, "Swap VFOs", cmdVFOSwap, 0x0));
emit sendUsbControllerCommands(&usbCommands);
}