Allo FT-857 to return cached vfo when set_vfo is called and EEPROM re…

…ad error occurs #1232
Hamlib · Feb 6, 2023 · 9ee5afb · 9ee5afb
1 parent 1f25aab
commit 9ee5afb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -29,6 +29,7 @@ Version 4.6
         * Fix FTDX3000 rig split
 
 Version 4.5.5
+        * Allow FT-857 to use cached vfo on get_vfo when error occurs reading EEPROM
         * Fix FTDX10 FT710 set_level AFy
         * Fix FT-450D detection
         * Fix VFO A/B swapping for gpredict -- hopefully better behavior for VFO swapping rigs

diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c
@@ -246,7 +246,7 @@ const struct rig_caps ft857_caps =
     RIG_MODEL(RIG_MODEL_FT857),
     .model_name =     "FT-857",
     .mfg_name =       "Yaesu",
-    .version =        "20220712.0",
+    .version =        "20230206.0",
     .copyright =      "LGPL",
     .status =         RIG_STATUS_STABLE,
     .rig_type =       RIG_TYPE_TRANSCEIVER,
@@ -613,7 +613,9 @@ int ft857_get_vfo(RIG *rig, vfo_t *vfo)
 
     if (ft857_read_eeprom(rig, 0x0068, &c) < 0)   /* get vfo status */
     {
-        return -RIG_EPROTO;
+        // Some 857's cannnot read so we'll just return the cached value
+        *vfo = rig->state.cache.vfo;
+        return RIG_OK;
     }
 
     if ((c & 0x1) == 0) { *vfo = RIG_VFO_A; }