mirror/SimplySerial
1
0
Fork 0
mirror of https://github.com/fasteddy516/SimplySerial.git synced 2024-11-24 10:04:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed "nowait" option as it no longer serves a purpose

Browse Source
This commit is contained in:
Edward Wright 2019-06-09 21:00:10 -04:00
parent 2a35a7cff3
commit 8f32b3f364
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
SimplySerial/SimplySerial.cs
View File

@ -18,7 +18,6 @@ namespace SimplySerial
// default comspec values and application settings set here will be overridden by values passed through command-line arguments // default comspec values and application settings set here will be overridden by values passed through command-line arguments
static bool Quiet = false; static bool Quiet = false;
static bool NoWait = false;
static AutoConnect autoConnect = AutoConnect.ONE; static AutoConnect autoConnect = AutoConnect.ONE;
static ComPort port; static ComPort port;
static int baud = 9600; static int baud = 9600;
@ -133,19 +132,6 @@ namespace SimplySerial
// if auto-connect is enabled, prepare to try again // if auto-connect is enabled, prepare to try again
serialPort.Dispose(); serialPort.Dispose();
Thread.Sleep(1000); // putting a delay here to avoid gobbling tons of resources thruogh constant high-speed re-connect attempts Thread.Sleep(1000); // putting a delay here to avoid gobbling tons of resources thruogh constant high-speed re-connect attempts
/*
if (autoConnect == AutoConnect.ANY)
{
port.name = String.Empty;
Console.Clear();
Output("<<< Attemping to connect to any avaiable COM port. Use CTRL-X to cancel >>>");
}
else if (autoConnect == AutoConnect.ONE)
{
Console.Clear();
Output("<<< Attempting to re-connect to " + port.name + ". Use CTRL-X to cancel >>>");
}
*/
continue; continue;
} }
@ -308,12 +294,6 @@ namespace SimplySerial
SimplySerial.Quiet = true; SimplySerial.Quiet = true;
} }
// nowait (disables the "press any key to exit" function)
else if (argument[0].StartsWith("n"))
{
SimplySerial.NoWait = true;
}
// the remainder of possible command-line arguments require two parameters, so let's enforce that now // the remainder of possible command-line arguments require two parameters, so let's enforce that now
else if (argument.Count() < 2) else if (argument.Count() < 2)
{ {
@ -459,7 +439,6 @@ namespace SimplySerial
Console.WriteLine(" -autoconnect:VAL NONE| ONE | ANY, enable/disable auto-(re)connection when"); Console.WriteLine(" -autoconnect:VAL NONE| ONE | ANY, enable/disable auto-(re)connection when");
Console.WriteLine(" a device is disconnected / reconnected."); Console.WriteLine(" a device is disconnected / reconnected.");
Console.WriteLine(" -quiet don't print any application messages/errors to console"); Console.WriteLine(" -quiet don't print any application messages/errors to console");
Console.WriteLine(" -nowait don't wait for user input (i.e. 'press any key to exit')\n");
Console.WriteLine(" Press CTRL-X to exit a running instance of SimplySerial."); Console.WriteLine(" Press CTRL-X to exit a running instance of SimplySerial.");
} }
@ -475,17 +454,8 @@ namespace SimplySerial
// the serial port should be closed before exiting // the serial port should be closed before exiting
if (serialPort != null && serialPort.IsOpen) if (serialPort != null && serialPort.IsOpen)
serialPort.Close(); serialPort.Close();
if (!silent) if (!silent)
Output("\n" + message); Output("\n" + message);
if (!(SimplySerial.NoWait || silent))
{
// we output this line regardless of the 'quiet' option to make it clear that we're waiting for user input
Console.WriteLine("\nPress any key to exit...");
while (!Console.KeyAvailable)
Thread.Sleep(25);
}
Environment.Exit(exitCode); Environment.Exit(exitCode);
} }
@ -777,9 +747,8 @@ namespace SimplySerial
// '?' or 'h' trigger the 'help' text output and supersede all other command-line arguments // '?' or 'h' trigger the 'help' text output and supersede all other command-line arguments
// 'l' triggers the 'list available ports' output and supersedes all other command-line arguments aside from 'help' // 'l' triggers the 'list available ports' output and supersedes all other command-line arguments aside from 'help'
// 'q' enables the 'quiet' option, which needs to be enabled before something that would normally generate console output // 'q' enables the 'quiet' option, which needs to be enabled before something that would normally generate console output
// 'n' enables the 'nowait' option, which needs to be enabled before anything that would trigger an artificial delay
// 'c' is the 'comport' setting, which needs to be processed before 'autoconnect' // 'c' is the 'comport' setting, which needs to be processed before 'autoconnect'
foreach (char c in "?hlqnc") foreach (char c in "?hlqc")
{ {
if (x[0] == c) if (x[0] == c)
return (-1); return (-1);