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

Merge branch 'master' of https://github.com/Hamlib/Hamlib

pull/527/head
DL1YCF 2021-02-06 10:42:14 +01:00
rodzic b5c96e0cde 1d8a010493
commit 865c28c4ca
3 zmienionych plików z 7 dodań i 7 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

@ -215,7 +215,11 @@ static int netrigctl_open(RIG *rig)
len = sprintf(cmd, "\\chk_vfo\n"); len = sprintf(cmd, "\\chk_vfo\n");
ret = netrigctl_transaction(rig, cmd, len, buf); ret = netrigctl_transaction(rig, cmd, len, buf);
if (ret == 2) if (sscanf(buf,"CHKVFO %d", &priv->rigctld_vfo_mode)==1)
{
rig_debug(RIG_DEBUG_TRACE, "%s: chkvfo=%d\n", __func__, priv->rigctld_vfo_mode);
}
else if (ret == 2)
{ {
if (buf[0]) { sscanf(buf, "%d", &priv->rigctld_vfo_mode); } if (buf[0]) { sscanf(buf, "%d", &priv->rigctld_vfo_mode); }
} }
@ -2284,7 +2288,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 = "20210108.0", .version = "20210204.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_OTHER, .rig_type = RIG_TYPE_OTHER,

2
src/network.c
Wyświetl plik

@ -216,7 +216,7 @@ int network_open(hamlib_port_t *rp, int default_port)
if (status == 0 && res->ai_family == AF_INET6) if (status == 0 && res->ai_family == AF_INET6)
{ {
rig_debug(RIG_DEBUG_ERR, "%s: Using IPV6\n", __func__); rig_debug(RIG_DEBUG_TRACE, "%s: Using IPV6\n", __func__);
//inet_pton(AF_INET6, hoststr, &h_addr.sin6_addr); //inet_pton(AF_INET6, hoststr, &h_addr.sin6_addr);
} }

4
tests/rigctl_parse.c
Wyświetl plik

@ -995,16 +995,12 @@ int rigctl_parse(RIG *my_rig, FILE *fin, FILE *fout, char *argv[], int argc,
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__); rig_debug(RIG_DEBUG_TRACE, "%s: debug7\n", __func__);
#if 0 // was printing Reply: twice
if (prompt) if (prompt)
{ {
rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__); rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__);
fprintf_flush(fout, "%s: ", cmd_entry->arg2); fprintf_flush(fout, "%s: ", cmd_entry->arg2);
} }
#endif
if (scanfc(fin, "%s", arg2) < 1) if (scanfc(fin, "%s", arg2) < 1)
{ {
rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#9?\n", __func__); rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#9?\n", __func__);