Skip to content

Commit

Permalink
Remove features that are not finished
Browse files Browse the repository at this point in the history
  • Loading branch information
@hbjorgo
hbjorgo committed Dec 10, 2024
1 parent f545198 commit 48abb94
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 33 deletions.
12 changes: 3 additions & 9 deletions src/HeboTech.ATLib.TestConsole/FunctionalityTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,12 @@ public static async Task RunAsync(System.IO.Stream stream, string pin)
modem.CallStarted += Modem_CallStarted;
modem.CallEnded += Modem_CallEnded;

modem.SmsStorageReferenceReceived += Modem_SmsStorageReferenceReceived;
modem.SmsReceived += Modem_SmsReceived;
modem.SmsStorageReferenceReceived += Modem_SmsStorageReferenceReceived;

modem.SmsStatusReportReceived += Modem_SmsStatusReportReceived;
modem.SmsStatusReportStorageReferenceReceived += Modem_SmsStatusReportStorageReferenceReceived;

modem.BroadcastMessageReceived += Modem_BroadcastMessageReceived;
modem.BroadcastMessageStorageReferenceReceived += Modem_BroadcastMessageStorageReferenceReceived;

modem.UssdResponseReceived += Modem_UssdResponseReceived;

// Configure modem with required settings before PIN
Expand Down Expand Up @@ -123,9 +120,6 @@ public static async Task RunAsync(System.IO.Stream stream, string pin)
var dateTime = await modem.GetDateTimeAsync();
Console.WriteLine($"Date and time: {dateTime}");

var selectMessageService = await modem.SetSelectMessageService(0);
Console.WriteLine($"Setting select message service: {selectMessageService}");

var newSmsIndicationResult = await modem.SetNewSmsIndicationAsync(2, 1, 0, 2, 0); // 2, 1, 0, 2, 0 (CSMS=0)
Console.WriteLine($"Setting new SMS indication: {newSmsIndicationResult}");

Expand Down Expand Up @@ -257,7 +251,7 @@ public static async Task RunAsync(System.IO.Stream stream, string pin)
}
}

private static void Modem_BroadcastMessageStorageReferenceReceived(object sender, BreadcastMessageStorageReferenceReceivedEventArgs e)
private static void Modem_BroadcastMessageStorageReferenceReceived(object sender, BroadcastMessageStorageReferenceReceivedEventArgs e)
{
Console.WriteLine($"Broadcast Message. Index {e.Index} at storage location {e.Storage}");
}
Expand All @@ -272,7 +266,7 @@ private static void Modem_SmsStatusReportStorageReferenceReceived(object sender,
Console.WriteLine($"SMS Status Report. Index {e.Index} at storage location {e.Storage}");
}

private static void Modem_BroadcastMessageReceived(object sender, BreadcastMessageReceivedEventArgs e)
private static void Modem_BroadcastMessageReceived(object sender, BroadcastMessageReceivedEventArgs e)
{
Console.WriteLine($"Broadcast Message: {e.BroadcastMessage}");
}
Expand Down
6 changes: 3 additions & 3 deletions ...ents/BreadcastMessageReceivedEventArgs.cs → ...ents/BroadcastMessageReceivedEventArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

