From b72f759956ab0ebc16247e65f8118926f1ce64e9 Mon Sep 17 00:00:00 2001
From: Mikael Nousiainen <mikael.nousiainen@iki.fi>
Date: Fri, 23 Oct 2020 10:13:08 +0300
Subject: [PATCH] Fix LOCK func

(cherry picked from commit db2017c0eac6bbeb963e33a87d6b773fa60133a9)
---
 rigs/yaesu/newcat.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index c9e55556d..3b9cf81d1 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -3864,8 +3864,15 @@ int newcat_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
             return -RIG_ENAVAIL;
         }
 
-        snprintf(priv->cmd_str, sizeof(priv->cmd_str), "LK%d%c", status ? 1 : 0,
-                 cat_term);
+        if (is_ft1200 || is_ft3000 || is_ft5000 || is_ft101)
+        {
+            // These rigs can lock Main/Sub VFO dials individually
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "LK%d%c", status ? 7 : 4, cat_term);
+        }
+        else
+        {
+            snprintf(priv->cmd_str, sizeof(priv->cmd_str), "LK%d%c", status ? 1 : 0, cat_term);
+        }
         break;
 
     case RIG_FUNC_MON:
@@ -4202,9 +4209,20 @@ int newcat_get_func(RIG *rig, vfo_t vfo, setting_t func, int *status)
         // The number of digits varies by rig, but the last digit indicates the status always
         *status = (retfunc[last_char_index] == '0') ? 0 : 1;
         break;
+    case RIG_FUNC_LOCK:
+        if (is_ft1200 || is_ft3000 || is_ft5000 || is_ft101)
+        {
+            // These rigs can lock Main/Sub VFO dials individually
+            *status = (retfunc[0] == '0' || retfunc[0] == '4') ? 0 : 1;
+        }
+        else
+        {
+            *status = (retfunc[0] == '0') ? 0 : 1;
+        }
+        break;
+
     case RIG_FUNC_ANF:
     case RIG_FUNC_FBKIN:
-    case RIG_FUNC_LOCK:
     case RIG_FUNC_NB:
     case RIG_FUNC_NR:
     case RIG_FUNC_VOX: