[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 8595c244e4cd3705212a652bfad0b2a2a49cf178

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  8595c244e4cd3705212a652bfad0b2a2a49cf178 (commit)
      from  1affac778b2b902cc218ec664b9716a1410dfb4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8595c244e4cd3705212a652bfad0b2a2a49cf178
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sat Jan 16 12:32:18 2021 -0600

    Add retries to flrig.c for set commands
    Was getting some timeouts on these set commands

diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c
index 9711509f..4f50ecac 100644
--- a/rigs/dummy/flrig.c
+++ b/rigs/dummy/flrig.c
@@ -517,6 +517,7 @@ static int write_transaction(RIG *rig, char *xml, int xml_len)
 static int flrig_transaction(RIG *rig, char *cmd, char *cmd_arg, char *value,
                              int value_len)
 {
+    char xml[MAXXMLLEN];
     int retry = 2;
 
     if (value)
@@ -526,7 +527,6 @@ static int flrig_transaction(RIG *rig, char *cmd, char *cmd_arg, char *value,
 
     do
     {
-        char xml[MAXXMLLEN];
         char *pxml;
         int retval;
 
@@ -551,7 +551,7 @@ static int flrig_transaction(RIG *rig, char *cmd, char *cmd_arg, char *value,
             xml_parse(xml, value, value_len);
         }
     }
-    while (value && strlen(value) == 0 && retry--); // we'll do retries if needed
+    while (((value && strlen(value) == 0) || (strlen(xml)==0)) && retry--); // we'll do retries if needed
 
     if (value && strlen(value) == 0) { return RIG_EPROTO; }
 
diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h
index 4c6633b3..b9a876e9 100644
--- a/rigs/dummy/flrig.h
+++ b/rigs/dummy/flrig.h
@@ -28,7 +28,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20210112"
+#define BACKEND_VER "20210116"
 
 #define EOM "\r"
 #define TRUE 1

-----------------------------------------------------------------------

Summary of changes:
 rigs/dummy/flrig.c | 4 ++--
 rigs/dummy/flrig.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries