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

Add command-line option to select encoding

Browse Source
This commit is contained in:
Edward Wright 2023-02-14 15:20:12 -05:00
parent d4da8d157b
commit 713ce8391d
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
SimplySerial/SimplySerial.cs
View File

@ -52,6 +52,7 @@ namespace SimplySerial
static int bufferSize = 102400; static int bufferSize = 102400;
static DateTime lastFlush = DateTime.Now; static DateTime lastFlush = DateTime.Now;
static bool forceNewline = false; static bool forceNewline = false;
static Encoding encoding = Encoding.UTF8;
// dictionary of "special" keys with the corresponding string to send out when they are pressed // dictionary of "special" keys with the corresponding string to send out when they are pressed
static Dictionary<ConsoleKey, String> specialKeys = new Dictionary<ConsoleKey, String> static Dictionary<ConsoleKey, String> specialKeys = new Dictionary<ConsoleKey, String>
@ -95,21 +96,21 @@ namespace SimplySerial
// if the above fails, it doesn't really matter - it just means escape sequences won't process nicely // if the above fails, it doesn't really matter - it just means escape sequences won't process nicely
} }
Console.OutputEncoding = System.Text.Encoding.UTF8;
// load and parse data in boards.json // load and parse data in boards.json
LoadBoards(); LoadBoards();
// process all command-line arguments // process all command-line arguments
ProcessArguments(args); ProcessArguments(args);
Console.OutputEncoding = encoding;
// verify log-related settings // verify log-related settings
if (logging) if (logging)
{ {
try try
{ {
FileStream stream = new FileStream(logFile, logMode, FileAccess.Write); FileStream stream = new FileStream(logFile, logMode, FileAccess.Write);
using (StreamWriter writer = new StreamWriter(stream, Encoding.UTF8)) using (StreamWriter writer = new StreamWriter(stream, encoding))
{ {
writer.WriteLine($"\n----- LOGGING STARTED ({DateTime.Now}) ------------------------------------"); writer.WriteLine($"\n----- LOGGING STARTED ({DateTime.Now}) ------------------------------------");
} }
@ -202,7 +203,7 @@ namespace SimplySerial
WriteTimeout = 250, // small delay - if we go too small on this it causes System.IO semaphore timeout exceptions WriteTimeout = 250, // small delay - if we go too small on this it causes System.IO semaphore timeout exceptions
DtrEnable = true, // without this we don't ever receive any data DtrEnable = true, // without this we don't ever receive any data
RtsEnable = true, // without this we don't ever receive any data RtsEnable = true, // without this we don't ever receive any data
Encoding = Encoding.UTF8 Encoding = encoding
}; };
// attempt to set the baud rate, fail if the specified value is not supported by the hardware // attempt to set the baud rate, fail if the specified value is not supported by the hardware
@ -253,8 +254,8 @@ namespace SimplySerial
// if we get this far, clear the screen and send the connection message if not in 'quiet' mode // if we get this far, clear the screen and send the connection message if not in 'quiet' mode
Console.Clear(); Console.Clear();
Output(String.Format("<<< SimplySerial v{0} connected via {1} >>>\n" + Output(String.Format("<<< SimplySerial v{0} connected via {1} >>>\n" +
"Settings : {2} baud, {3} parity, {4} data bits, {5} stop bit{6}, auto-connect {7}.\n" + "Settings : {2} baud, {3} parity, {4} data bits, {5} stop bit{6}, {7} encoding, auto-connect {8}\n" +
"Device : {8} {9}{10}\n{11}" + "Device : {9} {10}{11}\n{12}" +
"---\n\nUse CTRL-X to exit.\n", "---\n\nUse CTRL-X to exit.\n",
version, version,
port.name, port.name,
@ -262,12 +263,13 @@ namespace SimplySerial
(parity == Parity.None) ? "no" : (parity.ToString()).ToLower(), (parity == Parity.None) ? "no" : (parity.ToString()).ToLower(),
dataBits, dataBits,
(stopBits == StopBits.None) ? "0" : (stopBits == StopBits.One) ? "1" : (stopBits == StopBits.OnePointFive) ? "1.5" : "2", (stopBits == StopBits.One) ? "" : "s", (stopBits == StopBits.None) ? "0" : (stopBits == StopBits.One) ? "1" : (stopBits == StopBits.OnePointFive) ? "1.5" : "2", (stopBits == StopBits.One) ? "" : "s",
(encoding.ToString() == "System.Text.UTF8Encoding") ? "UTF-8" : "ASCII",
(autoConnect == AutoConnect.ONE) ? "on" : (autoConnect == AutoConnect.ANY) ? "any" : "off", (autoConnect == AutoConnect.ONE) ? "on" : (autoConnect == AutoConnect.ANY) ? "any" : "off",
port.board.make, port.board.make,
port.board.model, port.board.model,
(port.isCircuitPython) ? " (CircuitPython-capable)" : "", (port.isCircuitPython) ? " (CircuitPython-capable)" : "",
(logging == true) ? ($"Logfile : {logFile} (Mode = " + ((logMode == FileMode.Create) ? "OVERWRITE" : "APPEND") + ")\n" ) : "" (logging == true) ? ($"Logfile : {logFile} (Mode = " + ((logMode == FileMode.Create) ? "OVERWRITE" : "APPEND") + ")\n") : ""
), flush: true); ), flush: true); ;
lastFlush = DateTime.Now; lastFlush = DateTime.Now;
DateTime start = DateTime.Now; DateTime start = DateTime.Now;
@ -548,6 +550,19 @@ namespace SimplySerial
logFile = argument[1]; logFile = argument[1];
} }
// specify encoding
else if (argument[0].StartsWith("e"))
{
argument[1] = argument[1].ToLower();
if (argument[1].StartsWith("a"))
encoding = Encoding.ASCII;
else if (argument[1].StartsWith("u"))
encoding = Encoding.UTF8;
else
ExitProgram(("Invalid encoding specified <" + argument[1] + ">"), exitCode: -1);
}
// an invalid/incomplete argument was passed // an invalid/incomplete argument was passed
else else
{ {
@ -595,7 +610,7 @@ namespace SimplySerial
try try
{ {
FileStream stream = new FileStream(logFile, FileMode.Append, FileAccess.Write); FileStream stream = new FileStream(logFile, FileMode.Append, FileAccess.Write);
using (StreamWriter writer = new StreamWriter(stream, Encoding.UTF8)) using (StreamWriter writer = new StreamWriter(stream, encoding))
{ {
writer.Write(logData); writer.Write(logData);
} }