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

Fix icom.c vfo detection 

https://github.com/Hamlib/Hamlib/issues/624
pull/649/head
Michael Black W9MDB 2021-03-22 07:54:46 -05:00
rodzic 79b5142c44
commit f0a82fa2bf
3 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
include/hamlib/rig.h
Wyświetl plik

@ -515,7 +515,7 @@ typedef unsigned int vfo_t;
#define VFO_HAS_MAIN_SUB_A_B_ONLY (VFO_HAS_A_B & VFO_HAS_MAIN_SUB) #define VFO_HAS_MAIN_SUB_A_B_ONLY (VFO_HAS_A_B & VFO_HAS_MAIN_SUB)
#define VFO_HAS_A_B_ONLY (VFO_HAS_A_B & (!VFO_HAS_MAIN_SUB)) #define VFO_HAS_A_B_ONLY (VFO_HAS_A_B & (!VFO_HAS_MAIN_SUB))
#define VFO_DUAL (RIG_VFO_MAIN_A|RIG_VFO_MAIN_B|RIG_VFO_SUB_A|RIG_VFO_SUB_B) #define VFO_DUAL (RIG_VFO_MAIN_A|RIG_VFO_MAIN_B|RIG_VFO_SUB_A|RIG_VFO_SUB_B)
#define VFO_HAS_DUAL ((rig->state.vfo_list & VFO_DUAL == VFO_DUAL) #define VFO_HAS_DUAL ((rig->state.vfo_list & VFO_DUAL) == VFO_DUAL)
//! @endcond //! @endcond
/** /**

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

@ -2098,12 +2098,12 @@ int icom_set_vfo(RIG *rig, vfo_t vfo)
else if (VFO_HAS_MAIN_SUB_A_B_ONLY && rig->state.cache.satmode) { vfo = RIG_VFO_SUB; } else if (VFO_HAS_MAIN_SUB_A_B_ONLY && rig->state.cache.satmode) { vfo = RIG_VFO_SUB; }
} }
else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_MAIN_SUB_A_B_ONLY) else if ((vfo == RIG_VFO_A || vfo == RIG_VFO_MAIN) && VFO_HAS_DUAL)
{ {
// If we're being asked for A/Main but we are a MainA/MainB rig change it // If we're being asked for A/Main but we are a MainA/MainB rig change it
vfo = RIG_VFO_MAIN_A; vfo = RIG_VFO_MAIN_A;
} }
else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_MAIN_SUB_A_B_ONLY) else if ((vfo == RIG_VFO_B || vfo == RIG_VFO_SUB) && VFO_HAS_DUAL)
{ {
// If we're being asked for B/Sub but we are a MainA/MainB rig change it // If we're being asked for B/Sub but we are a MainA/MainB rig change it
vfo = RIG_VFO_MAIN_B; vfo = RIG_VFO_MAIN_B;

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

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