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

[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  b953141b0f538f21cc696c2a1b874c311f3154c5 (commit)
      from  0317e64dc83f9b0b3999d2c98df67608e4fa960e (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 b953141b0f538f21cc696c2a1b874c311f3154c5
Author: aa5sh <844...@us...>
Date:   Thu Aug 21 22:54:31 2025 -0500

    Bug Fixes for FTX1
    
    Needed to adjust one of the timeouts.  Was causing issues on Windows.  Also made some changes due to IF command response size being 30, it was erroring out.  And last band mapping  was a little different on this rig for 2m, 70cm, 4m and Air Band.

diff --git a/rigs/yaesu/ftx1.h b/rigs/yaesu/ftx1.h
index 63251bd74..4f530d4a7 100644
--- a/rigs/yaesu/ftx1.h
+++ b/rigs/yaesu/ftx1.h
@@ -164,7 +164,7 @@
 /* Delay between bytes sent to FTX-1
  * Should not exceed value set in CAT TOT menu (rig default is 10 mSec)
  */
-#define FTX1_WRITE_DELAY                    5
+#define FTX1_WRITE_DELAY                    0
 
 
 /* Delay sequential fast writes */
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 9e45d120b..6e812bd34 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -438,11 +438,15 @@ static int newcat_band_index(freq_t freq)
     // using < instead of <= for the moment
     // does anybody work LSB or RTTYR at the upper band edge?
     // what about band 13 -- what is it?
-    if (freq >= MHz(420) && freq < MHz(470)) { band = 16; }
+    if (freq >= MHz(420) && freq < MHz(470) && !is_ftx1) { band = 16; }
+    else if (freq >= MHz(420) && freq < MHz(470) && is_ftx1) { band = 14; }
+    else if (freq >= MHz(144) && freq < MHz(148) && is_ftx1) { band = 13; }
     else if (freq >= MHz(144) && freq < MHz(148)) { band = 15; }
     // band 14 is RX only
     // override band 15 with 14 if needed
+    else if (freq >= MHz(118) && freq < MHz(164) && is_ftx1) { band = 12; }
     else if (freq >= MHz(118) && freq < MHz(164)) { band = 14; }
+    else if (freq >= MHz(70) && freq < MHz(70.5) && is_ftx1) { band = 11; }
     else if (freq >= MHz(70) && freq < MHz(70.5)) { band = 17; }
     else if (freq >= MHz(50) && freq < MHz(55)) { band = 10; }
     else if (freq >= MHz(28) && freq < MHz(29.7)) { band = 9; }
@@ -864,7 +868,7 @@ int newcat_60m_exception(RIG *rig, freq_t freq, mode_t mode)
     // some rigs need to skip freq/mode settings as 60M only operates in memory mode
     if (is_ft991 || is_ft897 || is_ft897d || is_ftdx5000 || is_ftdx10) { return 1; }
 
-    if (!is_ftdx10 && !is_ft710 && !is_ftdx101d && !is_ftdx101mp) { return 0; }
+    if (!is_ftdx10 && !is_ft710 && !is_ftdx101d && !is_ftdx101mp && !is_ftx1) { return 0; }
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s: 60M exception ignoring freq/mode commands\n",
               __func__);
@@ -2790,7 +2794,7 @@ int newcat_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
         vfo = RIG_VFO_A;
         tx_vfo = RIG_SPLIT_ON == split ? RIG_VFO_B : RIG_VFO_A;
     }
-    else if (is_ftdx101d || is_ftdx101mp)
+    else if (is_ftdx101d || is_ftdx101mp || is_ftx1)
     {
         // FTDX101(D/MP) always use Sub VFO for transmit when in split mode
         vfo = RIG_VFO_MAIN;
@@ -3025,7 +3029,7 @@ int newcat_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
 
     case 41: // FT-991 V2-01 seems to randomly give 13 extra bytes
     case 28: offset = 14; break;
-
+    case 30: offset = 14; break;
     default: offset = 0;
     }
 
@@ -3139,7 +3143,7 @@ int newcat_get_xit(RIG *rig, vfo_t vfo, shortfreq_t *xit)
     switch (strlen(priv->ret_data))
     {
     case 27: offset = 13; break;
-
+    case 30: offset = 14; break;
     case 41: // FT-991 V2-01 seems to randomly give 13 extra bytes
     case 28: offset = 14; break;
 
@@ -8583,7 +8587,7 @@ static int newcat_get_split(RIG *rig, split_t *split, vfo_t *tx_vfo)
         *split = RIG_SPLIT_ON;
 
         // These rigs have fixed RX and TX VFOs when using the ST split command
-        if (is_ftdx101d || is_ftdx101mp)
+        if (is_ftdx101d || is_ftdx101mp || is_ftx1)
         {
             *tx_vfo = RIG_VFO_SUB;
         }
@@ -11114,7 +11118,7 @@ int newcat_get_vfo_mode(RIG *rig, vfo_t vfo, vfo_t *vfo_mode)
     switch (strlen(priv->ret_data))
     {
     case 27: offset = 21; priv->width_frequency = 8; break;
-
+    case 30: offset = 21; priv->width_frequency = 8; break;
     case 41: // FT-991 V2-01 seems to randomly give 13 extra bytes
     case 28: offset = 22; priv->width_frequency = 9; break;
 

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

Summary of changes:
 rigs/yaesu/ftx1.h   |  2 +-
 rigs/yaesu/newcat.c | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)


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