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

[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  ce96f424835a5140c000639a17dec5bb45c4ee07 (commit)
       via  34d7eb6c33296172c77af67b000d9104dcac0d40 (commit)
      from  4d7c988bec70c17350189f83a0a8700d2de6e939 (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 ce96f424835a5140c000639a17dec5bb45c4ee07
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sun Jan 17 17:16:50 2021 -0600

    Fix RETURNFUNC in misc.h

diff --git a/src/misc.h b/src/misc.h
index e3b803c3..e86a6ccd 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -141,7 +141,7 @@ extern HAMLIB_EXPORT(int) parse_hoststr(char *host, char hoststr[256], char port
 void errmsg(int err, char *s, const char *func, const char *file, int line);
 #define ERRMSG(err, s) errmsg(err,  s, __func__, __FILE__, __LINE__)
 #define ENTERFUNC rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s entered\n", __FILE__, __LINE__, __func__)
-#define RETURNFUNC(rc) rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s return\n", __FILE__, __LINE__, __func__);return rc
+#define RETURNFUNC(rc) {rig_debug(RIG_DEBUG_VERBOSE, "%s(%d):%s return\n", __FILE__, __LINE__, __func__);return rc;}
 
 __END_DECLS
 

commit 34d7eb6c33296172c77af67b000d9104dcac0d40
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Sun Jan 17 15:50:00 2021 -0600

    prm80 add extra read_string for 2-line response to set_freq

diff --git a/rigs/prm80/prm80.c b/rigs/prm80/prm80.c
index 5c69a462..0a026921 100644
--- a/rigs/prm80/prm80.c
+++ b/rigs/prm80/prm80.c
@@ -248,14 +248,19 @@ int prm80_reset(RIG *rig, reset_t reset)
 int prm80_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
 {
     char freqbuf[BUFSZ];
+    char data[BUFSZ];
     int freq_len;
+    int rc;
+    struct rig_state *rs = &rig->state;
 
     /* wild guess */
     freq_len = sprintf(freqbuf, "R%04X%04X",
                        (unsigned)(freq / 12500.),
                        (unsigned)(freq / 12500.));
 
-    return prm80_transaction(rig, freqbuf, freq_len, NULL, NULL);
+    rc = prm80_transaction(rig, freqbuf, freq_len, NULL, NULL);
+    read_string(&rs->rigport, data, BUFSZ, LF, strlen(LF));
+    return rc;
 }
 
 /*

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

Summary of changes:
 rigs/prm80/prm80.c | 7 ++++++-
 src/misc.h         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)


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