From a9b780db281c116306c5aa1f19145e21210551a9 Mon Sep 17 00:00:00 2001
From: noboba <noboba@hotmail.com>
Date: Tue, 9 Feb 2016 22:36:08 +0900
Subject: [PATCH] FT-991 CAT support mod by G3WYW

---
 ComLib.h   |  2 +-
 cradio.cpp | 35 +++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/ComLib.h b/ComLib.h
index 5acfcb5..ef6087f 100644
--- a/ComLib.h
+++ b/ComLib.h
@@ -32,7 +32,7 @@
 #include <SHELLAPI.H>
 
 #define	VERID	"Ver1.70"       //K6TU 1.68A -> 1.70A AA6YQ 1.65D->1.66G,  JE3HHT 1.67
-#define	VERBETA	"A"
+#define	VERBETA	"B"             //JA7UDE 1.70A -> 1.70B G3WYW FT-991 CAT support
 #define	VERTTL2	"MMTTY "VERID VERBETA
 #define	VERTTL  VERTTL2" (C) JE3HHT 2000-2010."
 
diff --git a/cradio.cpp b/cradio.cpp
index 0a4dc31..0cc2c15 100644
--- a/cradio.cpp
+++ b/cradio.cpp
@@ -1035,19 +1035,34 @@ void CCradio::FreqKenwood(void)
 }
 
 //AA6YQ 1.66B
+//G3WYW Fix for FT-991
 void CCradio::FreqYaesu9K2K(void)
 {
-//0123456789012
-//IF00021155000     +001000 0002000008 ;
-//abcdefghijklmnopqrstuvwxyz1234567890      <----@Œ…ˆΚ’u
-//f - m  Žό”g”@21.155MHz
+//000000000011111111112222222222
+//012345678901234567890123456789
+//IF000021155000+0000RTMVCTTS; <= FT991
+//IF00021155000+0000RTMVCTTS;  <= FT9K2K
+//abcdefghijklmnopqrstuvwxyz1234567890      <----@Œ…ˆΚ’u Digit Posn
+//f - m  Žό”g” freq@21.155MHz
+
+    ULONG fq = 0;
+
+//G3WYW Feb 2016 am I a FT-991 or FT9K2K?
+    if (m_rxbuf[26] == ';')
+    {    //FT9K2K
+        m_rxbuf[13] = 0;
+        if( sscanf((LPCSTR)&m_rxbuf[5], "%lu", &fq) == 1 ){
+            if( fq ) UpdateFreq(double(fq)/1e6);
+        }
+    }
+    else //FT991
+    {
+        m_rxbuf[14] = 0;
+        if( sscanf((LPCSTR)&m_rxbuf[5], "%lu", &fq) == 1 ){
+            if( fq ) UpdateFreq(double(fq)/1e6);
+        }
+    }
 
-	ULONG fq = 0;
-
-	m_rxbuf[13] = 0;
-	if( sscanf((LPCSTR)&m_rxbuf[5], "%lu", &fq) == 1 ){
-		if( fq ) UpdateFreq(double(fq)/1e6);
-	}
 }
 
 void CCradio::FreqJST245(void)