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

For the FT-990 we can read VFOA frequency once. 

https://github.com/Hamlib/Hamlib/issues/1050
pull/1068/head
Mike Black W9MDB 2022-06-07 12:19:09 -05:00
rodzic 479c43afa1
commit cca8d2b4ed
2 zmienionych plików z 18 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
rigs/yaesu/ft990.c
Wyświetl plik

@ -240,7 +240,7 @@ const struct rig_caps ft990_caps =
RIG_MODEL(RIG_MODEL_FT990), RIG_MODEL(RIG_MODEL_FT990),
.model_name = "FT-990", .model_name = "FT-990",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20211231.0", .version = "20220607.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -378,7 +378,7 @@ const struct rig_caps ft990uni_caps =
RIG_MODEL(RIG_MODEL_FT990UNI), RIG_MODEL(RIG_MODEL_FT990UNI),
.model_name = "FT-990 Old Rom", .model_name = "FT-990 Old Rom",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20220603.0", .version = "20220607.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -739,6 +739,13 @@ int ft990_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
*/ */
int ft990_get_freq_uni(RIG *rig, vfo_t vfo, freq_t *freq) int ft990_get_freq_uni(RIG *rig, vfo_t vfo, freq_t *freq)
{ {
// we can prime this frequency once
if (rig->state.cache.freqMainA == 0)
{
// this should read just enough to get VFO_A/B and then for UNI the rest gets flushed
return ft990_get_freq(rig, RIG_VFO_A, freq);
}
// VFOB should be set so we don't need to poll it
*freq = vfo == RIG_VFO_A ? rig->state.cache.freqMainA : rig->state.cache.freqMainB; *freq = vfo == RIG_VFO_A ? rig->state.cache.freqMainA : rig->state.cache.freqMainB;
return (RIG_OK); return (RIG_OK);
} }
@ -1257,9 +1264,14 @@ int ft990_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = 0x%02x\n", __func__, vfo); rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo = %s\n", __func__, rig_strvfo(vfo));
rig_debug(RIG_DEBUG_TRACE, "%s: passed split = 0x%02x\n", __func__, split); rig_debug(RIG_DEBUG_TRACE, "%s: passed split = %d\n", __func__, split);
rig_debug(RIG_DEBUG_TRACE, "%s: passed tx_vfo = 0x%02x\n", __func__, tx_vfo); rig_debug(RIG_DEBUG_TRACE, "%s: passed tx_vfo = %s\n", __func__, rig_strvfo(tx_vfo));
if (tx_vfo == RIG_VFO_A) // can't split on VFOA
{
tx_vfo = RIG_VFO_B;
rig_debug(RIG_DEBUG_TRACE, "%s: changin tx_vfo to VFOB\n", __func__);
}
priv = (struct ft990_priv_data *) rig->state.priv; priv = (struct ft990_priv_data *) rig->state.priv;

1
rigs/yaesu/ft990.h
Wyświetl plik

@ -58,6 +58,7 @@
/* Returned data length in bytes */ /* Returned data length in bytes */
#define FT990_ALL_DATA_LENGTH 1508 /* 0x10 P1 = 00 return size */ #define FT990_ALL_DATA_LENGTH 1508 /* 0x10 P1 = 00 return size */
#define FT990_ALL_DATA_LENGTH_UNI 1492 /* 0x10 P1 = 00 return size for 1.2 and earlier ROM */
#define FT990_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */ #define FT990_MEM_CHNL_LENGTH 1 /* 0x10 P1 = 01 return size */
#define FT990_OP_DATA_LENGTH 32 /* 0x10 P1 = 02 return size */ #define FT990_OP_DATA_LENGTH 32 /* 0x10 P1 = 02 return size */
#define FT990_VFO_DATA_LENGTH 32 /* 0x10 P1 = 03 return size -- A & B returned */ #define FT990_VFO_DATA_LENGTH 32 /* 0x10 P1 = 03 return size -- A & B returned */