[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.6.3 updated. 04af313f7d0953217b64fc4e1fdbb3dc1baa7e10

[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, Hamlib-4.6.3 has been updated
       via  04af313f7d0953217b64fc4e1fdbb3dc1baa7e10 (commit)
       via  3abac287677804f517c415dce047157e00eb4aca (commit)
       via  3249598cbf3b9e8e9ca1d360930c8d66217c3375 (commit)
      from  6150ee94c703b8d02d200ed685c497408394fc2a (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 04af313f7d0953217b64fc4e1fdbb3dc1baa7e10
Author: George Baltz N3GB <Geo...@gm...>
Date:   Sun Jun 1 10:55:32 2025 -0400

    Update NEWS
    
    (cherry picked from commit 4d322337c1d6d06edaa42887b2ba8430c53aa4f7)

diff --git a/NEWS b/NEWS
index 090e4ed3b..7e2378205 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ Version 4.6.3
           five years from 2020 to 2025.  Mike passed away on March 28, 2025 due to
           complications from ALS (Lou Gehrig's disease).
 
+        * Restore IC-7300 spectrum data callback - regression in 4.6 (n3gb)
+        * Add locking to rig_[gs]et_level() - fixes sending CW from tlf (n3gb)
         * Fix attempt to use memory returned by setlocale() after being freed (TNX Mooneer Salem)
         * Language bindings configuration and build fixes (TNX Daniele Forsi)
         * Various build system and compilation fixes (TNX Daniele Forsi)

commit 3abac287677804f517c415dce047157e00eb4aca
Author: George Baltz N3GB <Geo...@gm...>
Date:   Fri May 30 12:39:29 2025 -0400

    Don't start async_data_handler until rig is fully opened.
    
    Let the <model>_rig_open() finish its setup before trying to read status.
    
    (cherry picked from commit 7fa0c863f262a937cae95450fd15056a0fbce12f)

diff --git a/src/rig.c b/src/rig.c
index 227a4aa15..1be0bad4a 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -1422,22 +1422,6 @@ int HAMLIB_API rig_open(RIG *rig)
         RETURNFUNC2(status);
     }
 
-#if defined(HAVE_PTHREAD)
-
-    if (!skip_init)
-    {
-        status = async_data_handler_start(rig);
-
-        if (status < 0)
-        {
-            port_close(rp, rp->type.rig);
-            rs->comm_status = RIG_COMM_STATUS_ERROR;
-            RETURNFUNC2(status);
-        }
-    }
-
-#endif
-
     rs->comm_state = 1;
     rig_debug(RIG_DEBUG_VERBOSE, "%s: %p rs->comm_state==1?=%d\n", __func__,
               &rs->comm_state,
@@ -1488,15 +1472,6 @@ int HAMLIB_API rig_open(RIG *rig)
         if (status != RIG_OK)
         {
             remove_opened_rig(rig);
-#if defined(HAVE_PTHREAD)
-
-            if (!skip_init)
-            {
-                async_data_handler_stop(rig);
-                morse_data_handler_stop(rig);
-            }
-
-#endif
             port_close(rp, rp->type.rig);
             memcpy(&rs->rigport_deprecated, rp, sizeof(hamlib_port_t_deprecated));
             rs->comm_state = 0;
@@ -1542,6 +1517,15 @@ int HAMLIB_API rig_open(RIG *rig)
 
 #if defined(HAVE_PTHREAD)
 
+    status = async_data_handler_start(rig);
+
+    if (status < 0)
+    {
+        port_close(rp, rp->type.rig);
+        rs->comm_status = RIG_COMM_STATUS_ERROR;
+        RETURNFUNC2(status);
+    }
+
     // Some models don't support CW so don't need morse handler
     if (rig->caps->send_morse)
     {

commit 3249598cbf3b9e8e9ca1d360930c8d66217c3375
Author: George Baltz N3GB <Geo...@gm...>
Date:   Sun May 18 10:49:25 2025 -0400

    Pass spectrum data through to callback
    
    Fixes issue #1734
    
    (cherry picked from commit 63e1bb4c0096a974ad3388357c47c4398a587a84)

diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 77564a4b1..9f753ebf1 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -772,8 +772,6 @@ int icom_init(RIG *rig)
     // Reset 0x25/0x26 command detection for the rigs that may support it
     icom_set_x25x26_ability(rig, -1);
 
-    rig_debug(RIG_DEBUG_TRACE, "%s: done\n", __func__);
-
     RETURNFUNC(RIG_OK);
 }
 
@@ -9201,12 +9199,12 @@ int icom_process_async_frame(RIG *rig, size_t frame_length,
      * the rest is data
      * and don't forget one byte at the end for the EOM
      */
-    if (frame[2] != 0x00 || frame[2] == 0x01)
+    if (frame[2] != BCASTID && frame[2] != CTRLID)
     {
         // just ignoring 0x01 for now
         // fe fe 01 94 1c 03 00 80 07 07 00 fd
-        rig_debug(RIG_DEBUG_VERBOSE, "%s: 3rd byte not 0x00 or is 0x01...not async\n",
-                  __func__);
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: Unknown/invalid destination - %#x\n",
+                  __func__, frame[2]);
         RETURNFUNC(RIG_OK);
     }
 
diff --git a/rigs/icom/icom.h b/rigs/icom/icom.h
index 47d99d91d..1ceedec12 100644
--- a/rigs/icom/icom.h
+++ b/rigs/icom/icom.h
@@ -35,7 +35,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20250107"
+#define BACKEND_VER "20250517"
 
 #define ICOM_IS_ID31 rig_is_model(rig, RIG_MODEL_ID31)
 #define ICOM_IS_ID51 rig_is_model(rig, RIG_MODEL_ID51)

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

Summary of changes:
 NEWS             |  2 ++
 rigs/icom/icom.c |  8 +++-----
 rigs/icom/icom.h |  2 +-
 src/rig.c        | 34 +++++++++-------------------------
 4 files changed, 15 insertions(+), 31 deletions(-)


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