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

Replace priv->curr_vfo in xg3.c with rig->state.current_vfo

pull/312/head
Michael Black W9MDB 2020-06-13 16:02:14 -05:00
rodzic c5388b9f37
commit c5557ce3b1
1 zmienionych plików z 5 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
rigs/kenwood/xg3.c
Wyświetl plik

@ -52,7 +52,6 @@
struct xg3_priv_data struct xg3_priv_data
{ {
/* current vfo already in rig_state ? */ /* current vfo already in rig_state ? */
vfo_t curr_vfo;
vfo_t last_vfo; vfo_t last_vfo;
ptt_t ptt; ptt_t ptt;
powerstat_t powerstat; powerstat_t powerstat;
@ -107,9 +106,9 @@ const struct rig_caps xg3_caps =
RIG_MODEL(RIG_MODEL_XG3), RIG_MODEL(RIG_MODEL_XG3),
.model_name = "XG3", .model_name = "XG3",
.mfg_name = "Elecraft", .mfg_name = "Elecraft",
.version = "20191218.0", .version = "20200613.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_BETA, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
.ptt_type = RIG_PTT_RIG, .ptt_type = RIG_PTT_RIG,
.dcd_type = RIG_DCD_RIG, .dcd_type = RIG_DCD_RIG,
@ -193,7 +192,7 @@ int xg3_init(RIG *rig)
// Tried set_trn to turn transceiver on/off but turning it on isn't enabled in hamlib for some reason // Tried set_trn to turn transceiver on/off but turning it on isn't enabled in hamlib for some reason
// So we use PTT instead // So we use PTT instead
// rig->state.transceive = RIG_TRN_RIG; // this allows xg3_set_trn to be called // rig->state.transceive = RIG_TRN_RIG; // this allows xg3_set_trn to be called
priv->curr_vfo = RIG_VFO_A; rig->state.current_vfo = RIG_VFO_A;
priv->last_vfo = RIG_VFO_A; priv->last_vfo = RIG_VFO_A;
priv->ptt = RIG_PTT_ON; priv->ptt = RIG_PTT_ON;
priv->powerstat = RIG_POWER_ON; priv->powerstat = RIG_POWER_ON;
@ -334,8 +333,6 @@ int xg3_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
*/ */
int xg3_get_vfo(RIG *rig, vfo_t *vfo) int xg3_get_vfo(RIG *rig, vfo_t *vfo)
{ {
struct xg3_priv_data *priv = (struct xg3_priv_data *)rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!vfo) if (!vfo)
@ -343,7 +340,7 @@ int xg3_get_vfo(RIG *rig, vfo_t *vfo)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
*vfo = priv->curr_vfo; // VFOA or MEM *vfo = rig->state.current_vfo; // VFOA or MEM
return RIG_OK; return RIG_OK;
} }
@ -352,8 +349,6 @@ int xg3_get_vfo(RIG *rig, vfo_t *vfo)
*/ */
int xg3_set_vfo(RIG *rig, vfo_t vfo) int xg3_set_vfo(RIG *rig, vfo_t vfo)
{ {
struct xg3_priv_data *priv = (struct xg3_priv_data *)rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
if (!vfo) if (!vfo)
@ -365,7 +360,7 @@ int xg3_set_vfo(RIG *rig, vfo_t vfo)
// We don't actually set the vfo on the XG3 // We don't actually set the vfo on the XG3
// But we need this so we can set frequencies on the band buttons // But we need this so we can set frequencies on the band buttons
priv->curr_vfo = vfo; rig->state.current_vfo = vfo;
return RIG_OK; return RIG_OK;
} }