From 57aa5e839952122cfe725d8747d8b5fc7ba9a950 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Thu, 28 Jul 2022 07:10:13 -0500
Subject: [PATCH] Revert "Fix FT897 freq set/get for > 100MHz"

This reverts commit 44ad5c63637aa7402695ef994ec9f380f1d00aa1.
---
 rigs/dummy/netrigctl.c |  5 +++--
 rigs/yaesu/ft897.c     | 13 ++++---------
 tests/rigctld.c        |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/rigs/dummy/netrigctl.c b/rigs/dummy/netrigctl.c
index c259b401a..5b32afdb0 100644
--- a/rigs/dummy/netrigctl.c
+++ b/rigs/dummy/netrigctl.c
@@ -1071,8 +1071,9 @@ static int netrigctl_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt)
     char buf[BUF_MAX];
     char vfostr[16] = "";
 
-    rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, ptt=%d\n", __func__,
-              rig_strvfo(vfo), ptt);
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called vfo=%s, ptt=%d, ptt_type=%d\n", __func__,
+              rig_strvfo(vfo), ptt, rig->state.pttport.type.ptt);
+    if(rig->state.pttport.type.ptt == RIG_PTT_NONE) return RIG_OK;
 
     ret = netrigctl_vfostr(rig, vfostr, sizeof(vfostr), RIG_VFO_A);
 
diff --git a/rigs/yaesu/ft897.c b/rigs/yaesu/ft897.c
index a366ffbfe..a88f96205 100644
--- a/rigs/yaesu/ft897.c
+++ b/rigs/yaesu/ft897.c
@@ -250,7 +250,7 @@ const struct rig_caps ft897_caps =
     RIG_MODEL(RIG_MODEL_FT897),
     .model_name =     "FT-897",
     .mfg_name =       "Yaesu",
-    .version =        "20220727.0",
+    .version =        "20220404.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -394,7 +394,7 @@ const struct rig_caps ft897d_caps =
     RIG_MODEL(RIG_MODEL_FT897D),
     .model_name =     "FT-897D",
     .mfg_name =       "Yaesu",
-    .version =        "20220727.0",
+    .version =        "20220407.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -729,11 +729,7 @@ int ft897_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
         }
     }
 
-    int factor = 10;
-
-    if (p->fm_status[3] == 1) { factor = 100; }
-
-    *freq = from_bcd_be(p->fm_status, 8) * factor;
+    *freq = from_bcd_be(p->fm_status, 8) * 10;
 
     return RIG_OK;
 }
@@ -1086,9 +1082,8 @@ int ft897_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
     rig_debug(RIG_DEBUG_VERBOSE, "%s: requested freq = %"PRIfreq" Hz\n", __func__,
               freq);
 
-    int factor = freq > 100000000 ? 100 : 10;
     /* fill in the frequency */
-    to_bcd_be(data, (freq + 5) / factor, 8);
+    to_bcd_be(data, (freq + 5) / 10, 8);
 
     /*invalidate frequency cache*/
     rig_force_cache_timeout(&((struct ft897_priv_data *)
diff --git a/tests/rigctld.c b/tests/rigctld.c
index d1e1991b7..a47ca5cbc 100644
--- a/tests/rigctld.c
+++ b/tests/rigctld.c
@@ -684,7 +684,7 @@ int main(int argc, char *argv[])
     /*
      * ex: RIG_PTT_PARALLEL and /dev/parport0
      */
-    if (ptt_type != RIG_PTT_NONE)
+    //if (ptt_type != RIG_PTT_NONE)
     {
         my_rig->state.pttport.type.ptt = ptt_type;
         my_rig->state.pttport_deprecated.type.ptt = ptt_type;