Touch-ups on autoreconnect

This commit is contained in:
Heath Volmer
2016-11-10 12:26:45 -07:00
parent 9553dac99c
commit c92c2e6df4
8 changed files with 27 additions and 6 deletions

View File

@@ -32,6 +32,12 @@ namespace PepperDash.Core
/// </summary> /// </summary>
public IBasicCommunication Port { get; private set; } public IBasicCommunication Port { get; private set; }
/// <summary>
/// Default false. If true, the delimiter will be included in the line output
/// events
/// </summary>
public bool IncludeDelimiter { get; set; }
/// <summary> /// <summary>
/// For receive buffer /// For receive buffer
/// </summary> /// </summary>
@@ -92,7 +98,14 @@ namespace PepperDash.Core
if (lines.Length > 0) if (lines.Length > 0)
{ {
for (int i = 0; i < lines.Length - 1; i++) for (int i = 0; i < lines.Length - 1; i++)
handler(this, new GenericCommMethodReceiveTextArgs(lines[i])); {
string strToSend = null;
if (IncludeDelimiter)
strToSend = lines[i] + Delimiter;
else
strToSend = lines[i];
handler(this, new GenericCommMethodReceiveTextArgs(strToSend));
}
ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]); ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);
} }
} }
@@ -117,7 +130,14 @@ namespace PepperDash.Core
if (lines.Length > 1) if (lines.Length > 1)
{ {
for (int i = 0; i < lines.Length - 1; i++) for (int i = 0; i < lines.Length - 1; i++)
handler(this, new GenericCommMethodReceiveTextArgs(lines[i])); {
string strToSend = null;
if (IncludeDelimiter)
strToSend = lines[i] + StringDelimiter;
else
strToSend = lines[i];
handler(this, new GenericCommMethodReceiveTextArgs(strToSend));
}
ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]); ReceiveBuffer = new StringBuilder(lines[lines.Length - 1]);
} }
} }

View File

@@ -64,7 +64,7 @@ namespace PepperDash.Core
public bool AutoReconnect { get; set; } public bool AutoReconnect { get; set; }
/// <summary> /// <summary>
/// /// Milliseconds to wait before attempting to reconnect. Defaults to 5000
/// </summary> /// </summary>
public int AutoReconnectIntervalMs { get; set; } public int AutoReconnectIntervalMs { get; set; }
@@ -98,6 +98,7 @@ namespace PepperDash.Core
return; return;
} }
} }
AutoReconnectIntervalMs = 5000;
Client = new TCPClient(address, port, bufferSize); Client = new TCPClient(address, port, bufferSize);
Client.SocketStatusChange += Client_SocketStatusChange; Client.SocketStatusChange += Client_SocketStatusChange;

View File

@@ -10,8 +10,8 @@
<ArchiveName /> <ArchiveName />
</RequiredInfo> </RequiredInfo>
<OptionalInfo> <OptionalInfo>
<CompiledOn>10/18/2016 12:34:49 PM</CompiledOn> <CompiledOn>11/9/2016 5:41:14 PM</CompiledOn>
<CompilerRev>1.0.0.20775</CompilerRev> <CompilerRev>1.0.0.31834</CompilerRev>
</OptionalInfo> </OptionalInfo>
<Plugin> <Plugin>
<Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version> <Version>Crestron.SIMPLSharp, Version=2.0.48.0, Culture=neutral, PublicKeyToken=812d080f93e2de10</Version>

View File

@@ -1,4 +1,4 @@
MainAssembly=PepperDash_Core.dll:59ea04ece7016e5dd5cfbefdb88bb5ab MainAssembly=PepperDash_Core.dll:5bffbd7a7e3b0acd31ccd19249863216
MainAssemblyMinFirmwareVersion=1.007.0017 MainAssemblyMinFirmwareVersion=1.007.0017
MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e MainAssemblyResource=SimplSharpData.dat:315526abf906cded47fb0c7510266a7e
ü ü