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

Fix vfo_fixup 

https://github.com/Hamlib/Hamlib/issues/663
pull/668/head
Mike Black W9MDB 2021-04-14 16:56:38 -05:00
rodzic 4501c1c97b
commit cec6216388
2 zmienionych plików z 5 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
src/misc.c
Wyświetl plik

@ -1651,7 +1651,7 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
if (VFO_HAS_MAIN_SUB_A_B_ONLY) { vfo = RIG_VFO_MAIN; } if (VFO_HAS_MAIN_SUB_A_B_ONLY) { vfo = RIG_VFO_MAIN; }
} }
else if (vfo == RIG_VFO_TX || RIG_VFO_B) else if (vfo == RIG_VFO_TX || vfo == RIG_VFO_B)
{ {
int retval; int retval;
split_t split = 0; split_t split = 0;
@ -1668,7 +1668,7 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
} }
int satmode = rig->state.cache.satmode; int satmode = rig->state.cache.satmode;
vfo = RIG_VFO_A; if (vfo == RIG_VFO_TX) vfo = RIG_VFO_A;
if (split) { vfo = RIG_VFO_B; } if (split) { vfo = RIG_VFO_B; }
@ -1684,6 +1684,7 @@ vfo_t HAMLIB_API vfo_fixup(RIG *rig, vfo_t vfo)
"%s: RIG_VFO_TX changed to %s, split=%d, satmode=%d\n", __func__, "%s: RIG_VFO_TX changed to %s, split=%d, satmode=%d\n", __func__,
rig_strvfo(vfo), split, satmode); rig_strvfo(vfo), split, satmode);
} }
else if (vfo == RIG_VFO_B)
rig_debug(RIG_DEBUG_TRACE, "%s: final vfo=%s\n", __func__, rig_strvfo(vfo)); rig_debug(RIG_DEBUG_TRACE, "%s: final vfo=%s\n", __func__, rig_strvfo(vfo));
return vfo; return vfo;

4
tests/testcache.c
Wyświetl plik

@ -116,13 +116,13 @@ int main(int argc, char *argv[])
if (widthA != 1000) { printf("widthA = %d\n", (int)widthA); exit(1); } if (widthA != 1000) { printf("widthA = %d\n", (int)widthA); exit(1); }
if (freqB != 14074100) { printf("freqB = %.1f\n", freqB); exit(1); } if (freqB != 14075000) { printf("freqB = %.1f\n", freqB); exit(1); }
if (modeB != RIG_MODE_LSB) { printf("modeB = %s\n", rig_strrmode(modeB)); exit(1); } if (modeB != RIG_MODE_LSB) { printf("modeB = %s\n", rig_strrmode(modeB)); exit(1); }
if (widthB != 2000) { printf("widthB = %d\n", (int)widthB); exit(1); } if (widthB != 2000) { printf("widthB = %d\n", (int)widthB); exit(1); }
if (freqC != 14074200) { printf("freqC = %.1f\n", freqC); exit(1); } if (freqC != 14076000) { printf("freqC = %.1f\n", freqC); exit(1); }
if (modeC != RIG_MODE_PKTUSB) { printf("modeC = %s\n", rig_strrmode(modeC)); exit(1); } if (modeC != RIG_MODE_PKTUSB) { printf("modeC = %s\n", rig_strrmode(modeC)); exit(1); }