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

[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  4108c0b57169060a2c2743d39ba4471e87e70f83 (commit)
       via  fc37f0aeaff8f6833d36052cd2fd8450ada0f846 (commit)
       via  78470cf4ae83a76501b905494ebed57fa485e2ed (commit)
      from  16f5502af0a4f0c0662ae14c7c7dd063bd2bc697 (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 4108c0b57169060a2c2743d39ba4471e87e70f83
Merge: fc37f0ae 78470cf4
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat May 1 22:19:28 2021 -0500

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


commit fc37f0aeaff8f6833d36052cd2fd8450ada0f846
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat May 1 22:18:28 2021 -0500

    Add 10ms delay after rig_set_ptt to allow hardware ptt relays to do their thing
    https://github.com/Hamlib/Hamlib/issues/686

diff --git a/NEWS b/NEWS
index 5353a4c1..f00cbfed 100644
--- a/NEWS
+++ b/NEWS
@@ -8,15 +8,25 @@ Please send Hamlib bug reports to ham...@li...
 
 Version 4.2
     * 2021-04-27
-    * New rig_get_vfo_info 
-    * New rig_get_rig_info
-        Also get_rig_info in rigctld too
-        Example output with rig in split mode
-        This is a string return to allow for easy future expansion without changing the API
-        New tokens may be introduced and can be skipped if not used by clients
-        VFO=VFOA Freq=10133000 Mode=LSB Width=0 RX=1 TX=0
-        VFO=VFOB Freq=10134000 Mode=LSB Width=0 RX=0 TX=1
-        Split=1 SatMode=0
+    * New rig_get_info  -- returns token set for all vfos where order does not matter 
+      This is a string return to allow for easy future expansion without changing the API
+      New tokens may be introduced and can be skipped if not used by clients
+        Rig command: \get_rig_info
+        VFO=Main Freq=145000000 Mode=None Width=0 RX=1 TX=1
+        VFO=VFOB Freq=145000000 Mode=FM Width=15000 RX=0 TX=0
+        Split=0 SatMode=0
+        Rig=Dummy
+        App=Hamlib
+        Version=20210429
+        CRC=0xf49f4708
+    * New rig_get_vfo_info
+        Rig command: \get_vfo_info VFOA
+        Freq: 145000000
+        Mode: None
+        Width: 0
+        Split: 0
+        SatMode: 0
+
 
     * USRP lib and gnuradio are deprecated and will be removed in 5.0
     * Added Radan rotator
diff --git a/src/rig.c b/src/rig.c
index 582220c7..66bf6d4e 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -2938,6 +2938,11 @@ int HAMLIB_API rig_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
         rs->transmit = ptt != RIG_PTT_OFF;
     }
 
+    // some rigs like the FT-2000 with the SCU-17 need just a bit of time to let the relays work
+    // can affect fake it mode in WSJT-X when the rig is still in transmit and freq change
+    // is requested on a rig that can't change freq on a transmitting VFO
+    if (ptt != RIG_PTT_ON) hl_usleep(10*1000);
+
     rig->state.cache.ptt = ptt;
     elapsed_ms(&rig->state.cache.time_ptt, HAMLIB_ELAPSED_SET);
 

commit 78470cf4ae83a76501b905494ebed57fa485e2ed
Author: Mike Black W9MDB <mdb...@ya...>
Date:   Sat May 1 15:51:52 2021 -0500

    Fix get_vfo_info args

diff --git a/tests/rigctl_parse.c b/tests/rigctl_parse.c
index 645be701..0ede3fc6 100644
--- a/tests/rigctl_parse.c
+++ b/tests/rigctl_parse.c
@@ -251,7 +251,7 @@ declare_proto_rig(pause);
 static struct test_table test_list[] =
 {
 #if 0 // implement set_freq VFO later if it can be detected
-//    { 'F',  "set_freq",         ACTION(set_freq),       ARG_IN1 | ARG_OUT1, "Frequency" },
+    { 'F',  "set_freq",         ACTION(set_freq),       ARG_IN1 | ARG_OUT1, "Frequency" },
     { 'f',  "get_freq",         ACTION(get_freq),       ARG_OUT, "Frequency", "VFO" },
 #else
     { 'F',  "set_freq",         ACTION(set_freq),       ARG_IN1, "Frequency" },
@@ -333,9 +333,9 @@ static struct test_table test_list[] =
     { 0x8f, "dump_state",       ACTION(dump_state),     ARG_OUT | ARG_NOVFO },
     { 0xf0, "chk_vfo",          ACTION(chk_vfo),        ARG_NOVFO, "ChkVFO" },   /* rigctld only--check for VFO mode */
     { 0xf2, "set_vfo_opt",      ACTION(set_vfo_opt),    ARG_NOVFO | ARG_IN, "Status" }, /* turn vfo option on/off */
-    { 0xf3, "get_vfo_info",     ACTION(get_vfo_info),   ARG_IN1 | ARG_OUT4, "Freq", "Mode", "Width", "Split", "SatMode" }, /* get several vfo parameters at once */
+    { 0xf3, "get_vfo_info",     ACTION(get_vfo_info),   ARG_NOVFO | ARG_IN1 | ARG_OUT4, "Freq", "Mode", "Width", "Split", "SatMode" }, /* get several vfo parameters at once */
     { 0xf5, "get_rig_info",     ACTION(get_rig_info),   ARG_NOVFO | ARG_OUT, "RigInfo" }, /* get several vfo parameters at once */
-    { 0xf4,  "get_vfo_list",    ACTION(get_vfo_list),       ARG_OUT | ARG_NOVFO, "VFOs" },
+    { 0xf4,  "get_vfo_list",    ACTION(get_vfo_list),   ARG_OUT | ARG_NOVFO, "VFOs" },
     { 0xf1, "halt",             ACTION(halt),           ARG_NOVFO },   /* rigctld only--halt the daemon */
     { 0x8c, "pause",            ACTION(pause),          ARG_IN, "Seconds" },
     { 0x00, "", NULL },

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

Summary of changes:
 NEWS      | 28 +++++++++++++++++++---------
 src/rig.c |  5 +++++
 2 files changed, 24 insertions(+), 9 deletions(-)


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