[Hamlib-commits] Hamlib -- Ham radio control libraries branch Hamlib-4.6.3 updated. 4.6.3-13-g8abb5efcf

[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  8abb5efcf0b3eec5e9e7f8d1dac6bc4e10c7f560 (commit)
       via  53c30fcf8c0eb3c392c6891a38985200925d311d (commit)
       via  f518c478f2a1a5ac6d23823f5b1b547d20168199 (commit)
      from  867fc5886a5a9f0bee66be4fd2e5821a9cf0b00d (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 8abb5efcf0b3eec5e9e7f8d1dac6bc4e10c7f560
Author: Nate Bargmann <n0...@n0...>
Date:   Wed Jun 25 21:41:52 2025 -0500

    Update NEWS for TS-590 and rotctl fixes

diff --git a/NEWS b/NEWS
index 8f43ad6d2..e0eb64e46 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ Version 4.6.4
         * Fix memory leak in rigctl_parse.c and use unique separator character
           for each rigctld connection--closes GitHub #1748. (TNX George Baltz).
         * Fix powerstat check for Icom R75 which rejects the command.  (TNX Mark Fine).
+        * Restore TS-590S/SG RIG_LEVEL_RFPOWER_METER, Fix rotctl \dump_caps output
+          (TNX, George Baltz).
 
 Version 4.6.3
         * 2025-06-10

commit 53c30fcf8c0eb3c392c6891a38985200925d311d
Author: George Baltz N3GB <Geo...@gm...>
Date:   Tue Jun 24 21:48:09 2025 -0400

    Fix rotctl \dump_caps output
    
    rot_sprintf_status() was printing items multiple times.
    Cause of problem noticed by cppcheck.
    
    (cherry picked from commit 0b75b96ef160a5d14be39361b8bcf0a59f04982c)

diff --git a/include/hamlib/rotator.h b/include/hamlib/rotator.h
index 4ddf4f5a1..950678280 100644
--- a/include/hamlib/rotator.h
+++ b/include/hamlib/rotator.h
@@ -358,6 +358,8 @@ typedef enum {
     ROT_STATUS_OVERLAP_LEFT =      (1 << 14), /*!< The azimuth rotator has rotated left (CCW) past 0 degrees. */
     ROT_STATUS_OVERLAP_RIGHT =     (1 << 16), /*!< The azimuth rotator has rotated right (CW) past 360 degrees. */
 } rot_status_t;
+// Update this if any additions to status definitions
+#define HAMLIB_MAX_ROTOR_STATUS 16
 
 //! @cond Doxygen_Suppress
 /* So far only used in tests/sprintflst.c. */
diff --git a/src/sprintflst.c b/src/sprintflst.c
index 06b381316..ec85f8a7d 100644
--- a/src/sprintflst.c
+++ b/src/sprintflst.c
@@ -816,7 +816,7 @@ int rot_sprintf_status(char *str, int nlen, rot_status_t status)
         return 0;
     }
 
-    for (i = 0; i < HAMLIB_MAX_ROTORS; i++)
+    for (i = 0; i <= HAMLIB_MAX_ROTOR_STATUS; i++)
     {
         const char *sv = rot_strstatus(status & ROT_STATUS_N(i));
 

commit f518c478f2a1a5ac6d23823f5b1b547d20168199
Author: George Baltz N3GB <Geo...@gm...>
Date:   Mon Jun 23 12:55:12 2025 -0400

    Restore TS-590S/SG RIG_LEVEL_RFPOWER_METER
    
    (cherry picked from commit ec4590df8decc4c47a57e6dc78e92871b92c230e)

diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c
index bbe80b940..4ed0c94af 100644
--- a/rigs/kenwood/ts590.c
+++ b/rigs/kenwood/ts590.c
@@ -1013,15 +1013,14 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
     case RIG_LEVEL_RFPOWER_METER:
     case RIG_LEVEL_RFPOWER_METER_WATTS:
     {
-        static cal_table_t power_meter =
+        int raw_value;
+        const static cal_table_t power_meter =
         {
             7, { { 0, 0}, { 3, 5}, { 6, 10}, { 8, 15}, {12, 25},
                 { 17, 50}, { 30, 100}
             }
         };
 
-        int raw_value;
-
         if (CACHE(rig)->ptt == RIG_PTT_OFF)
         {
             val->f = 0;
@@ -1037,8 +1036,6 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 
         sscanf(ackbuf, "SM0%d", &raw_value);
 
-//        val->f = (float) raw_value / 30.0f;
-
         if (level == RIG_LEVEL_RFPOWER_METER_WATTS)
         {
             val->f = roundf(rig_raw2val(raw_value, &power_meter));
@@ -1049,7 +1046,11 @@ static int ts590_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
             }
 
         }
-
+        else
+        {
+            val->f = (float) raw_value / 30.0f;
+        }
+    
         break;
     }
 

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

Summary of changes:
 NEWS                     |  2 ++
 include/hamlib/rotator.h |  2 ++
 rigs/kenwood/ts590.c     | 13 +++++++------
 src/sprintflst.c         |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)


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