From 1fdf269489b0c2724a1599caa689c57c3f0dbfc2 Mon Sep 17 00:00:00 2001
From: alexwahl <email@alexwahl.de>
Date: Sat, 17 Mar 2018 21:22:50 +0100
Subject: [PATCH] process frequencies with more or less 9 digits

---
 .../GlobalSuppressions.cs                     | Bin 0 -> 2870 bytes
 SDRSharp.GpredictConnector/Rigctrld.cs        |  58 +++++-------------
 .../SDRSharp.GpredictConnector.csproj         |   1 +
 .../Test_rigctrld_set_frequency.cs            |  51 ++++++++++++---
 4 files changed, 59 insertions(+), 51 deletions(-)
 create mode 100644 SDRSharp.GpredictConnector/GlobalSuppressions.cs

diff --git a/SDRSharp.GpredictConnector/GlobalSuppressions.cs b/SDRSharp.GpredictConnector/GlobalSuppressions.cs
new file mode 100644
index 0000000000000000000000000000000000000000..22456ebb3f54d473f1d63c2c459a350659c82774
GIT binary patch
literal 2870
zcmeH}OKTHh6o$`Q@IMT3qhM3JRB#ckw}o0vq@cK%CX+fQnS_~1i~ZrQM17xgGMz+|
zx)D(*fy{R~m-pPi@88~AYL$MO&FsXc_Sqg-VtsuptNpZVhn9=#)C!yXX>LP(yY^W7
zk!X6lNu9S6B{zLr+Csllw@81v`XVK>+t$$uQc9ONx3P4g2kP84b?mNibflwa2X;@t
z`$7iAP?}Pg{KU?*FU0#?Cxx&~wJ#+DWTn##b&FLYuP^SoaAlJH(B;px#&Y<AX5iAn
zSzl81rTLAl`sjBHVSTo;Zsc~<uCWjX@YSw8`~y0yoQfWdnO0r9C0S?$f2nota%&;D
zV;}6M-LUJp{2Os0TmHwW9H?3b%6oFX(u&Nj?X{gN2dU>uH&k=#RiD{YospX(oss8r
zRWQ3pI^9OUtDfqW&OcpCzpu9=;a#eC<g)NOV!uZCZ%1sPPPo|Ub8S@iZC|~Wydpd4
z#)qDtnNAYrXs)g}(&|ikSm?`?DfMk84xO}_IB;Jm^4uTmv{arib$`0XclA8l6D2)2
zQ1!%5&(2jDORbO}efnH$rVNvT=|u16HWl6Ya*sWgc1Myiw@=zlL=P31GFjJ3!B#9o
zW}&&zqIj!4y16Uut9&_GSp{XQb5l#^lZ+{oc*Qf<pyt1JU5zIvI-^n&d*@b6wTfwu
zA6pzCpm$6iO~?v9I!GqZ=dzt_8;UM0ZzaxjgYB;*fk_KbD$30E+=J1fV$B<&nZz-V
zL5S2umRCaG`lrQrEH36QZ<dHgM1?3|$$DOe#rS5ockvtckx^s$orocQW?vi&F)1AT
zL_Pr@o?O@8*xY!UHxO0?XQG!6`NHdpmsjN1W(GkMy|~Ha@OWg&dUUqe1D1pPM7W3y
zz6i`0TJgTxMBHfSRko=Y{Xb_RywOXzrAl{sqLJH1t79+3bCv%qNn}!iv$GcQHoh}O
irLn20!EMpT_V7E=qxzO^9hts6{^6NzIS|>0Ek6K<HvrrK

literal 0
HcmV?d00001

diff --git a/SDRSharp.GpredictConnector/Rigctrld.cs b/SDRSharp.GpredictConnector/Rigctrld.cs
index 7926752..5384f89 100644
--- a/SDRSharp.GpredictConnector/Rigctrld.cs
+++ b/SDRSharp.GpredictConnector/Rigctrld.cs
@@ -1,59 +1,28 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace SDRSharp.GpredictConnector
 {
-    enum Errcode
-    {
-        RIG_OK = 0,     /*!< No error, operation completed successfully */
-        RIG_EINVAL,     /*!< invalid parameter */
-        RIG_ECONF,      /*!< invalid configuration (serial,..) */
-        RIG_ENOMEM,     /*!< memory shortage */
-        RIG_ENIMPL,     /*!< function not implemented, but will be */
-        RIG_ETIMEOUT,   /*!< communication timed out */
-        RIG_EIO,        /*!< IO error, including open failed */
-        RIG_EINTERNAL,  /*!< Internal Hamlib error, huh! */
-        RIG_EPROTO,     /*!< Protocol error */
-        RIG_ERJCTED,    /*!< Command rejected by the rig */
-        RIG_ETRUNC,     /*!< Command performed, but arg truncated */
-        RIG_ENAVAIL,    /*!< function not available */
-        RIG_ENTARGET,   /*!< VFO not targetable */
-        RIG_BUSERROR,   /*!< Error talking on the bus */
-        RIG_BUSBUSY,    /*!< Collision on the bus */
-        RIG_EARG,       /*!< NULL RIG handle or any invalid pointer parameter in get arg */
-        RIG_EVFO,       /*!< Invalid VFO */
-        RIG_EDOM        /*!< Argument out of domain of func */
-    };
-
     class Rigctrld
     {
-        
-        private string GenAnswer(Errcode code)
-        {
-            return "RPRT " + ((int)code).ToString() + "\n";
-        }
-
         public string ExecCommand(string command)
         {
-            var answer = GenAnswer(Errcode.RIG_OK);
             if (command.StartsWith("F"))
             {
-                answer = SetFrequency(command);
+                Regex regex = new Regex("^F[ ]*([0-9]{1,})$");
+                var matches = regex.Matches(command);
+                if (matches.Count > 0)
+                {
+                    if (matches[0].Groups.Count == 2)
+                    {
+                        var f_string = matches[0].Groups[1].Value;
+                        frequency_set_thread_ = new Thread(() => FrequencyInHzString = f_string);
+                        frequency_set_thread_.Start();
+                    }
+                }
             }
-            return answer;
-        }
-
-        private string SetFrequency(string command)
-        {
-            var f_string = command.Substring(3, 9);
-            frequency_set_thread_ = new Thread(() => FrequencyInHzString = f_string);
-            frequency_set_thread_.Start();          
-            return GenAnswer(Errcode.RIG_OK); 
+            return "RPRT 0\n";
         }
 
         public long FrequencyInHz
@@ -72,6 +41,7 @@ private set
                 
             }
         }
+
         public string FrequencyInHzString
         {
             get
diff --git a/SDRSharp.GpredictConnector/SDRSharp.GpredictConnector.csproj b/SDRSharp.GpredictConnector/SDRSharp.GpredictConnector.csproj
index 6a21c69..c06368b 100644
--- a/SDRSharp.GpredictConnector/SDRSharp.GpredictConnector.csproj
+++ b/SDRSharp.GpredictConnector/SDRSharp.GpredictConnector.csproj
@@ -64,6 +64,7 @@
       <DependentUpon>Controlpanel.cs</DependentUpon>
     </Compile>
     <Compile Include="FrequencyManager.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="GpredictConnectorPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Rigctrld.cs" />
diff --git a/UnitTestGpredictConnector/Test_rigctrld_set_frequency.cs b/UnitTestGpredictConnector/Test_rigctrld_set_frequency.cs
index 6e8ac96..66a9df4 100644
--- a/UnitTestGpredictConnector/Test_rigctrld_set_frequency.cs
+++ b/UnitTestGpredictConnector/Test_rigctrld_set_frequency.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Text;
-using System.Collections.Generic;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SDRSharp.GpredictConnector;
-using System.Threading;
 
 namespace UnitTestGpredictConnector
 {
@@ -62,15 +58,56 @@ public void Initialize()
         [TestMethod]
         public void SetFrequency_F__144800123()
         {
-            Rigctrld cut = new Rigctrld();
             TestHelper_SetFrequency(expected_freq: 144800123, command: "F  144800123");
         }
+        [TestMethod]
+        public void SetFrequency_F__1GHZ()
+        {
+            TestHelper_SetFrequency(expected_freq: 1234567890, command: "F  1234567890");
+        }
+        [TestMethod]
+        public void SetFrequency_F__10m()
+        {
+            TestHelper_SetFrequency(expected_freq: 29420877, command: "F  29420877");
+        }
+
+        [TestMethod]
+        public void SetFrequency_F_144800123()
+        {
+            TestHelper_SetFrequency(expected_freq: 144800123, command: "F 144800123");
+        }
+
+        [TestMethod]
+        public void SetFrequency_F_00144800123()
+        {
+            TestHelper_SetFrequency(expected_freq: 144800123, command: "F 00144800123");
+        }
+
+        [TestMethod]
+        public void SetFrequency_F_1GHZ()
+        {
+            TestHelper_SetFrequency(expected_freq: 1234567890, command: "F 1234567890");
+        }
+        [TestMethod]
+        public void SetFrequency_F_10m()
+        {
+            TestHelper_SetFrequency(expected_freq: 29420877, command: "F 29420877");
+        }
+
+        [TestMethod]
+        public void SetFrequency_unparseableFreq()
+        {
+            Assert.AreEqual("RPRT 0\n", class_under_test_.ExecCommand("F 1234d567890"));
+            Assert.IsNull(class_under_test_.FrequencySetThread);
+            Assert.AreEqual(0, class_under_test_.FrequencyInHz);
+        }
 
         private void TestHelper_SetFrequency(long expected_freq, string command)
         {
             long result_freq = 0;
+
             class_under_test_.FrequencyInHzChanged += x => result_freq = x;
-            class_under_test_.ExecCommand(command);
+            Assert.AreEqual("RPRT 0\n", class_under_test_.ExecCommand(command));
             Assert.IsNotNull(class_under_test_.FrequencySetThread); // should be running
             class_under_test_.FrequencySetThread.Join(); // wait for the freqeuncy set thread to finish his work
             Assert.AreEqual(expected_freq, class_under_test_.FrequencyInHz);