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

[n0nb <n0...@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  ece40e6bc28ee304a806181fc6483adec540c25c (commit)
       via  88cae85ab27e9cd59b4a37502e4fb2cd9c254541 (commit)
       via  49e870cfb8cb9a7dd119c8fee75de912936993ab (commit)
      from  be44ddc83055418110984c009dd6cf923136cc86 (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 ece40e6bc28ee304a806181fc6483adec540c25c
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Oct 30 17:05:44 2024 -0500

    Hopefully clean up clang warning on compile

diff --git a/tests/testrig.c b/tests/testrig.c
index e73a4cd79..b7a5b1abd 100644
--- a/tests/testrig.c
+++ b/tests/testrig.c
@@ -80,8 +80,8 @@ int main(int argc, const char *argv[])
 
     uint64_t levels = rig_get_caps_int(my_rig->caps->rig_model,
                                        RIG_CAPS_HAS_GET_LEVEL);
-    printf("HAS_GET_LEVEL=0x%8lx, SWR=%8llx,true=%d\n", levels,
-           levels & RIG_LEVEL_SWR, (levels & RIG_LEVEL_SWR) == RIG_LEVEL_SWR);
+    printf("HAS_GET_LEVEL=0x%8llx, SWR=%8llx,true=%d\n", (unsigned long long)levels,
+           (unsigned long long)(levels & RIG_LEVEL_SWR), (levels & RIG_LEVEL_SWR) == RIG_LEVEL_SWR);
 
     char val[256];
     retcode = rig_get_conf2(my_rig, rig_token_lookup(my_rig, "write_delay"), val,

commit 88cae85ab27e9cd59b4a37502e4fb2cd9c254541
Merge: 49e870cfb be44ddc83
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Oct 30 16:42:26 2024 -0500

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


commit 49e870cfb8cb9a7dd119c8fee75de912936993ab
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Wed Oct 30 16:41:29 2024 -0500

    Remove collision_retry=0 in icom/frame.c -- was causing a loop when random data received
    https://github.com/Hamlib/Hamlib/issues/1604

diff --git a/rigs/icom/frame.c b/rigs/icom/frame.c
index 50e962517..985df2613 100644
--- a/rigs/icom/frame.c
+++ b/rigs/icom/frame.c
@@ -329,7 +329,12 @@ again2:
     // https://github.com/Hamlib/Hamlib/issues/1575
     // these types of async can interrupt the cmd we sent
     // if our host number changes must not be for us
-    collision_retry = 0;
+    if (icom_is_async_frame(rig, frm_len, buf))
+    {
+        icom_process_async_frame(rig, frm_len, buf);
+        goto again2;
+    }
+
     if (sendbuf[3] != buf[2])
     {
         rig_debug(RIG_DEBUG_VERBOSE, "%s: unknown async?  read again\n", __func__);
@@ -341,12 +346,6 @@ again2:
     }
 
 
-    if (icom_is_async_frame(rig, frm_len, buf))
-    {
-        icom_process_async_frame(rig, frm_len, buf);
-        goto again2;
-    }
-
 #if 0
 
     // this was causing rigctld to fail on IC706 and WSJT-X

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

Summary of changes:
 rigs/icom/frame.c | 13 ++++++-------
 tests/testrig.c   |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)


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