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

Fix Hamlib NET rigctl so it works from WSJT-X/JTDX when rigctld --vfo is used 

https://github.com/Hamlib/Hamlib/issues/628
pull/649/head
Michael Black W9MDB 2021-03-26 14:25:32 -05:00
rodzic 4135a65503
commit 2aec11f5fe
1 zmienionych plików z 5 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
rigs/dummy/netrigctl.c
Wyświetl plik

@ -123,7 +123,7 @@ static int netrigctl_vfostr(RIG *rig, char *vfostr, int len, vfo_t vfo)
rig_debug(RIG_DEBUG_TRACE, "%s: vfo_opt=%d\n", __func__, rig->state.vfo_opt); rig_debug(RIG_DEBUG_TRACE, "%s: vfo_opt=%d\n", __func__, rig->state.vfo_opt);
if (rig->state.vfo_opt) if (rig->state.vfo_opt || priv->rigctld_vfo_mode)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: vfo_opt vfo=%u\n", __func__, vfo); rig_debug(RIG_DEBUG_TRACE, "%s: vfo_opt vfo=%u\n", __func__, vfo);
char *myvfo; char *myvfo;
@ -871,7 +871,7 @@ static int netrigctl_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
char buf[BUF_MAX]; char buf[BUF_MAX];
char vfostr[16] = ""; char vfostr[16] = "";
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__); rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, ptt=%d\n", __func__, rig_strvfo(vfo), ptt);
ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), RIG_VFO_A); ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), RIG_VFO_A);
@ -879,6 +879,8 @@ static int netrigctl_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
len = sprintf(cmd, "T%s %d\n", vfostr, ptt); len = sprintf(cmd, "T%s %d\n", vfostr, ptt);
rig_debug(RIG_DEBUG_TRACE, "%s: cmd=%s", __func__, cmd);
ret = netrigctl_transaction(rig, cmd, len, buf); ret = netrigctl_transaction(rig, cmd, len, buf);
if (ret > 0) if (ret > 0)
@ -2285,7 +2287,7 @@ struct rig_caps netrigctl_caps =
RIG_MODEL(RIG_MODEL_NETRIGCTL), RIG_MODEL(RIG_MODEL_NETRIGCTL),
.model_name = "NET rigctl", .model_name = "NET rigctl",
.mfg_name = "Hamlib", .mfg_name = "Hamlib",
.version = "20210207.0", .version = "20210326.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_OTHER, .rig_type = RIG_TYPE_OTHER,