Cleanup

Author: hbjorgo

src/HeboTech.ATLib.TestConsole/Program.cs

@@ -1,6 +1,8 @@
 using HeboTech.ATLib.Communication;
+using HeboTech.ATLib.Inputs;
 using HeboTech.ATLib.Modems;
 using HeboTech.ATLib.Parsers;
+using HeboTech.ATLib.Results;
 using System;
 using System.IO.Ports;
 using System.Threading.Tasks;
@@ -23,7 +25,7 @@ static async Task Main(string[] args)
 
                 AtChannel atChannel = new AtChannel(comm);
 
-                AdafruitFona modem = new AdafruitFona(atChannel);
+                AdafruitFona3G modem = new AdafruitFona3G(atChannel);
                 modem.IncomingCall += Modem_IncomingCall;
                 modem.MissedCall += Modem_MissedCall;
 
@@ -32,9 +34,12 @@ static async Task Main(string[] args)
                 var simStatus = modem.GetSimStatus();
                 Console.WriteLine($"SIM Status: {simStatus}");
 
-                if (simStatus == States.SimStatus.SIM_PIN)
+                var remainingCodeAttemps = modem.GetRemainingPinPukAttempts();
+                Console.WriteLine($"Remaining attempts: {remainingCodeAttemps}");
+
+                if (simStatus == SimStatus.SIM_PIN)
                 {
-                    var simPinStatus = modem.EnterSimPin(new Pin(args[0]));
+                    var simPinStatus = modem.EnterSimPin(new PersonalIdentificationNumber(args[0]));
                     Console.WriteLine($"SIM PIN Status: {simPinStatus}");
 
                     simStatus = modem.GetSimStatus();
@@ -50,7 +55,7 @@ static async Task Main(string[] args)
                 var smsReference = modem.SendSMS(new PhoneNumber(args[1]), "Hello ATLib!");
                 Console.WriteLine($"SMS Reference: {smsReference}");
 
-                Console.WriteLine("Done. Press any key to exit...");
+                Console.WriteLine("Done. Press 'a' to answer call, 'h' to hang up, and 'q' to exit...");
                 ConsoleKey key;
                 while ((key = Console.ReadKey().Key) != ConsoleKey.Q)
                 {

src/HeboTech.ATLib/EnumExtensions.cs …oTech.ATLib/Extensions/EnumExtensions.cssrc/HeboTech.ATLib/EnumExtensions.cs renamed to src/HeboTech.ATLib/Extensions/EnumExtensions.cs src/HeboTech.ATLib/EnumExtensions.cs renamed to src/HeboTech.ATLib/Extensions/EnumExtensions.cs

@@ -1,7 +1,7 @@
 using System;
 using System.ComponentModel;
 
-namespace HeboTech.ATLib
+namespace HeboTech.ATLib.Extensions
 {
     public static class EnumExtensions
     {

src/HeboTech.ATLib/HeboTech.ATLib.csproj

@@ -18,7 +18,6 @@
   <ItemGroup>
     <Compile Remove="Communication\ScriptCommunicator.cs" />
     <Compile Remove="Communication\SocketCommunicator.cs" />
-    <Compile Remove="Parsers\LineReader.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -29,10 +28,4 @@
     <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Commands\3GPP_TS_27_005\" />
-    <Folder Include="Commands\3GPP_TS_27_007\" />
-    <Folder Include="Commands\V25TER\" />
-  </ItemGroup>
-
 </Project>

src/HeboTech.ATLib/ITimeProvider.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace HeboTech.ATLib.Inputs
+{
+    public class PersonalIdentificationNumber
+    {
+        public PersonalIdentificationNumber(string pin)
+        {
+            if (!Regex.IsMatch(pin, @"^\d{4}$"))
+                throw new ArgumentException("Invalid PIN");
+            Pin = pin;
+        }
+
+        public string Pin { get; }
+
+        public override string ToString()
+        {
+            return Pin;
+        }
+    }
+}

src/HeboTech.ATLib/Inputs/PersonalIdentificationNumber.cs

@@ -1,4 +1,4 @@
-namespace HeboTech.ATLib
+namespace HeboTech.ATLib.Inputs
 {
     public class PhoneNumber
     {

src/HeboTech.ATLib/PhoneNumber.cs src/HeboTech.ATLib/Inputs/PhoneNumber.cssrc/HeboTech.ATLib/PhoneNumber.cs renamed to src/HeboTech.ATLib/Inputs/PhoneNumber.cs

@@ -1,4 +1,4 @@
-namespace HeboTech.ATLib
+namespace HeboTech.ATLib.Inputs
 {
     public enum PhoneNumberFormat : byte
     {

src/HeboTech.ATLib/PhoneNumberFormat.cs …boTech.ATLib/Inputs/PhoneNumberFormat.cssrc/HeboTech.ATLib/PhoneNumberFormat.cs renamed to src/HeboTech.ATLib/Inputs/PhoneNumberFormat.cs src/HeboTech.ATLib/PhoneNumberFormat.cs renamed to src/HeboTech.ATLib/Inputs/PhoneNumberFormat.cs

@@ -2,9 +2,9 @@
 
 namespace HeboTech.ATLib.Modems
 {
-    public class AdafruitFona : ModemBase
+    public class AdafruitFona3G : ModemBase
     {
-        public AdafruitFona(AtChannel channel)
+        public AdafruitFona3G(AtChannel channel)
             : base(channel)
         {
         }

src/HeboTech.ATLib/Modems/AdafruitFona.cs …/HeboTech.ATLib/Modems/AdafruitFona3G.cssrc/HeboTech.ATLib/Modems/AdafruitFona.cs renamed to src/HeboTech.ATLib/Modems/AdafruitFona3G.cs src/HeboTech.ATLib/Modems/AdafruitFona.cs renamed to src/HeboTech.ATLib/Modems/AdafruitFona3G.cs

@@ -0,0 +1,23 @@
+using HeboTech.ATLib.Events;
+using HeboTech.ATLib.Inputs;
+using HeboTech.ATLib.Results;
+using System;
+
+namespace HeboTech.ATLib.Modems
+{
+    public interface IModem
+    {
+        event EventHandler<IncomingCallEventArgs> IncomingCall;
+        event EventHandler<MissedCallEventArgs> MissedCall;
+
+        CommandStatus AnswerIncomingCall();
+        CommandStatus DisableEcho();
+        CommandStatus EnterSimPin(PersonalIdentificationNumber pin);
+        BatteryStatus GetBatteryStatus();
+        SignalStrength GetSignalStrength();
+        SimStatus GetSimStatus();
+        CallDetails Hangup();
+        SmsReference SendSMS(PhoneNumber phoneNumber, string message);
+        RemainingPinPukAttempts GetRemainingPinPukAttempts();
+    }
+}