namespace HeboTech.ATLib.Events
{
public class BreadcastMessageReceivedEventArgs
public class BroadcastMessageReceivedEventArgs
{
public BreadcastMessageReceivedEventArgs(BroadcastMessage broadcastMessage)
public BroadcastMessageReceivedEventArgs(BroadcastMessage broadcastMessage)
{
BroadcastMessage = broadcastMessage;
}

public BroadcastMessage BroadcastMessage { get; }

public static BreadcastMessageReceivedEventArgs CreateFromResponse(string line1, string line2)
public static BroadcastMessageReceivedEventArgs CreateFromResponse(string line1, string line2)
{
var line1Match = Regex.Match(line1, @"\+CBM:\s(?<length>\d+)");
if (line1Match.Success)
Expand Down
8 changes: 4 additions & 4 deletions ...ssageStorageReferenceReceivedEventArgs.cs → ...ssageStorageReferenceReceivedEventArgs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace HeboTech.ATLib.Events
{
public class BreadcastMessageStorageReferenceReceivedEventArgs
public class BroadcastMessageStorageReferenceReceivedEventArgs
{
public BreadcastMessageStorageReferenceReceivedEventArgs(string storage, int index)
public BroadcastMessageStorageReferenceReceivedEventArgs(string storage, int index)
{
Storage = storage;
Index = index;
Expand All @@ -13,14 +13,14 @@ public BreadcastMessageStorageReferenceReceivedEventArgs(string storage, int ind
public string Storage { get; }
public int Index { get; }

public static BreadcastMessageStorageReferenceReceivedEventArgs CreateFromResponse(string response)
public static BroadcastMessageStorageReferenceReceivedEventArgs CreateFromResponse(string response)
{
var match = Regex.Match(response, @"\+CBMI:\s""(?<storage>[A-Z]+)"",(?<index>\d+)");
if (match.Success)
{
string storage = match.Groups["storage"].Value;
int index = int.Parse(match.Groups["index"].Value);
return new BreadcastMessageStorageReferenceReceivedEventArgs(storage, index);
return new BroadcastMessageStorageReferenceReceivedEventArgs(storage, index);
}
return default;
}
Expand Down
28 changes: 14 additions & 14 deletions src/HeboTech.ATLib/Modems/Generic/ModemBase.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ protected virtual void Channel_UnsolicitedEvent(object sender, UnsolicitedEventA
else if (e.Line1.StartsWith("+CMTI: "))
SmsStorageReferenceReceived?.Invoke(this, SmsStorageReferenceReceivedEventArgs.CreateFromResponse(e.Line1));

else if (e.Line1.StartsWith("+CBM: "))
BroadcastMessageReceived?.Invoke(this, BreadcastMessageReceivedEventArgs.CreateFromResponse(e.Line1, e.Line2));
else if (e.Line1.StartsWith("+CBMI: "))
BroadcastMessageStorageReferenceReceived?.Invoke(this, BreadcastMessageStorageReferenceReceivedEventArgs.CreateFromResponse(e.Line1));
//else if (e.Line1.StartsWith("+CBM: "))
// BroadcastMessageReceived?.Invoke(this, BroadcastMessageReceivedEventArgs.CreateFromResponse(e.Line1, e.Line2));
//else if (e.Line1.StartsWith("+CBMI: "))
// BroadcastMessageStorageReferenceReceived?.Invoke(this, BroadcastMessageStorageReferenceReceivedEventArgs.CreateFromResponse(e.Line1));

else if (e.Line1.StartsWith("+CDS: "))
SmsStatusReportReceived?.Invoke(this, SmsStatusReportEventArgs.CreateFromResponse(e.Line1, e.Line2));
Expand All @@ -68,8 +68,8 @@ protected virtual void Channel_UnsolicitedEvent(object sender, UnsolicitedEventA
public event EventHandler<SmsReceivedEventArgs> SmsReceived;
public event EventHandler<SmsStorageReferenceReceivedEventArgs> SmsStorageReferenceReceived;

public event EventHandler<BreadcastMessageReceivedEventArgs> BroadcastMessageReceived;
public event EventHandler<BreadcastMessageStorageReferenceReceivedEventArgs> BroadcastMessageStorageReferenceReceived;
//public event EventHandler<BroadcastMessageReceivedEventArgs> BroadcastMessageReceived;
//public event EventHandler<BroadcastMessageStorageReferenceReceivedEventArgs> BroadcastMessageStorageReferenceReceived;

public event EventHandler<SmsStatusReportEventArgs> SmsStatusReportReceived;
public event EventHandler<SmsStatusReportStorageReferenceEventArgs> SmsStatusReportStorageReferenceReceived;
Expand Down Expand Up @@ -241,16 +241,16 @@ public virtual async Task<ModemResponse> SetSmsMessageFormatAsync(SmsTextFormat
return ModemResponse.HasError(error);
}

public virtual async Task<ModemResponse> SetSelectMessageService(int service)
{
AtResponse response = await channel.SendCommand($"AT+CSMS={service}");
//public virtual async Task<ModemResponse> SetSelectMessageService(int service)
//{
// AtResponse response = await channel.SendCommand($"AT+CSMS={service}");

if (response.Success)
return ModemResponse.IsSuccess();
// if (response.Success)
// return ModemResponse.IsSuccess();

AtErrorParsers.TryGetError(response.FinalResponse, out Error error);
return ModemResponse.HasError(error);
}
// AtErrorParsers.TryGetError(response.FinalResponse, out Error error);
// return ModemResponse.HasError(error);
//}

public virtual async Task<ModemResponse> SetNewSmsIndicationAsync(int mode, int mt, int bm, int ds, int bfr)
{
Expand Down
6 changes: 3 additions & 3 deletions src/HeboTech.ATLib/Modems/IModem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public interface IModem : IDisposable

event EventHandler<SmsReceivedEventArgs> SmsReceived;

event EventHandler<BreadcastMessageReceivedEventArgs> BroadcastMessageReceived;
event EventHandler<BreadcastMessageStorageReferenceReceivedEventArgs> BroadcastMessageStorageReferenceReceived;
//event EventHandler<BroadcastMessageReceivedEventArgs> BroadcastMessageReceived;
//event EventHandler<BroadcastMessageStorageReferenceReceivedEventArgs> BroadcastMessageStorageReferenceReceived;

event EventHandler<SmsStatusReportEventArgs> SmsStatusReportReceived;
event EventHandler<SmsStatusReportStorageReferenceEventArgs> SmsStatusReportStorageReferenceReceived;
Expand Down Expand Up @@ -239,7 +239,7 @@ public interface IModem : IDisposable
/// </summary>
/// <param name="service">Typical: 0, 1</param>
/// <returns>Command status</returns>
Task<ModemResponse> SetSelectMessageService(int service);
//Task<ModemResponse> SetSelectMessageService(int service);

/// <summary>
/// Sets how receiving a new SMS is indicated
Expand Down

0 comments on commit 48abb94

Please sign in to comment.