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

Fix icom MainA/B SubA/B VFO selection 

https://github.com/Hamlib/Hamlib/issues/348
pull/351/head
Michael Black W9MDB 2020-07-20 14:42:46 +02:00
rodzic c7eec2c788
commit 133a8acd30
2 zmienionych plików z 7 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
rigs/icom/icom.c
Wyświetl plik

@ -2096,7 +2096,8 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
case RIG_VFO_MAIN_A: // we need to select Main before setting VFO case RIG_VFO_MAIN_A: // we need to select Main before setting VFO
case RIG_VFO_MAIN_B: case RIG_VFO_MAIN_B:
retval = icom_transaction(rig, C_SET_VFO, RIG_VFO_MAIN, NULL, 0, rig_debug(RIG_DEBUG_VERBOSE, "%s: MainA/B logic\n", __func__);
retval = icom_transaction(rig, C_SET_VFO, S_MAIN, NULL, 0,
ackbuf, &ack_len); ackbuf, &ack_len);
if (retval != RIG_OK) if (retval != RIG_OK)
@ -2111,13 +2112,14 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
return -RIG_ERJCTED; return -RIG_ERJCTED;
} }
icvfo = RIG_VFO_MAIN_A ? S_VFOA : S_VFOB; icvfo = vfo == RIG_VFO_MAIN_A ? S_VFOA : S_VFOB;
break; break;
case RIG_VFO_SUB_A: // we need to select Sub before setting VFO case RIG_VFO_SUB_A: // we need to select Sub before setting VFO
case RIG_VFO_SUB_B: case RIG_VFO_SUB_B:
retval = icom_transaction(rig, C_SET_VFO, RIG_VFO_SUB, NULL, 0, rig_debug(RIG_DEBUG_VERBOSE, "%s: SubA/B logic\n", __func__);
retval = icom_transaction(rig, C_SET_VFO, S_SUB, NULL, 0,
ackbuf, &ack_len); ackbuf, &ack_len);
if (retval != RIG_OK) if (retval != RIG_OK)
@ -2132,7 +2134,7 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
return -RIG_ERJCTED; return -RIG_ERJCTED;
} }
icvfo = RIG_VFO_SUB_A ? S_VFOA : S_VFOB; icvfo = vfo == RIG_VFO_SUB_A ? S_VFOA : S_VFOB;
break; break;

2
rigs/icom/icom.h
Wyświetl plik

@ -31,7 +31,7 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#define BACKEND_VER "20200719" #define BACKEND_VER "20200720"
/* /*
* defines used by comp_cal_str in rig.c * defines used by comp_cal_str in rig.c