Merge branch 'master' into doxygen_work

bindings/perltest.pl

@@ -57,7 +57,8 @@ print "strength:\t\t$lvl\n";
 $chan = new Hamlib::channel($Hamlib::RIG_VFO_A);
 
 $rig->get_channel($chan,1);
-print "get_channel status:\t$rig->{error_status} = ".Hamlib::rigerror($rig->{error_status})."\n";
+@tokens = split("\n",Hamlib::rigerror($rig->{error_status}));
+print "get_channel status:\t$rig->{error_status} = ".$tokens[0]."\n";
 
 print "VFO:\t\t\t".Hamlib::rig_strvfo($chan->{vfo}).", $chan->{freq}\n";
 

rigs/dummy/netrigctl.c

@@ -215,7 +215,11 @@ static int netrigctl_open(RIG *rig)
     len = sprintf(cmd, "\\chk_vfo\n");
     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); }
     }
@@ -2284,7 +2288,7 @@ struct rig_caps netrigctl_caps =
     RIG_MODEL(RIG_MODEL_NETRIGCTL),
     .model_name =     "NET rigctl",
     .mfg_name =       "Hamlib",
-    .version =        "20210108.0",
+    .version =        "20210204.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_OTHER,

src/network.c

@@ -216,7 +216,7 @@ int network_open(hamlib_port_t *rp, int default_port)
 
     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);
     }
 

tests/rigctl_parse.c

@@ -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__);
 
-#if 0 // was printing Reply: twice
-
                 if (prompt)
                 {
                     rig_debug(RIG_DEBUG_TRACE, "%s: debug8\n", __func__);
                     fprintf_flush(fout, "%s: ", cmd_entry->arg2);
                 }
 
-#endif
-
                 if (scanfc(fin, "%s", arg2) < 1)
                 {
                     rig_debug(RIG_DEBUG_WARN, "%s: nothing to scan#9?\n", __func__);