From 9ab1130d09ea81bc9353a226399517c7504522f6 Mon Sep 17 00:00:00 2001 From: Michael Black Date: Sun, 15 Mar 2020 15:03:27 -0500 Subject: [PATCH] Remove setting default vfo in icom_get_freq. Fix 0x1c0x03 command frequency --- rigs/icom/icom.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c index 18ed4d3fa..849b56778 100644 --- a/rigs/icom/icom.c +++ b/rigs/icom/icom.c @@ -1019,10 +1019,12 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) rs = &rig->state; priv = (struct icom_priv_data *) rs->priv; +#if 0 // disabled to test if IC9700 satmode/gpredict still works OK if (priv->curr_vfo == RIG_VFO_NONE) { icom_set_default_vfo(rig); } +#endif cmd = C_RD_FREQ; subcmd = -1; @@ -1039,7 +1041,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq) if (retval == RIG_OK) // then we're done!! { - *freq = from_bcd(ackbuf, (priv->civ_731_mode ? 4 : 5) * 2); + *freq = from_bcd(ackbuf[2], (priv->civ_731_mode ? 4 : 5) * 2); return retval; } @@ -3860,7 +3862,7 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq) if (retval == RIG_OK) // then we're done!! { - *tx_freq = from_bcd(ackbuf, (priv->civ_731_mode ? 4 : 5) * 2); + *tx_freq = from_bcd(ackbuf[2], (priv->civ_731_mode ? 4 : 5) * 2); return retval; }